diff options
| author | Frankie <frankie.diamond@gmail.com> | 2017-02-02 05:05:58 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 05:05:58 +0800 |
| commit | 54b1339f6a2a8a66a01ac224c6dbb569911cfc9a (patch) | |
| tree | 675d11564292df8871ceea4b3e4a883b0ed2da57 /ui/app | |
| parent | ce0c3ed03c20eb0b7438cb9add7cbce490d7de64 (diff) | |
| parent | 25c5a4462369f5209924a99cbe0395da13a6a0a7 (diff) | |
| download | tangerine-wallet-browser-54b1339f6a2a8a66a01ac224c6dbb569911cfc9a.tar tangerine-wallet-browser-54b1339f6a2a8a66a01ac224c6dbb569911cfc9a.tar.gz tangerine-wallet-browser-54b1339f6a2a8a66a01ac224c6dbb569911cfc9a.tar.bz2 tangerine-wallet-browser-54b1339f6a2a8a66a01ac224c6dbb569911cfc9a.tar.lz tangerine-wallet-browser-54b1339f6a2a8a66a01ac224c6dbb569911cfc9a.tar.xz tangerine-wallet-browser-54b1339f6a2a8a66a01ac224c6dbb569911cfc9a.tar.zst tangerine-wallet-browser-54b1339f6a2a8a66a01ac224c6dbb569911cfc9a.zip | |
Merge branch 'dev' into messageManagerCleanUp
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/account-detail.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 1763c5374..514be7f25 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -29,7 +29,7 @@ function mapStateToProps (state) { network: state.metamask.network, unapprovedMsgs: valuesFor(state.metamask.unapprovedMsgs), shapeShiftTxList: state.metamask.shapeShiftTxList, - transactions: state.metamask.selectedAccountTxList || [], + transactions: state.metamask.selectedAddressTxList || [], } } |