fix: ignore error when getting address info on address management page

RabbyHub · Sep 14, 2023 · 0314822 · 0314822
1 parent 1a14dfc
commit 0314822
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/src/ui/views/HDManager/AccountList.tsx b/src/ui/views/HDManager/AccountList.tsx
@@ -87,7 +87,7 @@ export const AccountList: React.FC<Props> = ({
 
   React.useEffect(() => {
     if (!hiddenInfo) {
-      createTask(() => fetchAccountsInfo(wallet, data ?? []).then(setList));
+      fetchAccountsInfo(wallet, data ?? []).then(setList);
     } else {
       setList(data ?? []);
     }

diff --git a/src/ui/views/HDManager/utils.tsx b/src/ui/views/HDManager/utils.tsx
@@ -8,6 +8,7 @@ import * as Sentry from '@sentry/browser';
 import { KEYRING_CLASS } from '@/constant';
 import { useRabbyDispatch } from '@/ui/store';
 import { useTranslation } from 'react-i18next';
+import { isFunction } from 'lodash';
 
 export const sleep = (ms: number) =>
   new Promise((resolve) => setTimeout(resolve, ms));
@@ -40,7 +41,7 @@ export const fetchAccountsInfo = async (
         }
       }
 
-      let chains: Account['chains'];
+      let chains: Account['chains'] = [];
       try {
         chains = await wallet.openapi.usedChainList(account.address);
       } catch (e) {
@@ -59,11 +60,13 @@ export const fetchAccountsInfo = async (
       }
 
       // find firstTxTime
-      chains?.forEach((chain: any) => {
-        if (chain.born_at) {
-          firstTxTime = Math.min(firstTxTime ?? Infinity, chain.born_at);
-        }
-      });
+      if (isFunction(chains?.forEach)) {
+        chains?.forEach((chain: any) => {
+          if (chain.born_at) {
+            firstTxTime = Math.min(firstTxTime ?? Infinity, chain.born_at);
+          }
+        });
+      }
 
       const accountInfo: Account = {
         ...account,