diff --git a/app/components/Activity/TransactionModal.js b/app/components/Activity/TransactionModal.js index c3d3f60a..3d8c4e0b 100644 --- a/app/components/Activity/TransactionModal.js +++ b/app/components/Activity/TransactionModal.js @@ -31,15 +31,15 @@ const TransactionModal = ({ }) => (
- {transaction.amount < 0 ? ( + {transaction.received ? (
- - Sent + + Received
) : (
- - Received + + Sent
)}
@@ -65,8 +65,8 @@ const TransactionModal = ({

- 0 && styles.active}`}> - {transaction.amount > 0 ? '+' : '-'} + + {transaction.received ? '+' : '-'} - groupAll([...transactions.filter(transaction => transaction.amount < 0), ...payments]) + groupAll([...transactions.filter(transaction => !transaction.received), ...payments]) ) const pendingActivity = createSelector(invoicesSelector, invoices => diff --git a/app/reducers/transaction.js b/app/reducers/transaction.js index 69dfb4c3..2e4622f1 100644 --- a/app/reducers/transaction.js +++ b/app/reducers/transaction.js @@ -116,13 +116,15 @@ export const newTransaction = (event, { transaction }) => dispatch => { dispatch({ type: ADD_TRANSACTION, transaction }) + transaction.received = transaction.amount > 0 + // HTML 5 desktop notification for the new transaction - const notifTitle = - transaction.amount > 0 ? 'On-chain Transaction Received!' : 'On-chain Transaction Sent!' - const notifBody = - transaction.amount > 0 - ? "Lucky you, you just received a new on-chain transaction. I'm jealous." - : "Hate to see 'em go but love to watch 'em leave. Your on-chain transaction successfully sent." + const notifTitle = transaction.received + ? 'On-chain Transaction Received!' + : 'On-chain Transaction Sent!' + const notifBody = transaction.received + ? "Lucky you, you just received a new on-chain transaction. I'm jealous." + : "Hate to see 'em go but love to watch 'em leave. Your on-chain transaction successfully sent." showNotification(notifTitle, notifBody) diff --git a/app/routes/activity/components/components/Transaction/Transaction.js b/app/routes/activity/components/components/Transaction/Transaction.js index e1e9e22a..ad090cc5 100644 --- a/app/routes/activity/components/components/Transaction/Transaction.js +++ b/app/routes/activity/components/components/Transaction/Transaction.js @@ -13,18 +13,16 @@ const Transaction = ({ transaction, ticker, currentTicker, showActivityModal, cu >
-

{transaction.amount > 0 ? 'Received' : 'Sent'}

+

{transaction.received ? 'Received' : 'Sent'}

{transaction.time_stamp * 1000}
-
0 ? styles.positive : styles.negative}`} - > +
- 0 ? styles.plus : styles.minus}> - {transaction.amount > 0 ? '+' : '-'} + + {transaction.received ? '+' : '-'}