Fix: always load Transactions on initiial load

5afe · Dec 1, 2021 · f2efbef · f2efbef
1 parent 918d68e
commit f2efbef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/logic/safe/hooks/useLoadSafe.tsx b/src/logic/safe/hooks/useLoadSafe.tsx
@@ -17,7 +17,7 @@ export const useLoadSafe = (safeAddress?: string): void => {
     if (!safeAddress) return
 
     dispatch(fetchLatestMasterContractVersion())
-    dispatch(fetchSafe(safeAddress))
+    dispatch(fetchSafe(safeAddress, true))
     dispatch(fetchSafeTokens(safeAddress))
     dispatch(updateAvailableCurrencies())
     dispatch(addViewedSafe(safeAddress))

diff --git a/src/logic/safe/store/actions/fetchSafe.ts b/src/logic/safe/store/actions/fetchSafe.ts
@@ -56,7 +56,7 @@ export const buildSafe = async (safeAddress: string): Promise<SafeRecordProps> =
  * @param {string} safeAddress
  */
 export const fetchSafe =
-  (safeAddress: string) =>
+  (safeAddress: string, isInitialLoad = false) =>
   async (dispatch: Dispatch<any>): Promise<Action<Partial<SafeRecordProps>> | void> => {
     let address = ''
     try {
@@ -94,11 +94,11 @@ export const fetchSafe =
       const shouldUpdateTxHistory = txHistoryTag !== safeInfo.txHistoryTag
       const shouldUpdateTxQueued = txQueuedTag !== safeInfo.txQueuedTag
 
-      if (shouldUpdateCollectibles) {
+      if (shouldUpdateCollectibles || isInitialLoad) {
         dispatch(fetchCollectibles(safeAddress))
       }
 
-      if (shouldUpdateTxHistory || shouldUpdateTxQueued) {
+      if (shouldUpdateTxHistory || shouldUpdateTxQueued || isInitialLoad) {
         dispatch(fetchTransactions(getNetworkId(), safeAddress))
       }
     }