Merge pull request #68 from BoltzExchange/minor-fixes

Minor fixes
BoltzExchange · Jan 26, 2019 · cfd22c1 · cfd22c1
2 parents 72b4885 + dbcbd62
commit cfd22c1
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 42 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/views/refund/refund.js b/src/views/refund/refund.js
@@ -94,7 +94,10 @@ const Refund = ({
                   onPress={() => props.nextStage()}
                   loadingText={'Upload refund file'}
                   loadingStyle={classes.fileUpload}
-                  loading={Object.keys(refundFile).length === 0}
+                  loading={
+                    Object.keys(refundFile).length === 0 ||
+                    transactionHash === ''
+                  }
                 />
               )}
             />
@@ -119,7 +122,7 @@ const Refund = ({
               num={3}
               render={() => (
                 <Controls
-                  text={'Successfully completed refund!'}
+                  text={'Try another Swap!'}
                   onPress={() => {
                     completeRefund();
                     goHome();

diff --git a/src/views/refund/refundActions.js b/src/views/refund/refundActions.js
@@ -84,17 +84,19 @@ export const startRefund = (
           response.data.transactionHex
         );
 
-        // TODO: refactor for new version of core library
+        // TODO: make sure the provided lockup transaction hash was correct and show more specific error if not
         const refundTransaction = constructRefundTransaction(
-          ECPair.fromPrivateKey(getHexBuffer(refundFile.privateKey)),
-          redeemScript,
+          [
+            {
+              redeemScript,
+              txHash: lockupTransaction.getHash(),
+              keys: ECPair.fromPrivateKey(getHexBuffer(refundFile.privateKey)),
+              ...detectSwap(redeemScript, lockupTransaction),
+            },
+          ],
+          address.toOutputScript(destinationAddress, getNetwork(currency)),
           refundFile.timeoutBlockHeight,
-          // TODO: make sure the provided lockup transaction hash was correct and show more specific error if not
-          {
-            txHash: lockupTransaction.getHash(),
-            ...detectSwap(redeemScript, lockupTransaction),
-          },
-          address.toOutputScript(destinationAddress, getNetwork(currency))
+          1
         );
 
         const refundTransactionHex = refundTransaction.toHex();
@@ -103,11 +105,13 @@ export const startRefund = (
         dispatch(setRefundTransaction(refundTransactionHex));
         dispatch(setRefundTransactionHash(refundTransactionHash));
 
-        broadcastRefund(currency, refundTransactionHex, () => {
-          dispatch(refundResponse(true, response.data));
+        dispatch(
+          broadcastRefund(currency, refundTransactionHex, () => {
+            dispatch(refundResponse(true, response.data));
 
-          cb();
-        });
+            cb();
+          })
+        );
       })
       .catch(error => {
         window.alert('Failed to refund swap');

diff --git a/src/views/refund/refundReducer.js b/src/views/refund/refundReducer.js
@@ -3,7 +3,7 @@ import * as actionTypes from '../../constants/actions';
 const initalState = {
   isFetching: false,
   refundFile: {},
-  transactionHash: null,
+  transactionHash: '',
   destinationAddress: null,
   refundTransaction: null,
   refundTransactionHash: null,

diff --git a/src/views/refund/steps/completeRefund.js b/src/views/refund/steps/completeRefund.js
@@ -33,18 +33,17 @@ const StyledCompleteRefund = ({
 }) => (
   <View className={classes.wrapper}>
     <FaCheckCircle size={240} className={classes.icon} />
-    <span className={classes.title}>Success!</span>
-    <p>Your refund transaction:</p>
-    <code className={classes.transaction}>{refundTransaction}</code>
+    <span className={classes.title}>
+      Refund transaction successfully broadcasted!
+    </span>
+    <p>
+      Your refund transaction hash: <br />
+      <code className={classes.transaction}>{refundTransactionHash}</code>
+    </p>
 
     <p>
-      <a
-        className={classes.link}
-        target={'_blank'}
-        href={`https://chain.so/tx/LTCTEST/${refundTransactionHash}`}
-      >
-        {refundTransactionHash}
-      </a>
+      Raw transaction: <br />
+      <code className={classes.transaction}>{refundTransaction}</code>
     </p>
   </View>
 );

diff --git a/src/views/swap/swapActions.js b/src/views/swap/swapActions.js
@@ -84,13 +84,14 @@ export const startListening = (dispatch, swapId, callback) => {
   source.onmessage = event => {
     const data = JSON.parse(event.data);
 
-    if (data.message.startsWith('Transaction confirmed:')) {
-      message = {
-        pending: false,
-        message: 'Confirmed!',
-      };
+    if (data.message.startsWith('Invoice paid:')) {
       source.close();
       callback();
+    } else if (data.message.startsWith('Transaction confirmed:')) {
+      message = {
+        pending: true,
+        message: 'Waiting for invoice to be paid...',
+      };
     } else {
       message = {
         error: true,