aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/account-detail.js
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-08-19 01:40:35 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-08-19 02:04:28 +0800
commit752d16f6c072b0dd54eb245209881a25ff06cb8e (patch)
tree942ce682425b2811c5143028d842e02095712c46 /ui/app/account-detail.js
parent9b1a3fd7f36adfacd46de78f4f60e26eca6edd16 (diff)
downloadtangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.gz
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.bz2
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.lz
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.xz
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.tar.zst
tangerine-wallet-browser-752d16f6c072b0dd54eb245209881a25ff06cb8e.zip
WIP: ShapeShift tx
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r--ui/app/account-detail.js11
1 files changed, 4 insertions, 7 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js
index 0053935f5..13188e20c 100644
--- a/ui/app/account-detail.js
+++ b/ui/app/account-detail.js
@@ -29,6 +29,7 @@ function mapStateToProps (state) {
unconfTxs: valuesFor(state.metamask.unconfTxs),
unconfMsgs: valuesFor(state.metamask.unconfMsgs),
isEthWarningConfirmed: state.metamask.isEthConfirmed,
+ shapeShiftTxList : state.metamask.shapeShiftTxList,
}
}
@@ -179,12 +180,7 @@ AccountDetailScreen.prototype.render = function () {
position: 'absolute',
left: '219px',
},
- }, props.accountDetail.subview === 'buyForm' ? [h('i.fa.fa-arrow-left', {
- style: {
- width: '22.641px',
- height: '14px',
- },
- })] : 'BUY'),
+ }, 'BUY'),
h('button', {
onClick: () => props.dispatch(actions.showSendPage()),
@@ -233,7 +229,7 @@ AccountDetailScreen.prototype.subview = function () {
}
AccountDetailScreen.prototype.transactionList = function () {
- const { transactions, unconfTxs, unconfMsgs, address, network } = this.props
+ const { transactions, unconfTxs, unconfMsgs, address, network, shapeShiftTxList } = this.props
var txsToRender = transactions
// only transactions that are from the current address
@@ -248,6 +244,7 @@ AccountDetailScreen.prototype.transactionList = function () {
network,
unconfTxs,
unconfMsgs,
+ shapeShiftTxList,
viewPendingTx: (txId) => {
this.props.dispatch(actions.viewPendingTx(txId))
},