diff options
| author | Bruno Barbieri <bruno.barbieri@consensys.net> | 2018-08-29 03:33:42 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-29 03:33:42 +0800 |
| commit | 4560df6e739b97caf95ef5bc5bc93f91e8c890bb (patch) | |
| tree | 76984504e65b06ae15633d721fedc7ddd5b0cca7 /app/scripts/metamask-controller.js | |
| parent | 0259eb02140fec1db9861506a6ff7890911af652 (diff) | |
| parent | e743f44150d4c09908d24945de5a281e15e8469d (diff) | |
| download | tangerine-wallet-browser-4560df6e739b97caf95ef5bc5bc93f91e8c890bb.tar tangerine-wallet-browser-4560df6e739b97caf95ef5bc5bc93f91e8c890bb.tar.gz tangerine-wallet-browser-4560df6e739b97caf95ef5bc5bc93f91e8c890bb.tar.bz2 tangerine-wallet-browser-4560df6e739b97caf95ef5bc5bc93f91e8c890bb.tar.lz tangerine-wallet-browser-4560df6e739b97caf95ef5bc5bc93f91e8c890bb.tar.xz tangerine-wallet-browser-4560df6e739b97caf95ef5bc5bc93f91e8c890bb.tar.zst tangerine-wallet-browser-4560df6e739b97caf95ef5bc5bc93f91e8c890bb.zip | |
Merge pull request #4606 from MetaMask/WatchTokenFeature
Add metamask_watchAsset
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index a6215d51b..98cb62bfa 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -92,6 +92,7 @@ module.exports = class MetamaskController extends EventEmitter { this.preferencesController = new PreferencesController({ initState: initState.PreferencesController, initLangCode: opts.initLangCode, + showWatchAssetUi: opts.showWatchAssetUi, network: this.networkController, }) @@ -386,6 +387,7 @@ module.exports = class MetamaskController extends EventEmitter { setSelectedAddress: nodeify(preferencesController.setSelectedAddress, preferencesController), addToken: nodeify(preferencesController.addToken, preferencesController), removeToken: nodeify(preferencesController.removeToken, preferencesController), + removeSuggestedTokens: nodeify(preferencesController.removeSuggestedTokens, preferencesController), setCurrentAccountTab: nodeify(preferencesController.setCurrentAccountTab, preferencesController), setAccountLabel: nodeify(preferencesController.setAccountLabel, preferencesController), setFeatureFlag: nodeify(preferencesController.setFeatureFlag, preferencesController), @@ -1250,6 +1252,7 @@ module.exports = class MetamaskController extends EventEmitter { engine.push(createOriginMiddleware({ origin })) engine.push(createLoggerMiddleware({ origin })) engine.push(filterMiddleware) + engine.push(this.preferencesController.requestWatchAsset.bind(this.preferencesController)) engine.push(createProviderMiddleware({ provider: this.provider })) // setup connection |