Bugfix/incoming notifications (#1637)

* incoming * take exclamation out
MetaMask · Jun 15, 2020 · 08c0099 · 08c0099
1 parent 8c039a7
commit 08c0099
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/app/components/UI/Notification/index.js b/app/components/UI/Notification/index.js
@@ -463,23 +463,25 @@ class Notification extends PureComponent {
 	handleTransactionNotification = () => {
 		const { status } = this.props;
 		const { tx, transactionDetailsIsVisible, inBrowserView } = this.state;
-		const { paymentChannelTransaction } = tx;
+		const isPaymentChannelTransaction = tx && tx.paymentChannelTransaction;
 		return (
 			<ElevatedView
 				style={[
 					styles.modalTypeView,
 					inBrowserView ? styles.modalTypeViewBrowser : {},
-					transactionDetailsIsVisible && !paymentChannelTransaction ? styles.modalTypeViewDetailsVisible : {}
+					transactionDetailsIsVisible && !isPaymentChannelTransaction
+						? styles.modalTypeViewDetailsVisible
+						: {}
 				]}
 				elevation={100}
 			>
-				{transactionDetailsIsVisible && !paymentChannelTransaction && this.notificationOverlay()}
+				{transactionDetailsIsVisible && !isPaymentChannelTransaction && this.notificationOverlay()}
 				<Animated.View
 					style={[styles.notificationContainer, { transform: [{ translateY: this.notificationAnimated }] }]}
 				>
 					<BaseNotification
 						status={status}
-						data={tx.transaction || {}}
+						data={{ ...tx.transaction, ...this.props.transaction }}
 						onPress={this.onNotificationPress}
 						onHide={this.onClose}
 					/>

diff --git a/locales/en.json b/locales/en.json
@@ -935,7 +935,7 @@
 		"success_deposit_title": "Deposit Complete!",
 		"success_withdrawal_title": "Withdrawal Complete!",
 		"error_title": "Oops, something went wrong :/",
-		"received_title": "You received {{amount}} {{assetType}}!",
+		"received_title": "You received {{amount}} {{assetType}}",
 		"received_payment_title": "Instant payment received",
 		"pending_message": "Waiting for confirmation",
 		"pending_deposit_message": "Waiting for deposit to complete",

diff --git a/locales/es.json b/locales/es.json
@@ -878,7 +878,7 @@
 		"success_deposit_title": "Depósito Completo!",
 		"success_withdrawal_title": "Retiro Completo!",
 		"error_title": "Oops, algo ha salido mal :/",
-		"received_title": "Has recibido {{amount}} {{assetType}}!",
+		"received_title": "Has recibido {{amount}} {{assetType}}",
 		"received_payment_title": "Pago instantáneo recibido",
 		"pending_message": "Tu transacción está en proceso",
 		"pending_deposit_message": "Esperando que el deposito sea compleado",