incoming

MetaMask · Jun 15, 2020 · 6757b4e · 6757b4e
1 parent dd2852b
commit 6757b4e
Showing 1 changed file with 6 additions and 4 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}
 					/>