fix(mobile): fetching balances for created wallet (#649)

tonkeeper · Dec 7, 2023 · 1403215 · 1403215
1 parent d903dec
commit 1403215
Showing 1 changed file with 30 additions and 14 deletions.
diff --git a/packages/mobile/src/blockchain/wallet.ts b/packages/mobile/src/blockchain/wallet.ts
@@ -677,24 +677,40 @@ export class TonWallet {
   }
 
   async getLockupBalances(info: Account) {
-    if (['empty', 'uninit', 'nonexist'].includes(info?.status ?? '')) {
-      const balance = (
-        await this.blockchainApi.getRawAccount({ accountId: info.address })
-      ).balance;
-      return [Ton.fromNano(balance), 0, 0];
-    }
+    try {
+      if (['empty', 'uninit', 'nonexist'].includes(info?.status ?? '')) {
+        const balance = (
+          await this.blockchainApi.getRawAccount({ accountId: info.address })
+        ).balance;
+        return [Ton.fromNano(balance), 0, 0];
+      }
 
-    const balances = await this.vault.tonWallet.getBalances();
-    const result = balances.map((item: number) => Ton.fromNano(item.toString()));
-    result[0] = new BigNumber(result[0]).minus(result[1]).minus(result[2]).toString();
+      const balances = await this.vault.tonWallet.getBalances();
+      const result = balances.map((item: number) => Ton.fromNano(item.toString()));
+      result[0] = new BigNumber(result[0]).minus(result[1]).minus(result[2]).toString();
+
+      return result;
+    } catch (e) {
+      if (e?.response?.status === 404) {
+        return [Ton.fromNano('0'), 0, 0];
+      }
 
-    return result;
+      throw e;
+    }
   }
 
   async getBalance(): Promise<string> {
-    const account = await this.vault.getTonAddress(this.isTestnet);
-    const balance = (await this.blockchainApi.getRawAccount({ accountId: account }))
-      .balance;
-    return Ton.fromNano(balance);
+    try {
+      const account = await this.vault.getTonAddress(this.isTestnet);
+      const balance = (await this.blockchainApi.getRawAccount({ accountId: account }))
+        .balance;
+      return Ton.fromNano(balance);
+    } catch (e) {
+      if (e?.response?.status === 404) {
+        return Ton.fromNano(0);
+      }
+
+      throw e;
+    }
   }
 }