rever PR 52117

src/CONST.ts

@@ -934,7 +934,6 @@ const CONST = {
     CONFIGURE_REIMBURSEMENT_SETTINGS_HELP_URL: 'https://help.expensify.com/articles/expensify-classic/workspaces/Configure-Reimbursement-Settings',
     COPILOT_HELP_URL: 'https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Assign-or-remove-a-Copilot',
     DELAYED_SUBMISSION_HELP_URL: 'https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports',
-    PLAN_TYPES_AND_PRICING_HELP_URL: 'https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing',
     // Use Environment.getEnvironmentURL to get the complete URL with port number
     DEV_NEW_EXPENSIFY_URL: 'https://dev.new.expensify.com:',
     NAVATTIC: {

src/ROUTES.ts

@@ -711,10 +711,6 @@ const ROUTES = {
         route: 'settings/workspaces/:policyID/profile/address',
         getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/address` as const, backTo),
     },
-    WORKSPACE_PROFILE_PLAN: {
-        route: 'settings/workspaces/:policyID/profile/plan',
-        getRoute: (policyID: string, backTo?: string) => getUrlWithBackToParam(`settings/workspaces/${policyID}/profile/plan` as const, backTo),
-    },
     WORKSPACE_ACCOUNTING: {
         route: 'settings/workspaces/:policyID/accounting',
         getRoute: (policyID: string) => `settings/workspaces/${policyID}/accounting` as const,
@@ -978,9 +974,9 @@ const ROUTES = {
         getRoute: (policyID: string, categoryName: string) => `settings/workspaces/${policyID}/category/${encodeURIComponent(categoryName)}` as const,
     },
     WORKSPACE_UPGRADE: {
-        route: 'settings/workspaces/:policyID/upgrade/:featureName?',
-        getRoute: (policyID: string, featureName?: string, backTo?: string) =>
-            getUrlWithBackToParam(`settings/workspaces/${policyID}/upgrade/${encodeURIComponent(featureName ?? '')}` as const, backTo),
+        route: 'settings/workspaces/:policyID/upgrade/:featureName',
+        getRoute: (policyID: string, featureName: string, backTo?: string) =>
+            getUrlWithBackToParam(`settings/workspaces/${policyID}/upgrade/${encodeURIComponent(featureName)}` as const, backTo),
     },
     WORKSPACE_DOWNGRADE: {
         route: 'settings/workspaces/:policyID/downgrade/',

src/SCREENS.ts

@@ -498,7 +498,6 @@ const SCREENS = {
         TAG_GL_CODE: 'Tag_GL_Code',
         CURRENCY: 'Workspace_Profile_Currency',
         ADDRESS: 'Workspace_Profile_Address',
-        PLAN: 'Workspace_Profile_Plan_Type',
         WORKFLOWS: 'Workspace_Workflows',
         WORKFLOWS_PAYER: 'Workspace_Workflows_Payer',
         WORKFLOWS_APPROVALS_NEW: 'Workspace_Approvals_New',

src/languages/en.ts

@@ -191,7 +191,6 @@ import type {
     WelcomeNoteParams,
     WelcomeToRoomParams,
     WeSentYouMagicSignInLinkParams,
-    WorkspaceLockedPlanTypeParams,
     WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
     YourPlanPriceParams,
     ZipCodeExampleFormatParams,
@@ -2539,7 +2538,6 @@ const translations = {
                         return 'Member';
                 }
             },
-            planType: 'Plan type',
             submitExpense: 'Submit expenses using your workspace chat below:',
             defaultCategory: 'Default category',
         },
@@ -4282,19 +4280,6 @@ const translations = {
                 moreDetails: 'for more details.',
                 gotIt: 'Got it, thanks',
             },
-            commonFeatures: {
-                title: 'Upgrade Workspace to Control',
-                note: 'Get access to all our most advanced functionality, including:',
-                benefits: {
-                    note: 'The Control plan starts at $9 per active member per month.',
-                    learnMore: 'Learn more',
-                    pricing: 'about our plans and pricing.',
-                    benefit1: 'Advanced accounting connections (NetSuite, Sage Intacct and more)',
-                    benefit2: 'Expense rules',
-                    benefit3: 'Multiple approval workflows',
-                    benefit4: 'Enhanced security controls',
-                },
-            },
         },
         restrictedAction: {
             restricted: 'Restricted',
@@ -4398,23 +4383,6 @@ const translations = {
                 andEnableWorkflows: 'and enable workflows, then add approvals to unlock this feature.',
             },
         },
-        planTypePage: {
-            planTypes: {
-                team: {
-                    label: 'Collect',
-                    description: 'For teams looking to automate their processes.',
-                },
-                corporate: {
-                    label: 'Control',
-                    description: 'For organizations with advanced requirements.',
-                },
-            },
-            description: "Choose a plan that's right for you. For a detailed list of features and pricing, check out our",
-            subscriptionLink: 'plan types and pricing help page',
-            lockedPlanDescription: ({subscriptionUsersCount, annualSubscriptionEndDate}: WorkspaceLockedPlanTypeParams) =>
-                `You've committed to ${subscriptionUsersCount} active users on the Control plan until your annual subscription ends on ${annualSubscriptionEndDate}. You can switch to pay-per-use subscription and downgrade to the Collect plan starting ${annualSubscriptionEndDate} by disabling auto-renew in`,
-            subscriptions: 'Subscriptions',
-        },
     },
     getAssistancePage: {
         title: 'Get assistance',

src/languages/es.ts

@@ -191,7 +191,6 @@ import type {
     WelcomeNoteParams,
     WelcomeToRoomParams,
     WeSentYouMagicSignInLinkParams,
-    WorkspaceLockedPlanTypeParams,
     WorkspaceOwnerWillNeedToAddOrUpdatePaymentCardParams,
     YourPlanPriceParams,
     ZipCodeExampleFormatParams,
@@ -2563,7 +2562,6 @@ const translations = {
                         return 'Miembro';
                 }
             },
-            planType: 'Tipo de plan',
             submitExpense: 'Envíe los gastos utilizando el chat de su espacio de trabajo:',
             defaultCategory: 'Categoría predeterminada',
         },
@@ -4249,23 +4247,6 @@ const translations = {
             confirmText: 'Sí, exportar de nuevo',
             cancelText: 'Cancelar',
         },
-        planTypePage: {
-            planTypes: {
-                team: {
-                    label: 'Collect',
-                    description: 'Para equipos que buscan automatizar sus procesos.',
-                },
-                corporate: {
-                    label: 'Recolectar',
-                    description: 'Para organizaciones con requisitos avanzados.',
-                },
-            },
-            description: 'Elige el plan adecuado para ti. Para ver una lista detallada de funciones y precios, consulta nuestra',
-            subscriptionLink: 'página de ayuda sobre tipos de planes y precios',
-            lockedPlanDescription: ({subscriptionUsersCount, annualSubscriptionEndDate}: WorkspaceLockedPlanTypeParams) =>
-                `Tienes un compromiso anual de ${subscriptionUsersCount} miembros activos en el plan Control hasta el ${annualSubscriptionEndDate}. Puedes cambiar a una suscripción de pago por uso y desmejorar al plan Recopilar a partir del ${annualSubscriptionEndDate} desactivando la renovación automática en`,
-            subscriptions: 'Suscripciones',
-        },
         upgrade: {
             reportFields: {
                 title: 'Los campos',
@@ -4347,19 +4328,6 @@ const translations = {
                 moreDetails: 'para obtener más información.',
                 gotIt: 'Entendido, gracias.',
             },
-            commonFeatures: {
-                title: 'Actualiza tu espacio de trabajo al plan Controlar',
-                note: 'Obtén acceso a todas nuestras funciones más avanzadas, incluyendo:',
-                benefits: {
-                    note: 'El plan Controlar comienza en $9 por miembro activo al mes.',
-                    learnMore: 'Obtén más información',
-                    pricing: 'sobre nuestros planes y precios.',
-                    benefit1: 'Conexiones contables avanzadas (NetSuite, Sage Intacct y más)',
-                    benefit2: 'Reglas de gastos',
-                    benefit3: 'Flujos de aprobación múltiples',
-                    benefit4: 'Controles de seguridad mejorados',
-                },
-            },
         },
         restrictedAction: {
             restricted: 'Restringido',

src/languages/params.ts

@@ -559,10 +559,6 @@ type CurrencyCodeParams = {
     currencyCode: string;
 };
 
-type WorkspaceLockedPlanTypeParams = {
-    subscriptionUsersCount: number;
-    annualSubscriptionEndDate: string;
-};
 type CompanyNameParams = {
     companyName: string;
 };
@@ -773,7 +769,6 @@ export type {
     ImportedTypesParams,
     ImportPerDiemRatesSuccessfullDescriptionParams,
     CurrencyCodeParams,
-    WorkspaceLockedPlanTypeParams,
     CompanyNameParams,
     ChatWithAccountManagerParams,
 };

src/libs/API/parameters/UpgradeToCorporateParams.ts

@@ -1,6 +1,6 @@
 type UpgradeToCorporateParams = {
     policyID: string;
-    featureName?: string;
+    featureName: string;
 };
 
 export default UpgradeToCorporateParams;

src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx

@@ -270,7 +270,6 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
     [SCREENS.WORKSPACE.CURRENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceProfileCurrencyPage').default,
     [SCREENS.WORKSPACE.CATEGORY_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/CategorySettingsPage').default,
     [SCREENS.WORKSPACE.ADDRESS]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceProfileAddressPage').default,
-    [SCREENS.WORKSPACE.PLAN]: () => require<ReactComponentModule>('../../../../pages/workspace/WorkspaceProfilePlanTypePage').default,
     [SCREENS.WORKSPACE.CATEGORIES_SETTINGS]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/WorkspaceCategoriesSettingsPage').default,
     [SCREENS.WORKSPACE.CATEGORIES_IMPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/ImportCategoriesPage').default,
     [SCREENS.WORKSPACE.CATEGORIES_IMPORTED]: () => require<ReactComponentModule>('../../../../pages/workspace/categories/ImportedCategoriesPage').default,

src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts

@@ -5,7 +5,6 @@ const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
     [SCREENS.WORKSPACE.PROFILE]: [
         SCREENS.WORKSPACE.NAME,
         SCREENS.WORKSPACE.ADDRESS,
-        SCREENS.WORKSPACE.PLAN,
         SCREENS.WORKSPACE.CURRENCY,
         SCREENS.WORKSPACE.DESCRIPTION,
         SCREENS.WORKSPACE.SHARE,

src/libs/Navigation/linkingConfig/config.ts

@@ -347,9 +347,6 @@ const config: LinkingOptions<RootStackParamList>['config'] = {
                         [SCREENS.WORKSPACE.ADDRESS]: {
                             path: ROUTES.WORKSPACE_PROFILE_ADDRESS.route,
                         },
-                        [SCREENS.WORKSPACE.PLAN]: {
-                            path: ROUTES.WORKSPACE_PROFILE_PLAN.route,
-                        },
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_IMPORT]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_IMPORT.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CHART_OF_ACCOUNTS.route},
                         [SCREENS.WORKSPACE.ACCOUNTING.QUICKBOOKS_ONLINE_CLASSES]: {path: ROUTES.POLICY_ACCOUNTING_QUICKBOOKS_ONLINE_CLASSES.route},

src/libs/Navigation/types.ts

@@ -246,7 +246,7 @@ type SettingsNavigatorParamList = {
     };
     [SCREENS.WORKSPACE.UPGRADE]: {
         policyID: string;
-        featureName?: string;
+        featureName: string;
         backTo?: Routes;
         categoryId?: string;
     };

src/libs/PolicyUtils.ts

@@ -1114,17 +1114,6 @@ function getActivePolicy(): OnyxEntry<Policy> {
     return getPolicy(activePolicyId);
 }
 
-function getUserFriendlyWorkspaceType(workspaceType: ValueOf<typeof CONST.POLICY.TYPE>) {
-    switch (workspaceType) {
-        case CONST.POLICY.TYPE.CORPORATE:
-            return Localize.translateLocal('workspace.type.control');
-        case CONST.POLICY.TYPE.TEAM:
-            return Localize.translateLocal('workspace.type.collect');
-        default:
-            return Localize.translateLocal('workspace.type.free');
-    }
-}
-
 function isPolicyAccessible(policy: OnyxEntry<Policy>): boolean {
     return !isEmptyObject(policy) && (Object.keys(policy).length !== 1 || isEmptyObject(policy.errors)) && !!policy?.id;
 }
@@ -1257,7 +1246,6 @@ export {
     getNetSuiteImportCustomFieldLabel,
     getAllPoliciesLength,
     getActivePolicy,
-    getUserFriendlyWorkspaceType,
     isPolicyAccessible,
     areAllGroupPoliciesExpenseChatDisabled,
 };

src/libs/actions/Policy/Policy.ts

@@ -1663,7 +1663,6 @@ function buildPolicyData(policyOwnerEmail = '', makeMeAdmin = false, policyName
                     outputCurrency: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                     address: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                     description: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                    type: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 },
             },
         },
@@ -1736,7 +1735,6 @@ function buildPolicyData(policyOwnerEmail = '', makeMeAdmin = false, policyName
                     outputCurrency: null,
                     address: null,
                     description: null,
-                    type: null,
                 },
             },
         },
@@ -3326,7 +3324,7 @@ function setForeignCurrencyDefault(policyID: string, taxCode: string) {
     API.write(WRITE_COMMANDS.SET_POLICY_TAXES_FOREIGN_CURRENCY_DEFAULT, parameters, onyxData);
 }
 
-function upgradeToCorporate(policyID: string, featureName?: string) {
+function upgradeToCorporate(policyID: string, featureName: string) {
     const policy = getPolicy(policyID);
     const optimisticData: OnyxUpdate[] = [
         {
@@ -3378,7 +3376,7 @@ function upgradeToCorporate(policyID: string, featureName?: string) {
         },
     ];
 
-    const parameters: UpgradeToCorporateParams = {policyID, ...(featureName ? {featureName} : {})};
+    const parameters: UpgradeToCorporateParams = {policyID, featureName};
 
     API.write(WRITE_COMMANDS.UPGRADE_TO_CORPORATE, parameters, {optimisticData, successData, failureData});
 }

src/pages/workspace/WorkspaceProfilePage.tsx

@@ -77,7 +77,6 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
     const onPressName = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_NAME.getRoute(policy?.id ?? '-1')), [policy?.id]);
     const onPressDescription = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_DESCRIPTION.getRoute(policy?.id ?? '-1')), [policy?.id]);
     const onPressShare = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_SHARE.getRoute(policy?.id ?? '-1')), [policy?.id]);
