feat: refresh on next-time open dashboard after tx completed.

RabbyHub · Apr 29, 2024 · 94a1dbf · 94a1dbf
1 parent 5787a0c
commit 94a1dbf
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 11 deletions.
diff --git a/src/background/controller/wallet.ts b/src/background/controller/wallet.ts
@@ -3794,7 +3794,7 @@ autoLockService.onAutoLock = async () => {
     method: EVENTS.LOCK_WALLET,
   });
 };
-refreshBalanceService.onRefreshBalance = async (ctx) => {
+refreshBalanceService.onRefreshBalance = (ctx) => {
   const address =
     ctx?.accountToRefresh || refreshBalanceService.accountToRefresh;
   if (!address) return;

diff --git a/src/ui/hooks/useCurrentBalance.ts b/src/ui/hooks/useCurrentBalance.ts
@@ -138,7 +138,7 @@ export default function useCurrentBalance(
     if (!account) return false;
 
     try {
-      return wallet.isAddressBalanceExpired(account);
+      return wallet.isAddressBalanceExpired(account.toLowerCase());
     } catch (error) {
       return false;
     }

diff --git a/src/ui/views/Dashboard/components/BalanceView/BalanceView.tsx b/src/ui/views/Dashboard/components/BalanceView/BalanceView.tsx
@@ -35,6 +35,7 @@ import {
 } from './useHomeBalanceView';
 import { BALANCE_LOADING_TIMES } from '@/constant/timeout';
 import type { Account } from '@/background/service/preference';
+import { IExtractFromPromise } from '@/ui/utils/type';
 
 const BalanceView = ({
   currentAccount,
@@ -134,6 +135,17 @@ const BalanceView = ({
     latestCurveData,
   ]);
 
+  const getCacheExpired = useCallback(async () => {
+    const res = {
+      balanceExpired: await isCurrentBalanceExpired(),
+      curveExpired: await isCurveCollectionExpired(),
+      expired: false,
+    };
+    res.expired = res.balanceExpired || res.curveExpired;
+
+    return res;
+  }, [isCurrentBalanceExpired, isCurveCollectionExpired]);
+
   const { isManualRefreshing, onRefresh } = useRefreshHomeBalanceView({
     currentAddress: currentAccount?.address,
     refreshFn: useCallback(
@@ -147,19 +159,33 @@ const BalanceView = ({
       },
       [refreshBalance, refreshCurve]
     ),
-    isExpired: useCallback(async () => {
-      return {
-        balanceExpired: await isCurrentBalanceExpired(),
-        curveExpired: await isCurveCollectionExpired(),
-      };
-    }, [isCurrentBalanceExpired, isCurveCollectionExpired]),
+    isExpired: getCacheExpired,
   });
 
   const refreshTimerlegacy = useRef<NodeJS.Timeout>();
+  // only execute once on component mounted or address changed
   useEffect(() => {
-    if (!currentHomeBalanceCache?.balance) {
-      onRefresh({ balanceExpired: true, curveExpired: true, isManual: false });
-    }
+    (async () => {
+      let expirationInfo: IExtractFromPromise<
+        ReturnType<typeof getCacheExpired>
+      > | null = null;
+      if (!currentHomeBalanceCache?.balance) {
+        onRefresh({
+          balanceExpired: true,
+          curveExpired: true,
+          isManual: false,
+        });
+      } else if (
+        (expirationInfo = await getCacheExpired()) &&
+        expirationInfo.expired
+      ) {
+        onRefresh({
+          balanceExpired: expirationInfo.balanceExpired,
+          curveExpired: expirationInfo.curveExpired,
+          isManual: false,
+        });
+      }
+    })();
 
     const handler = async ({ address }) => {
       if (
@@ -192,6 +218,7 @@ const BalanceView = ({
     currentAccount?.address,
     dispatch.transactions,
     onRefresh,
+    getCacheExpired,
   ]);
 
   const handleIsGnosisChange = useCallback(async () => {