diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-06-20 04:51:38 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-06-20 04:51:38 +0800 |
| commit | 9da243f42d7f9a1bfc868b9637774c6fbad6af53 (patch) | |
| tree | f37cc44c80a3c22f11b46c527dee66454ed70867 /app/scripts/metamask-controller.js | |
| parent | 7ec7e1226691474ea200ccf867f7a7d1f0c1086a (diff) | |
| parent | 39c7ed230d61b04d147e45a55ac7af0576961968 (diff) | |
| download | tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.tar tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.tar.gz tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.tar.bz2 tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.tar.lz tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.tar.xz tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.tar.zst tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.zip | |
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList
Diffstat (limited to 'app/scripts/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index de9a15924..f33da5213 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -280,6 +280,7 @@ module.exports = class MetamaskController extends EventEmitter { // PreferencesController setSelectedAddress: nodeify(preferencesController.setSelectedAddress).bind(preferencesController), + setCurrentAccountTab: nodeify(preferencesController.setCurrentAccountTab).bind(preferencesController), setDefaultRpc: nodeify(this.setDefaultRpc).bind(this), setCustomRpc: nodeify(this.setCustomRpc).bind(this), |