Merge remote-tracking branch 'origin/fix-home-history-refresh' into t…

…mp/20241206
RabbyHub · Dec 6, 2024 · 91b70a9 · 91b70a9
2 parents b991e17 + 2d1aa6d
commit 91b70a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/apps/mobile/src/components2024/WordsMatrix/index.tsx b/apps/mobile/src/components2024/WordsMatrix/index.tsx
@@ -108,7 +108,7 @@ const getStyle = createGetStyles2024(({ colors2024 }) => ({
     borderWidth: 1,
     borderColor: 'transparent',
     backgroundColor: colors2024['neutral-bg-2'],
-    width: '48%',
+    width: '47%',
     minWidth: 0,
     borderRadius: 12,
     flexShrink: 0,

diff --git a/apps/mobile/src/screens/Home/MultiAddressHome.tsx b/apps/mobile/src/screens/Home/MultiAddressHome.tsx
@@ -201,18 +201,11 @@ function MultiAddressHome(): JSX.Element {
     if (!addresses.length) {
       return;
     }
-    const { pendingsLength, pendings } =
+    const { pendingsLength } =
       transactionHistoryService.getPendingsAddresses(addresses);
-    console.debug('fetchHistory :', balanceCacheAccounts, pendings);
     setPendingTxCount(pendingsLength);
-    if (pendingsLength) {
-      if (!timeRef.current) {
-        timeRef.current = setInterval(fetchHistory, 5000);
-      }
-    } else {
-      timeRef.current && clearInterval(timeRef.current);
-      timeRef.current = null;
-    }
+    timeRef.current && clearInterval(timeRef.current);
+    timeRef.current = pendingsLength ? setInterval(fetchHistory, 5000) : null;
   }, [balanceCacheAccounts]);
 
   const detectHasAccounts = useMemoizedFn(async () => {
@@ -241,7 +234,7 @@ function MultiAddressHome(): JSX.Element {
         const { redirectAction } = await detectHasAccounts();
         if (redirectAction) {
           redirectAction();
-        } else if (!timeRef.current) {
+        } else {
           fetchHistory();
         }
       })();
@@ -608,7 +601,7 @@ const getStyle = createGetStyles2024(({ colors2024, isLight }) => ({
     backgroundColor: isLight
       ? colors2024['neutral-bg-1']
       : colors2024['neutral-bg-2'],
-    width: '48%',
+    width: '47%',
     minWidth: 0,
     borderRadius: 18,
     flexShrink: 0,