From 49cdd2874eb60bfb9ded71e958913f6eca260d5b Mon Sep 17 00:00:00 2001
From: Fernando <fernando.greco@gmail.com>
Date: Mon, 15 Feb 2021 05:56:12 -0300
Subject: [PATCH] [Transaction List v2] Pending status only if user signs the
 tx (#1890)

* prevent setting a tx to _pending_ if user didn't signed the tx
---
 src/logic/safe/store/reducer/gatewayTransactions.ts | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/logic/safe/store/reducer/gatewayTransactions.ts b/src/logic/safe/store/reducer/gatewayTransactions.ts
index df347f4c..a3eada88 100644
--- a/src/logic/safe/store/reducer/gatewayTransactions.ts
+++ b/src/logic/safe/store/reducer/gatewayTransactions.ts
@@ -326,6 +326,11 @@ export const gatewayTransactions = handleActions<AppReduxState['gatewayTransacti
         }
         case 'queued.next': {
           queued.next[nonce] = queued.next[nonce].map((txToUpdate) => {
+            // prevent setting `PENDING_FAILED` status, if previous status wasn't `PENDING`
+            if (txStatus === 'PENDING_FAILED' && txToUpdate.txStatus !== 'PENDING') {
+              return txToUpdate
+            }
+
             if (typeof id !== 'undefined') {
               if (sameString(txToUpdate.id, id)) {
                 txToUpdate.txStatus = txStatus
@@ -339,6 +344,11 @@ export const gatewayTransactions = handleActions<AppReduxState['gatewayTransacti
         }
         case 'queued.queued': {
           queued.queued[nonce] = queued.queued[nonce].map((txToUpdate) => {
+            // prevent setting `PENDING_FAILED` status, if previous status wasn't `PENDING`
+            if (txStatus === 'PENDING_FAILED' && txToUpdate.txStatus !== 'PENDING') {
+              return txToUpdate
+            }
+
             if (typeof id !== 'undefined') {
               if (sameString(txToUpdate.id, id)) {
                 txToUpdate.txStatus = txStatus