[HOLD rollout] Remove Insights page and comparison beta gates

src/CONST/index.ts

@@ -1431,8 +1431,6 @@ const CONST = {
         ARCHIVE_POLICIES: 'archivePolicies',
         MERGE_ATS: 'mergeATSConnections',
         REPORT_MERGE: 'reportMerge',
-        INSIGHTS_PAGE: 'insightsPage',
-        INSIGHTS_COMPARE: 'insightsCompare',
         NL_FILTERS: 'nlFilters',
         PAYMENT_HISTORY: 'paymentHistory',
         UNIFIED_CONNECTIONS: 'unifiedConnections',

src/components/Navigation/AccountAvatarButton.tsx

@@ -7,7 +7,6 @@ import EducationalTooltip from '@components/Tooltip/EducationalTooltip';
 import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
 import useIsAnonymousUser from '@hooks/useIsAnonymousUser';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -28,10 +27,9 @@ import React from 'react';
  * the Account tab is not part of the navigation tab bar.
  */
 function AccountAvatarButton() {
-    const {isBetaEnabled} = usePermissions();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
 
-    if (!shouldUseNarrowLayout || !isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE)) {
+    if (!shouldUseNarrowLayout) {
         return null;
     }
 

src/components/Navigation/NavigationTabBar/index.tsx

@@ -8,7 +8,6 @@ import {PressableWithFeedback} from '@components/Pressable';
 import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
-import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
@@ -45,8 +44,6 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED);
-    const {isBetaEnabled} = usePermissions();
-    const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
     const expensifyIcons = useMemoizedLazyExpensifyIcons(['ExpensifyAppIcon', 'Home']);
 
     const {shouldUseNarrowLayout} = useResponsiveLayout();
@@ -123,12 +120,10 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                                     selectedTab={selectedTab}
                                     isWideLayout
                                 />
-                                {isInsightsTabVisible && (
-                                    <InsightsTabButton
-                                        selectedTab={selectedTab}
-                                        isWideLayout
-                                    />
-                                )}
+                                <InsightsTabButton
+                                    selectedTab={selectedTab}
+                                    isWideLayout
+                                />
                                 <WorkspacesTabButton
                                     selectedTab={selectedTab}
                                     isWideLayout
@@ -180,23 +175,14 @@ function NavigationTabBar({selectedTab, shouldShowFloatingButtons = true}: Navig
                     selectedTab={selectedTab}
                     isWideLayout={false}
                 />
-                {isInsightsTabVisible && (
-                    <InsightsTabButton
-                        selectedTab={selectedTab}
-                        isWideLayout={false}
-                    />
-                )}
+                <InsightsTabButton
+                    selectedTab={selectedTab}
+                    isWideLayout={false}
+                />
                 <WorkspacesTabButton
                     selectedTab={selectedTab}
                     isWideLayout={false}
                 />
-                {!isInsightsTabVisible && (
-                    <NavigationTabBarAvatar
-                        style={styles.navigationTabBarItem}
-                        isSelected={selectedTab === NAVIGATION_TABS.SETTINGS}
-                        onPress={navigateToSettings}
-                    />
-                )}
             </View>
 
             {shouldShowFloatingButtons && (

src/components/Search/SearchRouter/useNavigationSuggestions.tsx

@@ -111,7 +111,6 @@ type BuildTopLevelNavigationItemsParams = {
         account: string;
     };
     icons: TopLevelNavigationIcons;
-    isInsightsPageBetaEnabled: boolean;
     getSpendRoute: () => Route;
     getDestinationText: (destination: string) => string;
 };
@@ -219,7 +218,7 @@ type BuildAccountNavigationItemsParams = {
 };
 
 // Tab buttons own stateful navigation behavior and do not expose reusable descriptors, so Search Router keeps deterministic destination actions here.
-function buildTopLevelNavigationItems({labels, icons, isInsightsPageBetaEnabled, getSpendRoute, getDestinationText}: BuildTopLevelNavigationItemsParams): NavigationSuggestionSourceItem[] {
+function buildTopLevelNavigationItems({labels, icons, getSpendRoute, getDestinationText}: BuildTopLevelNavigationItemsParams): NavigationSuggestionSourceItem[] {
     return [
         {
             text: getDestinationText(labels.home),
@@ -242,17 +241,13 @@ function buildTopLevelNavigationItems({labels, icons, isInsightsPageBetaEnabled,
             keyForList: 'topLevelSpend',
             matchTerms: [labels.spend],
         },
-        ...(isInsightsPageBetaEnabled
-            ? [
-                  {
-                      text: getDestinationText(labels.insights),
-                      singleIcon: icons.PieChart,
-                      action: () => Navigation.navigate(ROUTES.INSIGHTS.getRoute(CONST.INSIGHTS.DASHBOARD.SPEND)),
-                      keyForList: 'topLevelInsights',
-                      matchTerms: [labels.insights],
-                  },
-              ]
-            : []),
+        {
+            text: getDestinationText(labels.insights),
+            singleIcon: icons.PieChart,
+            action: () => Navigation.navigate(ROUTES.INSIGHTS.getRoute(CONST.INSIGHTS.DASHBOARD.SPEND)),
+            keyForList: 'topLevelInsights',
+            matchTerms: [labels.insights],
+        },
         {
             text: getDestinationText(labels.workspaces),
             singleIcon: icons.Building,
@@ -434,7 +429,6 @@ function useNavigationSuggestions(query: string, shouldWatchForApprovals = true)
             account: translate('initialSettingsPage.account'),
         },
         icons,
-        isInsightsPageBetaEnabled: isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE),
         getSpendRoute: () => getSearchTabRoute(navigationRef.getRootState(), lastSearchParams, lastExpensesSearchQuerySelector(searchFilters)),
         getDestinationText: (destination) => getGoToText(translate, destination),
     });

src/hooks/useIsSettingsDrawnOverTabs/index.native.ts

@@ -1,19 +1,12 @@
-import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 
-import getTabWithoutBarItem from '@libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/getTabWithoutBarItem';
-
-import CONST from '@src/CONST';
-import NAVIGATORS from '@src/NAVIGATORS';
-
 /**
  * When the native tab bar has no Account item, the Account tab is drawn over the other tabs
  * as a full screen with the bar hidden, and it needs its own way back.
  */
 function useIsSettingsDrawnOverTabs() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const {isBetaEnabled} = usePermissions();
-    return shouldUseNarrowLayout && getTabWithoutBarItem(isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE)) === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR;
+    return shouldUseNarrowLayout;
 }
 
 export default useIsSettingsDrawnOverTabs;

src/hooks/useSearchTypeMenuSections.ts

@@ -153,10 +153,6 @@ const useSearchTypeMenuSectionsForNavigation = (isScreenFocused = true) => {
         sections = omitTravelApprovalMenuItems(sections);
     }
 
-    if (!isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE)) {
-        return sections;
-    }
-
     return omitInsightsPageMenuItems(sections);
 };
 

src/libs/Navigation/AppNavigator/Navigators/NativeTabNavigator/useNativeTabNavigator.ts

@@ -4,19 +4,15 @@ import useAccountTabIndicatorStatus from '@hooks/useAccountTabIndicatorStatus';
 import useInboxTabIndicatorStatus from '@hooks/useInboxTabIndicatorStatus';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
-import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useWorkspacesTabIndicatorStatus from '@hooks/useWorkspacesTabIndicatorStatus';
 
 import {getPreservedNavigatorState, setPreservedNavigatorState} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
 import isTabRouteAtRoot from '@libs/Navigation/helpers/isTabRouteAtRoot';
-import Navigation from '@libs/Navigation/Navigation';
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
 
-import CONST from '@src/CONST';
 import NAVIGATORS from '@src/NAVIGATORS';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 
 import type {NavigationAction, NavigationState, PartialState, Router, TabNavigationState} from '@react-navigation/native';
@@ -26,7 +22,6 @@ import {isAnonymousSessionSelector} from '@selectors/Session';
 import {useEffect} from 'react';
 
 import getActiveTabRoute from './getActiveTabRoute';
-import getTabWithoutBarItem from './getTabWithoutBarItem';
 import {isInboxTabAtChatList, isNativeTabSelectionEnabled} from './tabScreenListeners';
 import useIsWorkspacesTabRestored from './useIsWorkspacesTabRestored';
 
@@ -45,11 +40,9 @@ function isRealizedNavigationState(state: NavigationState | PartialState<Navigat
 function useNativeTabNavigator() {
     const {shouldUseNarrowLayout} = useResponsiveLayout();
     const {isBlockingViewVisible} = useFullScreenBlockingViewState();
-    const {isBetaEnabled, isBetaEnabledOrUnknown} = usePermissions();
     const {translate} = useLocalize();
     const [isAnonymousUser = false] = useOnyx(ONYXKEYS.SESSION, {selector: isAnonymousSessionSelector});
-    const isInsightsTabVisible = isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE);
-    const tabWithoutBarItem = getTabWithoutBarItem(isInsightsTabVisible);
+    const tabWithoutBarItem = NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR;
     const {indicatorColor: inboxDotColor} = useInboxTabIndicatorStatus();
     const {indicatorColor: workspacesIndicatorColor, status: workspacesIndicatorStatus} = useWorkspacesTabIndicatorStatus();
     const {indicatorColor: accountIndicatorColor, status: accountIndicatorStatus} = useAccountTabIndicatorStatus();
@@ -97,17 +90,6 @@ function useNativeTabNavigator() {
         setPreservedNavigatorState(route.key, tabState);
     }, [tabState, route.key]);
 
-    // Without the beta, Insights has no bar item and its page is not found, so a restored or deep-linked Insights tab
-    // would be a full screen with no way out. Home replaces it, so going back does not return to it. Betas that are
-    // still loading are not a missing beta.
-    const isInsightsTabFocusedWithoutBeta = isBetaEnabledOrUnknown(CONST.BETAS.INSIGHTS_PAGE) === false && activeTabRoute?.name === SCREENS.INSIGHTS;
-    useEffect(() => {
-        if (!isInsightsTabFocusedWithoutBeta) {
-            return;
-        }
-        Navigation.navigate(ROUTES.HOME, {forceReplace: true});
-    }, [isInsightsTabFocusedWithoutBeta]);
-
     // The slicing optimization in useCustomRootStackNavigatorState can unmount and later remount
     // this TAB_NAVIGATOR. Without restoration it would default to index 0. We restore the saved
     // state by overriding the bottom-tab router's getInitialState, the same pattern SplitRouter
@@ -121,11 +103,9 @@ function useNativeTabNavigator() {
         },
     });
 
