diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-08-23 02:59:08 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-08-23 02:59:08 +0800 |
commit | 3d451ddf3e59e8d4ac610b7e6a01a59beed4f944 (patch) | |
tree | 93193c3014065d00fc14d2efcdca8a11c63e2e4a /app/scripts/lib/idStore.js | |
parent | 8592ffd85582612ae18b5f4e5ed6749401f86f3b (diff) | |
parent | 3756384da6cb7d1566271cb99ec561d3b051a4ac (diff) | |
download | tangerine-wallet-browser-3d451ddf3e59e8d4ac610b7e6a01a59beed4f944.tar.gz tangerine-wallet-browser-3d451ddf3e59e8d4ac610b7e6a01a59beed4f944.tar.zst tangerine-wallet-browser-3d451ddf3e59e8d4ac610b7e6a01a59beed4f944.zip |
Merge branch 'master' into i390-TransactionLimit
Diffstat (limited to 'app/scripts/lib/idStore.js')
-rw-r--r-- | app/scripts/lib/idStore.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/lib/idStore.js b/app/scripts/lib/idStore.js index 3272f2d1a..7ac71e409 100644 --- a/app/scripts/lib/idStore.js +++ b/app/scripts/lib/idStore.js @@ -100,6 +100,7 @@ IdentityStore.prototype.getState = function () { unconfMsgs: messageManager.unconfirmedMsgs(), messages: messageManager.getMsgList(), selectedAddress: configManager.getSelectedAccount(), + shapeShiftTxList: configManager.getShapeShiftTxList(), currentFiat: configManager.getCurrentFiat(), conversionRate: configManager.getConversionRate(), conversionDate: configManager.getConversionDate(), |