diff options
author | Chi Kei Chan <chikeichan@gmail.com> | 2018-01-13 05:41:03 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-13 05:41:03 +0800 |
commit | 71a308d98b541b05ffabf8f63085e3cbd8bf61b7 (patch) | |
tree | 5f360e4a65a0768817913e99840e3705439432e2 /ui/app/actions.js | |
parent | 0f4bfcb02e3a04f044a571e01a4977dae2afec8e (diff) | |
parent | bdcee058dc278c46c828f376476f121417481385 (diff) | |
download | tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.gz tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.tar.zst tangerine-wallet-browser-71a308d98b541b05ffabf8f63085e3cbd8bf61b7.zip |
Merge branch 'uat' into cb-388
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r-- | ui/app/actions.js | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index bd3aab45a..0d96d2b59 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -925,9 +925,13 @@ function lockMetamask () { }) .then(newState => { dispatch(actions.updateMetamaskState(newState)) + dispatch(actions.hideLoadingIndication()) + dispatch({ type: actions.LOCK_METAMASK }) + }) + .catch(() => { + dispatch(actions.hideLoadingIndication()) dispatch({ type: actions.LOCK_METAMASK }) }) - .catch(() => dispatch({ type: actions.LOCK_METAMASK })) } } @@ -1434,7 +1438,6 @@ function pairUpdate (coin) { function shapeShiftSubview (network) { var pair = 'btc_eth' - return (dispatch) => { dispatch(actions.showSubLoadingIndication()) shapeShiftRequest('marketinfo', {pair}, (mktResponse) => { @@ -1460,7 +1463,7 @@ function coinShiftRquest (data, marketData) { dispatch(actions.hideLoadingIndication()) if (response.error) return dispatch(actions.displayWarning(response.error)) var message = ` - Deposit your ${response.depositType} to the address bellow:` + Deposit your ${response.depositType} to the address below:` log.debug(`background.createShapeShiftTx`) background.createShapeShiftTx(response.deposit, response.depositType) dispatch(actions.showQrView(response.deposit, [message].concat(marketData))) @@ -1496,7 +1499,7 @@ function reshowQrCode (data, coin) { if (mktResponse.error) return dispatch(actions.displayWarning(mktResponse.error)) var message = [ - `Deposit your ${coin} to the address bellow:`, + `Deposit your ${coin} to the address below:`, `Deposit Limit: ${mktResponse.limit}`, `Deposit Minimum:${mktResponse.minimum}`, ] |