-    const isAccountAvatarShown = shouldUseNarrowLayout && tabWithoutBarItem !== NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR;
-
     const isTabSelectionEnabled = (routeName: string) => isNativeTabSelectionEnabled(routeName, {isAnonymousUser, isInboxAtChatList, isWorkspacesTabRestored});
 
-    return {shouldShowNativeTabBar, isAccountAvatarShown, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isTabSelectionEnabled};
+    return {shouldShowNativeTabBar, isAccountAvatarShown: false, dotColors, tabLabels, tabWithoutBarItem, tabRouterOverride, isTabSelectionEnabled};
 }
 
 export default useNativeTabNavigator;

src/libs/Permissions.ts

@@ -8,8 +8,6 @@ import type {OnyxEntry} from 'react-native-onyx';
 
 import type Environment from './Environment/getEnvironment/types';
 
-import getPlatform from './getPlatform';
-
 /**
  * Overrides are a test tool, so they never apply in production.
  * Android staging and TestFlight are compiled as production, so only the resolved environment tells a real production
@@ -40,11 +38,6 @@ function isBetaEnabled(beta: Beta, betas: OnyxEntry<Beta[]>, betaConfiguration:
         }
     }
 
-    // Release desktop web independently while the native navigation fixes roll out.
-    if ((beta === CONST.BETAS.INSIGHTS_PAGE || beta === CONST.BETAS.INSIGHTS_COMPARE) && getPlatform(true) === CONST.PLATFORM.WEB) {
-        return true;
-    }
-
     const hasAllBetasEnabled = canUseAllBetas(betas);
     const isFeatureEnabled = !!betas?.includes(beta);
 

src/libs/SearchUIUtils.ts

@@ -7519,7 +7519,6 @@ export {
     createTypeMenuSections,
     omitInsightsPageMenuItems,
     omitTravelApprovalMenuItems,
-    SPEND_INSIGHT_KEYS,
     formatBadgeText,
     getSectionBadgeText,
     getItemBadgeText,

src/pages/Insights/InsightsDashboard.tsx

@@ -15,7 +15,6 @@ import useLocalize from '@hooks/useLocalize';
 import useMultipleSnapshots from '@hooks/useMultipleSnapshots';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
-import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useScrollEventEmitter from '@hooks/useScrollEventEmitter';
 import useTheme from '@hooks/useTheme';
@@ -195,13 +194,10 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
     const {login} = useCurrentUserPersonalDetails();
     const [policies, policiesMetadata] = useOnyx(ONYXKEYS.COLLECTION.POLICY);
     const {filters, defaultFilters, isResolved, setFilters} = useInsightsFilters(dashboardID);
-    const {isBetaEnabled} = usePermissions();
-
-    const isCompareEnabled = isBetaEnabled(CONST.BETAS.INSIGHTS_COMPARE);
     const {headlineChart: headlineSpec, supportingCharts: supportingSpecs} = INSIGHTS_DASHBOARD_SPECS[dashboardID];
     const eligibleCharts = getVisibleCharts(supportingSpecs, policies, filters.policyIDs, login);
     const eligibleGraphKeys = eligibleCharts.map(({graphKey}) => graphKey).join(',');
-    const query = isResolved && !isLoadingOnyxValue(policiesMetadata) ? buildInsightsJsonQuery(dashboardID, filters, eligibleCharts, isCompareEnabled) : undefined;
+    const query = isResolved && !isLoadingOnyxValue(policiesMetadata) ? buildInsightsJsonQuery(dashboardID, filters, eligibleCharts) : undefined;
     const hash = query?.hash;
 
     const requestDashboard = () => {
@@ -221,7 +217,7 @@ function InsightsDashboard({dashboardID}: {dashboardID: InsightsDashboardID}) {
         }
         onRequestConditionsChanged();
         // Leaves out jsonQuery so toggling Compare mode doesn't refetch, since every response covers it. Group by and the eligible charts are listed because the hash leaves them out
-    }, [dashboardID, hash, filters.groupBy, eligibleGraphKeys, isCompareEnabled, isFocused, isOffline]);
+    }, [dashboardID, hash, filters.groupBy, eligibleGraphKeys, isFocused, isOffline]);
 
     const [dashboard] = useOnyx(`${ONYXKEYS.COLLECTION.INSIGHTS}${dashboardID}_${hash}`);
     // Until the filters and workspaces load, the charts have no query to read data for, so they show their loading state

src/pages/Insights/InsightsPage.tsx

@@ -1,6 +1,5 @@
 import useDocumentTitle from '@hooks/useDocumentTitle';
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 
 import type {TabNavigatorParamList} from '@libs/Navigation/types';
 
@@ -19,12 +18,11 @@ type InsightsPageProps = BottomTabScreenProps<TabNavigatorParamList, typeof SCRE
 
 function InsightsPage({route}: InsightsPageProps) {
     const {translate} = useLocalize();
-    const {isBetaEnabled} = usePermissions();
     useDocumentTitle(translate('common.insights'));
 
     const dashboardID = Object.values(CONST.INSIGHTS.DASHBOARD).find((id) => id === route.params?.dashboardID);
 
-    if (!isBetaEnabled(CONST.BETAS.INSIGHTS_PAGE) || !dashboardID) {
+    if (!dashboardID) {
         return <NotFoundPage />;
     }
 

src/pages/Insights/controls/InsightsPageControls.tsx

@@ -1,14 +1,11 @@
 import ScrollView from '@components/ScrollView';
 
 import useLayoutSpacing from '@hooks/useLayoutSpacing';
-import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
 import type {InsightsFilters} from '@pages/Insights/insightsFilters';
 
-import CONST from '@src/CONST';
-
 import React from 'react';
 import {View} from 'react-native';
 
@@ -31,20 +28,17 @@ function InsightsPageControls({filters, defaultFilters, onChange}: InsightsPageC
     const styles = useThemeStyles();
     const {pageGutter} = useLayoutSpacing();
     const {shouldUseNarrowLayout} = useResponsiveLayout();
-    const {isBetaEnabled} = usePermissions();
 
     const controls = (
         <>
             <InsightsDateControl
                 value={filters.date}
                 onChange={(date) => onChange({date})}
             />
-            {isBetaEnabled(CONST.BETAS.INSIGHTS_COMPARE) && (
-                <InsightsCompareControl
-                    value={filters.compare}
-                    onChange={(compare) => onChange({compare})}
-                />
-            )}
+            <InsightsCompareControl
+                value={filters.compare}
+                onChange={(compare) => onChange({compare})}
+            />
             <InsightsWorkspaceControl
                 value={filters.policyIDs}
                 onChange={(policyIDs) => onChange({policyIDs})}