diff options
| author | kumavis <aaron@kumavis.me> | 2016-07-08 06:04:53 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2016-07-08 06:04:53 +0800 |
| commit | ac808e681fe6a8666a4842cf7fde23345f63e96a (patch) | |
| tree | 27b3f32b69b302de0ac0750ad5b8a34f5f868da5 /ui/app | |
| parent | f71956b2ab748af8d9a11053a00c858370f340f3 (diff) | |
| parent | 3fb36b2dd388d7344fd7b3b7e32dcbafeabc9b48 (diff) | |
| download | tangerine-wallet-browser-ac808e681fe6a8666a4842cf7fde23345f63e96a.tar.gz tangerine-wallet-browser-ac808e681fe6a8666a4842cf7fde23345f63e96a.tar.zst tangerine-wallet-browser-ac808e681fe6a8666a4842cf7fde23345f63e96a.zip | |
Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/components/transaction-list-item.js | 3 | ||||
| -rw-r--r-- | ui/app/reducers.js | 1 |
2 files changed, 2 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..9243ddba4 100644 --- a/ui/app/reducers.js +++ b/ui/app/reducers.js @@ -37,4 +37,3 @@ function rootReducer (state, action) { return state } - |