chore: Remove notifications logic from wallet view (#12276)

app/components/Views/Wallet/index.test.tsx

@@ -1,15 +1,13 @@
 import React from 'react';
 import Wallet from './';
 import { renderScreen } from '../../../util/test/renderWithProvider';
-import { act, screen } from '@testing-library/react-native';
+import { screen } from '@testing-library/react-native';
 import ScrollableTabView from 'react-native-scrollable-tab-view';
 import Routes from '../../../constants/navigation/Routes';
 import { backgroundState } from '../../../util/test/initial-root-state';
 import { createMockAccountsControllerState } from '../../../util/test/accountsControllerTestUtils';
 import { WalletViewSelectorsIDs } from '../../../../e2e/selectors/wallet/WalletView.selectors';
 import { CommonSelectorsIDs } from '../../../../e2e/selectors/Common.selectors';
-import { useAccountSyncing } from '../../../util/notifications/hooks/useAccountSyncing';
-import { AppState } from 'react-native';
 
 const MOCK_ADDRESS = '0xc4955c0d639d99699bfd7ec54d9fafee40e4d272';
 
@@ -153,40 +151,4 @@ describe('Wallet', () => {
     const foxIcon = screen.getByTestId(CommonSelectorsIDs.FOX_ICON);
     expect(foxIcon).toBeDefined();
   });
-  it('dispatches account syncing on mount', () => {
-    jest.clearAllMocks();
-    //@ts-expect-error we are ignoring the navigation params on purpose because we do not want to mock setOptions to test the navbar
-    render(Wallet);
-    expect(useAccountSyncing().dispatchAccountSyncing).toHaveBeenCalledTimes(1);
-  });
-  it('dispatches account syncing when appState switches from inactive|background to active', () => {
-    jest.clearAllMocks();
-
-    const addEventListener = jest.spyOn(AppState, 'addEventListener');
-
-    //@ts-expect-error we are ignoring the navigation params on purpose because we do not want to mock setOptions to test the navbar
-    render(Wallet);
-
-    expect(addEventListener).toHaveBeenCalledWith(
-      'change',
-      expect.any(Function),
-    );
-    const handleAppStateChange = (
-      addEventListener as jest.Mock
-    ).mock.calls.find(([event]) => event === 'change')[1];
-
-    act(() => {
-      handleAppStateChange('background');
-      handleAppStateChange('active');
-    });
-
-    expect(useAccountSyncing().dispatchAccountSyncing).toHaveBeenCalledTimes(2);
-
-    act(() => {
-      handleAppStateChange('inactive');
-      handleAppStateChange('active');
-    });
-
-    expect(useAccountSyncing().dispatchAccountSyncing).toHaveBeenCalledTimes(3);
-  });
 });

app/components/Views/Wallet/index.tsx

@@ -1,19 +1,11 @@
-import React, {
-  useEffect,
-  useRef,
-  useCallback,
-  useContext,
-  useLayoutEffect,
-} from 'react';
+import React, { useEffect, useRef, useCallback, useContext } from 'react';
 import {
   ActivityIndicator,
   StyleSheet,
   View,
   TextStyle,
   InteractionManager,
   Linking,
-  AppState,
-  AppStateStatus,
 } from 'react-native';
 import type { Theme } from '@metamask/design-tokens';
 import { connect, useSelector } from 'react-redux';
@@ -93,8 +85,6 @@ import {
   selectIsProfileSyncingEnabled,
 } from '../../../selectors/notifications';
 import { ButtonVariants } from '../../../component-library/components/Buttons/Button';
-import { useListNotifications } from '../../../util/notifications/hooks/useNotifications';
-import { useAccountSyncing } from '../../../util/notifications/hooks/useAccountSyncing';
 
 import { PortfolioBalance } from '../../UI/Tokens/TokenList/PortfolioBalance';
 import useCheckNftAutoDetectionModal from '../../hooks/useCheckNftAutoDetectionModal';
@@ -161,10 +151,7 @@ const Wallet = ({
   showNftFetchingLoadingIndicator,
   hideNftFetchingLoadingIndicator,
 }: WalletProps) => {
-  const appState = useRef(AppState.currentState);
   const { navigate } = useNavigation();
-  const { listNotifications } = useListNotifications();
-  const { dispatchAccountSyncing } = useAccountSyncing();
   const walletRef = useRef(null);
   const theme = useTheme();
   const { toastRef } = useContext(ToastContext);
@@ -406,35 +393,6 @@ const Wallet = ({
     [navigation, providerConfig.chainId],
   );
 
-  // Layout effect when component/view is visible
-  // - fetches notifications
-  // - dispatches account syncing
-  useLayoutEffect(() => {
-    const handleAppStateChange = (nextAppState: AppStateStatus) => {
-      if (
-        appState.current?.match(/inactive|background/) &&
-        nextAppState === 'active'
-      ) {
-        listNotifications();
-        dispatchAccountSyncing();
-      }
-
-      appState.current = nextAppState;
-    };
-
-    const subscription = AppState.addEventListener(
-      'change',
-      handleAppStateChange,
-    );
-
-    listNotifications();
-    dispatchAccountSyncing();
-
-    return () => {
-      subscription.remove();
-    };
-  }, [listNotifications, dispatchAccountSyncing]);
-
   useEffect(() => {
     navigation.setOptions(
       getWalletNavbarOptions(
@@ -514,7 +472,8 @@ const Wallet = ({
     // TODO: Replace "any" with type
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let balance: any = 0;
-    let assets = tokens;
+
+    let assets = [...(tokens || [])];
 
     if (accountBalanceByChainId) {
       balance = renderFromWei(accountBalanceByChainId.balance);
@@ -539,9 +498,8 @@ const Wallet = ({
         } as any,
         ...(tokens || []),
       ];
-    } else {
-      assets = tokens;
     }
+
     return (
       <View
         style={styles.wrapper}

bitrise.yml

@@ -135,8 +135,8 @@ stages:
       - run_ios_api_specs: {}
       - run_tag_smoke_accounts_ios: {}
       - run_tag_smoke_accounts_android: {}
-      - run_tag_smoke_notifications_ios: {}
-      - run_tag_smoke_notifications_android: {}
+      # - run_tag_smoke_notifications_ios: {}
+      # - run_tag_smoke_notifications_android: {}
       # - run_tag_smoke_assets_ios: {}
       - run_tag_smoke_assets_android: {}
       - run_tag_smoke_confirmations_ios: {}