From 6d92e5f1ec0c5c3e6b30a5b4ef172f0a59211a3a Mon Sep 17 00:00:00 2001
From: Andre Pimenta <andrepimenta7@gmail.com>
Date: Fri, 30 Oct 2020 15:44:11 +0000
Subject: [PATCH] Error boundary - sentry clean-up (#1915)

* more sentry cleanup

* Optional chaining
---
 app/components/UI/Notification/index.js  | 3 ++-
 app/components/Views/Onboarding/index.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/components/UI/Notification/index.js b/app/components/UI/Notification/index.js
index 20bd948ed5b..7457ec9f25f 100644
--- a/app/components/UI/Notification/index.js
+++ b/app/components/UI/Notification/index.js
@@ -461,6 +461,7 @@ class Notification extends PureComponent {
 		const { status } = this.props;
 		const { tx, transactionDetailsIsVisible, inBrowserView } = this.state;
 		const isPaymentChannelTransaction = tx && tx.paymentChannelTransaction;
+		const data = tx ? { ...tx.transaction, ...this.props.transaction } : { ...this.props.transaction };
 		return (
 			<ElevatedView
 				style={[
@@ -478,7 +479,7 @@ class Notification extends PureComponent {
 				>
 					<BaseNotification
 						status={status}
-						data={{ ...tx.transaction, ...this.props.transaction }}
+						data={data}
 						onPress={this.onNotificationPress}
 						onHide={this.onClose}
 					/>
diff --git a/app/components/Views/Onboarding/index.js b/app/components/Views/Onboarding/index.js
index 177aefbd207..8975913457e 100644
--- a/app/components/Views/Onboarding/index.js
+++ b/app/components/Views/Onboarding/index.js
@@ -637,7 +637,7 @@ class Onboarding extends PureComponent {
 }
 
 const mapStateToProps = state => ({
-	selectedAddress: state.engine.backgroundState.PreferencesController.selectedAddress,
+	selectedAddress: state?.engine?.backgroundState?.PreferencesController?.selectedAddress,
 	accounts: state.engine.backgroundState.AccountTrackerController.accounts,
 	passwordSet: state.user.passwordSet
 });