From cb0e767b03be8819dab95f1c74c86826dc3ef5d2 Mon Sep 17 00:00:00 2001
From: Usame Algan <usame@safe.global>
Date: Fri, 2 Jun 2023 11:59:43 +0200
Subject: [PATCH] Fix linting errors, add TODOs for failing tx flows

---
 .../ReviewSafeAppsSignMessage.tsx                         | 3 ++-
 .../safe-apps/SafeAppsTxModal/ReviewSafeAppsTx.tsx        | 3 ++-
 .../settings/ContractVersion/UpdateSafeDialog.tsx         | 3 ++-
 .../SafeModules/RemoveModule/steps/ReviewRemoveModule.tsx | 3 ++-
 .../NewSpendingLimit/steps/ReviewSpendingLimit.tsx        | 3 ++-
 .../settings/SpendingLimits/RemoveSpendingLimit/index.tsx | 3 ++-
 .../RemoveGuard/steps/ReviewRemoveGuard.tsx               | 3 ++-
 .../AddOwnerDialog/DialogSteps/ReviewOwnerTxStep.tsx      | 3 ++-
 .../settings/owner/ChangeThresholdDialog/index.tsx        | 8 ++------
 .../DialogSteps/ReviewRemoveOwnerTxStep.tsx               | 3 ++-
 src/components/tx/modals/NftBatchModal/ReviewNftBatch.tsx | 3 ++-
 src/components/tx/modals/RejectTxModal/RejectTx.tsx       | 3 ++-
 .../tx/modals/TokenTransferModal/ReviewMultisigTx.tsx     | 3 ++-
 .../modals/TokenTransferModal/ReviewSpendingLimitTx.tsx   | 7 +------
 14 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/components/safe-apps/SafeAppsSignMessageModal/ReviewSafeAppsSignMessage.tsx b/src/components/safe-apps/SafeAppsSignMessageModal/ReviewSafeAppsSignMessage.tsx
index a22f775f6d..07cab3a5d5 100644
--- a/src/components/safe-apps/SafeAppsSignMessageModal/ReviewSafeAppsSignMessage.tsx
+++ b/src/components/safe-apps/SafeAppsSignMessageModal/ReviewSafeAppsSignMessage.tsx
@@ -92,8 +92,9 @@ const ReviewSafeAppsSignMessage = ({
     }
   }
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={handleSubmit} error={safeTxError || submitError}>
+    <SignOrExecuteForm onSubmit={handleSubmit}>
       <>
         <SendFromBlock />
 
