fix: avoid crash on empty NFT details (#7398)

* fix: avoid crash when clicking empty NFT * clean up * fixes --------- Co-authored-by: marc2332 <[email protected]> Co-authored-by: Begoña Álvarez de la Cruz <[email protected]>
iotaledger · Sep 12, 2023 · 4db889d · 4db889d
1 parent f17ff60
commit 4db889d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte b/packages/desktop/views/dashboard/collectibles/views/CollectiblesDetailsView.svelte
@@ -49,8 +49,8 @@
     const { standard, version, type, uri, description, issuerName, collectionName, attributes, soonaverseAttributes } =
         nft?.parsedMetadata || {}
 
-    const issuerAddress = getBech32AddressFromAddressTypes(issuer)
-    const collectionId = getHexAddressFromAddressTypes(issuer)
+    const issuerAddress = issuer ? getBech32AddressFromAddressTypes(issuer) : undefined
+    const collectionId = issuer ? getHexAddressFromAddressTypes(issuer) : undefined
 
     let detailsList: {
         [key in string]: {

diff --git a/packages/shared/components/activity-info/NftActivityInformation.svelte b/packages/shared/components/activity-info/NftActivityInformation.svelte
@@ -15,9 +15,9 @@
 
     export let activity: NftActivity
 
-    $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity?.nftId)
-    $: issuerAddress = getBech32AddressFromAddressTypes(nft?.issuer)
-    $: collectionId = getHexAddressFromAddressTypes(nft?.issuer)
+    $: nft = getNftByIdFromAllAccountNfts($selectedAccountIndex, activity.nftId)
+    $: issuerAddress = nft?.issuer && getBech32AddressFromAddressTypes(nft.issuer)
+    $: collectionId = nft?.issuer && getHexAddressFromAddressTypes(nft.issuer)
 
     let detailsList: IKeyValueBoxList
     $: detailsList = {

diff --git a/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts b/packages/shared/lib/core/profile-manager/actions/events-handlers/handleNewOutputEvent.ts
@@ -36,7 +36,7 @@ export async function handleNewOutputEventInternal(accountIndex: number, payload
 
     const output = outputData.output as AliasOutput
 
-    const address = getBech32AddressFromAddressTypes(outputData?.address)
+    const address = getBech32AddressFromAddressTypes(outputData.address)
     const isNewAliasOutput =
         output.type === OutputType.Alias &&
         output.stateIndex === 0 &&

diff --git a/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getBech32AddressFromAddressTypes.ts
@@ -2,7 +2,7 @@ import { api } from '@core/profile-manager'
 import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/sdk/out/types'
 import { getNetworkHrp } from '@core/profile'
 
-export function getBech32AddressFromAddressTypes(address: Address): string | undefined {
+export function getBech32AddressFromAddressTypes(address: Address): string {
     const hrp = getNetworkHrp()
     switch (address.type) {
         case AddressType.Ed25519:

diff --git a/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts b/packages/shared/lib/core/wallet/utils/getHexAddressFromAddressTypes.ts
@@ -1,7 +1,7 @@
 import { Address, AddressType, AliasAddress, Ed25519Address, NftAddress } from '@iota/sdk/out/types'
 
 export function getHexAddressFromAddressTypes(address: Address): string {
-    switch (address?.type) {
+    switch (address.type) {
         case AddressType.Ed25519:
             return (address as Ed25519Address).pubKeyHash
         case AddressType.Alias:

diff --git a/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts b/packages/shared/lib/core/wallet/utils/outputs/getSenderFromOutput.ts
@@ -17,7 +17,7 @@ export function getSenderFromOutput(output: CommonOutput): Subject | undefined {
             const storageOrExpirationUnlockCondition = unlockCondition as
                 | StorageDepositReturnUnlockCondition
                 | ExpirationUnlockCondition
-            const address = getBech32AddressFromAddressTypes(storageOrExpirationUnlockCondition?.returnAddress)
+            const address = getBech32AddressFromAddressTypes(storageOrExpirationUnlockCondition.returnAddress)
             if (address) {
                 return getSubjectFromAddress(address)
             }