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

Display reflexive transaction in gray with circle arrow - Closes #236 #246

Merged
merged 2 commits into from
May 19, 2017
Merged

Display reflexive transaction in gray with circle arrow - Closes #236 #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0558e5e
Display reflexive transaction in gray with circle arrow #236
slaweet May 19, 2017
707f69b
Merge branch 'development' into 236-reflexive-transactions
slaweet May 19, 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
3 changes: 2 additions & 1 deletion src/components/transactions/transactions.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ transactions {
color: #333;
}

&.fee {
&.fee,
&.neutral {
background-color: #eee;
color: #555;
font-weight: normal;
Expand Down
5 changes: 3 additions & 2 deletions src/components/transactions/transactions.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ md-card.offline-hide
i.material-icons.expanding-button(ng-if='transaction.senderId !== $ctrl.account.get().address', data-show-transfer-modal, data-recipient-id='transaction.senderId') arrow_forward
i.material-icons.expanding-button(ng-if='transaction.senderId === $ctrl.account.get().address', data-show-transfer-modal, data-recipient-id='transaction.recipientId') arrow_forward
td(md-cell)
i.material-icons(ng-if='transaction.type === 0 && transaction.senderId === transaction.recipientId') replay
i.material-icons.in(ng-if='transaction.senderId !== $ctrl.account.get().address') call_received
i.material-icons.out(ng-if='transaction.senderId === $ctrl.account.get().address') call_made
i.material-icons.out(ng-if='transaction.type !== 0 || transaction.recipientId !== $ctrl.account.get().address') call_made
td(md-cell)
.amount(ng-class='{ positive: transaction.senderId !== $ctrl.account.get().address, negative: transaction.senderId === $ctrl.account.get().address }')
.amount(ng-class='{ neutral:transaction.type === 0 && transaction.senderId === transaction.recipientId, positive: transaction.senderId !== $ctrl.account.get().address, negative: transaction.type !== 0 || transaction.recipientId !== $ctrl.account.get().address }')
lsk.value(amount='transaction.amount')
td(md-cell)
.fee
Expand Down