fix: do not load safe overview for undeployed Safes

src/components/common/NetworkSelector/index.tsx

@@ -293,11 +293,6 @@ const NetworkSelector = ({
     [availableChainIds, configs],
   )
 
-  const multiChainSafes = useMemo(
-    () => availableChainIds.map((chain) => ({ address: safeAddress, chainId: chain })),
-    [availableChainIds, safeAddress],
-  )
-
   const onChange = (event: SelectChangeEvent) => {
     event.preventDefault() // Prevent the link click
 

src/components/welcome/MyAccounts/AccountItem.tsx

@@ -28,6 +28,7 @@ import { useGetHref } from './useGetHref'
 import { extractCounterfactualSafeSetup, isPredictedSafeProps } from '@/features/counterfactual/utils'
 import { useGetSafeOverviewQuery } from '@/store/safeOverviews'
 import useWallet from '@/hooks/wallets/useWallet'
+import { skipToken } from '@reduxjs/toolkit/query'
 
 type AccountItemProps = {
   safeItem: SafeItem
@@ -64,13 +65,15 @@ const AccountItem = ({ onLinkClick, safeItem }: AccountItemProps) => {
 
   const isReplayable = !safeItem.isWatchlist && (!undeployedSafe || !isPredictedSafeProps(undeployedSafe.props))
 
-  const { data: safeOverview } = useGetSafeOverviewQuery({
-    chainId: safeItem.chainId,
-    safeAddress: safeItem.address,
-    walletAddress,
-  })
-
-  console.log('Resulting overview', safeOverview)
+  const { data: safeOverview } = useGetSafeOverviewQuery(
+    undeployedSafe
+      ? skipToken
+      : {
+          chainId: safeItem.chainId,
+          safeAddress: safeItem.address,
+          walletAddress,
+        },
+  )
 
   return (
     <ListItemButton

src/components/welcome/MyAccounts/MultiAccountItem.tsx

@@ -95,7 +95,11 @@ const MultiAccountItem = ({ onLinkClick, multiSafeAccountItem }: MultiAccountIte
 
   const currency = useAppSelector(selectCurrency)
   const { address: walletAddress } = useWallet() ?? {}
-  const { data: safeOverviews } = useGetMultipleSafeOverviewsQuery({ currency, walletAddress, safes })
+  const deployedSafes = useMemo(
+    () => safes.filter((safe) => undeployedSafes[safe.chainId]?.[safe.address] === undefined),
+    [safes, undeployedSafes],
+  )
+  const { data: safeOverviews } = useGetMultipleSafeOverviewsQuery({ currency, walletAddress, safes: deployedSafes })
 
   const safeSetups = useMemo(
     () => getSafeSetups(safes, safeOverviews ?? [], undeployedSafes),

src/features/multichain/components/SignerSetupWarning/InconsistentSignerSetupWarning.tsx

@@ -44,7 +44,11 @@ export const InconsistentSignerSetupWarning = () => {
     () => allMultiChainSafes?.find((account) => sameAddress(safeAddress, account.safes[0].address))?.safes ?? [],
     [allMultiChainSafes, safeAddress],
   )
-  const { data: safeOverviews } = useGetMultipleSafeOverviewsQuery({ safes: multiChainGroupSafes, currency })
+  const deployedSafes = useMemo(
+    () => multiChainGroupSafes.filter((safe) => undeployedSafes[safe.chainId]?.[safe.address] === undefined),
+    [multiChainGroupSafes, undeployedSafes],
+  )
+  const { data: safeOverviews } = useGetMultipleSafeOverviewsQuery({ safes: deployedSafes, currency })
 
   const safeSetups = useMemo(
     () => getSafeSetups(multiChainGroupSafes, safeOverviews ?? [], undeployedSafes),

src/store/safeOverviews.ts

@@ -54,7 +54,7 @@ class SafeOverviewFetcher {
       this.fetchTimeout = null
 
       if (nextBatch.length === 0) {
-        // If for some reason the queue was already processed we are done
+        // Nothing to process
         return
       }