aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/keyring-controller.js
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-01-28 15:05:29 +0800
committerkumavis <aaron@kumavis.me>2017-01-28 15:05:29 +0800
commit1fd17467442fb60f308b116fea53f87a4cc16dca (patch)
treeea8a54fd952877d9f8f74c2d5fbfe602dff18252 /app/scripts/keyring-controller.js
parent3afd0ef27d69ed5d130f4ea37e3e856cadba34d9 (diff)
downloadtangerine-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/scripts/keyring-controller.js')
-rw-r--r--app/scripts/keyring-controller.js1
1 files changed, 0 insertions, 1 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(),