Refactor: unify confirmations in the transaction flow

cypress/e2e/pages/safeapps.pages.js

@@ -64,7 +64,7 @@ export const testBooleanValue3 = '3 testBooleanValue'
 export const transfer2AssetsStr = 'Transfer 2 assets'
 
 export const testTransfer1 = '1 transfer'
-export const testTransfer2 = '2 transfer'
+export const testTransfer2 = '2 MetaMultiSigWallet: transfer'
 export const nativeTransfer2 = '2 native transfer'
 export const nativeTransfer1 = '1 native transfer'
 

src/components/common/ErrorBoundary/index.tsx

@@ -1,5 +1,4 @@
 import { Typography, Link } from '@mui/material'
-import type { FallbackRender } from '@sentry/react'
 
 import { HELP_CENTER_URL, IS_PRODUCTION } from '@/config/constants'
 import { AppRoutes } from '@/config/routes'
@@ -8,8 +7,12 @@ import WarningIcon from '@/public/images/notifications/warning.svg'
 import css from '@/components/common/ErrorBoundary/styles.module.css'
 import CircularIcon from '../icons/CircularIcon'
 import ExternalLink from '../ExternalLink'
+interface ErrorBoundaryProps {
+  error: Error
+  componentStack: string
+}
 
-const ErrorBoundary: FallbackRender = ({ error, componentStack }) => {
+const ErrorBoundary = ({ error, componentStack }: ErrorBoundaryProps) => {
   return (
     <div className={css.container}>
       <div className={css.wrapper}>

src/components/transactions/TxDetails/Summary/SafeTxHashDataRow/index.tsx

@@ -16,6 +16,7 @@ export const SafeTxHashDataRow = ({
 }) => {
   const chainId = useChainId()
   const safeAddress = useSafeAddress()
+
   const domainHash = TypedDataEncoder.hashDomain({
     chainId,
     verifyingContract: safeAddress,

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

@@ -71,7 +71,6 @@ export const Multisend = ({ txData, compact = false }: MultisendProps): ReactEle
   if (!multiSendTransactions) {
     return null
   }
-
   return (
     <>
       <MultisendActionsHeader setOpen={setOpenMap} amount={multiSendTransactions.length} compact={compact} />

src/components/tx-flow/SafeTxProvider.tsx

@@ -9,7 +9,7 @@ import useSafeInfo from '@/hooks/useSafeInfo'
 import { useCurrentChain } from '@/hooks/useChains'
 import { prependSafeToL2Migration } from '@/utils/transactions'
 
-export const SafeTxContext = createContext<{
+export type SafeTxContextParams = {
   safeTx?: SafeTransaction
   setSafeTx: Dispatch<SetStateAction<SafeTransaction | undefined>>
 
@@ -28,7 +28,9 @@ export const SafeTxContext = createContext<{
   setSafeTxGas: Dispatch<SetStateAction<string | undefined>>
 
   recommendedNonce?: number
-}>({
+}
+
+export const SafeTxContext = createContext<SafeTxContextParams>({
   setSafeTx: () => {},
   setSafeMessage: () => {},
   setSafeTxError: () => {},
@@ -81,7 +83,10 @@ const SafeTxProvider = ({ children }: { children: ReactNode }): ReactElement =>
     if (safeTx.data.nonce === finalNonce && safeTx.data.safeTxGas === finalSafeTxGas) return
 
     createTx({ ...safeTx.data, safeTxGas: String(finalSafeTxGas) }, finalNonce)
-      .then(setSafeTx)
+      .then((tx) => {
+        console.log('SafeTxProvider: Updated tx with nonce and safeTxGas', tx)
+        setSafeTx(tx)
+      })
       .catch(setSafeTxError)
   }, [isSigned, finalNonce, finalSafeTxGas, safeTx?.data])
 

src/components/tx-flow/flows/AddOwner/ReviewOwner.tsx

@@ -1,6 +1,5 @@
 import { useCurrentChain } from '@/hooks/useChains'
 import { useContext, useEffect } from 'react'
-import { Typography, Divider, Box, SvgIcon, Paper } from '@mui/material'
 
 import SignOrExecuteForm from '@/components/tx/SignOrExecuteForm'
 import useSafeInfo from '@/hooks/useSafeInfo'
@@ -11,11 +10,7 @@ import { upsertAddressBookEntries } from '@/store/addressBookSlice'
 import { SafeTxContext } from '../../SafeTxProvider'
 import type { AddOwnerFlowProps } from '.'
 import type { ReplaceOwnerFlowProps } from '../ReplaceOwner'
-import { OwnerList } from '../../common/OwnerList'
-import MinusIcon from '@/public/images/common/minus.svg'
-import EthHashInfo from '@/components/common/EthHashInfo'
-import commonCss from '@/components/tx-flow/common/styles.module.css'
-import { ChangeSignerSetupWarning } from '@/features/multichain/components/SignerSetupWarning/ChangeSignerSetupWarning'
+import { SettingsChangeContext } from './context'
 
 export const ReviewOwner = ({ params }: { params: AddOwnerFlowProps | ReplaceOwnerFlowProps }) => {
   const dispatch = useAppDispatch()
@@ -57,33 +52,8 @@ export const ReviewOwner = ({ params }: { params: AddOwnerFlowProps | ReplaceOwn
   }
 
   return (
-    <SignOrExecuteForm onSubmit={addAddressBookEntryAndSubmit}>
-      {params.removedOwner && (
-        <Paper sx={{ backgroundColor: ({ palette }) => palette.warning.background, p: 2 }}>
-          <Typography color="text.secondary" mb={2} display="flex" alignItems="center">
-            <SvgIcon component={MinusIcon} inheritViewBox fontSize="small" sx={{ mr: 1 }} />
-            Previous signer
-          </Typography>
-          <EthHashInfo
-            name={params.removedOwner.name}
-            address={params.removedOwner.address}
-            shortAddress={false}
-            showCopyButton
-            hasExplorer
-          />
-        </Paper>
-      )}
-      <OwnerList owners={[{ name: newOwner.name, value: newOwner.address }]} />
-      <ChangeSignerSetupWarning />
-
-      <Divider className={commonCss.nestedDivider} />
-      <Box>
-        <Typography variant="body2">Any transaction requires the confirmation of:</Typography>
-        <Typography>
-          <b>{threshold}</b> out of <b>{safe.owners.length + (removedOwner ? 0 : 1)} signers</b>
-        </Typography>
-      </Box>
-      <Divider className={commonCss.nestedDivider} />
-    </SignOrExecuteForm>
+    <SettingsChangeContext.Provider value={params}>
+      <SignOrExecuteForm onSubmit={addAddressBookEntryAndSubmit} showMethodCall />
+    </SettingsChangeContext.Provider>
   )
 }

src/components/tx-flow/flows/AddOwner/context.ts

@@ -0,0 +1,7 @@
+import { type Context, createContext } from 'react'
+import { type AddOwnerFlowProps } from '.'
+import { type ReplaceOwnerFlowProps } from '../ReplaceOwner'
+
+type SettingsChange = Context<AddOwnerFlowProps | ReplaceOwnerFlowProps>
+
+export const SettingsChangeContext: SettingsChange = createContext({} as AddOwnerFlowProps | ReplaceOwnerFlowProps)

src/components/tx-flow/flows/ChangeThreshold/ReviewChangeThreshold.tsx

@@ -1,6 +1,5 @@
 import useSafeInfo from '@/hooks/useSafeInfo'
 import { useContext, useEffect } from 'react'
-import { Box, Divider, Typography } from '@mui/material'
 
 import { createUpdateThresholdTx } from '@/services/tx/tx-sender'
 import { SETTINGS_EVENTS, trackEvent } from '@/services/analytics'
@@ -9,8 +8,7 @@ import { SafeTxContext } from '@/components/tx-flow/SafeTxProvider'
 import { ChangeThresholdFlowFieldNames } from '@/components/tx-flow/flows/ChangeThreshold'
 import type { ChangeThresholdFlowProps } from '@/components/tx-flow/flows/ChangeThreshold'
 
-import commonCss from '@/components/tx-flow/common/styles.module.css'
-import { ChangeSignerSetupWarning } from '@/features/multichain/components/SignerSetupWarning/ChangeSignerSetupWarning'
+import { ChangeThresholdReviewContext } from './context'
 
 const ReviewChangeThreshold = ({ params }: { params: ChangeThresholdFlowProps }) => {
   const { safe } = useSafeInfo()
@@ -28,22 +26,9 @@ const ReviewChangeThreshold = ({ params }: { params: ChangeThresholdFlowProps })
   }
 
   return (
-    <SignOrExecuteForm onSubmit={onChangeThreshold}>
-      <ChangeSignerSetupWarning />
-      <Divider className={commonCss.nestedDivider} />
-      <div>
-        <Typography variant="body2" color="text.secondary" mb={0.5}>
-          Any transaction will require the confirmation of:
-        </Typography>
-
-        <Typography>
-          <b>{newThreshold}</b> out of <b>{safe.owners.length} signer(s)</b>
-        </Typography>
-      </div>
-      <Box my={1}>
-        <Divider className={commonCss.nestedDivider} />
-      </Box>
-    </SignOrExecuteForm>
+    <ChangeThresholdReviewContext.Provider value={{ newThreshold }}>
+      <SignOrExecuteForm onSubmit={onChangeThreshold} showMethodCall />
+    </ChangeThresholdReviewContext.Provider>
   )
 }
 

src/components/tx-flow/flows/ChangeThreshold/context.tsx

@@ -0,0 +1,5 @@
+import { createContext } from 'react'
+
+export const ChangeThresholdReviewContext = createContext({
+  newThreshold: 0,
+})

src/components/tx-flow/flows/ConfirmBatch/index.tsx

@@ -8,7 +8,6 @@ import { OperationType } from '@safe-global/safe-core-sdk-types'
 import TxLayout from '../../common/TxLayout'
 import BatchIcon from '@/public/images/common/batch.svg'
 import { useDraftBatch } from '@/hooks/useDraftBatch'
-import BatchTxList from '@/components/batch/BatchSidebar/BatchTxList'
 
 type ConfirmBatchProps = {
   onSubmit: () => void
@@ -32,11 +31,7 @@ const ConfirmBatch = ({ onSubmit }: ConfirmBatchProps): ReactElement => {
     createMultiSendCallOnlyTx(calls).then(setSafeTx).catch(setSafeTxError)
   }, [batchTxs, setSafeTx, setSafeTxError])
 
-  return (
-    <SignOrExecuteForm onSubmit={onSubmit} isBatch>
-      <BatchTxList txItems={batchTxs} />
-    </SignOrExecuteForm>
-  )
+  return <SignOrExecuteForm onSubmit={onSubmit} isBatch />
 }
 
 const ConfirmBatchFlow = (props: ConfirmBatchProps) => {

src/components/tx-flow/flows/ConfirmTx/ConfirmProposedTx.tsx

@@ -4,10 +4,10 @@ import type { TransactionSummary } from '@safe-global/safe-gateway-typescript-sd
 import useSafeInfo from '@/hooks/useSafeInfo'
 import { useChainId } from '@/hooks/useChainId'
 import useWallet from '@/hooks/wallets/useWallet'
-import SignOrExecuteForm from '@/components/tx/SignOrExecuteForm'
 import { isExecutable, isMultisigExecutionInfo, isSignableBy } from '@/utils/transaction-guards'
 import { createExistingTx } from '@/services/tx/tx-sender'
 import { SafeTxContext } from '../../SafeTxProvider'
+import SignOrExecuteForm from '@/components/tx/SignOrExecuteForm'
 
 type ConfirmProposedTxProps = {
   txSummary: TransactionSummary

src/components/tx-flow/flows/RecoverAccount/RecoverAccountFlowReview.tsx

@@ -34,6 +34,8 @@ import WalletRejectionError from '@/components/tx/SignOrExecuteForm/WalletReject
 import commonCss from '@/components/tx-flow/common/styles.module.css'
 import { BlockaidBalanceChanges } from '@/components/tx/security/blockaid/BlockaidBalanceChange'
 import NetworkWarning from '@/components/new-safe/create/NetworkWarning'
+import { useGetTransactionDetailsQuery } from '@/store/api/gateway'
+import { skipToken } from '@reduxjs/toolkit/query'
 
 export function RecoverAccountFlowReview({ params }: { params: RecoverAccountFlowProps }): ReactElement | null {
   // Form state
@@ -52,6 +54,8 @@ export function RecoverAccountFlowReview({ params }: { params: RecoverAccountFlo
   const recovery = data && selectDelayModifierByRecoverer(data, wallet?.address ?? '')
   const [, executionValidationError] = useIsValidRecoveryExecTransactionFromModule(recovery?.address, safeTx)
 
+  const { data: txDetails } = useGetTransactionDetailsQuery(skipToken)
+
   // Proposal
   const newThreshold = Number(params[RecoverAccountFlowFields.threshold])
   const newOwners = params[RecoverAccountFlowFields.owners]
@@ -127,7 +131,7 @@ export function RecoverAccountFlowReview({ params }: { params: RecoverAccountFlo
 
         <Divider className={commonCss.nestedDivider} />
 
-        <DecodedTx tx={safeTx} decodedData={decodedData} />
+        <DecodedTx txDetails={txDetails} tx={safeTx} decodedData={decodedData} />
 
         <BlockaidBalanceChanges />
       </TxCard>