Merge branch 'main' into NWNT-fix-tron-logo

Author: zone-live

app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.test.tsx

@@ -1,12 +1,23 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 // eslint-disable-next-line import/no-namespace
 import * as PushNotificationsHooks from '../../../../util/notifications/hooks/usePushNotifications';
+// eslint-disable-next-line import/no-namespace
+import * as NotificationService from '../../../../util/notifications/services/NotificationService';
 import { usePushNotificationSettingsToggle } from './PushNotificationToggle.hooks';
 
 describe('usePushNotificationSettingsToggle', () => {
+  beforeEach(() => jest.resetAllMocks());
+
   const arrange = () => {
     const mockTogglePushNotification = jest.fn();
-
+    const mockGetPushPermission = jest.spyOn(
+      NotificationService,
+      'getPushPermission',
+    );
+    const mockOpenNotificationSettings = jest.spyOn(
+      NotificationService.default,
+      'openSystemSettings',
+    );
     jest
       .spyOn(PushNotificationsHooks, 'usePushNotificationsToggle')
       .mockReturnValue({
@@ -17,16 +28,40 @@ describe('usePushNotificationSettingsToggle', () => {
 
     const hook = renderHook(() => usePushNotificationSettingsToggle());
 
-    return { hook, mockTogglePushNotification };
+    return {
+      hook,
+      mockTogglePushNotification,
+      mockGetPushPermission,
+      mockOpenNotificationSettings,
+    };
   };
 
   it('toggles the push notification setting', async () => {
-    const { hook, mockTogglePushNotification } = arrange();
-
+    const { hook, mockTogglePushNotification, mockGetPushPermission } =
+      arrange();
+    mockGetPushPermission.mockResolvedValue('authorized');
     await act(async () => {
       hook.result.current.onToggle();
     });
 
     expect(mockTogglePushNotification).toHaveBeenCalled();
   });
+
+  it('opens settings if permission is denied', async () => {
+    const {
+      hook,
+      mockGetPushPermission,
+      mockOpenNotificationSettings,
+      mockTogglePushNotification,
+    } = arrange();
+    mockGetPushPermission.mockResolvedValue('denied');
+    await act(async () => {
+      hook.result.current.onToggle();
+    });
+
+    // Assert - opens settings
+    expect(mockOpenNotificationSettings).toHaveBeenCalled();
+    // Assert - was not toggled as a user needs to complete settings action
+    expect(mockTogglePushNotification).not.toHaveBeenCalled();
+  });
 });

app/components/Views/Settings/NotificationsSettings/PushNotificationToggle.hooks.tsx

@@ -1,14 +1,22 @@
 import { useCallback } from 'react';
+import NotificationService, {
+  getPushPermission,
+} from '../../../../util/notifications/services/NotificationService';
 import { usePushNotificationsToggle } from '../../../../util/notifications/hooks/usePushNotifications';
 
 export function usePushNotificationSettingsToggle() {
   const { data, togglePushNotification, loading } = usePushNotificationsToggle({
     nudgeEnablePush: true,
   });
-  const onToggle = useCallback(
-    () => togglePushNotification(!data),
-    [data, togglePushNotification],
-  );
+  const onToggle = useCallback(async () => {
+    const perm = await getPushPermission();
+    if (perm === 'denied') {
+      await NotificationService.openSystemSettings();
+      return;
+    }
+
+    togglePushNotification(!data);
+  }, [data, togglePushNotification]);
   return {
     onToggle,
     value: data,

app/util/notifications/services/NotificationService.test.ts

@@ -10,7 +10,7 @@ import {
   ChannelId,
   notificationChannels,
 } from '../../../util/notifications/androidChannels';
-import NotificationService from './NotificationService';
+import NotificationService, { getPushPermission } from './NotificationService';
 import { store } from '../../../store';
 
 jest.mock('@notifee/react-native', () => ({
@@ -124,6 +124,28 @@ describe('NotificationsService - getBlockedNotifications', () => {
   });
 });
 
+describe('getPushPermission', () => {
+  const arrangeMocks = () => {
+    const mockGetAllPermissions = jest.spyOn(
+      NotificationService,
+      'getAllPermissions',
+    );
+    return { mockGetAllPermissions };
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns the push permission from getAllPermissions', async () => {
+    const mocks = arrangeMocks();
+    mocks.mockGetAllPermissions.mockResolvedValue({ permission: 'authorized' });
+    expect(await getPushPermission()).toBe('authorized');
+    mocks.mockGetAllPermissions.mockResolvedValue({ permission: 'denied' });
+    expect(await getPushPermission()).toBe('denied');
+  });
+});
+
 describe('NotificationService - getAllPermissions', () => {
   const arrangeMocks = () => {
     const mockCreateChannel = jest

app/util/notifications/services/NotificationService.ts

@@ -60,7 +60,9 @@ class NotificationsService {
     }
   }
 
-  async getAllPermissions(shouldOpenSettings = true) {
+  async getAllPermissions(
+    shouldOpenSettings = true,
+  ): Promise<{ permission: 'authorized' | 'denied' }> {
     const promises: Promise<string>[] = notificationChannels.map(
       async (channel: AndroidChannel) =>
         await withTimeout(this.createChannel(channel), 5000),
@@ -174,10 +176,19 @@ class NotificationsService {
 
   async hasPerimssion() {
     const settings = await notifee.getNotificationSettings();
-    return settings.authorizationStatus === AuthorizationStatus.AUTHORIZED ||
-      settings.authorizationStatus === AuthorizationStatus.PROVISIONAL
-      ? ('authorized' as const)
-      : ('denied' as const);
+    // status where we can assume authorized
+    if (
+      [
+        AuthorizationStatus.NOT_DETERMINED,
+        AuthorizationStatus.AUTHORIZED,
+        AuthorizationStatus.PROVISIONAL,
+      ].includes(settings.authorizationStatus)
+    ) {
+      return 'authorized' as const;
+    }
+
+    // Otherwise this settings has been denied
+    return 'denied' as const;
   }
 
   onForegroundEvent = (
@@ -311,3 +322,8 @@ export async function hasPushPermission() {
   const result = await NotificationService.getAllPermissions(false);
   return result.permission === 'authorized';
 }
+
+export async function getPushPermission() {
+  const result = await NotificationService.getAllPermissions(false);
+  return result.permission;
+}

app/util/notifications/settings/auth.ts

@@ -1,3 +1 @@
-export * from './auth';
 export * from './storage';
-export * from './firebase';

app/util/notifications/settings/firebase.ts

@@ -44,7 +44,7 @@ const PredictionMarketFeature = async (mockServer: Mockttp) => {
 };
 
 describe(SmokePredictions('Predictions'), () => {
-  it('should cash out on open position: Spurs vs. Pelicans', async () => {
+  it.skip('should cash out on open position: Spurs vs. Pelicans', async () => {
     await withFixtures(
       {
         fixture: new FixtureBuilder().withPolygon().build(),