diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-05-09 04:32:01 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 04:32:01 +0800 |
| commit | 09a0e7ed89c25698161e1952e93160c99456f656 (patch) | |
| tree | a30f7079fdfae74d746688bd30932884c9f3d7c3 /ui/app | |
| parent | 86500d0bcbba5222d97e5882985a73234a928b71 (diff) | |
| parent | 21b6a1b478032fa51505c1be517587515fe8bd6c (diff) | |
| download | tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.tar tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.tar.gz tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.tar.bz2 tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.tar.lz tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.tar.xz tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.tar.zst tangerine-wallet-browser-09a0e7ed89c25698161e1952e93160c99456f656.zip | |
Merge pull request #1390 from MetaMask/ui-slim
Slim down the ui bundle a bit
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/actions.js | 2 | ||||
| -rw-r--r-- | ui/app/components/ens-input.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/actions.js b/ui/app/actions.js index c15c9be7e..1a3557cb4 100644 --- a/ui/app/actions.js +++ b/ui/app/actions.js @@ -393,7 +393,7 @@ function signPersonalMsg (msgData) { function signTx (txData) { return (dispatch) => { - web3.eth.sendTransaction(txData, (err, data) => { + global.ethQuery.sendTransaction(txData, (err, data) => { dispatch(actions.hideLoadingIndication()) if (err) return dispatch(actions.displayWarning(err.message)) dispatch(actions.hideWarning()) diff --git a/ui/app/components/ens-input.js b/ui/app/components/ens-input.js index f1cf49998..0457bde2e 100644 --- a/ui/app/components/ens-input.js +++ b/ui/app/components/ens-input.js @@ -75,7 +75,7 @@ EnsInput.prototype.componentDidMount = function () { const resolverAddress = networkResolvers[network] if (resolverAddress) { - const provider = web3.currentProvider + const provider = global.ethereumProvider this.ens = new ENS({ provider, network }) this.checkName = debounce(this.lookupEnsName.bind(this), 200) } |