diff --git a/app/src/containers/TransactionsMonitorContainer.js b/app/src/containers/TransactionsMonitorContainer.js
index 0021910..92876ec 100644
--- a/app/src/containers/TransactionsMonitorContainer.js
+++ b/app/src/containers/TransactionsMonitorContainer.js
@@ -80,36 +80,36 @@ class RightSideBar extends Component {
}
const transactionMessages = transactionStack.map(
- (transaction, index) => {
- if (isTransactionMessageDismissed[index]) {
+ (transactionIndex, index) => {
+ if (isTransactionMessageDismissed[index])
return null;
- }
let color = 'black';
const message = [];
- message.push(
- 'New transaction has been queued and is waiting your confirmation.',
- );
- if (transactions[transaction]) {
+ const transaction = transactions[transactionIndex];
+
+ if(!transaction)
+ message.push('New transaction has been queued and is waiting your confirmation.');
+
+ if (transaction && transaction.status === 'pending') {
+ message.push('New transaction has been queued and is waiting your confirmation.');
message.push(
);
message.push('- transaction confirmed');
}
- if (transactions[transaction]
- && transactions[transaction].status === 'success') {
+ if (transaction && transaction.status === 'success') {
/* Transaction completed successfully */
+ message.push('New transaction has been queued and is waiting your confirmation.');
+ message.push(
);
+ message.push('- transaction confirmed');
message.push(
);
message.push('- transaction mined');
color = 'green';
message.push(
);
message.push('- transaction completed successfully');
- } else if (transactions[transaction]
- && transactions[transaction].status === 'error') {
+ } else if (transaction && transaction.status === 'error') {
/* Transaction failed to complete */
- message.push(
);
- message.push('- transaction mined');
color = 'red';
- message.push(
);
- message.push('Transaction failed to complete!');
+ message.push('Transaction failed!');
}
return (