diff options
| author | Dan <danjm.com@gmail.com> | 2018-05-14 21:30:50 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-05-14 22:14:50 +0800 |
| commit | 6bc8cc819a16118acc010d0efdec90afbda14590 (patch) | |
| tree | 2d2c35604af2e6a44c5f3ecb5c901a52980710d8 /app/scripts/controllers/network | |
| parent | 0739618a61cfc383498e466f4fdeb5a25324598f (diff) | |
| download | tangerine-wallet-browser-6bc8cc819a16118acc010d0efdec90afbda14590.tar.gz tangerine-wallet-browser-6bc8cc819a16118acc010d0efdec90afbda14590.tar.zst tangerine-wallet-browser-6bc8cc819a16118acc010d0efdec90afbda14590.zip | |
Merge branch 'develop' into i3725-refactor-send-component-
Diffstat (limited to 'app/scripts/controllers/network')
| -rw-r--r-- | app/scripts/controllers/network/network.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 6fd983bb2..2f5b81cd2 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -1,7 +1,7 @@ const assert = require('assert') const EventEmitter = require('events') const createMetamaskProvider = require('web3-provider-engine/zero.js') -const SubproviderFromProvider = require('web3-provider-engine/subproviders/web3.js') +const SubproviderFromProvider = require('web3-provider-engine/subproviders/provider.js') const createInfuraProvider = require('eth-json-rpc-infura/src/createProvider') const ObservableStore = require('obs-store') const ComposedStore = require('obs-store/lib/composed') |