Merge pull request #141 from liquality/dev

Patch: Alert on metamask speedup function
liquality · Jun 26, 2019 · 36465f4 · 36465f4
2 parents 2495b10 + 0b80b8a
commit 36465f4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liquality-atomic-swap",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "private": true,
   "dependencies": {
     "@liquality/bitcoin-bitcoinjs-lib-swap-provider": "^0.2.10",

diff --git a/src/actions/swap.js b/src/actions/swap.js
@@ -1,3 +1,5 @@
+/* global alert */
+
 import { replace } from 'connected-react-router'
 import watch from 'redux-watch'
 import { store } from '../store'
@@ -151,6 +153,9 @@ async function lockFunds (dispatch, getState) {
     console.log('Initiating Swap', initiateSwapParams)
   }
   const txHash = await client.swap.initiateSwap(...initiateSwapParams)
+  if (wallets.a.type === 'metamask') { // TODO: fix properly
+    alert('Please do not use the "Speed up" function to bump the priority of the transaction as this is not yet supported.')
+  }
   dispatch(transactionActions.setTransaction('a', 'fund', { hash: txHash, block }))
 }