diff options
| author | kumavis <aaron@kumavis.me> | 2017-01-28 15:05:29 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-01-28 15:05:29 +0800 |
| commit | 1fd17467442fb60f308b116fea53f87a4cc16dca (patch) | |
| tree | ea8a54fd952877d9f8f74c2d5fbfe602dff18252 /app | |
| parent | 3afd0ef27d69ed5d130f4ea37e3e856cadba34d9 (diff) | |
| download | tangerine-wallet-browser-1fd17467442fb60f308b116fea53f87a4cc16dca.tar.gz tangerine-wallet-browser-1fd17467442fb60f308b116fea53f87a4cc16dca.tar.zst tangerine-wallet-browser-1fd17467442fb60f308b116fea53f87a4cc16dca.zip | |
metamask - adopt shapeshift txs from keyringController
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/keyring-controller.js | 1 | ||||
| -rw-r--r-- | app/scripts/metamask-controller.js | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js index a4bee8ae1..e1e1342aa 100644 --- a/app/scripts/keyring-controller.js +++ b/app/scripts/keyring-controller.js @@ -87,7 +87,6 @@ module.exports = class KeyringController extends EventEmitter { unconfMsgs: messageManager.unconfirmedMsgs(), messages: messageManager.getMsgList(), selectedAccount: address, - shapeShiftTxList: this.configManager.getShapeShiftTxList(), currentFiat: this.configManager.getCurrentFiat(), conversionRate: this.configManager.getConversionRate(), conversionDate: this.configManager.getConversionDate(), diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 30fc61168..bef791ec9 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -162,7 +162,9 @@ module.exports = class MetamaskController extends EventEmitter { this.configManager.getConfig(), this.txManager.getState(), keyringControllerState, - this.noticeController.getState(), { + this.noticeController.getState(), + { + shapeShiftTxList: this.configManager.getShapeShiftTxList(), lostAccounts: this.configManager.getLostAccounts(), } ) |