Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Fix after-migration issues in transactions tab - Closes #683 #684

Merged
merged 3 commits into from
Aug 30, 2017
Merged

Fix after-migration issues in transactions tab - Closes #683 #684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b34ab9
Disable transaction arrow icon
slaweet Aug 30, 2017
9eabbe0
Disable "Click to send" on non-send transactions
slaweet Aug 30, 2017
ee7358c
Fix confirmations tooltip for pending transactions
slaweet Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/transactions/amount.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
6 changes: 3 additions & 3 deletions src/components/transactions/status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
2 changes: 1 addition & 1 deletion src/components/transactions/transactionRow.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down