fix: resolve conflict

Author: brancoder

package.json

@@ -9,7 +9,7 @@
     },
     "license": "MIT",
     "dependencies": {
-        "@iota/iota.js": "^1.9.0-stardust.11",
+        "@iota/iota.js": "^1.9.0-stardust.13",
         "classnames": "^2.3.1",
         "humanize-duration": "^3.25.2",
         "moment": "^2.29.1",

src/app/components/tangle/Output.tsx

@@ -29,7 +29,8 @@ class Output extends Component<OutputProps, OutputState> {
 
         this.state = {
             formatFull: false,
-            isGenesis: (this.isOutputResponse(props.output)) ? props.output.messageId === "0".repeat(64) : false,
+            isGenesis: (this.isOutputResponse(props.output))
+                    ? props.output.metadata.messageId === "0".repeat(64) : false,
             output: (this.isOutputResponse(props.output)) ? props.output.output : props.output,
             showDetails: false
         };
@@ -94,16 +95,16 @@ class Output extends Component<OutputProps, OutputState> {
                                             <React.Fragment>
                                                 <Link
                                                     to={
-                                                        `/explorer/message/${this.props.output.messageId}`
+                                                        `/explorer/message/${this.props.output.metadata.messageId}`
                                                     }
                                                     className="margin-r-t"
                                                 >
-                                                    {this.props.output.messageId}
+                                                    {this.props.output.metadata.messageId}
                                                 </Link>
                                                 <MessageButton
                                                     onClick={() => {
                                                         if (this.isOutputResponse(this.props.output)) {
-                                                            ClipboardHelper.copy(this.props.output.messageId);
+                                                            ClipboardHelper.copy(this.props.output.metadata.messageId);
                                                         }
                                                     }}
                                                     buttonType="copy"
@@ -122,12 +123,14 @@ class Output extends Component<OutputProps, OutputState> {
                                         {!this.state.isGenesis && (
                                             <React.Fragment>
                                                 <span className="margin-r-t">
-                                                    {this.props.output.transactionId}
+                                                    {this.props.output.metadata.transactionId}
                                                 </span>
                                                 <MessageButton
                                                     onClick={() => {
                                                         if (this.isOutputResponse(this.props.output)) {
-                                                            ClipboardHelper.copy(this.props.output.transactionId);
+                                                            ClipboardHelper.copy(
+                                                                this.props.output.metadata.transactionId
+                                                            );
                                                         }
                                                     }}
                                                     buttonType="copy"
@@ -140,13 +143,13 @@ class Output extends Component<OutputProps, OutputState> {
                                         Index
                                     </div>
                                     <div className="card--value">
-                                        {this.props.output.outputIndex}
+                                        {this.props.output.metadata.outputIndex}
                                     </div>
                                     <div className="card--label">
                                         Is Spent
                                     </div>
                                     <div className="card--value">
-                                        {this.props.output.isSpent ? "Yes" : "No"}
+                                        {this.props.output.metadata.isSpent ? "Yes" : "No"}
                                     </div>
                                 </React.Fragment>
                             )}
@@ -205,12 +208,6 @@ class Output extends Component<OutputProps, OutputState> {
                                     <div className="card--value row">
                                         {this.state.output.serialNumber}
                                     </div>
-                                    <div className="card--label">
-                                        Token tag:
-                                    </div>
-                                    <div className="card--value row">
-                                        {this.state.output.tokenTag}
-                                    </div>
                                     <div className="card--label">
                                         Token scheme type:
                                     </div>

src/app/routes/Search.tsx

@@ -160,7 +160,7 @@ class Search extends AsyncComponent<RouteComponentProps<SearchRouteProps>, Searc
                             objType = "address";
                         } else if (response.output) {
                             objType = "message";
-                            objParam = response.output.messageId;
+                            objParam = response.output.metadata.messageId;
                         } else if (response.milestone) {
                             objType = "milestone";
                             objParam = response.milestone.index.toString();

src/utils/formatHelper.ts

@@ -28,7 +28,11 @@ export class FormatHelper {
 
     /**
      * Get the FormatHelper singleton instance.
+<<<<<<< HEAD
      * @returns The FormatHelper instance.
+=======
+     * @returns FormatHelper instance.
+>>>>>>> feat/stardust
      */
     public static getInstance(): FormatHelper {
         if (!FormatHelper.instance) {