Merge branch 'recovery-epic' into recovery-pending-status

safe-global · Nov 28, 2023 · 9df48ac · 9df48ac
2 parents 534395c + e9e0974
commit 9df48ac
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/src/components/recovery/CancelRecoveryButton/index.tsx b/src/components/recovery/CancelRecoveryButton/index.tsx
@@ -13,7 +13,6 @@ import useSafeInfo from '@/hooks/useSafeInfo'
 import useOnboard from '@/hooks/wallets/useOnboard'
 import { trackError, Errors } from '@/services/exceptions'
 import { asError } from '@/services/exceptions/utils'
-import { useIsGuardian } from '@/hooks/useIsGuardian'
 import { useRecoveryTxState } from '@/hooks/useRecoveryTxState'
 import { RecoveryListItemContext } from '../RecoveryListItem/RecoveryListItemContext'
 import type { RecoveryQueueItem } from '@/services/recovery/recovery-state'
@@ -27,7 +26,6 @@ export function CancelRecoveryButton({
 }): ReactElement {
   const { setSubmitError } = useContext(RecoveryListItemContext)
   const isOwner = useIsSafeOwner()
-  const isGuardian = useIsGuardian()
   const { isExpired, isPending } = useRecoveryTxState(recovery)
   const { setTxFlow } = useContext(TxModalContext)
   const onboard = useOnboard()
@@ -59,7 +57,7 @@ export function CancelRecoveryButton({
   return (
     <CheckWallet allowNonOwner>
       {(isOk) => {
-        const isDisabled = !isOk || isPending || (isGuardian && !isExpired)
+        const isDisabled = isPending || (isOwner ? !isOk : !isOk || !isExpired)
 
         return compact ? (
           <IconButton onClick={onClick} color="error" size="small" disabled={isDisabled}>

diff --git a/src/components/settings/Recovery/index.tsx b/src/components/settings/Recovery/index.tsx
@@ -32,7 +32,7 @@ const headCells = [
     label: (
       <>
         Recovery delay{' '}
-        <Tooltip title="You can cancel any recovery attempt when it is not needed or wanted within the delay period.">
+        <Tooltip title="You can cancel any recovery attempt when it is not needed or wanted.">
           <span>
             <SvgIcon
               component={InfoIcon}

diff --git a/src/components/tx-flow/flows/UpsertRecovery/UpsertRecoveryFlowReview.tsx b/src/components/tx-flow/flows/UpsertRecovery/UpsertRecoveryFlowReview.tsx
@@ -72,10 +72,7 @@ export function UpsertRecoveryFlowReview({
         title={
           <>
             Recovery delay
-            <Tooltip
-              placement="top"
-              title="You can cancel any recovery attempt when it is not needed or wanted within the delay period."
-            >
+            <Tooltip placement="top" title="You can cancel any recovery attempt when it is not needed or wanted.">
               <span>
                 <SvgIcon
                   component={InfoIcon}

diff --git a/src/components/tx-flow/flows/UpsertRecovery/UpsertRecoveryFlowSettings.tsx b/src/components/tx-flow/flows/UpsertRecovery/UpsertRecoveryFlowSettings.tsx
@@ -105,7 +105,7 @@ export function UpsertRecoveryFlowSettings({
               </Typography>
 
               <Typography variant="body2">
-                You can cancel any recovery attempt when it is not needed or wanted within the delay period.
+                You can cancel any recovery attempt when it is not needed or wanted.
               </Typography>
             </div>