fix: error handling of invalid timestamps (#2796)

* fix: error handling of invalid timestamps * fix: invalid date and time in cvs export * fix: handle undefined index
iotaledger · Apr 8, 2022 · 6e239c0 · 6e239c0
1 parent c66d658
commit 6e239c0
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 35 deletions.
diff --git a/packages/shared/components/ActivityDetail.svelte b/packages/shared/components/ActivityDetail.svelte
@@ -21,7 +21,7 @@
         sendAddressFromTransactionPayload,
     } from 'shared/lib/wallet'
     import { getContext } from 'svelte'
-    import { Readable, Writable } from 'svelte/store'
+    import { Writable } from 'svelte/store'
 
     export let locale: Locale
 
@@ -33,12 +33,26 @@
 
     export let onBackClick = (): void => {}
 
+    let date = locale('error.invalidDate')
+    $: {
+        try {
+            date = formatDate(new Date(timestamp), {
+                year: 'numeric',
+                month: 'short',
+                day: 'numeric',
+                hour: 'numeric',
+                minute: 'numeric',
+            })
+        } catch {
+            date = locale('error.invalidDate')
+        }
+    }
+
     const cachedMigrationTx = !payload
     const milestonePayload = payload?.type === 'Milestone' ? payload : undefined
     const txPayload = payload?.type === 'Transaction' ? payload : undefined
 
     const accounts = getContext<Writable<WalletAccount[]>>('walletAccounts')
-    const account = getContext<Readable<WalletAccount>>('selectedAccount')
     const explorerLink = getOfficialExplorer($accounts[0].clientOptions.network)
 
     let senderAccount: WalletAccount
@@ -166,18 +180,10 @@
             <Text secondary>{locale('general.status')}</Text>
             <Text smaller>{locale(`general.${confirmed ? 'confirmed' : 'pending'}`)}</Text>
         </div>
-        {#if timestamp}
+        {#if date}
             <div class="mb-5">
                 <Text secondary>{locale('general.date')}</Text>
-                <Text smaller>
-                    {formatDate(new Date(timestamp), {
-                        year: 'numeric',
-                        month: 'long',
-                        day: 'numeric',
-                        hour: 'numeric',
-                        minute: 'numeric',
-                    })}
-                </Text>
+                <Text smaller>{date}</Text>
             </div>
         {/if}
         {#if id}

diff --git a/packages/shared/components/ActivityRow.svelte b/packages/shared/components/ActivityRow.svelte
@@ -33,6 +33,20 @@
     export let onClick = (): void => {}
 
     let messageValue = ''
+    let date = locale('error.invalidDate')
+    $: {
+        try {
+            date = formatDate(new Date(timestamp), {
+                year: 'numeric',
+                month: 'short',
+                day: 'numeric',
+                hour: 'numeric',
+                minute: 'numeric',
+            })
+        } catch {
+            date = locale('error.invalidDate')
+        }
+    }
 
     $: hasCachedMigrationTx = !payload
     $: milestonePayload = payload?.type === 'Milestone' ? payload : undefined
@@ -210,13 +224,7 @@
             {/if}
         </Text>
         <p class="text-10 leading-120 text-gray-500">
-            {formatDate(new Date(timestamp), {
-                year: 'numeric',
-                month: 'short',
-                day: 'numeric',
-                hour: 'numeric',
-                minute: 'numeric',
-            })}
+            {date}
         </p>
     </div>
     <div class="flex-1 items-end flex flex-col ml-4">

diff --git a/packages/shared/lib/transactionHistory.ts b/packages/shared/lib/transactionHistory.ts
@@ -36,16 +36,23 @@ export const generateTransactionHistoryCsvFromAccount = (
             const formattedValueString = incoming
                 ? formatUnitBestMatch(value, true)
                 : '-' + formatUnitBestMatch(value, true)
-            const date = formatDate(new Date(timestamp), {
-                year: 'numeric',
-                month: 'short',
-                day: 'numeric',
-            })
-            const time = formatDate(new Date(timestamp), {
-                hour: 'numeric',
-                minute: 'numeric',
-                timeZoneName: 'short',
-            })
+            let date
+            let time
+            try {
+                date = formatDate(new Date(timestamp), {
+                    year: 'numeric',
+                    month: 'short',
+                    day: 'numeric',
+                })
+                time = formatDate(new Date(timestamp), {
+                    hour: 'numeric',
+                    minute: 'numeric',
+                    timeZoneName: 'short',
+                })
+            } catch {
+                date = localize('error.invalidDate')
+                time = localize('error.invalidTime')
+            }
 
             const csvLineParts: string[] = []
             headerParams.id && csvLineParts.push(String(id))

diff --git a/packages/shared/lib/wallet.ts b/packages/shared/lib/wallet.ts
@@ -1400,12 +1400,20 @@ export const getWalletBalanceHistory = (accountsBalanceHistory: AccountsBalanceH
     Object.values(accountsBalanceHistory).forEach((accBalanceHistory) => {
         Object.entries(accBalanceHistory).forEach(([timeframe, data]) => {
             if (!balanceHistory[timeframe].length) {
-                balanceHistory[timeframe] = data
+                try {
+                    balanceHistory[timeframe] = data
+                } catch (err) {
+                    console.error(err)
+                }
             } else {
-                balanceHistory[timeframe] = balanceHistory[timeframe].map(({ balance, timestamp }, index) => ({
-                    timestamp,
-                    balance: balance + data[index].balance,
-                }))
+                try {
+                    balanceHistory[timeframe] = balanceHistory[timeframe].map(({ balance, timestamp }, index) => ({
+                        timestamp,
+                        balance: balance + (data[index]?.balance ?? 0),
+                    }))
+                } catch (err) {
+                    console.error(err)
+                }
             }
         })
     })

diff --git a/packages/shared/locales/en.json b/packages/shared/locales/en.json
@@ -1225,7 +1225,9 @@
             "cannotFindStakingEvent": "Unable to find staking event.",
             "cannotVisitAirdropWebsite": "Unable to open the {airdrop} website.",
             "invalidStakingEventId": "Invalid staking event ID."
-        }
+        },
+        "invalidDate": "INVALID DATE",
+        "invalidTime": "INVALID TIME"
     },
     "warning": {
         "node": {