fix: correct use of nft metadata

iotaledger · Nov 18, 2022 · 5441dad · 5441dad
1 parent 1fd1763
commit 5441dad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/packages/shared/components/molecules/activity-info/GenericActivityInformation.svelte b/packages/shared/components/molecules/activity-info/GenericActivityInformation.svelte
@@ -2,7 +2,7 @@
     import { KeyValueBox } from 'shared/components'
     import { formatDate, localize } from '@core/i18n'
     import { activeProfile } from '@core/profile'
-    import { Activity, formatTokenAmountPrecise, NftActivity } from '@core/wallet'
+    import { Activity, formatTokenAmountPrecise } from '@core/wallet'
     import { BASE_TOKEN } from '@core/network'
     import { getOfficialExplorerUrl } from '@core/network/utils'
     import { Platform } from '@core/app'
@@ -34,10 +34,9 @@
         ...(activity.time && {
             transactionTime: { data: formattedTransactionTime },
         }),
-        ...(activity.metadata &&
-            !(activity as NftActivity).nftId && {
-                metadata: { data: activity.metadata, isTooltipVisible: true },
-            }),
+        ...(activity.metadata && {
+            metadata: { data: activity.metadata, isTooltipVisible: true },
+        }),
         ...(activity.tag && {
             tag: { data: activity.tag, isTooltipVisible: true },
         }),
@@ -85,7 +84,6 @@
         tooltipText={value.isTooltipVisible
             ? localize(`tooltips.transactionDetails.${activity?.direction}.${key}`)
             : undefined}
-        classes={key === 'metadata' ? 'whitespace-pre-wrap' : ''}
     />
 {/each}
 {#if activity.asyncData?.claimingTransactionId}

diff --git a/packages/shared/components/molecules/activity-info/NftMetadataInformation.svelte b/packages/shared/components/molecules/activity-info/NftMetadataInformation.svelte
@@ -2,8 +2,9 @@
     import { KeyValueBox } from 'shared/components'
 
     import { localize } from '@core/i18n'
-    import { IIrc27Metadata, parseNftMetadata } from '@core/nfts'
-    import { Activity } from '@core/wallet'
+    import { getNftByIdFromAllAccountNfts, IIrc27Metadata } from '@core/nfts'
+    import { Activity, NftActivity } from '@core/wallet'
+    import { selectedAccountIndex } from '@core/account'
 
     export let activity: Partial<Activity> = {}
 
@@ -14,8 +15,8 @@
         }
     }
 
-    $: nftMetadata = parseNftMetadata(activity?.metadata)
-    $: nftMetadataDetailsList = createNftMetadataDetailsList(nftMetadata)
+    $: storedNft = getNftByIdFromAllAccountNfts($selectedAccountIndex, (activity as NftActivity)?.nftId)
+    $: nftMetadataDetailsList = createNftMetadataDetailsList(storedNft?.parsedMetadata)
 
     function createNftMetadataDetailsList(
         metadata: IIrc27Metadata | string
@@ -71,7 +72,7 @@
             ? localize(`tooltips.transactionDetails.nftMetadata.${key}`)
             : ''}
         valueText={JSON.stringify(value, null, 2)}
-        isCopyable
         classes="whitespace-pre-wrap"
+        isCopyable
     />
 {/each}
diff --git a/packages/shared/lib/core/nfts/interfaces/nft.interface.ts b/packages/shared/lib/core/nfts/interfaces/nft.interface.ts
@@ -6,6 +6,6 @@ export interface INft {
     name: string
     issuer: AddressTypes
     metadata: string
-    parsedMetadata?: IIrc27Metadata
+    parsedMetadata?: IIrc27Metadata | string
     isOwned: boolean
 }
diff --git a/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts b/packages/shared/lib/core/nfts/utils/buildNftFromNftOutput.ts
@@ -11,7 +11,7 @@ export function buildNftFromNftOutput(nftOutput: INftOutput, outputId: string, i
     const parsedMetadata = parseNftMetadata(metadata)
     return {
         id,
-        name: parsedMetadata?.name ?? DEFAULT_NFT_NAME,
+        name: typeof parsedMetadata === 'string' ? DEFAULT_NFT_NAME : (parsedMetadata?.name ?? DEFAULT_NFT_NAME),
         issuer,
         isOwned,
         metadata,