diff options
| author | Frankie <frankie.pangilinan@consensys.net> | 2016-08-11 04:48:34 +0800 |
|---|---|---|
| committer | Frankie <frankie.pangilinan@consensys.net> | 2016-08-11 04:48:34 +0800 |
| commit | ba1edc429b948962fe0f03ef43588f7945cea3f2 (patch) | |
| tree | eda1b54a424c2fc06ef151763b5cb57d2e838116 /ui/app/account-detail.js | |
| parent | 9c6dd9ef4953f6e421feb6e6684ef43da26f6b75 (diff) | |
| parent | c48b60d7a6f14d2d2348be8d9a63965ca1267433 (diff) | |
| download | tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.tar tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.tar.gz tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.tar.bz2 tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.tar.lz tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.tar.xz tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.tar.zst tangerine-wallet-browser-ba1edc429b948962fe0f03ef43588f7945cea3f2.zip | |
Merge branch 'master' into buyForm
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()), |