aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-02-04 12:45:20 +0800
committerDan Finlay <dan@danfinlay.com>2017-02-04 12:45:20 +0800
commit13ee92909cce93b37eec2092757e4aab174a970e (patch)
tree40802425ce3731679b0c877168ca9e9ee067dd9d /ui
parent24ff38e97386eafe0cd9c8e4e77dbed856b2464e (diff)
downloadtangerine-wallet-browser-13ee92909cce93b37eec2092757e4aab174a970e.tar
tangerine-wallet-browser-13ee92909cce93b37eec2092757e4aab174a970e.tar.gz
tangerine-wallet-browser-13ee92909cce93b37eec2092757e4aab174a970e.tar.bz2
tangerine-wallet-browser-13ee92909cce93b37eec2092757e4aab174a970e.tar.lz
tangerine-wallet-browser-13ee92909cce93b37eec2092757e4aab174a970e.tar.xz
tangerine-wallet-browser-13ee92909cce93b37eec2092757e4aab174a970e.tar.zst
tangerine-wallet-browser-13ee92909cce93b37eec2092757e4aab174a970e.zip
Mostly got shapeshift tx management into its own controller
Rendering the list is still having issues, so this isn't done yet.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/actions.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js
index c153a55a6..0c6e40552 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -843,6 +843,7 @@ function coinShiftRquest (data, marketData) {
return (dispatch) => {
dispatch(actions.showLoadingIndication())
shapeShiftRequest('shift', { method: 'POST', data}, (response) => {
+ dispatch(actions.hideLoadingIndication())
if (response.error) return dispatch(actions.displayWarning(response.error))
var message = `
Deposit your ${response.depositType} to the address bellow:`
@@ -933,4 +934,4 @@ function forceUpdateMetamaskState(dispatch){
}
dispatch(actions.updateMetamaskState(newState))
})
-} \ No newline at end of file
+}