From ac60a4f6417a9137d09664a29172e79707684f58 Mon Sep 17 00:00:00 2001
From: Nicole O'Brien <nicole.obrien@iota.org>
Date: Thu, 16 Feb 2023 11:02:00 +0000
Subject: [PATCH] fix: add more optional chaining (#5893)

Co-authored-by: Tuditi <45079109+Tuditi@users.noreply.github.com>
---
 .../GenericActivityInformation.svelte            | 16 ++++++++--------
 .../popups/ActivityDetailsPopup.svelte           |  4 ++--
 .../BurnNativeTokensConfirmationPopup.svelte     |  2 +-
 .../popups/send/SendConfirmationPopup.svelte     |  2 +-
 .../handleDeepLinkSendFormOperation.ts           |  2 +-
 .../getAccountAssetsForSelectedAccount.ts        |  2 +-
 .../stores/selected-account-activities.store.ts  |  6 +++---
 .../shared/lib/core/wallet/utils/sortAssets.ts   |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/packages/shared/components/molecules/activity-info/GenericActivityInformation.svelte b/packages/shared/components/molecules/activity-info/GenericActivityInformation.svelte
index 243fb2cb99..d32996781b 100644
--- a/packages/shared/components/molecules/activity-info/GenericActivityInformation.svelte
+++ b/packages/shared/components/molecules/activity-info/GenericActivityInformation.svelte
@@ -31,19 +31,19 @@
         ...(activity?.destinationNetwork && {
             destinationNetwork: { data: activity?.destinationNetwork },
         }),
-        ...(activity.time && {
+        ...(activity?.time && {
             transactionTime: { data: formattedTransactionTime },
         }),
-        ...(activity.metadata && {
+        ...(activity?.metadata && {
             metadata: { data: activity.metadata, isTooltipVisible: true },
         }),
-        ...(activity.tag && {
+        ...(activity?.tag && {
             tag: { data: activity.tag, isTooltipVisible: true },
         }),
         ...(hasStorageDeposit && {
             storageDeposit: { data: formattedStorageDeposit, isTooltipVisible: true },
         }),
-        ...(activity.giftedStorageDeposit && {
+        ...(activity?.giftedStorageDeposit && {
             giftedStorageDeposit: { data: formattedGiftedStorageDeposit, isTooltipVisible: true },
         }),
         ...(gasBudget && {
@@ -52,7 +52,7 @@
         ...(expirationTime && {
             expirationTime: { data: expirationTime, isTooltipVisible: true },
         }),
-        ...(activity.asyncData?.timelockDate && {
+        ...(activity?.asyncData?.timelockDate && {
             timelockDate: { data: formattedTimelockDate, isTooltipVisible: true },
         }),
         ...(claimedTime && { claimedTime: { data: claimedTime } }),
@@ -61,9 +61,9 @@
     function handleTransactionIdClick(): void {
         explorerUrl
             ? openUrlInBrowser(
-                  `${explorerUrl}/${ExplorerEndpoint.Transaction}/${activity.asyncData?.claimingTransactionId}`
+                  `${explorerUrl}/${ExplorerEndpoint.Transaction}/${activity?.asyncData?.claimingTransactionId}`
               )
-            : setClipboard(activity.asyncData?.claimingTransactionId)
+            : setClipboard(activity?.asyncData?.claimingTransactionId)
     }
 </script>
 
@@ -76,7 +76,7 @@
             : undefined}
     />
 {/each}
-{#if activity.asyncData?.claimingTransactionId}
+{#if activity?.asyncData?.claimingTransactionId}
     <KeyValueBox keyText={localize(activity.asyncData?.isClaiming ? 'general.claimingIn' : 'general.claimedIn')}>
         <button
             slot="value"
diff --git a/packages/shared/components/popups/ActivityDetailsPopup.svelte b/packages/shared/components/popups/ActivityDetailsPopup.svelte
index 7f96e62a95..198395f5ee 100644
--- a/packages/shared/components/popups/ActivityDetailsPopup.svelte
+++ b/packages/shared/components/popups/ActivityDetailsPopup.svelte
@@ -58,8 +58,8 @@
         const details = {
             transactionTime: activity.time,
             inclusionState: activity.inclusionState,
-            tag: activity.tag,
-            metadata: activity.metadata,
+            tag: activity?.tag,
+            metadata: activity?.metadata,
             direction: activity.direction,
             asyncStatus: activity.asyncData?.asyncStatus,
             claimedDate: activity.asyncData?.claimedDate,
diff --git a/packages/shared/components/popups/BurnNativeTokensConfirmationPopup.svelte b/packages/shared/components/popups/BurnNativeTokensConfirmationPopup.svelte
index 466d80a758..2ba8c543b6 100644
--- a/packages/shared/components/popups/BurnNativeTokensConfirmationPopup.svelte
+++ b/packages/shared/components/popups/BurnNativeTokensConfirmationPopup.svelte
@@ -48,7 +48,7 @@
     <Text type={TextType.h3} fontWeight={FontWeight.semibold} classes="text-left">
         {localize('actions.confirmTokenBurn.title', {
             values: {
-                assetName: asset.metadata.name,
+                assetName: asset?.metadata.name,
             },
         })}
     </Text>
diff --git a/packages/shared/components/popups/send/SendConfirmationPopup.svelte b/packages/shared/components/popups/send/SendConfirmationPopup.svelte
index d75b3123be..ffd36070dd 100644
--- a/packages/shared/components/popups/send/SendConfirmationPopup.svelte
+++ b/packages/shared/components/popups/send/SendConfirmationPopup.svelte
@@ -128,7 +128,7 @@
             expirationDate,
             recipientAddress,
             transactionDetails.type === NewTransactionType.TokenTransfer ? transactionDetails.rawAmount : '0',
-            transactionDetails.metadata,
+            transactionDetails?.metadata,
             transactionDetails.tag,
             asset,
             giftStorageDeposit,
diff --git a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
index 0e56e55aae..6792e579e0 100644
--- a/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
+++ b/packages/shared/lib/auxiliary/deep-link/handlers/wallet/operations/handleDeepLinkSendFormOperation.ts
@@ -42,7 +42,7 @@ function parseSendFormOperation(searchParams: URLSearchParams): NewTransactionDe
     }
 
     const address = searchParams.get(SendOperationParameter.Address)
-    const unit = searchParams.get(SendOperationParameter.Unit) ?? asset.metadata?.unit
+    const unit = searchParams.get(SendOperationParameter.Unit) ?? asset?.metadata?.unit
     const rawAmount = getRawAmountFromSearchParam(searchParams)
     const metadata = searchParams.get(SendOperationParameter.Metadata)
     const tag = searchParams.get(SendOperationParameter.Tag)
diff --git a/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts b/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
index 0fca2436e9..9f05c8f3b0 100644
--- a/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
+++ b/packages/shared/lib/core/wallet/actions/getAccountAssetsForSelectedAccount.ts
@@ -27,7 +27,7 @@ export function getAccountAssetsForSelectedAccount(marketCoinPrices: MarketCoinP
     const tokens = account?.balances?.nativeTokens ?? []
     for (const token of tokens) {
         const persistedAsset = getAssetFromPersistedAssets(token.tokenId)
-        if (persistedAsset && isValidIrc30(persistedAsset.metadata)) {
+        if (persistedAsset && isValidIrc30(persistedAsset?.metadata)) {
             nativeTokens.push({
                 ...persistedAsset,
                 balance: {
diff --git a/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts b/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
index 8d8ab1902b..e15c917e0a 100644
--- a/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
+++ b/packages/shared/lib/core/wallet/stores/selected-account-activities.store.ts
@@ -80,15 +80,15 @@ function getFieldsToSearchFromActivity(activity: Activity): string[] {
         fieldsToSearch.push(activity.subject?.address)
     }
 
-    if (activity.asyncData?.claimingTransactionId) {
+    if (activity?.asyncData?.claimingTransactionId) {
         fieldsToSearch.push(activity.asyncData.claimingTransactionId)
     }
 
-    if (activity.metadata) {
+    if (activity?.metadata) {
         fieldsToSearch.push(activity.metadata)
     }
 
-    if (activity.tag) {
+    if (activity?.tag) {
         fieldsToSearch.push(activity.tag)
     }
 
diff --git a/packages/shared/lib/core/wallet/utils/sortAssets.ts b/packages/shared/lib/core/wallet/utils/sortAssets.ts
index 09ba0c3648..cc3be106bf 100644
--- a/packages/shared/lib/core/wallet/utils/sortAssets.ts
+++ b/packages/shared/lib/core/wallet/utils/sortAssets.ts
@@ -24,7 +24,7 @@ export function sortAssets(assets: IAsset[]): IAsset[] {
 }
 
 function sortByName(asset1: IAsset, asset2: IAsset, asc: boolean): number {
-    return asset1.metadata?.name.toLowerCase() > asset2.metadata?.name.toLowerCase() ? (asc ? 1 : -1) : asc ? -1 : 1
+    return asset1?.metadata?.name.toLowerCase() > asset2?.metadata?.name.toLowerCase() ? (asc ? 1 : -1) : asc ? -1 : 1
 }
 
 function sortByAmount(asset1: IAsset, asset2: IAsset, asc: boolean): number {