diff options
Diffstat (limited to 'ui/app/account-detail.js')
-rw-r--r-- | ui/app/account-detail.js | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index cf65cbb7d..814d8bab0 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -172,19 +172,27 @@ AccountDetailScreen.prototype.render = function () { }), h('button', { +<<<<<<< HEAD onClick: this.buyButtonDeligator.bind(this), +======= + onClick: () => props.dispatch(actions.buyEth(selected)), +>>>>>>> master style: { marginBottom: '20px', marginRight: '8px', position: 'absolute', left: '219px', }, +<<<<<<< HEAD }, props.accountDetail.subview === 'buyForm' ? [h('i.fa.fa-arrow-left', { style: { width: '22.641px', height: '14px', }, })] : 'BUY'), +======= + }, 'BUY'), +>>>>>>> master h('button', { onClick: () => props.dispatch(actions.showSendPage()), |