From 9fb9e960ad93f3ff55b956f4d42372dcccf4db19 Mon Sep 17 00:00:00 2001
From: iamacook <aaron@safe.global>
Date: Thu, 23 Nov 2023 08:11:43 +0100
Subject: [PATCH 1/2] fix: add overview of cancellation + skip -> cancel

---
 .../index.tsx                                 |  8 ++--
 .../recovery/RecoveryDetails/index.tsx        |  4 +-
 .../recovery/RecoverySigners/index.tsx        |  4 +-
 .../recovery/RecoverySummary/index.tsx        |  4 +-
 .../tx-flow/common/OwnerList/index.tsx        |  4 +-
 .../CancelRecoveryFlowReview.tsx}             | 19 ++++----
 .../CancelRecovery/CancelRecoveryOverview.tsx | 43 +++++++++++++++++++
 .../tx-flow/flows/CancelRecovery/index.tsx    | 30 +++++++++++++
 .../tx-flow/flows/SkipRecovery/index.tsx      | 13 ------
 9 files changed, 96 insertions(+), 33 deletions(-)
 rename src/components/recovery/{SkipRecoveryButton => CancelRecoveryButton}/index.tsx (84%)
 rename src/components/tx-flow/flows/{SkipRecovery/SkipRecoveryFlowReview.tsx => CancelRecovery/CancelRecoveryFlowReview.tsx} (62%)
 create mode 100644 src/components/tx-flow/flows/CancelRecovery/CancelRecoveryOverview.tsx
 create mode 100644 src/components/tx-flow/flows/CancelRecovery/index.tsx
 delete mode 100644 src/components/tx-flow/flows/SkipRecovery/index.tsx

diff --git a/src/components/recovery/SkipRecoveryButton/index.tsx b/src/components/recovery/CancelRecoveryButton/index.tsx
similarity index 84%
rename from src/components/recovery/SkipRecoveryButton/index.tsx
rename to src/components/recovery/CancelRecoveryButton/index.tsx
index dfb01d92d6..b274dc9a8d 100644
--- a/src/components/recovery/SkipRecoveryButton/index.tsx
+++ b/src/components/recovery/CancelRecoveryButton/index.tsx
@@ -6,10 +6,10 @@ import ErrorIcon from '@/public/images/notifications/error.svg'
 import IconButton from '@mui/material/IconButton'
 import CheckWallet from '@/components/common/CheckWallet'
 import { TxModalContext } from '@/components/tx-flow'
-import { SkipRecoveryFlow } from '@/components/tx-flow/flows/SkipRecovery'
+import { CancelRecoveryFlow } from '@/components/tx-flow/flows/CancelRecovery'
 import type { RecoveryQueueItem } from '@/store/recoverySlice'
 
