show conf modal during submit

vacuumlabs · Aug 3, 2020 · 89e29e7 · 89e29e7
1 parent 6f79eae
commit 89e29e7
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/app/frontend/actions.ts b/app/frontend/actions.ts
@@ -379,6 +379,13 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
     })
   }
 
+  const closeConfirmationDialog = (state) => {
+    setState({
+      keepConfirmationDialogOpen: false,
+      shouldShowConfirmTransactionDialog: false,
+    })
+  }
+
   const cancelTransaction = () => ({
     shouldShowConfirmTransactionDialog: false,
   })
@@ -795,6 +802,9 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
       stopLoadingAction(state, {})
       return
     }
+    setState({
+      keepConfirmationDialogOpen: true,
+    })
     setTransactionSummary('stake', plan, coins)
     confirmTransaction(getState(), 'convert')
     stopLoadingAction(state, {})
@@ -1023,9 +1033,11 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
   }
 
   const submitTransaction = async (state) => {
-    setState({
-      shouldShowConfirmTransactionDialog: false,
-    })
+    if (!state.keepConfirmationDialogOpen) {
+      setState({
+        shouldShowConfirmTransactionDialog: false,
+      })
+    }
     if (state.usingHwWallet) {
       setState({waitingForHwWallet: true})
       loadingAction(state, `Waiting for ${state.hwWalletName}...`)
@@ -1055,7 +1067,7 @@ export default ({setState, getState}: {setState: SetStateFn; getState: GetStateF
       const address = state.sendAddress.fieldValue
       const donationAmount = state.donationAmount.coins
       const didDonate = address === getDonationAddress() || donationAmount > 0
-
+      closeConfirmationDialog(state)
       if (didDonate) {
         setState({shouldShowThanksForDonation: true})
       }

diff --git a/app/frontend/state.ts b/app/frontend/state.ts
@@ -26,6 +26,7 @@ export interface State {
   visibleAddresses: Array<any> // TODO
   sendAddress: any // TODO
   sendAmount: any // TODO
+  keepConfirmationDialogOpen: boolean
 
   sendTransactionSummary: SendTransactionSummary
 
@@ -204,6 +205,7 @@ const initialState: State = {
   },
   txConfirmType: '',
   txSuccessTab: '',
+  keepConfirmationDialogOpen: false,
 }
 
 export {initialState}
diff --git a/app/public/css/styles.css b/app/public/css/styles.css
@@ -3118,7 +3118,7 @@ input:checked + .slider:before {
   left: 0;
   right: 0;
   bottom: 0;
-  z-index: 20;
+  z-index: 998;
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -3133,6 +3133,7 @@ input:checked + .slider:before {
   line-height: 32px;
   font-weight: bold;
   color: white;
+  z-index: 999;
 }
 
 .spinner {
@@ -3155,6 +3156,7 @@ input:checked + .slider:before {
   clip: rect(24px, 40px, 40px, 0);
   -webkit-animation: rotate 2s cubic-bezier(0.77, 0, 0.175, 1) infinite;
   animation: rotate 2s cubic-bezier(0.77, 0, 0.175, 1) infinite;
+  z-index: 999;
 }
 
 .spinner span::before {