fix safe loaded

aura-nw · Sep 7, 2023 · 2ad87de · 2ad87de
1 parent cc2fe6e
commit 2ad87de
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/src/logic/safe/store/actions/fetchSafe.ts b/src/logic/safe/store/actions/fetchSafe.ts
@@ -231,7 +231,7 @@ async function _getSafeInfo(safeAddress: string, safeId: number): Promise<[IMSaf
     throw new Error("Get Safe Info failed");
   }
 
-  const isSafeLoaded = accountAssetData && mSafeInfotData && accountInfoData
+  const isSafeLoaded = !!(accountAssetData && mSafeInfotData && accountInfoData)
   const formatMSafeInfotData: IMSafeInfo = {
     ...mSafeInfotData,
     accountNumber: String(accountInfoData?.account_number),
@@ -315,7 +315,4 @@ async function _getSafeInfo(safeAddress: string, safeId: number): Promise<[IMSaf
   }
 
   return [formatMSafeInfotData, safeInfoData, accountInfoData, isSafeLoaded]
-
-
-
 }
diff --git a/src/logic/safe/store/models/safe.ts b/src/logic/safe/store/models/safe.ts
@@ -79,6 +79,7 @@ const makeSafe = Record<SafeRecordProps>({
   sequence: '1',
   coinConfig: [],
   isHideZeroBalance: true,
+  isSafeLoaded: undefined,
 })
 
 export type SafeRecord = RecordOf<SafeRecordProps>

diff --git a/src/services/index.ts b/src/services/index.ts
@@ -417,7 +417,7 @@ export async function getDetailToken(address: string): Promise<IResponse<any>> {
 export async function fetchAccountInfo(safeAddress: string) {
   try {
     const response = await getAccountInfo(safeAddress);
-    const accountInfo = response.account[0];
+    const accountInfo = response.account[0] ?? { account_number: 0, sequence: 0, balances: [] };
     return accountInfo;
   } catch (error) {
     try {