Merge branch 'recovery-epic' into refactor-recovery-loading

src/components/dashboard/PendingTxs/PendingRecoveryListItem.tsx

@@ -0,0 +1,51 @@
+import Link from 'next/link'
+import { useMemo } from 'react'
+import { useRouter } from 'next/router'
+import { ChevronRight } from '@mui/icons-material'
+import { Box } from '@mui/material'
+import type { ReactElement } from 'react'
+
+import { RecoveryInfo } from '@/components/recovery/RecoveryInfo'
+import { RecoveryStatus } from '@/components/recovery/RecoveryStatus'
+import { RecoveryType } from '@/components/recovery/RecoveryType'
+import { AppRoutes } from '@/config/routes'
+import type { RecoveryQueueItem } from '@/components/recovery/RecoveryLoaderContext'
+
+import css from './styles.module.css'
+
+export function PendingRecoveryListItem({ transaction }: { transaction: RecoveryQueueItem }): ReactElement {
+  const router = useRouter()
+  const { isMalicious } = transaction
+
+  const url = useMemo(
+    () => ({
+      pathname: AppRoutes.transactions.queue,
+      query: router.query,
+    }),
+    [router.query],
+  )
+
+  return (
+    <Link href={url} passHref>
+      <Box className={css.container}>
+        <Box gridArea="nonce" />
+
+        <Box gridArea="type">
+          <RecoveryType isMalicious={isMalicious} />
+        </Box>
+
+        <Box gridArea="info">
+          <RecoveryInfo isMalicious={isMalicious} />
+        </Box>
+
+        <Box gridArea="confirmations">
+          <RecoveryStatus recovery={transaction} />
+        </Box>
+
+        <Box gridArea="action">
+          <ChevronRight color="border" />
+        </Box>
+      </Box>
+    </Link>
+  )
+}

src/components/dashboard/PendingTxs/PendingTxList.test.ts

@@ -0,0 +1,71 @@
+import { BigNumber } from 'ethers'
+import { faker } from '@faker-js/faker'
+import { DetailedExecutionInfoType } from '@safe-global/safe-gateway-typescript-sdk'
+import type { MultisigExecutionInfo, Transaction } from '@safe-global/safe-gateway-typescript-sdk'
+
+import { safeInfoBuilder } from '@/tests/builders/safe'
+import { _getTransactionsToDisplay } from './PendingTxsList'
+import type { RecoveryQueueItem } from '@/components/recovery/RecoveryLoaderContext'
+
+describe('_getTransactionsToDisplay', () => {
+  it('should return the recovery queue if it has more than or equal to MAX_TXS items', () => {
+    const walletAddress = faker.finance.ethereumAddress()
+    const safe = safeInfoBuilder().build()
+    const recoveryQueue = [
+      { timestamp: BigNumber.from(1) },
+      { timestamp: BigNumber.from(2) },
+      { timestamp: BigNumber.from(3) },
+      { timestamp: BigNumber.from(4) },
+      { timestamp: BigNumber.from(5) },
+    ] as Array<RecoveryQueueItem>
+    const queue = [] as Array<Transaction>
+
+    const result = _getTransactionsToDisplay({ recoveryQueue, queue, walletAddress, safe })
+    expect(result).toStrictEqual(recoveryQueue.slice(0, 4))
+  })
+
+  it('should return the recovery queue followed by the actionable transactions from the queue', () => {
+    const walletAddress = faker.finance.ethereumAddress()
+    const safe = safeInfoBuilder().build()
+    const recoveryQueue = [
+      { timestamp: BigNumber.from(1) },
+      { timestamp: BigNumber.from(2) },
+      { timestamp: BigNumber.from(3) },
+    ] as Array<RecoveryQueueItem>
+    const actionableQueue = [
+      {
+        transaction: { id: '1' },
+        executionInfo: {
+          type: DetailedExecutionInfoType.MULTISIG,
+          missingSigners: [walletAddress],
+        } as unknown as MultisigExecutionInfo,
+      } as unknown as Transaction,
+      {
+        transaction: { id: '2' },
+        executionInfo: {
+          type: DetailedExecutionInfoType.MULTISIG,
+          missingSigners: [walletAddress],
+        } as unknown as MultisigExecutionInfo,
+      } as unknown as Transaction,
+    ]
+
+    const expected = [...recoveryQueue, actionableQueue[0]]
+    const result = _getTransactionsToDisplay({ recoveryQueue, queue: actionableQueue, walletAddress, safe })
+    expect(result).toEqual(expected)
+  })
+
+  it('should return the recovery queue followed by the transactions from the queue if there are no actionable transactions', () => {
+    const walletAddress = faker.finance.ethereumAddress()
+    const safe = safeInfoBuilder().build()
+    const recoveryQueue = [
+      { timestamp: BigNumber.from(1) },
+      { timestamp: BigNumber.from(2) },
+      { timestamp: BigNumber.from(3) },
+    ] as Array<RecoveryQueueItem>
+    const queue = [{ transaction: { id: '1' } }, { transaction: { id: '2' } }] as Array<Transaction>
+
+    const expected = [...recoveryQueue, queue[0]]
+    const result = _getTransactionsToDisplay({ recoveryQueue, queue, walletAddress, safe })
+    expect(result).toEqual(expected)
+  })
+})

