diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-09-02 02:39:08 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-02 02:39:08 +0800 |
commit | a76e198c9c23cfe93346ea7690925fe9d3be5843 (patch) | |
tree | 671a308c73f61fc1e2b3fba3cc71ef1d3ac77477 /ui/app/actions.js | |
parent | 32345bda7751f962105bb8bd4ea402f549f30409 (diff) | |
parent | 34fd23803d5eea94bd588b805872377edf48a9c6 (diff) | |
download | tangerine-wallet-browser-a76e198c9c23cfe93346ea7690925fe9d3be5843.tar.gz tangerine-wallet-browser-a76e198c9c23cfe93346ea7690925fe9d3be5843.tar.zst tangerine-wallet-browser-a76e198c9c23cfe93346ea7690925fe9d3be5843.zip |
Merge pull request #603 from MetaMask/i566-NoPopupWhenOpen
Don't show popup when sending tx from within metamask
Diffstat (limited to 'ui/app/actions.js')
-rw-r--r-- | ui/app/actions.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index c92138f68..d49223e71 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -276,8 +276,6 @@ function signMsg (msgData) { function signTx (txData) { return (dispatch) => { - dispatch(actions.showLoadingIndication()) - web3.eth.sendTransaction(txData, (err, data) => { dispatch(actions.hideLoadingIndication()) @@ -285,6 +283,7 @@ function signTx (txData) { dispatch(actions.hideWarning()) dispatch(actions.goHome()) }) + dispatch(this.showConfTxPage()) } } |