From 9d25636cf4918fd4fc68bfab8d38983823fb8068 Mon Sep 17 00:00:00 2001
From: Gleidson Daniel Silva <gleidson10daniel@hotmail.com>
Date: Wed, 19 Jan 2022 17:37:06 -0300
Subject: [PATCH] [FIX] App crashes when opening a notification while app is
 closed (#3629)

---
 app/definitions/INotification.ts   | 1 +
 app/notifications/push/index.ts    | 5 +++--
 app/notifications/push/push.ios.ts | 2 +-
 app/notifications/push/push.ts     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/definitions/INotification.ts b/app/definitions/INotification.ts
index 77467d9d7..4974b0c91 100644
--- a/app/definitions/INotification.ts
+++ b/app/definitions/INotification.ts
@@ -9,4 +9,5 @@ export interface INotification {
 	from: string;
 	image: string;
 	soundname: string;
+	getData: () => INotification;
 }
diff --git a/app/notifications/push/index.ts b/app/notifications/push/index.ts
index af25c9eed..09fa86027 100644
--- a/app/notifications/push/index.ts
+++ b/app/notifications/push/index.ts
@@ -16,9 +16,10 @@ interface IEjson {
 	messageId: string;
 }
 
-export const onNotification = (notification: INotification): void => {
-	if (notification) {
+export const onNotification = (push: INotification): void => {
+	if (push) {
 		try {
+			const notification = push?.getData();
 			const { rid, name, sender, type, host, messageType, messageId }: IEjson = EJSON.parse(notification.ejson);
 
 			const types: Record<string, string> = {
diff --git a/app/notifications/push/push.ios.ts b/app/notifications/push/push.ios.ts
index 92c2d3a6c..a6b1118c5 100644
--- a/app/notifications/push/push.ios.ts
+++ b/app/notifications/push/push.ios.ts
@@ -22,7 +22,7 @@ class PushNotification {
 			// TODO REDUX MIGRATION TO TS
 			const { background } = reduxStore.getState().app;
 			if (background) {
-				this.onNotification(notification?.getData());
+				this.onNotification(notification);
 			}
 			completion();
 		});
diff --git a/app/notifications/push/push.ts b/app/notifications/push/push.ts
index 16aa8cf5c..11eccbcb5 100644
--- a/app/notifications/push/push.ts
+++ b/app/notifications/push/push.ts
@@ -16,7 +16,7 @@ class PushNotification {
 		});
 
 		NotificationsAndroid.setNotificationOpenedListener((notification: Notification) => {
-			this.onNotification(notification?.getData());
+			this.onNotification(notification);
 		});
 	}