fix(Multichain): memoize data for InconsistentSignerSetupWarning

safe-global · Sep 23, 2024 · 63eb8a5 · 63eb8a5
1 parent d450f1c
commit 63eb8a5
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/features/multichain/components/SignerSetupWarning/InconsistentSignerSetupWarning.tsx b/src/features/multichain/components/SignerSetupWarning/InconsistentSignerSetupWarning.tsx
@@ -40,12 +40,15 @@ export const InconsistentSignerSetupWarning = () => {
   const undeployedSafes = useAppSelector(selectUndeployedSafes)
   const { allMultiChainSafes } = useAllSafesGrouped()
 
-  const multiChainGroup = allMultiChainSafes?.find((account) => sameAddress(safeAddress, account.safes[0].address))
-  const [safeOverviews] = useSafeOverviews(multiChainGroup?.safes ?? [])
+  const multiChainGroupSafes = useMemo(
+    () => allMultiChainSafes?.find((account) => sameAddress(safeAddress, account.safes[0].address))?.safes ?? [],
+    [allMultiChainSafes, safeAddress],
+  )
+  const [safeOverviews] = useSafeOverviews(multiChainGroupSafes)
 
   const safeSetups = useMemo(
-    () => getSafeSetups(multiChainGroup?.safes ?? [], safeOverviews ?? [], undeployedSafes),
-    [multiChainGroup?.safes, safeOverviews, undeployedSafes],
+    () => getSafeSetups(multiChainGroupSafes ?? [], safeOverviews ?? [], undeployedSafes),
+    [multiChainGroupSafes, safeOverviews, undeployedSafes],
   )
   const deviatingSetups = getDeviatingSetups(safeSetups, currentChain?.chainId)
   const deviatingChainIds = deviatingSetups.map((setup) => setup?.chainId)