metamask - adopt shapeshift txs from keyringController

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(),
         }
       )