From f6191ff688ac18751a5cb87e744c41149b934285 Mon Sep 17 00:00:00 2001
From: gotcha84 <anurag.kalavakunta@hingehealth.com>
Date: Tue, 6 Feb 2024 15:31:54 -0800
Subject: [PATCH 1/2] fix(ios) allow the original delegate to handle
 non-Notifee notifications first

---
 .../NotifeeCore+UNUserNotificationCenter.m         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.m b/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.m
index cf8020d8..e4019b18 100644
--- a/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.m
+++ b/ios/NotifeeCore/NotifeeCore+UNUserNotificationCenter.m
@@ -181,8 +181,13 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
 
   // handle notification outside of notifee
   if (notifeeNotification == nil) {
-    notifeeNotification =
-        [NotifeeCoreUtil parseUNNotificationRequest:response.notification.request];
+    if (_originalDelegate != nil && originalUNCDelegateRespondsTo.didReceiveNotificationResponse) {
+      [_originalDelegate userNotificationCenter:center
+                 didReceiveNotificationResponse:response
+                          withCompletionHandler:completionHandler];
+    } else {
+      notifeeNotification = [NotifeeCoreUtil parseUNNotificationRequest:response.notification.request];
+    }
   }
 
   if (notifeeNotification != nil) {
@@ -247,11 +252,6 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center
                      completionHandler();
                    });
 
-  } else if (_originalDelegate != nil &&
-             originalUNCDelegateRespondsTo.didReceiveNotificationResponse) {
-    [_originalDelegate userNotificationCenter:center
-               didReceiveNotificationResponse:response
-                        withCompletionHandler:completionHandler];
   }
 }
 

From 496abde14d0733d833888f5dd5d491d5229c1e67 Mon Sep 17 00:00:00 2001
From: gotcha84 <anurag.kalavakunta@hingehealth.com>
Date: Tue, 6 Feb 2024 15:49:09 -0800
Subject: [PATCH 2/2] chore: update ios simulator to iPhone 15

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index dae7f206..25be790b 100644
--- a/package.json
+++ b/package.json
@@ -33,13 +33,13 @@
     "tests_rn:packager": "cd tests_react_native && npx react-native start",
     "tests_rn:packager:reset-cache": "cd tests_react_native && npx react-native start --reset-cache",
     "run:android": "cd tests_react_native && npx react-native run-android  --variant 'debug'",
-    "run:ios": "cd tests_react_native && npx react-native run-ios --scheme=Notifee --simulator 'iPhone 14'",
+    "run:ios": "cd tests_react_native && npx react-native run-ios --scheme=Notifee --simulator 'iPhone 15'",
     "tests_rn:test": "cd tests_react_native && jest",
     "tests_rn:test-watch": "cd tests_react_native && jest --watch",
     "tests_rn:test-coverage": "cd tests_react_native && jest --coverage",
     "tests_rn:android:build": "cd tests_react_native/android && ./gradlew assembleDebug -DtestBuildType=debug",
     "tests_rn:android:test": "cd tests_react_native && npm_config_yes=true npx cavy-cli run-android --no-jetifier",
-    "tests_rn:ios:test": "cd tests_react_native && npm_config_yes=true npx cavy-cli run-ios --scheme=Notifee --simulator 'iPhone 14'",
+    "tests_rn:ios:test": "cd tests_react_native && npm_config_yes=true npx cavy-cli run-ios --scheme=Notifee --simulator 'iPhone 15'",
     "tests_rn:ios:pod:install": "cd tests_react_native && npm_config_yes=true npx pod-install && cd .."
   },
   "devDependencies": {