fix: push notifications

app/components/Nav/Main/index.js

@@ -21,27 +21,24 @@ import BackgroundTimer from 'react-native-background-timer';
 import NotificationManager from '../../../core/NotificationManager';
 import Engine from '../../../core/Engine';
 import AppConstants from '../../../core/AppConstants';
-import notifee from '@notifee/react-native';
 import I18n, { strings } from '../../../../locales/i18n';
 import FadeOutOverlay from '../../UI/FadeOutOverlay';
 import BackupAlert from '../../UI/BackupAlert';
 import Notification from '../../UI/Notification';
 import RampOrders from '../../UI/Ramp';
-import Device from '../../../util/device';
-import Routes from '../../../constants/navigation/Routes';
 import {
   showTransactionNotification,
   hideCurrentNotification,
   showSimpleNotification,
   removeNotificationById,
   removeNotVisibleNotifications,
 } from '../../../actions/notification';
+
 import ProtectYourWalletModal from '../../UI/ProtectYourWalletModal';
 import MainNavigator from './MainNavigator';
 import SkipAccountSecurityModal from '../../UI/SkipAccountSecurityModal';
 import { query } from '@metamask/controller-utils';
 import SwapsLiveness from '../../UI/Swaps/SwapsLiveness';
-import useNotificationHandler from '../../../util/notifications/hooks';
 
 import {
   setInfuraAvailabilityBlocked,
@@ -70,6 +67,8 @@ import {
   selectNetworkImageSource,
 } from '../../../selectors/networkInfos';
 import { selectShowIncomingTransactionNetworks } from '../../../selectors/preferencesController';
+
+import useNotificationHandler from '../../../util/notifications/hooks';
 import {
   DEPRECATED_NETWORKS,
   NETWORKS_CHAIN_ID,
@@ -105,16 +104,18 @@ const Main = (props) => {
   const [showDeprecatedAlert, setShowDeprecatedAlert] = useState(true);
   const { colors } = useTheme();
   const styles = createStyles(colors);
-
   const backgroundMode = useRef(false);
   const locale = useRef(I18n.locale);
   const removeConnectionStatusListener = useRef();
 
   const removeNotVisibleNotifications = props.removeNotVisibleNotifications;
-
+  useNotificationHandler(props.navigation);
   useEnableAutomaticSecurityChecks();
   useMinimumVersions();
 
+
+
+
   useEffect(() => {
     if (DEPRECATED_NETWORKS.includes(props.chainId)) {
       setShowDeprecatedAlert(true);
@@ -267,23 +268,8 @@ const Main = (props) => {
       initForceReload();
       return;
     }
-  });
-
-  const bootstrapAndroidInitialNotification = useCallback(async () => {
-    if (Device.isAndroid()) {
-      const initialNotification = await notifee.getInitialNotification();
-
-      if (
-        initialNotification?.data?.action === 'tx' &&
-        initialNotification.data.id
-      ) {
-        NotificationManager.setTransactionToView(initialNotification.data.id);
-        props.navigation.navigate(Routes.TRANSACTIONS_VIEW);
-      }
-    }
-  }, [props.navigation]);
 
-  useNotificationHandler(bootstrapAndroidInitialNotification, props.navigation);
+  });
 
   // Remove all notifications that aren't visible
   useEffect(() => {

app/components/UI/BasicFunctionality/BasicFunctionalityModal/BasicFunctionalityModal.tsx

@@ -26,18 +26,14 @@ import Icon, {
   IconSize,
 } from '../../../../component-library/components/Icons/Icon';
 import Routes from '../../../../constants/navigation/Routes';
-import {
-  asyncAlert,
-  requestPushNotificationsPermission,
-} from '../../../../util/notifications';
+import NotificationsService from '../../../../util/notifications/services/NotificationService';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
 import { useEnableNotifications } from '../../../../util/notifications/hooks/useNotifications';
 import { useMetrics } from '../../../hooks/useMetrics';
 import {
   selectIsProfileSyncingEnabled,
   selectIsMetamaskNotificationsEnabled,
 } from '../../../../selectors/notifications';
-import { AuthorizationStatus } from '@notifee/react-native';
 
 interface Props {
   route: {
@@ -65,18 +61,11 @@ const BasicFunctionalityModal = ({ route }: Props) => {
   const { enableNotifications } = useEnableNotifications();
 
   const enableNotificationsFromModal = useCallback(async () => {
-    const nativeNotificationStatus = await requestPushNotificationsPermission(
-      asyncAlert,
-    );
-
-    if (nativeNotificationStatus?.authorizationStatus === AuthorizationStatus.AUTHORIZED) {
-      /**
-       * Although this is an async function, we are dispatching an action (firing & forget)
-       * to emulate optimistic UI.
-       *
-       */
-      enableNotifications();
+    const { permission } = await NotificationsService.getAllPermissions(false);
+    if (permission !== 'authorized') {
+      return;
     }
+      enableNotifications();
   }, [enableNotifications]);
 
   const closeBottomSheet = async () => {

app/components/UI/Notification/List/index.tsx

@@ -1,6 +1,6 @@
 import { NavigationProp, ParamListBase } from '@react-navigation/native';
 import React, { useCallback, useMemo } from 'react';
-import notifee from '@notifee/react-native';
+import NotificationsService from '../../../../util/notifications/services/NotificationService';
 import { ActivityIndicator, FlatList, FlatListProps, View } from 'react-native';
 import ScrollableTabView, {
   DefaultTabBar,
@@ -75,11 +75,11 @@ function NotificationsListItem(props: NotificationsListItemProps) {
         });
       }
 
-      notifee.getBadgeCount().then((count) => {
+      NotificationsService.getBadgeCount().then((count) => {
         if (count > 0) {
-          notifee.setBadgeCount(count - 1);
+          NotificationsService.decrementBadgeCount(count - 1);
         } else {
-          notifee.setBadgeCount(0);
+          NotificationsService.setBadgeCount(0);
         }
       });
 

app/components/Views/Notifications/OptIn/index.test.tsx

@@ -1,13 +1,16 @@
 import React from 'react';
-import OptIn from './';
+import OptIn from '.';
 import { RootState } from '../../../../reducers';
 import { backgroundState } from '../../../../util/test/initial-root-state';
 import renderWithProvider, {
   DeepPartial,
 } from '../../../../util/test/renderWithProvider';
+import { strings } from '../../../../../locales/i18n';
 
 const mockedDispatch = jest.fn();
 
+
+
 const mockInitialState: DeepPartial<RootState> = {
   settings: {},
   engine: {
@@ -18,14 +21,12 @@ const mockInitialState: DeepPartial<RootState> = {
       },
     },
   },
-};
+  };
 
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  // TODO: Replace "any" with type
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  useSelector: (fn: any) => fn(mockInitialState),
-}));
+  jest.mock('react-redux', () => ({
+    ...jest.requireActual('react-redux'),
+    useSelector: jest.fn().mockImplementation((selector) => selector(mockInitialState)),
+  }));
 
 jest.mock('@react-navigation/native', () => {
   const actualNav = jest.requireActual('@react-navigation/native');
@@ -38,9 +39,82 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
+jest.mock('../../../../actions/notification/helpers', () => ({
+  enableNotificationServices: jest.fn(),
+}));
+
+jest.mock('../../../../components/hooks/useMetrics', () => ({
+  useMetrics: () => ({
+    trackEvent: jest.fn(),
+  }),
+}));
+
+jest.mock('../../../../util/notifications/hooks/useNotifications', () => ({
+  useEnableNotifications: () => ({
+    enableNotifications: jest.fn(),
+  }),
+}));
+
+jest.mock('react-native', () => ({
+  Linking: {
+    openURL: jest.fn(),
+  },
+}));
+
+jest.mock('../../../../selectors/notifications', () => ({
+  selectIsMetamaskNotificationsEnabled: jest.fn(),
+}));
+
+jest.mock('../../../../core/Analytics', () => ({
+  MetaMetricsEvents: {
+    NOTIFICATIONS_ACTIVATED: 'notifications_activated',
+  },
+}));
+
+jest.mock('../../../../util/theme', () => ({
+  useTheme: jest.fn(),
+}));
+
+jest.mock('../../../../selectors/notifications', () => ({
+  selectIsProfileSyncingEnabled: jest.fn(),
+}));
+
 describe('OptIn', () => {
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
   it('should render correctly', () => {
     const { toJSON } = renderWithProvider(<OptIn />);
     expect(toJSON()).toMatchSnapshot();
   });
+
+  it('calls enableNotifications when the button is pressed', async () => {
+    const { getByText } = renderWithProvider(
+        <OptIn />
+    );
+
+    const button = getByText(strings('notifications.activation_card.cta'));
+    expect(button).toBeDefined();
+  });
+
+  it('calls navigate when the cancel button is pressed', async () => {
+    const { getByText } = renderWithProvider(
+        <OptIn />
+    );
+
+    const button = getByText(strings('notifications.activation_card.cancel'));
+    expect(button).toBeDefined();
+  });
+
+  it('calls trackEvent when the button is pressed', async () => {
+    const { getByText } = renderWithProvider(
+        <OptIn />
+    );
+
+    const button = getByText(strings('notifications.activation_card.cta'));
+    expect(button).toBeDefined();
+  });
 });
+

app/components/Views/Notifications/OptIn/index.tsx

@@ -4,7 +4,6 @@ import { useNavigation } from '@react-navigation/native';
 
 import { useMetrics } from '../../../../components/hooks/useMetrics';
 import { MetaMetricsEvents } from '../../../../core/Analytics';
-import { AuthorizationStatus } from '@notifee/react-native';
 import Button, {
   ButtonVariants,
 } from '../../../../component-library/components/Buttons/Button';
@@ -18,10 +17,7 @@ import EnableNotificationsCardPlaceholder from '../../../../images/enableNotific
 import { createStyles } from './styles';
 import Routes from '../../../../constants/navigation/Routes';
 import { useSelector } from 'react-redux';
-import {
-  asyncAlert,
-  requestPushNotificationsPermission,
-} from '../../../../util/notifications';
+import NotificationsService from '../../../../util/notifications/services/NotificationService';
 import AppConstants from '../../../../core/AppConstants';
 import { RootState } from '../../../../reducers';
 import { useEnableNotifications } from '../../../../util/notifications/hooks/useNotifications';
@@ -76,14 +72,11 @@ const OptIn = () => {
         },
       });
     } else {
-      const nativeNotificationStatus = await requestPushNotificationsPermission(
-        asyncAlert,
-      );
-
-      if (
-        nativeNotificationStatus?.authorizationStatus ===
-        AuthorizationStatus.AUTHORIZED
-      ) {
+      const { permission } = await NotificationsService.getAllPermissions();
+
+      if (permission !== 'authorized') {
+        return;
+      }
         /**
          * Although this is an async function, we are dispatching an action (firing & forget)
          * to emulate optimistic UI.
@@ -103,7 +96,6 @@ const OptIn = () => {
         action_type: 'activated',
         is_profile_syncing_enabled: isProfileSyncingEnabled,
       });
-    }
   }, [
     basicFunctionalityEnabled,
     enableNotifications,

app/components/Views/Notifications/index.tsx

@@ -1,7 +1,6 @@
 import React, { useCallback, useMemo } from 'react';
 import { View } from 'react-native';
 import { useSelector } from 'react-redux';
-import notifee from '@notifee/react-native';
 import { useMetrics } from '../../../components/hooks/useMetrics';
 import { NotificationsViewSelectorsIDs } from '../../../../e2e/selectors/NotificationsView.selectors';
 import styles from './styles';
@@ -29,6 +28,7 @@ import {
   useMarkNotificationAsRead,
 } from '../../../util/notifications/hooks/useNotifications';
 import { NavigationProp, ParamListBase } from '@react-navigation/native';
+import NotificationsService from '../../../util/notifications/services/NotificationService';
 import ButtonIcon, {
   ButtonIconSizes,
 } from '../../../component-library/components/Buttons/ButtonIcon';
@@ -53,7 +53,7 @@ const NotificationsView = ({
 
   const handleMarkAllAsRead = useCallback(() => {
     markNotificationAsRead(notifications);
-    notifee.setBadgeCount(0);
+    NotificationsService.setBadgeCount(0);
     trackEvent(MetaMetricsEvents.NOTIFICATIONS_MARKED_ALL_AS_READ);
   }, [markNotificationAsRead, notifications, trackEvent]);