diff --git a/src/logic/safe/hooks/useLoadSafe.tsx b/src/logic/safe/hooks/useLoadSafe.tsx index 6f4ef156f9..53a410bc49 100644 --- 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 index 4daad273eb..370cc44e8b 100644 --- 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 = * @param {string} safeAddress */ export const fetchSafe = - (safeAddress: string) => + (safeAddress: string, isInitialLoad = false) => async (dispatch: Dispatch): Promise> | 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)) } }