-export function SkipRecoveryButton({
+export function CancelRecoveryButton({
   recovery,
   compact = false,
 }: {
@@ -22,7 +22,7 @@ export function SkipRecoveryButton({
     e.stopPropagation()
     e.preventDefault()
 
-    setTxFlow(<SkipRecoveryFlow recovery={recovery} />)
+    setTxFlow(<CancelRecoveryFlow recovery={recovery} />)
   }
 
   return (
@@ -34,7 +34,7 @@ export function SkipRecoveryButton({
           </IconButton>
         ) : (
           <Button onClick={onClick} variant="danger" disabled={!isOk} size="stretched">
-            Skip
+            Cancel
           </Button>
         )
       }
diff --git a/src/components/recovery/RecoveryDetails/index.tsx b/src/components/recovery/RecoveryDetails/index.tsx
index 46a2773e03..5e4b4d3ef8 100644
--- a/src/components/recovery/RecoveryDetails/index.tsx
+++ b/src/components/recovery/RecoveryDetails/index.tsx
@@ -61,7 +61,9 @@ export function RecoveryDetails({ item }: { item: RecoveryQueueItem }): ReactEle
               </div>
             </InfoDetails>
           ) : (
-            <ErrorMessage>This transaction potentially calls malicious actions. We recommend skipping it.</ErrorMessage>
+            <ErrorMessage>
+              This transaction potentially calls malicious actions. We recommend cancelling it.
+            </ErrorMessage>
           )}
         </div>
 
diff --git a/src/components/recovery/RecoverySigners/index.tsx b/src/components/recovery/RecoverySigners/index.tsx
index 1133ab7d45..2e9e517728 100644
--- a/src/components/recovery/RecoverySigners/index.tsx
+++ b/src/components/recovery/RecoverySigners/index.tsx
@@ -6,7 +6,7 @@ import CheckIcon from '@/public/images/common/circle-check.svg'
 import EthHashInfo from '@/components/common/EthHashInfo'
 import { Countdown } from '@/components/common/Countdown'
 import { ExecuteRecoveryButton } from '../ExecuteRecoveryButton'
-import { SkipRecoveryButton } from '../SkipRecoveryButton'
+import { CancelRecoveryButton } from '../CancelRecoveryButton'
 import { useRecoveryTxState } from '@/hooks/useRecoveryTxState'
 import type { RecoveryQueueItem } from '@/store/recoverySlice'
 
@@ -69,7 +69,7 @@ export function RecoverySigners({ item }: { item: RecoveryQueueItem }): ReactEle
 
       <Box display="flex" alignItems="center" justifyContent="center" gap={1} mt={2}>
         <ExecuteRecoveryButton recovery={item} />
-        <SkipRecoveryButton recovery={item} />
+        <CancelRecoveryButton recovery={item} />
       </Box>
     </>
   )
diff --git a/src/components/recovery/RecoverySummary/index.tsx b/src/components/recovery/RecoverySummary/index.tsx
index 4003b3b6a1..9992d76db3 100644
--- a/src/components/recovery/RecoverySummary/index.tsx
+++ b/src/components/recovery/RecoverySummary/index.tsx
@@ -6,7 +6,7 @@ import { RecoveryType } from '../RecoveryType'
 import { RecoveryInfo } from '../RecoveryInfo'
 import { RecoveryStatus } from '../RecoveryStatus'
 import { ExecuteRecoveryButton } from '../ExecuteRecoveryButton'
-import { SkipRecoveryButton } from '../SkipRecoveryButton'
+import { CancelRecoveryButton } from '../CancelRecoveryButton'
 import useWallet from '@/hooks/wallets/useWallet'
 import type { RecoveryQueueItem } from '@/store/recoverySlice'
 
@@ -31,7 +31,7 @@ export function RecoverySummary({ item }: { item: RecoveryQueueItem }): ReactEle
       {wallet && (
         <Box gridArea="actions" display="flex" justifyContent={{ sm: 'center' }} gap={1}>
           <ExecuteRecoveryButton recovery={item} compact />
-          <SkipRecoveryButton recovery={item} compact />
+          <CancelRecoveryButton recovery={item} compact />
         </Box>
       )}
 
diff --git a/src/components/tx-flow/common/OwnerList/index.tsx b/src/components/tx-flow/common/OwnerList/index.tsx
index f177b62e67..39c7eddecb 100644
--- a/src/components/tx-flow/common/OwnerList/index.tsx
+++ b/src/components/tx-flow/common/OwnerList/index.tsx
@@ -1,5 +1,5 @@
 import { Paper, Typography, SvgIcon } from '@mui/material'
-import type { SxProps } from '@mui/material'
+import type { PaperProps } from '@mui/material'
 import type { AddressEx } from '@safe-global/safe-gateway-typescript-sdk'
 import type { ReactElement } from 'react'
 
@@ -15,7 +15,7 @@ export function OwnerList({
 }: {
   owners: Array<AddressEx>
   title?: string
-  sx?: SxProps
+  sx?: PaperProps['sx']
 }): ReactElement {
   return (
     <Paper className={css.container} sx={sx}>
diff --git a/src/components/tx-flow/flows/SkipRecovery/SkipRecoveryFlowReview.tsx b/src/components/tx-flow/flows/CancelRecovery/CancelRecoveryFlowReview.tsx
similarity index 62%
rename from src/components/tx-flow/flows/SkipRecovery/SkipRecoveryFlowReview.tsx
rename to src/components/tx-flow/flows/CancelRecovery/CancelRecoveryFlowReview.tsx
index 13f810983a..846df693aa 100644
--- a/src/components/tx-flow/flows/SkipRecovery/SkipRecoveryFlowReview.tsx
+++ b/src/components/tx-flow/flows/CancelRecovery/CancelRecoveryFlowReview.tsx
@@ -7,9 +7,10 @@ import SignOrExecuteForm from '@/components/tx/SignOrExecuteForm'
 import { useWeb3ReadOnly } from '@/hooks/wallets/web3'
 import { getRecoverySkipTransaction } from '@/services/recovery/transaction'
 import { createTx } from '@/services/tx/tx-sender'
+import ErrorMessage from '@/components/tx/ErrorMessage'
 import type { RecoveryQueueItem } from '@/store/recoverySlice'
 
-export function SkipRecoveryFlowReview({ recovery }: { recovery: RecoveryQueueItem }): ReactElement {
+export function CancelRecoveryFlowReview({ recovery }: { recovery: RecoveryQueueItem }): ReactElement {
   const web3ReadOnly = useWeb3ReadOnly()
   const { setSafeTx, setSafeTxError } = useContext(SafeTxContext)
 
@@ -23,16 +24,16 @@ export function SkipRecoveryFlowReview({ recovery }: { recovery: RecoveryQueueIt
 
   return (
     <SignOrExecuteForm onSubmit={() => null} isBatchable={false}>
-      <Typography mb={2}>
-        To reject the recovery attempt, a separate transaction will be created to increase the nonce beyond the
-        proposal.
+      <Typography mb={1}>
+        This transaction will initiate the cancellation of the{' '}
+        {recovery.isMalicious ? 'malicious transaction' : 'recovery attempt'}. It requires other owner signatures in
+        order to be complete.
       </Typography>
 
-      <Typography mb={2}>
-        Queue nonce: <b>{recovery.args.queueNonce.toNumber()}</b>
-      </Typography>
-
-      <Typography mb={2}>You will need to confirm the transaction with your currently connected wallet.</Typography>
+      <ErrorMessage level="info">
+        All actions initiated by the guardian will be skipped. The current owners will remain the owners of the Safe
+        Account.
+      </ErrorMessage>
     </SignOrExecuteForm>
   )
 }
diff --git a/src/components/tx-flow/flows/CancelRecovery/CancelRecoveryOverview.tsx b/src/components/tx-flow/flows/CancelRecovery/CancelRecoveryOverview.tsx
new file mode 100644
index 0000000000..ca95fb326f
--- /dev/null
+++ b/src/components/tx-flow/flows/CancelRecovery/CancelRecoveryOverview.tsx
@@ -0,0 +1,43 @@
+import { Box, Button, Typography } from '@mui/material'
+import { useContext } from 'react'
+import type { ReactElement } from 'react'
+
+import ReplaceTxIcon from '@/public/images/transactions/replace-tx.svg'
+import { TxModalContext } from '../..'
+import TxCard from '../../common/TxCard'
+
+export function CancelRecoveryOverview({ onSubmit }: { onSubmit: () => void }): ReactElement {
+  const { setTxFlow } = useContext(TxModalContext)
+
+  const onClose = () => {
+    setTxFlow(undefined)
+  }
+
+  return (
+    <TxCard>
+      <Box display="flex" flexDirection="column" alignItems="center" p={5}>
+        {/* TODO: Replace with correct icon when provided */}
+        <ReplaceTxIcon />
+
+        <Typography mb={1} variant="h4" mt={5} fontWeight={700}>
+          Do you want to cancel the Account recovery?
+        </Typography>
+
+        <Typography variant="body2" mb={3} textAlign="center">
+          If it is was an unwanted recovery attempt or you&apos;ve noticed something suspicious, you can cancel it by
+          increasing the nonce of the recovery module.
+        </Typography>
+
+        <Box display="flex" gap={3}>
+          <Button variant="outlined" onClick={onClose}>
+            Go back
+          </Button>
+
+          <Button variant="contained" onClick={onSubmit}>
+            Yes, cancel recovery
+          </Button>
+        </Box>
+      </Box>
+    </TxCard>
+  )
+}
diff --git a/src/components/tx-flow/flows/CancelRecovery/index.tsx b/src/components/tx-flow/flows/CancelRecovery/index.tsx
new file mode 100644
index 0000000000..51e87d2ffd
--- /dev/null
+++ b/src/components/tx-flow/flows/CancelRecovery/index.tsx
@@ -0,0 +1,30 @@
+import type { ReactElement } from 'react'
+
+import TxLayout from '../../common/TxLayout'
+import { CancelRecoveryFlowReview } from './CancelRecoveryFlowReview'
+import { CancelRecoveryOverview } from './CancelRecoveryOverview'
+import useTxStepper from '../../useTxStepper'
+import type { RecoveryQueueItem } from '@/store/recoverySlice'
+
+export function CancelRecoveryFlow({ recovery }: { recovery: RecoveryQueueItem }): ReactElement {
+  const { step, nextStep, prevStep } = useTxStepper<undefined>(undefined)
+
+  const steps = [
+    <CancelRecoveryOverview key={0} onSubmit={() => nextStep(undefined)} />,
+    <CancelRecoveryFlowReview key={0} recovery={recovery} />,
+  ]
+
+  const isIntro = step === 0
+
+  return (
+    <TxLayout
+      title={isIntro ? 'Cancel Account recovery' : 'New transaction'}
+      subtitle={isIntro ? undefined : 'Cancel Account recovery'}
+      step={step}
+      hideNonce={isIntro}
+      onBack={prevStep}
+    >
+      {steps}
+    </TxLayout>
+  )
+}
diff --git a/src/components/tx-flow/flows/SkipRecovery/index.tsx b/src/components/tx-flow/flows/SkipRecovery/index.tsx
deleted file mode 100644
index 6da4a1f3ef..0000000000
--- a/src/components/tx-flow/flows/SkipRecovery/index.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { ReactElement } from 'react'
-
-import TxLayout from '../../common/TxLayout'
-import { SkipRecoveryFlowReview } from './SkipRecoveryFlowReview'
-import type { RecoveryQueueItem } from '@/store/recoverySlice'
-
-export function SkipRecoveryFlow({ recovery }: { recovery: RecoveryQueueItem }): ReactElement {
-  return (
-    <TxLayout title="Confirm transaction" subtitle="Skip recovery" step={0}>
-      <SkipRecoveryFlowReview recovery={recovery} />
-    </TxLayout>
-  )
-}

From 92b54af74c32df678f319f260f2e643c875e343c Mon Sep 17 00:00:00 2001
From: iamacook <aaron@safe.global>
Date: Thu, 23 Nov 2023 08:17:48 +0100
Subject: [PATCH 2/2] fix: icon colour

---
 src/components/tx/ErrorMessage/index.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/tx/ErrorMessage/index.tsx b/src/components/tx/ErrorMessage/index.tsx
index 5f6cc07932..bbae5fc712 100644
--- a/src/components/tx/ErrorMessage/index.tsx
+++ b/src/components/tx/ErrorMessage/index.tsx
@@ -26,7 +26,12 @@ const ErrorMessage = ({
   return (
     <div className={classNames(css.container, css[level], className, 'errorMessage')}>
       <div className={css.message}>
-        <SvgIcon component={level === 'info' ? InfoIcon : WarningIcon} inheritViewBox fontSize="small" />
+        <SvgIcon
+          component={level === 'info' ? InfoIcon : WarningIcon}
+          inheritViewBox
+          fontSize="small"
+          sx={{ color: ({ palette }) => `${palette[level].main} !important` }}
+        />
 
         <div>
           <Typography variant="body2" component="span">