Merge pull request #684 from LiskHQ/683-fix-transactions-tab

Fix after-migration issues in transactions tab - Closes #683
LiskArchive · Aug 30, 2017 · a9eb8ff · a9eb8ff
2 parents e56d9b2 + ee7358c
commit a9eb8ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/transactions/amount.js b/src/components/transactions/amount.js
@@ -13,8 +13,8 @@ const Amount = (props) => {
     params.className = 'inButton';
   } else if (props.value.type !== 0 || props.value.recipientId !== props.address) {
     params.className = 'outButton';
-    params.tooltipText = 'Repeat the transaction';
-    params.clickToSendEnabled = true;
+    params.tooltipText = props.value.type === 0 ? 'Repeat the transaction' : undefined;
+    params.clickToSendEnabled = props.value.type === 0;
   }
   return <TooltipWrapper tooltip={params.tooltipText}>
     <ClickToSend rawAmount={props.value.amount}

diff --git a/src/components/transactions/status.js b/src/components/transactions/status.js
@@ -6,11 +6,11 @@ const Status = (props) => {
   let template = null;
   if (props.value.type === 0 &&
     props.value.senderId === props.value.recipientId) {
-    template = <IconButton icon='replay' />;
+    template = <IconButton icon='replay' disabled={true}/>;
   } else if (props.value.senderId !== props.address) {
-    template = <IconButton icon='call_received' className={styles.in} />;
+    template = <IconButton icon='call_received' className={styles.in} disabled={true}/>;
   } else if (props.value.type !== 0 || props.value.recipientId !== props.address) {
-    template = <IconButton icon='call_made' className={styles.out} />;
+    template = <IconButton icon='call_made' className={styles.out} disabled={true}/>;
   }
   return template;
 };

diff --git a/src/components/transactions/transactionRow.js b/src/components/transactions/transactionRow.js
@@ -15,7 +15,7 @@ const TransactionRow = props => (
           <Spinner />}
     </td>
     <td className={`${props.tableStyle.rowCell} ${styles.centerText} ${styles.hiddenXs}`}>
-        <TooltipWrapper tooltip={`${props.value.confirmations} confirmation${props.value.confirmations !== 1 ? 's' : ''}`}>{props.value.id}</TooltipWrapper>
+        <TooltipWrapper tooltip={`${props.value.confirmations || 0} confirmation${props.value.confirmations !== 1 ? 's' : ''}`}>{props.value.id}</TooltipWrapper>
     </td>
     <td className={`${props.tableStyle.rowCell} ${styles.centerText}`}>
       <TransactionType {...props.value} address={props.address}></TransactionType>