Fix: Change tx queued copy (#3287)

* docs: update statuses doc Co-authored-by: Aaron Cook <[email protected]> * fix: change text for PENDING_FAILED tx Co-authored-by: Aaron Cook <[email protected]>
5afe · Jan 11, 2022 · 8bf1607 · 8bf1607
1 parent 341d3de
commit 8bf1607
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/docs/transactions.md b/docs/transactions.md
@@ -7,11 +7,10 @@ The status of a transaction can vary depending on whether it has just been submi
 | Status                                                                       | Description                                                              |
 | ---------------------------------------------------------------------------- | ------------------------------------------------------------------------ |
 | Needs your confirmation /<br>Needs confirmations<br>`AWAITING_CONFIRMATIONS` | The transaction still requires confirmations.                            |
-| Needs execution<br>`AWAITING_EXECUTION`                                      | The transaction has sufficient confirmations but has yet to be executed. |
+| Needs execution<br>`AWAITING_EXECUTION` /<br>`PENDING_FAILED`\*                                      | The transaction has sufficient confirmations but has yet to be executed.<br><br>The requested execution was rejected by the user but it can be attempted again.* |
 | Cancelled<br>`CANCELLED`                                                     | The transaction was cancelled.                                           |
 | Failed<br>`FAILED`                                                           | The transaction failed.                                                  |
-| Pending\*<br>`PENDING`                                                       | The transaction has been submitted and is waiting to be mined.           |
-| Execution Failed\*<br>`PENDING_FAILED`                                       | The requested execution failed but it can be attempted again.            |
+| Pending<br>`PENDING`\*                                                       | The transaction has been submitted and is waiting to be mined.*           |
 | Success<br>`SUCCESS`                                                         | The transaction was successfully executed.                               |
 | Transaction will be replaced<br>`WILL_BE_REPLACED`                           | A corresponding rejection transaction has been created.                  |
 

diff --git a/src/routes/safe/components/Transactions/TxList/hooks/useTransactionStatus.ts b/src/routes/safe/components/Transactions/TxList/hooks/useTransactionStatus.ts
@@ -39,14 +39,12 @@ export const useTransactionStatus = (transaction: Transaction): TransactionStatu
         setStatus({ color: 'rinkeby', text })
         break
       case LocalTransactionStatus.AWAITING_EXECUTION:
+      case LocalTransactionStatus.PENDING_FAILED:
         setStatus({ color: 'rinkeby', text: 'Needs execution' })
         break
       case LocalTransactionStatus.PENDING:
         setStatus({ color: 'rinkeby', text: 'Pending' })
         break
-      case LocalTransactionStatus.PENDING_FAILED:
-        setStatus({ color: 'rinkeby', text: 'Execution failed' })
-        break
     }
   }, [setStatus, txStatus, currentUser, executionInfo])