diff --git a/src/components/settings/FallbackHandler/index.tsx b/src/components/settings/FallbackHandler/index.tsx index 19ab5348e1..3d921be961 100644 --- a/src/components/settings/FallbackHandler/index.tsx +++ b/src/components/settings/FallbackHandler/index.tsx @@ -33,7 +33,8 @@ export const FallbackHandler = (): ReactElement | null => { return null } - const isOfficial = !!safe.fallbackHandler && safe.fallbackHandler.value === fallbackHandlerDeployment?.defaultAddress + const isOfficial = + !!safe.fallbackHandler && safe.fallbackHandler.value === fallbackHandlerDeployment?.networkAddresses[safe.chainId] const tooltip = !safe.fallbackHandler ? ( <> diff --git a/src/hooks/coreSDK/safeCoreSDK.ts b/src/hooks/coreSDK/safeCoreSDK.ts index 155166b3eb..f942e96469 100644 --- a/src/hooks/coreSDK/safeCoreSDK.ts +++ b/src/hooks/coreSDK/safeCoreSDK.ts @@ -76,8 +76,8 @@ export const initSafeSDK = async ({ const safeL1Deployment = getSafeSingletonDeployment({ network: chainId, version: safeVersion }) const safeL2Deployment = getSafeL2SingletonDeployment({ network: chainId, version: safeVersion }) - isL1SafeMasterCopy = masterCopy === safeL1Deployment?.defaultAddress - const isL2SafeMasterCopy = masterCopy === safeL2Deployment?.defaultAddress + isL1SafeMasterCopy = masterCopy === safeL1Deployment?.networkAddresses[chainId] + const isL2SafeMasterCopy = masterCopy === safeL2Deployment?.networkAddresses[chainId] // Unknown deployment, which we do not want to support if (!isL1SafeMasterCopy && !isL2SafeMasterCopy) { diff --git a/src/services/security/modules/DelegateCallModule/index.ts b/src/services/security/modules/DelegateCallModule/index.ts index 489f5a5ab9..e9704a3a17 100644 --- a/src/services/security/modules/DelegateCallModule/index.ts +++ b/src/services/security/modules/DelegateCallModule/index.ts @@ -30,7 +30,7 @@ export class DelegateCallModule implements SecurityModule> {