-    const onPressPlanType = useCallback(() => Navigation.navigate(ROUTES.WORKSPACE_PROFILE_PLAN.getRoute(policy?.id ?? '-1')), [policy?.id]);
 
     const policyName = policy?.name ?? '';
     const policyDescription =
@@ -268,22 +267,6 @@ function WorkspaceProfilePage({policyDraft, policy: policyProp, route}: Workspac
                                 </View>
                             </OfflineWithFeedback>
                         )}
-                        {!readOnly && !!policy?.type && (
-                            <OfflineWithFeedback pendingAction={policy?.pendingFields?.type}>
-                                <View>
-                                    <MenuItemWithTopDescription
-                                        title={PolicyUtils.getUserFriendlyWorkspaceType(policy.type)}
-                                        description={translate('workspace.common.planType')}
-                                        shouldShowRightIcon={!readOnly}
-                                        disabled={readOnly}
-                                        wrapperStyle={styles.sectionMenuItemTopDescription}
-                                        onPress={onPressPlanType}
-                                        shouldGreyOutWhenDisabled={false}
-                                        shouldUseDefaultCursorWhenDisabled
-                                    />
-                                </View>
-                            </OfflineWithFeedback>
-                        )}
                         {!readOnly && (
                             <View style={[styles.flexRow, styles.mt6, styles.mnw120]}>
                                 <Button