Fix: multisend verification only worked for the latest contract version

src/components/transactions/TxDetails/TxData/index.tsx

@@ -19,9 +19,11 @@ import DecodedData from '@/components/transactions/TxDetails/TxData/DecodedData'
 import TransferTxInfo from '@/components/transactions/TxDetails/TxData/Transfer'
 import useChainId from '@/hooks/useChainId'
 import { MultiSendTxInfo } from '@/components/transactions/TxDetails/TxData/MultiSendTxInfo'
+import useSafeInfo from '@/hooks/useSafeInfo'
 
 const TxData = ({ txDetails }: { txDetails: TransactionDetails }): ReactElement => {
   const chainId = useChainId()
+  const { safe } = useSafeInfo()
   const txInfo = txDetails.txInfo
 
   if (isTransferTxInfo(txInfo)) {
@@ -36,7 +38,7 @@ const TxData = ({ txDetails }: { txDetails: TransactionDetails }): ReactElement
     return <RejectionTxInfo nonce={txDetails.detailedExecutionInfo?.nonce} isTxExecuted={!!txDetails.executedAt} />
   }
 
-  if (isSupportedMultiSendAddress(txInfo, chainId) && isMultiSendTxInfo(txInfo)) {
+  if (isSupportedMultiSendAddress(txInfo, chainId, safe.version) && isMultiSendTxInfo(txInfo)) {
     return <MultiSendTxInfo txInfo={txInfo} />
   }
 

src/components/transactions/TxDetails/index.tsx

@@ -40,6 +40,7 @@ type TxDetailsProps = {
 
 const TxDetailsBlock = ({ txSummary, txDetails }: TxDetailsProps): ReactElement => {
   const chainId = useChainId()
+  const { safe } = useSafeInfo()
   const isPending = useIsPending(txSummary.id)
   const isQueue = isTxQueued(txSummary.txStatus)
   const awaitingExecution = isAwaitingExecution(txSummary.txStatus)
@@ -89,13 +90,14 @@ const TxDetailsBlock = ({ txSummary, txDetails }: TxDetailsProps): ReactElement
           <Summary txDetails={txDetails} />
         </div>
 
-        {isSupportedMultiSendAddress(txDetails.txInfo, chainId) && isMultiSendTxInfo(txDetails.txInfo) && (
-          <div className={`${css.multiSend}`}>
-            <ErrorBoundary fallback={<div>Error parsing data</div>}>
-              <Multisend txData={txDetails.txData} />
-            </ErrorBoundary>
-          </div>
-        )}
+        {isSupportedMultiSendAddress(txDetails.txInfo, chainId, safe.version) &&
+          isMultiSendTxInfo(txDetails.txInfo) && (
+            <div className={`${css.multiSend}`}>
+              <ErrorBoundary fallback={<div>Error parsing data</div>}>
+                <Multisend txData={txDetails.txData} />
+              </ErrorBoundary>
+            </div>
+          )}
       </div>
 
       {/* Signers */}

src/components/transactions/TxInfo/index.tsx

@@ -23,6 +23,7 @@ import {
 import { ellipsis, shortenAddress } from '@/utils/formatters'
 import { useCurrentChain } from '@/hooks/useChains'
 import useChainId from '@/hooks/useChainId'
+import useSafeInfo from '@/hooks/useSafeInfo'
 
 export const TransferTx = ({
   info,
@@ -99,12 +100,13 @@ const SettingsChangeTx = ({ info }: { info: SettingsChange }): ReactElement => {
 
 const TxInfo = ({ info, ...rest }: { info: TransactionInfo; omitSign?: boolean; withLogo?: boolean }): ReactElement => {
   const chainId = useChainId()
+  const { safe } = useSafeInfo()
 
   if (isSettingsChangeTxInfo(info)) {
     return <SettingsChangeTx info={info} />
   }
 
-  if (isSupportedMultiSendAddress(info, chainId) && isMultiSendTxInfo(info)) {
+  if (isSupportedMultiSendAddress(info, chainId, safe.version) && isMultiSendTxInfo(info)) {
     return <MultiSendTx info={info} />
   }
 

src/services/contracts/safeContracts.ts

@@ -102,26 +102,16 @@ export const getReadOnlyGnosisSafeContract = (chain: ChainInfo, safeVersion: str
 
 // MultiSend
 
-const getMultiSendContractDeployment = (chainId: string) => {
-  return getMultiSendDeployment({ network: chainId }) || getMultiSendDeployment()
-}
-
-export const getMultiSendContractAddress = (chainId: string): string | undefined => {
-  const deployment = getMultiSendContractDeployment(chainId)
-
-  return deployment?.networkAddresses[chainId]
+export const getMultiSendContractAddress = (network: string, version: string): string | undefined => {
+  const deployment = getMultiSendDeployment({ network, version })
+  return deployment?.networkAddresses[network]
 }
 
 // MultiSendCallOnly
 
-const getMultiSendCallOnlyContractDeployment = (chainId: string) => {
-  return getMultiSendCallOnlyDeployment({ network: chainId }) || getMultiSendCallOnlyDeployment()
-}
-
-export const getMultiSendCallOnlyContractAddress = (chainId: string): string | undefined => {
-  const deployment = getMultiSendCallOnlyContractDeployment(chainId)
-
-  return deployment?.networkAddresses[chainId]
+export const getMultiSendCallOnlyContractAddress = (network: string, version: string): string | undefined => {
+  const deployment = getMultiSendCallOnlyDeployment({ network, version })
+  return deployment?.networkAddresses[network]
 }
 
 export const getMultiSendCallOnlyContract = (
@@ -132,7 +122,7 @@ export const getMultiSendCallOnlyContract = (
   const ethAdapter = createEthersAdapter(provider)
 
   return ethAdapter.getMultiSendCallOnlyContract({
-    singletonDeployment: getMultiSendCallOnlyContractDeployment(chainId),
+    singletonDeployment: getMultiSendCallOnlyDeployment({ network: chainId, version: safeVersion || undefined }),
     ..._getValidatedGetContractProps(chainId, safeVersion),
   })
 }
@@ -144,7 +134,7 @@ export const getReadOnlyMultiSendCallOnlyContract = (
   const ethAdapter = createReadOnlyEthersAdapter()
 
   return ethAdapter.getMultiSendCallOnlyContract({
-    singletonDeployment: getMultiSendCallOnlyContractDeployment(chainId),
+    singletonDeployment: getMultiSendCallOnlyDeployment({ network: chainId, version: safeVersion || undefined }),
     ..._getValidatedGetContractProps(chainId, safeVersion),
   })
 }

src/utils/transaction-guards.ts

@@ -78,10 +78,17 @@ export const isCustomTxInfo = (value: TransactionInfo): value is Custom => {
   return value.type === TransactionInfoType.CUSTOM
 }
 
-export const isSupportedMultiSendAddress = (txInfo: TransactionInfo, chainId: string): boolean => {
+export const isSupportedMultiSendAddress = (
+  txInfo: TransactionInfo,
+  chainId: string,
+  version: string | null,
+): boolean => {
+  // Safe version can be null when a Safe is being loaded
+  if (version == null) return false
+
   const toAddress = isCustomTxInfo(txInfo) ? txInfo.to.value : ''
-  const multiSendAddress = getMultiSendContractAddress(chainId)
-  const multiSendCallOnlyAddress = getMultiSendCallOnlyContractAddress(chainId)
+  const multiSendAddress = getMultiSendContractAddress(chainId, version)
+  const multiSendCallOnlyAddress = getMultiSendCallOnlyContractAddress(chainId, version)
 
   return sameAddress(multiSendAddress, toAddress) || sameAddress(multiSendCallOnlyAddress, toAddress)
 }