From 1fd17467442fb60f308b116fea53f87a4cc16dca Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Fri, 27 Jan 2017 23:05:29 -0800
Subject: metamask - adopt shapeshift txs from keyringController

---
 app/scripts/metamask-controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app/scripts/metamask-controller.js')

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