src/components/dashboard/PendingTxs/PendingTxListItem.tsx

@@ -42,34 +42,38 @@ const PendingTx = ({ transaction }: PendingTxType): ReactElement => {
   return (
     <NextLink href={url} passHref>
       <Box className={css.container}>
-        {isMultisigExecutionInfo(transaction.executionInfo) && transaction.executionInfo.nonce}
+        <Box gridArea="nonce">
+          {isMultisigExecutionInfo(transaction.executionInfo) && transaction.executionInfo.nonce}
+        </Box>
 
-        <Box flex={1}>
+        <Box gridArea="type">
           <TxType tx={transaction} short={true} />
         </Box>
 
-        <Box flex={1} className={css.txInfo}>
+        <Box gridArea="info">
           <TxInfo info={transaction.txInfo} />
         </Box>
 
-        {isMultisigExecutionInfo(transaction.executionInfo) ? (
-          <Box className={css.confirmationsCount}>
-            <SvgIcon component={OwnersIcon} inheritViewBox fontSize="small" />
-            <Typography variant="caption" fontWeight="bold">
-              {`${transaction.executionInfo.confirmationsSubmitted}/${transaction.executionInfo.confirmationsRequired}`}
-            </Typography>
-          </Box>
-        ) : (
-          <Box flexGrow={1} />
-        )}
+        <Box gridArea="confirmations">
+          {isMultisigExecutionInfo(transaction.executionInfo) && (
+            <Box className={css.confirmationsCount}>
+              <SvgIcon component={OwnersIcon} inheritViewBox fontSize="small" />
+              <Typography variant="caption" fontWeight="bold">
+                {`${transaction.executionInfo.confirmationsSubmitted}/${transaction.executionInfo.confirmationsRequired}`}
+              </Typography>
+            </Box>
+          )}
+        </Box>
 
-        {canExecute ? (
-          <ExecuteTxButton txSummary={transaction} compact />
-        ) : canSign ? (
-          <SignTxButton txSummary={transaction} compact />
-        ) : (
-          <ChevronRight color="border" />
-        )}
+        <Box gridArea="action">
+          {canExecute ? (
+            <ExecuteTxButton txSummary={transaction} compact />
+          ) : canSign ? (
+            <SignTxButton txSummary={transaction} compact />
+          ) : (
+            <ChevronRight color="border" />
+          )}
+        </Box>
       </Box>
     </NextLink>
   )

src/components/dashboard/PendingTxs/PendingTxsList.tsx

@@ -12,6 +12,10 @@ import css from './styles.module.css'
 import { isSignableBy, isExecutable } from '@/utils/transaction-guards'
 import useWallet from '@/hooks/wallets/useWallet'
 import useSafeInfo from '@/hooks/useSafeInfo'
+import { useRecoveryQueue } from '@/hooks/useRecoveryQueue'
+import { PendingRecoveryListItem } from './PendingRecoveryListItem'
+import type { SafeInfo, Transaction } from '@safe-global/safe-gateway-typescript-sdk'
+import type { RecoveryQueueItem } from '@/components/recovery/RecoveryLoaderContext'
 
 const MAX_TXS = 4
 
@@ -37,23 +41,58 @@ const LoadingState = () => (
   </div>
 )
 
+function getActionableTransactions(txs: Transaction[], safe: SafeInfo, walletAddress?: string): Transaction[] {
+  if (!walletAddress) {
+    return txs
+  }
+
+  return txs.filter((tx) => {
+    return isSignableBy(tx.transaction, walletAddress) || isExecutable(tx.transaction, walletAddress, safe)
+  })
+}
+
+export function _getTransactionsToDisplay({
+  recoveryQueue,
+  queue,
+  walletAddress,
+  safe,
+}: {
+  recoveryQueue: RecoveryQueueItem[]
+  queue: Transaction[]
+  walletAddress?: string
+  safe: SafeInfo
+}): (Transaction | RecoveryQueueItem)[] {
+  if (recoveryQueue.length >= MAX_TXS) {
+    return recoveryQueue.slice(0, MAX_TXS)
+  }
+
+  const actionableQueue = getActionableTransactions(queue, safe, walletAddress)
+  const _queue = actionableQueue.length > 0 ? actionableQueue : queue
+  const queueToDisplay = _queue.slice(0, MAX_TXS - recoveryQueue.length)
+
+  return [...recoveryQueue, ...queueToDisplay]
+}
+
+function isRecoveryQueueItem(tx: Transaction | RecoveryQueueItem): tx is RecoveryQueueItem {
+  return 'args' in tx
+}
+
 const PendingTxsList = (): ReactElement | null => {
   const router = useRouter()
   const { page, loading } = useTxQueue()
   const { safe } = useSafeInfo()
   const wallet = useWallet()
   const queuedTxns = useMemo(() => getLatestTransactions(page?.results), [page?.results])
+  const recoveryQueue = useRecoveryQueue()
 
-  const actionableTxs = useMemo(() => {
-    return wallet
-      ? queuedTxns.filter(
-          (tx) => isSignableBy(tx.transaction, wallet.address) || isExecutable(tx.transaction, wallet.address, safe),
-        )
-      : queuedTxns
-  }, [wallet, queuedTxns, safe])
-
-  const txs = actionableTxs.length ? actionableTxs : queuedTxns
-  const txsToDisplay = txs.slice(0, MAX_TXS)
+  const txsToDisplay = useMemo(() => {
+    return _getTransactionsToDisplay({
+      recoveryQueue,
+      queue: queuedTxns,
+      walletAddress: wallet?.address,
+      safe,
+    })
+  }, [recoveryQueue, queuedTxns, wallet?.address, safe])
 
   const queueUrl = useMemo(
     () => ({
@@ -76,11 +115,14 @@ const PendingTxsList = (): ReactElement | null => {
       <WidgetBody>
         {loading ? (
           <LoadingState />
-        ) : queuedTxns.length ? (
+        ) : txsToDisplay.length > 0 ? (
           <div className={css.list}>
-            {txsToDisplay.map((tx) => (
-              <PendingTxListItem transaction={tx.transaction} key={tx.transaction.id} />
-            ))}
+            {txsToDisplay.map((tx) => {
+              if (isRecoveryQueueItem(tx)) {
+                return <PendingRecoveryListItem transaction={tx} key={tx.transactionHash} />
+              }
+              return <PendingTxListItem transaction={tx.transaction} key={tx.transaction.id} />
+            })}
           </div>
         ) : (
           <EmptyState />

src/components/dashboard/PendingTxs/styles.module.css

@@ -1,11 +1,13 @@
 .container {
   width: 100%;
+  min-height: 50px;
   padding: 8px 16px;
   background-color: var(--color-background-paper);
   border: 1px solid var(--color-border-light);
   border-radius: 8px;
-  flex-wrap: wrap;
-  display: flex;
+  display: grid;
+  grid-template-columns: minmax(30px, min-content) 0.5fr 1fr min-content min-content;
+  grid-template-areas: 'nonce type info confirmations action';
   align-items: center;
   gap: var(--space-2);
 }
@@ -44,12 +46,3 @@
   color: var(--color-static-main);
   text-align: center;
 }
-
-@media (max-width: 599.95px) {
-  .txInfo {
-    width: 100%;
-    order: 1;
-    flex: auto;
-    margin-top: calc(var(--space-1) * -1);
-  }
-}

src/components/recovery/SkipRecoveryButton/index.tsx → 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 '@/components/recovery/RecoveryLoaderContext'
 
-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>
         )
       }

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>
 

src/components/recovery/RecoveryInfo/index.tsx

@@ -3,7 +3,11 @@ import type { ReactElement } from 'react'
 
 import WarningIcon from '@/public/images/notifications/warning.svg'
 
-export const RecoveryInfo = (): ReactElement => {
+export const RecoveryInfo = ({ isMalicious }: { isMalicious: boolean }): ReactElement | null => {
+  if (!isMalicious) {
+    return null
+  }
+
   return (
     <Tooltip title="Suspicious activity" placement="top" arrow>
       <span>

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 '@/components/recovery/RecoveryLoaderContext'
 
@@ -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>
     </>
   )