aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2016-07-08 04:48:52 +0800
committerKevin Serrano <kevgagser@gmail.com>2016-07-08 04:48:52 +0800
commitecb0f9767bff2ee39ef807889056daebfe349e51 (patch)
tree766ebea87dd6a19d9c956df44a9aa45e313b075d /ui
parent5a99d2a77c9029ecbf78d6859db30bcfec0f2eca (diff)
downloadtangerine-wallet-browser-ecb0f9767bff2ee39ef807889056daebfe349e51.tar
tangerine-wallet-browser-ecb0f9767bff2ee39ef807889056daebfe349e51.tar.gz
tangerine-wallet-browser-ecb0f9767bff2ee39ef807889056daebfe349e51.tar.bz2
tangerine-wallet-browser-ecb0f9767bff2ee39ef807889056daebfe349e51.tar.lz
tangerine-wallet-browser-ecb0f9767bff2ee39ef807889056daebfe349e51.tar.xz
tangerine-wallet-browser-ecb0f9767bff2ee39ef807889056daebfe349e51.tar.zst
tangerine-wallet-browser-ecb0f9767bff2ee39ef807889056daebfe349e51.zip
Add new test state with tx history. Fix alignment issue with transaction history text.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/components/transaction-list-item.js3
-rw-r--r--ui/app/reducers.js2
2 files changed, 3 insertions, 2 deletions
diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index b1fc0d5f3..0cd2f32a7 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -68,7 +68,8 @@ TransactionListItem.prototype.render = function () {
recipientField(txParams, transaction, isTx, isMsg),
]),
- transaction.hash ? h(CopyButton, { value: transaction.hash }) : null,
+ // Places a copy button if tx is successful, else places a placeholder empty div.
+ transaction.hash ? h(CopyButton, { value: transaction.hash }) : h('div', {style: { display: 'flex', alignItems: 'center', width: '26px' }}),
isTx ? h(EtherBalance, {
value: txParams.value,
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index f198758ea..f8b192af3 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -35,6 +35,6 @@ function rootReducer (state, action) {
state.appState = reduceApp(state, action)
+ console.log(JSON.stringify(state, null, 2))
return state
}
-