diff --git a/src/components/safe-apps/SafeAppsTxModal/ReviewSafeAppsTx.tsx b/src/components/safe-apps/SafeAppsTxModal/ReviewSafeAppsTx.tsx
index c7aa00933c..5febe3e3e0 100644
--- a/src/components/safe-apps/SafeAppsTxModal/ReviewSafeAppsTx.tsx
+++ b/src/components/safe-apps/SafeAppsTxModal/ReviewSafeAppsTx.tsx
@@ -61,8 +61,9 @@ const ReviewSafeAppsTx = ({
 
   const origin = useMemo(() => getTxOrigin(app), [app])
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={handleSubmit} error={safeTxError || submitError} origin={origin}>
+    <SignOrExecuteForm onSubmit={handleSubmit} origin={origin}>
       <>
         <ErrorBoundary fallback={<div>Error parsing data</div>}>
           <ApprovalEditor txs={txList} updateTxs={setTxList} />
diff --git a/src/components/settings/ContractVersion/UpdateSafeDialog.tsx b/src/components/settings/ContractVersion/UpdateSafeDialog.tsx
index b424aaf16b..6e372d9f74 100644
--- a/src/components/settings/ContractVersion/UpdateSafeDialog.tsx
+++ b/src/components/settings/ContractVersion/UpdateSafeDialog.tsx
@@ -55,8 +55,9 @@ const ReviewUpdateSafeStep = ({ onSubmit }: { onSubmit: () => void }) => {
     return createMultiSendCallOnlyTx(txs)
   }, [chain, safe, safeLoaded])
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={onSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={onSubmit}>
       <Typography mb={2}>
         Update now to take advantage of new features and the highest security standards available.
       </Typography>
diff --git a/src/components/settings/SafeModules/RemoveModule/steps/ReviewRemoveModule.tsx b/src/components/settings/SafeModules/RemoveModule/steps/ReviewRemoveModule.tsx
index cef844ad24..8cd19ca303 100644
--- a/src/components/settings/SafeModules/RemoveModule/steps/ReviewRemoveModule.tsx
+++ b/src/components/settings/SafeModules/RemoveModule/steps/ReviewRemoveModule.tsx
@@ -26,8 +26,9 @@ export const ReviewRemoveModule = ({ data, onSubmit }: { data: RemoveModuleData;
     onSubmit()
   }
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={onFormSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={onFormSubmit}>
       <SendToBlock address={data.address} title="Module" />
       <Typography my={2}>
         After removing this module, any feature or app that uses this module might no longer work. If this Safe Account
diff --git a/src/components/settings/SpendingLimits/NewSpendingLimit/steps/ReviewSpendingLimit.tsx b/src/components/settings/SpendingLimits/NewSpendingLimit/steps/ReviewSpendingLimit.tsx
index 61f8be0757..cbc932f637 100644
--- a/src/components/settings/SpendingLimits/NewSpendingLimit/steps/ReviewSpendingLimit.tsx
+++ b/src/components/settings/SpendingLimits/NewSpendingLimit/steps/ReviewSpendingLimit.tsx
@@ -61,8 +61,9 @@ export const ReviewSpendingLimit = ({ data, onSubmit }: Props) => {
     onSubmit()
   }
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={onFormSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={onFormSubmit}>
       {token && (
         <TokenTransferReview amount={data.amount} tokenInfo={token.tokenInfo}>
           {!!existingSpendingLimit && (
diff --git a/src/components/settings/SpendingLimits/RemoveSpendingLimit/index.tsx b/src/components/settings/SpendingLimits/RemoveSpendingLimit/index.tsx
index f65ef2fdda..b902788fdc 100644
--- a/src/components/settings/SpendingLimits/RemoveSpendingLimit/index.tsx
+++ b/src/components/settings/SpendingLimits/RemoveSpendingLimit/index.tsx
@@ -41,8 +41,9 @@ export const RemoveSpendingLimit = ({ data, onSubmit }: { data: SpendingLimitSta
     onSubmit()
   }
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={onFormSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={onFormSubmit}>
       {token && (
         <TokenTransferReview
           amount={safeFormatUnits(data.amount, token.tokenInfo.decimals)}
diff --git a/src/components/settings/TransactionGuards/RemoveGuard/steps/ReviewRemoveGuard.tsx b/src/components/settings/TransactionGuards/RemoveGuard/steps/ReviewRemoveGuard.tsx
index 11abaf6d9d..0808892cdc 100644
--- a/src/components/settings/TransactionGuards/RemoveGuard/steps/ReviewRemoveGuard.tsx
+++ b/src/components/settings/TransactionGuards/RemoveGuard/steps/ReviewRemoveGuard.tsx
@@ -27,8 +27,9 @@ export const ReviewRemoveGuard = ({ data, onSubmit }: { data: RemoveGuardData; o
     onSubmit()
   }
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={onFormSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={onFormSubmit}>
       <Typography sx={({ palette }) => ({ color: palette.primary.light })}>Transaction guard</Typography>
       <EthHashInfo address={data.address} showCopyButton hasExplorer shortAddress={false} />
       <Typography my={2}>
diff --git a/src/components/settings/owner/AddOwnerDialog/DialogSteps/ReviewOwnerTxStep.tsx b/src/components/settings/owner/AddOwnerDialog/DialogSteps/ReviewOwnerTxStep.tsx
index 835fc7986e..de991c4a06 100644
--- a/src/components/settings/owner/AddOwnerDialog/DialogSteps/ReviewOwnerTxStep.tsx
+++ b/src/components/settings/owner/AddOwnerDialog/DialogSteps/ReviewOwnerTxStep.tsx
@@ -54,8 +54,9 @@ export const ReviewOwnerTxStep = ({ data, onSubmit }: { data: ChangeOwnerData; o
     onSubmit()
   }
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={addAddressBookEntryAndSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={addAddressBookEntryAndSubmit}>
       <Grid
         container
         mt={-3}
diff --git a/src/components/settings/owner/ChangeThresholdDialog/index.tsx b/src/components/settings/owner/ChangeThresholdDialog/index.tsx
index 84d11659f4..608d105179 100644
--- a/src/components/settings/owner/ChangeThresholdDialog/index.tsx
+++ b/src/components/settings/owner/ChangeThresholdDialog/index.tsx
@@ -114,12 +114,8 @@ const ChangeThresholdStep = ({ data, onSubmit }: { data: ChangeThresholdData; on
       </DialogContent>
 
       <Box mt={-5}>
-        <SignOrExecuteForm
-          safeTx={safeTx}
-          onSubmit={onChangeThreshold}
-          error={safeTxError}
-          disableSubmit={isSameThreshold}
-        />
+        {/* TODO: Need to use the SafeTxProvider here */}
+        <SignOrExecuteForm onSubmit={onChangeThreshold} disableSubmit={isSameThreshold} />
       </Box>
     </>
   )
diff --git a/src/components/settings/owner/RemoveOwnerDialog/DialogSteps/ReviewRemoveOwnerTxStep.tsx b/src/components/settings/owner/RemoveOwnerDialog/DialogSteps/ReviewRemoveOwnerTxStep.tsx
index b152ff6fef..b0bc55488b 100644
--- a/src/components/settings/owner/RemoveOwnerDialog/DialogSteps/ReviewRemoveOwnerTxStep.tsx
+++ b/src/components/settings/owner/RemoveOwnerDialog/DialogSteps/ReviewRemoveOwnerTxStep.tsx
@@ -30,8 +30,9 @@ export const ReviewRemoveOwnerTxStep = ({ data, onSubmit }: { data: RemoveOwnerD
     onSubmit()
   }
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={onFormSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={onFormSubmit}>
       <Grid
         container
         mt={-3}
diff --git a/src/components/tx/modals/NftBatchModal/ReviewNftBatch.tsx b/src/components/tx/modals/NftBatchModal/ReviewNftBatch.tsx
index b9fd391d0a..f6f78d72ec 100644
--- a/src/components/tx/modals/NftBatchModal/ReviewNftBatch.tsx
+++ b/src/components/tx/modals/NftBatchModal/ReviewNftBatch.tsx
@@ -25,8 +25,9 @@ const ReviewNftBatch = ({ params, onSubmit }: ReviewNftBatchProps): ReactElement
     return calls.length > 1 ? createMultiSendCallOnlyTx(calls) : createTx(calls[0])
   }, [safeAddress, params])
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={onSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={onSubmit}>
       <SendFromBlock title={`Sending ${tokens.length} NFT${tokens.length > 1 ? 's' : ''} from`} />
 
       <SendToBlock address={params.recipient} title="To" />
diff --git a/src/components/tx/modals/RejectTxModal/RejectTx.tsx b/src/components/tx/modals/RejectTxModal/RejectTx.tsx
index 9be392c2e8..da0b8b6f5c 100644
--- a/src/components/tx/modals/RejectTxModal/RejectTx.tsx
+++ b/src/components/tx/modals/RejectTxModal/RejectTx.tsx
@@ -16,8 +16,9 @@ const RejectTx = ({ txNonce, onSubmit }: RejectTxProps): ReactElement => {
     return createRejectTx(txNonce)
   }, [txNonce])
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={rejectTx} isRejection onSubmit={onSubmit} error={rejectError}>
+    <SignOrExecuteForm isRejection onSubmit={onSubmit}>
       <Typography mb={2}>
         To reject the transaction, a separate rejection transaction will be created to replace the original one.
       </Typography>
diff --git a/src/components/tx/modals/TokenTransferModal/ReviewMultisigTx.tsx b/src/components/tx/modals/TokenTransferModal/ReviewMultisigTx.tsx
index 7549ede416..66ba684b6c 100644
--- a/src/components/tx/modals/TokenTransferModal/ReviewMultisigTx.tsx
+++ b/src/components/tx/modals/TokenTransferModal/ReviewMultisigTx.tsx
@@ -24,8 +24,9 @@ const ReviewMultisigTx = ({ params, onSubmit }: TokenTransferModalProps): ReactE
     return createTx(txParams, params.txNonce)
   }, [params, decimals, address])
 
+  // TODO: Need to use the SafeTxProvider here
   return (
-    <SignOrExecuteForm safeTx={safeTx} onSubmit={onSubmit} error={safeTxError}>
+    <SignOrExecuteForm onSubmit={onSubmit}>
       {token && <TokenTransferReview amount={params.amount} tokenInfo={token.tokenInfo} />}
 
       <SendFromBlock />
diff --git a/src/components/tx/modals/TokenTransferModal/ReviewSpendingLimitTx.tsx b/src/components/tx/modals/TokenTransferModal/ReviewSpendingLimitTx.tsx
index 2f139ad1b6..fa1038289c 100644
--- a/src/components/tx/modals/TokenTransferModal/ReviewSpendingLimitTx.tsx
+++ b/src/components/tx/modals/TokenTransferModal/ReviewSpendingLimitTx.tsx
@@ -109,12 +109,7 @@ const ReviewSpendingLimitTx = ({ params, onSubmit }: TokenTransferModalProps): R
 
         <SendToBlock address={params.recipient} />
 
-        <AdvancedParams
-          params={advancedParams}
-          willExecute={true}
-          nonceReadonly={false}
-          onFormSubmit={setManualParams}
-        />
+        <AdvancedParams params={advancedParams} willExecute={true} onFormSubmit={setManualParams} />
 
         <WrongChainWarning />