Fix: warn if wallet already signed a tx

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

@@ -71,8 +71,8 @@ export const SuccessScreen = ({ txId }: { txId: string }) => {
       <Divider />
       <div className={classnames(css.row, css.buttons)}>
         <Link href={homeLink} passHref>
-          <Button variant="outlined" size="small">
-            Back to dashboard
+          <Button variant="contained" size="small">
+            Finish
           </Button>
         </Link>
         {txLink && (

src/components/tx/SignOrExecuteForm/ExecuteForm.tsx

@@ -154,7 +154,7 @@ const ExecuteForm = ({
           <CheckWallet allowNonOwner={onlyExecute}>
             {(isOk) => (
               <Button variant="contained" type="submit" disabled={!isOk || submitDisabled}>
-                Submit
+                Execute
               </Button>
             )}
           </CheckWallet>

src/components/tx/SignOrExecuteForm/SignForm.tsx

@@ -5,7 +5,7 @@ import ErrorMessage from '@/components/tx/ErrorMessage'
 import { logError, Errors } from '@/services/exceptions'
 import useIsSafeOwner from '@/hooks/useIsSafeOwner'
 import CheckWallet from '@/components/common/CheckWallet'
-import { useTxActions } from './hooks'
+import { useAlreadySigned, useTxActions } from './hooks'
 import type { SignOrExecuteProps } from '.'
 import type { SafeTransaction } from '@safe-global/safe-core-sdk-types'
 import { TxModalContext } from '@/components/tx-flow'
@@ -32,6 +32,7 @@ const SignForm = ({
   const { signTx } = useTxActions()
   const { setTxFlow } = useContext(TxModalContext)
   const { needsRiskConfirmation, isRiskConfirmed, setIsRiskIgnored } = useContext(TxSecurityContext)
+  const hasSigned = useAlreadySigned(safeTx)
 
   // On modal submit
   const handleSubmit = async (e: SyntheticEvent) => {
@@ -64,6 +65,8 @@ const SignForm = ({
 
   return (
     <form onSubmit={handleSubmit}>
+      {hasSigned && <ErrorMessage level="warning">You have already signed this transaction.</ErrorMessage>}
+
       {cannotPropose ? (
         <NonOwnerError />
       ) : (
@@ -79,7 +82,7 @@ const SignForm = ({
         <CheckWallet>
           {(isOk) => (
             <Button variant="contained" type="submit" disabled={!isOk || submitDisabled}>
-              Submit
+              Sign
             </Button>
           )}
         </CheckWallet>

src/components/tx/SignOrExecuteForm/hooks.test.ts

@@ -10,7 +10,7 @@ import * as pending from '@/hooks/usePendingTxs'
 import * as txSender from '@/services/tx/tx-sender/dispatch'
 import * as onboardHooks from '@/hooks/wallets/useOnboard'
 import { type OnboardAPI } from '@web3-onboard/core'
-import { useImmediatelyExecutable, useIsExecutionLoop, useTxActions, useValidateNonce } from './hooks'
+import { useAlreadySigned, useImmediatelyExecutable, useIsExecutionLoop, useTxActions, useValidateNonce } from './hooks'
 
 const createSafeTx = (data = '0x'): SafeTransaction => {
   return {
@@ -542,4 +542,43 @@ describe('SignOrExecute hooks', () => {
       expect(relaySpy).not.toHaveBeenCalled()
     })
   })
+
+  describe('useAlreadySigned', () => {
+    it('should return true if wallet already signed a tx', () => {
+      // Wallet
+      jest.spyOn(wallet, 'default').mockReturnValue({
+        chainId: '1',
+        label: 'MetaMask',
+        address: '0x1234567890000000000000000000000000000000',
+      } as unknown as ConnectedWallet)
+
+      const tx = createSafeTx()
+      tx.addSignature({
+        signer: '0x1234567890000000000000000000000000000000',
+        data: '0x0001',
+        staticPart: () => '',
+        dynamicPart: () => '',
+      })
+      const { result } = renderHook(() => useAlreadySigned(tx))
+      expect(result.current).toEqual(true)
+    })
+  })
+  it('should return false if wallet has not signed a tx yet', () => {
+    // Wallet
+    jest.spyOn(wallet, 'default').mockReturnValue({
+      chainId: '1',
+      label: 'MetaMask',
+      address: '0x1234567890000000000000000000000000000000',
+    } as unknown as ConnectedWallet)
+
+    const tx = createSafeTx()
+    tx.addSignature({
+      signer: '0x00000000000000000000000000000000000000000',
+      data: '0x0001',
+      staticPart: () => '',
+      dynamicPart: () => '',
+    })
+    const { result } = renderHook(() => useAlreadySigned(tx))
+    expect(result.current).toEqual(false)
+  })
 })

src/components/tx/SignOrExecuteForm/hooks.ts

@@ -179,3 +179,10 @@ export const useSafeTxGas = (safeTx: SafeTransaction | undefined): number | unde
 
   return safeTxGas
 }
+
+export const useAlreadySigned = (safeTx: SafeTransaction | undefined): boolean => {
+  const wallet = useWallet()
+  const hasSigned =
+    safeTx && wallet && (safeTx.signatures.has(wallet.address.toLowerCase()) || safeTx.signatures.has(wallet.address))
+  return Boolean(hasSigned)
+}