Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle

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
 }
-