diff options
author | kumavis <aaron@kumavis.me> | 2018-10-26 10:24:30 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-10-26 10:24:30 +0800 |
commit | 9b42416fc0d92662d1a21759db357e7f439d7a7b (patch) | |
tree | 4fb658d739a7127d4c18a22b4abe556bfc3a194e /app/scripts/controllers | |
parent | 9b501b7c42ebebb61ac3130d1e84d36efcac9b7e (diff) | |
parent | 55c66b0d988fac6b2ed5948cf4dcd20fd486070e (diff) | |
download | tangerine-wallet-browser-9b42416fc0d92662d1a21759db357e7f439d7a7b.tar.gz tangerine-wallet-browser-9b42416fc0d92662d1a21759db357e7f439d7a7b.tar.zst tangerine-wallet-browser-9b42416fc0d92662d1a21759db357e7f439d7a7b.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardBraham-develop
Diffstat (limited to 'app/scripts/controllers')
-rw-r--r-- | app/scripts/controllers/preferences.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js index 689506a7a..20b13398c 100644 --- a/app/scripts/controllers/preferences.js +++ b/app/scripts/controllers/preferences.js @@ -104,7 +104,7 @@ class PreferencesController { * @param {Function} - end */ async requestWatchAsset (req, res, next, end) { - if (req.method === 'metamask_watchAsset') { + if (req.method === 'metamask_watchAsset' || req.method === 'wallet_watchAsset') { const { type, options } = req.params switch (type) { case 'ERC20': |