feat: handle zero conf swaps (#195)

BoltzExchange · Jun 26, 2019 · 7555fb9 · 7555fb9
1 parent a38a159
commit 7555fb9
Show file tree

Hide file tree

Showing 4 changed files with 139 additions and 132 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -41,10 +41,11 @@
     "react-jss": "^8.6.1",
     "react-loader-spinner": "^2.3.0",
     "react-notifications-component": "^1.1.1",
-    "react-redux": "^7.0.3",
+    "react-redux": "^7.1.0",
     "react-responsive-modal": "^4.0.1",
-    "react-router-dom": "^5.0.0",
+    "react-router-dom": "^5.0.1",
     "react-scripts": "^3.0.1",
+    "react-switch": "^5.0.0",
     "redux": "^4.0.1",
     "redux-logger": "^3.0.6",
     "redux-thunk": "^2.3.0",
@@ -59,6 +60,6 @@
     "eslint-plugin-html": "^5.0.5",
     "eslint-plugin-prettier": "^3.1.0",
     "eslint-plugin-react": "^7.13.0",
-    "prettier": "^1.17.1"
+    "prettier": "^1.18.2"
   }
 }
diff --git a/src/views/reverse/reverse.js b/src/views/reverse/reverse.js
@@ -26,7 +26,12 @@ const styles = () => ({
 class ReverseSwap extends React.Component {
   constructor(props) {
     super(props);
+
     this.notificationDom = React.createRef();
+
+    this.state = {
+      allowZeroConf: false,
+    };
   }
 
   componentDidMount = () => {
@@ -112,8 +117,8 @@ class ReverseSwap extends React.Component {
         <Prompt />
         <View className={classes.wrapper}>
           <StepsWizard
-            range={4}
             stage={1}
+            range={4}
             id={swapResponse ? swapResponse.id : null}
             onExit={() => {
               if (window.confirm('Are you sure you want to exit')) {
@@ -138,6 +143,11 @@ class ReverseSwap extends React.Component {
                   <LockingFunds
                     swapInfo={swapInfo}
                     swapResponse={swapResponse}
+                    setAllowZeroConf={allow => {
+                      this.setState({
+                        allowZeroConf: allow,
+                      });
+                    }}
                   />
                 )}
               />
@@ -198,7 +208,9 @@ class ReverseSwap extends React.Component {
                 num={2}
                 render={props => (
                   <Controls
-                    loading={isFetching}
+                    loading={isFetching && !this.state.allowZeroConf}
+                    text={'Accept 0-conf transaction'}
+                    onPress={() => props.nextStage()}
                     loadingText={'Locking your funds...'}
                     loadingRender={() => <Loading />}
                     error={!swapFailResponse === true}