Created auxiliary functioon to check if a module is enabled

src/logic/safe/utils/modules.ts

@@ -2,6 +2,7 @@ import { getGnosisSafeInstanceAt, SENTINEL_ADDRESS } from 'src/logic/contracts/s
 import { CreateTransactionArgs } from 'src/logic/safe/store/actions/createTransaction'
 import { ModulePair } from 'src/logic/safe/store/models/safe'
 import { CALL, TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
+import { sameAddress } from 'src/logic/wallets/ethAddresses'
 
 /**
  * Builds a collection of tuples with (prev, module) module addresses
@@ -64,3 +65,7 @@ export const enableModuleTx = ({
     notifiedTransaction: TX_NOTIFICATION_TYPES.SETTINGS_CHANGE_TX,
   }
 }
+
+export const isModuleEnabled = (modules: string[], moduleAddress: string): boolean => {
+  return modules?.some((module) => sameAddress(module, moduleAddress)) ?? false
+}

src/logic/safe/utils/spendingLimits.ts

@@ -3,7 +3,7 @@ import { AbiItem } from 'web3-utils'
 
 import { CreateTransactionArgs } from 'src/logic/safe/store/actions/createTransaction'
 import { CALL, DELEGATE_CALL, TX_NOTIFICATION_TYPES } from 'src/logic/safe/transactions'
-import { enableModuleTx } from 'src/logic/safe/utils/modules'
+import { enableModuleTx, isModuleEnabled } from 'src/logic/safe/utils/modules'
 import SpendingLimitModule from 'src/logic/contracts/artifacts/AllowanceModule.json'
 import generateBatchRequests from 'src/logic/contracts/generateBatchRequests'
 import { getMultisendContractAddress } from 'src/logic/contracts/safeContracts'
@@ -118,11 +118,8 @@ const requestAllowancesByDelegatesAndTokens = async (
   )
 }
 
-export const getSpendingLimits = async (
-  modules: string[] | undefined,
-  safeAddress: string,
-): Promise<SpendingLimit[] | null> => {
-  const isSpendingLimitEnabled = modules?.some((module) => sameAddress(module, SPENDING_LIMIT_MODULE_ADDRESS)) ?? false
+export const getSpendingLimits = async (modules: string[], safeAddress: string): Promise<SpendingLimit[] | null> => {
+  const isSpendingLimitEnabled = isModuleEnabled(modules, SPENDING_LIMIT_MODULE_ADDRESS)
 
   try {
     if (isSpendingLimitEnabled) {

src/routes/safe/components/Settings/SpendingLimit/NewLimitModal/Review.tsx

@@ -33,6 +33,8 @@ import { EditableTxParameters } from 'src/routes/safe/components/Transactions/he
 import { TransactionFees } from 'src/components/TransactionsFees'
 import { EstimationStatus, useEstimateTransactionGas } from 'src/logic/hooks/useEstimateTransactionGas'
 import { useEstimationStatus } from 'src/logic/hooks/useEstimationStatus'
+import { isModuleEnabled } from 'src/logic/safe/utils/modules'
+import { SPENDING_LIMIT_MODULE_ADDRESS } from 'src/utils/constants'
 
 const useExistentSpendingLimit = ({
   spendingLimits,
@@ -71,6 +73,7 @@ const calculateSpendingLimitsTxData = (
   existentSpendingLimit: SpendingLimit | null,
   txToken: Token,
   values: Record<string, string>,
+  modules: string[],
   txParameters?: TxParameters,
 ): {
   spendingLimitTxData: CreateTransactionArgs
@@ -83,8 +86,7 @@ const calculateSpendingLimitsTxData = (
     resetBaseMin: number
   }
 } => {
-  // enabled if it's an array with at least one element
-  const isSpendingLimitEnabled = !!spendingLimits?.length
+  const isSpendingLimitEnabled = isModuleEnabled(modules, SPENDING_LIMIT_MODULE_ADDRESS)
   const transactions: MultiSendTx[] = []
 
   // is spendingLimit module enabled? -> if not, create the tx to enable it, and encode it
@@ -150,10 +152,14 @@ interface ReviewSpendingLimitProps {
 
 export const ReviewSpendingLimits = ({ onBack, onClose, txToken, values }: ReviewSpendingLimitProps): ReactElement => {
   const classes = useStyles()
-
   const dispatch = useDispatch()
 
-  const { address: safeAddress = '', spendingLimits, currentVersion: safeVersion = '' } = useSelector(currentSafe) ?? {}
+  const {
+    address: safeAddress = '',
+    spendingLimits,
+    currentVersion: safeVersion = '',
+    modules,
+  } = useSelector(currentSafe) ?? {}
   const existentSpendingLimit = useExistentSpendingLimit({ spendingLimits, txToken, values })
   const [estimateGasArgs, setEstimateGasArgs] = useState<Partial<CreateTransactionArgs>>({
     to: '',
@@ -184,6 +190,8 @@ export const ReviewSpendingLimits = ({ onBack, onClose, txToken, values }: Revie
 
   const [buttonStatus] = useEstimationStatus(txEstimationExecutionStatus)
 
+  const safeModules = useMemo(() => modules?.map((pair) => pair[1]) || [], [modules])
+
   useEffect(() => {
     const { spendingLimitTxData } = calculateSpendingLimitsTxData(
       safeAddress,
@@ -192,9 +200,10 @@ export const ReviewSpendingLimits = ({ onBack, onClose, txToken, values }: Revie
       existentSpendingLimit,
       txToken,
       values,
+      safeModules,
     )
     setEstimateGasArgs(spendingLimitTxData)
-  }, [safeAddress, safeVersion, spendingLimits, existentSpendingLimit, txToken, values])
+  }, [safeAddress, safeVersion, spendingLimits, existentSpendingLimit, txToken, values, safeModules])
 
   const handleSubmit = (txParameters: TxParameters): void => {
     const { ethGasPrice, ethGasLimit, ethGasPriceInGWei } = txParameters
@@ -213,6 +222,7 @@ export const ReviewSpendingLimits = ({ onBack, onClose, txToken, values }: Revie
         existentSpendingLimit,
         txToken,
         values,
+        safeModules,
         advancedOptionsTxParameters,
       )