m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 16:18:07 +01:00
Code

metamask - adopt shapeshift txs from keyringController

Browse Source
This commit is contained in:
kumavis 2017-01-27 23:05:29 -08:00
parent 3afd0ef27d
commit 1fd1746744
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/scripts/keyring-controller.js
View File

@ -87,7 +87,6 @@ module.exports = class KeyringController extends EventEmitter {
unconfMsgs: messageManager.unconfirmedMsgs(), unconfMsgs: messageManager.unconfirmedMsgs(),
messages: messageManager.getMsgList(), messages: messageManager.getMsgList(),
selectedAccount: address, selectedAccount: address,
shapeShiftTxList: this.configManager.getShapeShiftTxList(),
currentFiat: this.configManager.getCurrentFiat(), currentFiat: this.configManager.getCurrentFiat(),
conversionRate: this.configManager.getConversionRate(), conversionRate: this.configManager.getConversionRate(),
conversionDate: this.configManager.getConversionDate(), conversionDate: this.configManager.getConversionDate(),

4
app/scripts/metamask-controller.js
View File

@ -162,7 +162,9 @@ module.exports = class MetamaskController extends EventEmitter {
this.configManager.getConfig(), this.configManager.getConfig(),
this.txManager.getState(), this.txManager.getState(),
keyringControllerState, keyringControllerState,
this.noticeController.getState(), { this.noticeController.getState(),
{
shapeShiftTxList: this.configManager.getShapeShiftTxList(),
lostAccounts: this.configManager.getLostAccounts(), lostAccounts: this.configManager.getLostAccounts(),
} }
) )