fix: bug that caused success page after confirmation of 0-conf (#219)

BoltzExchange · Sep 19, 2019 · 2c0f6b1 · 2c0f6b1
1 parent 60ae870
commit 2c0f6b1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/actions/reverseActions.js b/src/actions/reverseActions.js
@@ -137,7 +137,7 @@ const handleReverseSwapStatus = (
   switch (status) {
     case SwapUpdateEvent.TransactionConfirmed:
       dispatch(setReverseSwapStatus('Waiting for invoice to be paid...'));
-      nextStage();
+      nextStage(true);
       break;
 
     case SwapUpdateEvent.TransactionRefunded:

diff --git a/src/views/reverse/reverse.js b/src/views/reverse/reverse.js
@@ -24,6 +24,8 @@ const styles = () => ({
 });
 
 class ReverseSwap extends React.Component {
+  acceptedZeroConf = false;
+
   constructor(props) {
     super(props);
 
@@ -144,6 +146,8 @@ class ReverseSwap extends React.Component {
                     swapInfo={swapInfo}
                     swapResponse={swapResponse}
                     setAllowZeroConf={allow => {
+                      this.acceptedZeroConf = true;
+
                       this.setState({
                         allowZeroConf: allow,
                       });
@@ -195,7 +199,11 @@ class ReverseSwap extends React.Component {
                       if (swapInfo.address && swapInfo.address !== '') {
                         startReverseSwap(
                           swapInfo,
-                          props.nextStage,
+                          confirmedEvent => {
+                            if (!confirmedEvent || !this.acceptedZeroConf) {
+                              props.nextStage();
+                            }
+                          },
                           goTimelockExpired
                         );
                         props.nextStage();