fix: replace transaction

decentraland · Feb 5, 2020 · 4812b40 · 4812b40
1 parent 7097411
commit 4812b40
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/modules/transaction/reducer.ts b/src/modules/transaction/reducer.ts
@@ -158,7 +158,7 @@ export function transactionReducer(
           action.payload.hash === transaction.hash
             ? {
                 ...transaction,
-                status: TransactionStatus.REVERTED,
+                status: TransactionStatus.REPLACED,
                 replacedBy: action.payload.replaceBy
               }
             : transaction

diff --git a/src/modules/transaction/sagas.ts b/src/modules/transaction/sagas.ts
@@ -308,12 +308,18 @@ function* handleWatchRevertedTransaction(
 
   do {
     yield delay(TRANSACTION_FETCH_DELAY)
-    const tx: AnyTransaction | null = yield call(() =>
+    const txInNetwork: AnyTransaction | null = yield call(() =>
       getTransactionFromNetwork(hash)
     )
-    if (tx != null && tx.status === TransactionStatus.CONFIRMED) {
+    if (
+      txInNetwork != null &&
+      txInNetwork.status === TransactionStatus.CONFIRMED
+    ) {
       yield put(fixRevertedTransaction(hash))
       return
+    } else if (txInNetwork == null && txInState.nonce) {
+      yield put(replaceTransactionRequest(hash, txInState.nonce))
+      return
     }
   } while (!isExpired(txInState, REVERTED_TRANSACTION_THRESHOLD))
 }