Merge pull request #433 from hermeznetwork/fix-behavior-when-rejectin…

…g-l1-tx-signing Fix behavior when rejecting l1 tx signing
hermeznetwork · Apr 21, 2021 · 6907574 · 6907574
2 parents 869ba26 + 281444c
commit 6907574
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/src/store/transaction/transaction.thunks.js b/src/store/transaction/transaction.thunks.js
@@ -219,7 +219,10 @@ function deposit (amount, account) {
       .catch((error) => {
         console.error(error)
         dispatch(transactionActions.stopTransactionSigning())
-        dispatch(transactionActions.goToTransactionErrorStep())
+        // 4001 error code means that user denied tx signature
+        if (error.code !== 4001) {
+          dispatch(transactionActions.goToTransactionErrorStep())
+        }
       })
   }
 }
@@ -267,7 +270,10 @@ function withdraw (amount, account, exit, completeDelayedWithdrawal, instantWith
       }).catch((error) => {
         console.error(error)
         dispatch(transactionActions.stopTransactionSigning())
-        dispatch(transactionActions.goToTransactionErrorStep())
+        // 4001 error code means that user denied tx signature
+        if (error.code !== 4001) {
+          dispatch(transactionActions.goToTransactionErrorStep())
+        }
       })
     } else {
       return Tx.delayedWithdraw(
@@ -289,7 +295,10 @@ function withdraw (amount, account, exit, completeDelayedWithdrawal, instantWith
         .catch((error) => {
           console.error(error)
           dispatch(transactionActions.stopTransactionSigning())
-          dispatch(transactionActions.goToTransactionErrorStep())
+          // 4001 error code means that user denied tx signature
+          if (error.code !== 4001) {
+            dispatch(transactionActions.goToTransactionErrorStep())
+          }
         })
     }
   }
@@ -311,7 +320,10 @@ function forceExit (amount, account) {
       .catch((error) => {
         console.error(error)
         dispatch(transactionActions.stopTransactionSigning())
-        dispatch(transactionActions.goToTransactionErrorStep())
+        // 4001 error code means that user denied tx signature
+        if (error.code !== 4001) {
+          dispatch(transactionActions.goToTransactionErrorStep())
+        }
       })
   }
 }

diff --git a/src/views/my-account/my-account.view.jsx b/src/views/my-account/my-account.view.jsx
@@ -101,9 +101,9 @@ function MyAccount ({
             </div>
           </div>
           <div className={classes.settingContainer}>
-            <div className={classes.settingHeader}>
+            <div className={classes.settingHeader} onClick={onNavigateToForceExit}>
               <ExitIcon />
-              <p className={classes.settingTitle} onClick={onNavigateToForceExit}>Force withdrawal</p>
+              <p className={classes.settingTitle}>Force withdrawal</p>
               <p className={classes.settingSubTitle}>Forces the coordinator to process the transaction (more Gas is required).</p>
             </div>
           </div>

diff --git a/src/views/transaction/components/transaction-overview/transaction-overview.view.jsx b/src/views/transaction/components/transaction-overview/transaction-overview.view.jsx
@@ -85,8 +85,8 @@ function TransactionOverview ({
    * @returns {void}
    */
   async function handleFormSubmit () {
-    setIsButtonDisabled(true)
-
+    // We only need to disable the button on L2 txs, as L1 txs are going to display an
+    // spinner which will prevent the user from submitting the form twice
     switch (transactionType) {
       case TxType.Deposit: {
         return onDeposit(amount, account)
@@ -98,9 +98,11 @@ function TransactionOverview ({
         return onWithdraw(amount, account, exit, completeDelayedWithdrawal, instantWithdrawal)
       }
       case TxType.Exit: {
+        setIsButtonDisabled(true)
         return onExit(amount, account, fee)
       }
       default: {
+        setIsButtonDisabled(true)
         return onTransfer(amount, account, to, fee)
       }
     }