RU-T39 PR#187 fixes.

Author: ucswift

src/services/__tests__/push-notification.test.ts

@@ -120,7 +120,7 @@ jest.mock('@notifee/react-native', () => ({
 }));
 
 describe('Push Notification Service Integration', () => {
-  const mockShowNotificationModal = jest.fn();
+  const mockShowNotificationModal = jest.fn().mockResolvedValue(undefined);
   const mockGetState = usePushNotificationModalStore.getState as jest.Mock;
 
   beforeAll(() => {
@@ -131,6 +131,7 @@ describe('Push Notification Service Integration', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    mockShowNotificationModal.mockResolvedValue(undefined);
     mockGetState.mockReturnValue({
       showNotificationModal: mockShowNotificationModal,
     });
@@ -161,7 +162,10 @@ describe('Push Notification Service Integration', () => {
       };
 
       // Show the notification modal using the store
-      usePushNotificationModalStore.getState().showNotificationModal(notificationData);
+      usePushNotificationModalStore.getState().showNotificationModal(notificationData).catch((err) => {
+        // Handle error in test environment
+        console.error('Error showing notification modal:', err);
+      });
     }
   };
 

src/services/push-notification.ts

@@ -166,7 +166,7 @@ class PushNotificationService {
       };
 
       // Show the notification modal using the store
-      usePushNotificationModalStore.getState().showNotificationModal(notificationData);
+      await usePushNotificationModalStore.getState().showNotificationModal(notificationData);
     }
   };
 
@@ -201,7 +201,7 @@ class PushNotificationService {
             context: { eventCode, title },
           });
 
-          usePushNotificationModalStore.getState().showNotificationModal(notificationData);
+          await usePushNotificationModalStore.getState().showNotificationModal(notificationData);
         }
       }
     });
@@ -231,7 +231,7 @@ class PushNotificationService {
             context: { eventCode, title },
           });
 
-          usePushNotificationModalStore.getState().showNotificationModal(notificationData);
+          await usePushNotificationModalStore.getState().showNotificationModal(notificationData);
         }
       }
     });
@@ -294,7 +294,7 @@ class PushNotificationService {
 
       // Handle notification tap
       // Use a small delay to ensure the app is fully initialized and the store is ready
-      setTimeout(() => {
+      setTimeout(async () => {
         if (eventCode && typeof eventCode === 'string') {
           const notificationData = {
             eventCode: eventCode,
@@ -309,7 +309,7 @@ class PushNotificationService {
           });
 
           // Show the notification modal using the store
-          usePushNotificationModalStore.getState().showNotificationModal(notificationData);
+          await usePushNotificationModalStore.getState().showNotificationModal(notificationData);
         }
       }, 300);
     });
@@ -336,7 +336,7 @@ class PushNotificationService {
 
             // Handle the initial notification
             // Use a delay to ensure the app is fully loaded and the store is ready
-            setTimeout(() => {
+            setTimeout(async () => {
               if (eventCode && typeof eventCode === 'string') {
                 const notificationData = {
                   eventCode: eventCode,
@@ -351,7 +351,7 @@ class PushNotificationService {
                 });
 
                 // Show the notification modal using the store
-                usePushNotificationModalStore.getState().showNotificationModal(notificationData);
+                await usePushNotificationModalStore.getState().showNotificationModal(notificationData);
               }
             }, 500);
           }