From c29e243a768ca92f97b0ea4fc469c5331b310ce7 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Wed, 10 Jul 2024 04:13:14 +0500
Subject: [PATCH 1/9] add upgrade screen to more features

---
 src/CONST.ts                                  | 22 ++++++++++++++++---
 src/ROUTES.ts                                 |  3 ++-
 .../ConnectToNetSuiteButton/index.tsx         |  8 +++++++
 .../ConnectToSageIntacctButton/index.tsx      | 11 ++++++++++
 src/languages/en.ts                           | 20 ++++++++++++-----
 src/languages/es.ts                           | 20 ++++++++++++-----
 .../FULL_SCREEN_TO_RHP_MAPPING.ts             |  9 +-------
 src/libs/Permissions.ts                       |  2 +-
 .../workspace/WorkspaceMoreFeaturesPage.tsx   |  7 ++++++
 src/pages/workspace/upgrade/UpgradeIntro.tsx  | 12 +++++-----
 .../upgrade/WorkspaceUpgradePage.tsx          |  4 ++--
 11 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index a872636eb427..aff5f1cd657c 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5206,8 +5206,8 @@ const CONST = {
     },
 
     EXCLUDE_FROM_LAST_VISITED_PATH: [SCREENS.NOT_FOUND, SCREENS.SAML_SIGN_IN, SCREENS.VALIDATE_LOGIN] as string[],
-    UPGRADE_FEATURE_INTRO_MAPPING: [
-        {
+    UPGRADE_FEATURE_INTRO_MAPPING: {
+        reportFields: {
             id: 'reportFields',
             alias: 'report-fields',
             name: 'Report Fields',
@@ -5215,7 +5215,23 @@ const CONST = {
             description: 'workspace.upgrade.reportFields.description',
             icon: 'Pencil',
         },
-    ],
+        netSuite: {
+            id: 'netSuite',
+            alias: 'netsuite',
+            name: 'NetSuite',
+            title: 'workspace.upgrade.netSuite.title',
+            description: 'workspace.upgrade.netSuite.description',
+            icon: 'NetSuiteSquare',
+        },
+        sageIntacct: {
+            id: 'sageIntacct',
+            alias: 'sage-intacct',
+            name: 'Sage Intacct',
+            title: 'workspace.upgrade.sageIntacct.title',
+            description: 'workspace.upgrade.sageIntacct.description',
+            icon: 'IntacctSquare',
+        },
+    },
     REPORT_FIELD_TYPES: {
         TEXT: 'text',
         DATE: 'date',
diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 3f93109463c9..f4b367648930 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -681,7 +681,8 @@ const ROUTES = {
     },
     WORKSPACE_UPGRADE: {
         route: 'settings/workspaces/:policyID/upgrade/:featureName',
-        getRoute: (policyID: string, featureName: string) => `settings/workspaces/${policyID}/upgrade/${encodeURIComponent(featureName)}` as const,
+        getRoute: (policyID: string, featureName: string, backTo?: string) =>
+            getUrlWithBackToParam(`settings/workspaces/${policyID}/upgrade/${encodeURIComponent(featureName)}` as const, backTo),
     },
     WORKSPACE_CATEGORIES_SETTINGS: {
         route: 'settings/workspaces/:policyID/categories/settings',
diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index a0cd36671117..72b0b78f45a8 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -1,4 +1,5 @@
 import React, {useState} from 'react';
+import {useOnyx} from 'react-native-onyx';
 import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import Button from '@components/Button';
 import useLocalize from '@hooks/useLocalize';
@@ -7,6 +8,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {ConnectToNetSuiteButtonProps} from './types';
 
@@ -14,6 +16,7 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
     const styles = useThemeStyles();
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
 
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
@@ -21,6 +24,11 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
         <>
             <Button
                 onPress={() => {
+                    if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+                        Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.netSuite.alias, ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID)));
+                        return;
+                    }
+
                     if (shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect) {
                         setIsDisconnectModalOpen(true);
                         return;
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index 460647838ec3..a095db6f46f2 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -1,5 +1,6 @@
 import React, {useRef, useState} from 'react';
 import type {View} from 'react-native';
+import {useOnyx} from 'react-native-onyx';
 import AccountingConnectionConfirmationModal from '@components/AccountingConnectionConfirmationModal';
 import Button from '@components/Button';
 import * as Expensicons from '@components/Icon/Expensicons';
@@ -13,6 +14,7 @@ import {getPoliciesConnectedToSageIntacct} from '@libs/actions/Policy/Policy';
 import Navigation from '@libs/Navigation/Navigation';
 import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {PolicyConnectionName} from '@src/types/onyx/Policy';
 
@@ -27,6 +29,8 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
 
+    const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`);
+
     const [isDisconnectModalOpen, setIsDisconnectModalOpen] = useState(false);
 
     const hasPoliciesConnectedToSageIntacct = !!getPoliciesConnectedToSageIntacct().length;
@@ -57,6 +61,13 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
         <>
             <Button
                 onPress={() => {
+                    if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+                        Navigation.navigate(
+                            ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.sageIntacct.alias, ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID)),
+                        );
+                        return;
+                    }
+
                     if (shouldDisconnectIntegrationBeforeConnecting && integrationToDisconnect) {
                         setIsDisconnectModalOpen(true);
                         return;
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 5c5cc795f4f8..dbe67674e092 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3217,11 +3217,21 @@ export default {
             reportFields: {
                 title: 'Report fields',
                 description: `Report fields let you specify header-level details, distinct from tags that pertain to expenses on individual line items. These details can encompass specific project names, business trip information, locations, and more.`,
-                pricing: {
-                    onlyAvailableOnPlan: 'Report fields are only available on the Control plan, starting at ',
-                    amount: '$9 ',
-                    perActiveMember: 'per active member per month.',
-                },
+                onlyAvailableOnPlan: 'Report fields are only available on the Control plan, starting at ',
+            },
+            netSuite: {
+                title: 'NetSuite',
+                description: `Enjoy automated syncing and reduce manual entries with the Expensify + NetSuite integration. Gain in-depth, realtime financial insights with native and custom segment support, including project and customer mapping.`,
+                onlyAvailableOnPlan: 'Our NetSuite integration is only available on the Control plan, starting at ',
+            },
+            sageIntacct: {
+                title: 'Sage Intacct',
+                description: `Enjoy automated syncing and reduce manual entries with the Expensify + Sage Intacct integration. Gain in-depth, real-time financial insights with user-defined dimensions, as well as expense coding by department, class, location, customer, and project (job).`,
+                onlyAvailableOnPlan: 'Our Sage Intacct integration is only available on the Control plan, starting at ',
+            },
+            pricing: {
+                amount: '$9 ',
+                perActiveMember: 'per active member per month.',
             },
             note: {
                 upgradeWorkspace: 'Upgrade your workspace to access this feature, or',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 6b685343d8e2..bc51cae4c772 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3264,17 +3264,27 @@ export default {
             reportFields: {
                 title: 'Los campos',
                 description: `Los campos de informe permiten especificar detalles a nivel de cabecera, distintos de las etiquetas que pertenecen a los gastos en partidas individuales. Estos detalles pueden incluir nombres de proyectos específicos, información sobre viajes de negocios, ubicaciones, etc.`,
-                pricing: {
-                    onlyAvailableOnPlan: 'Los campos de informe sólo están disponibles en el plan Control, a partir de ',
-                    amount: '$9 ',
-                    perActiveMember: 'por miembro activo al mes.',
-                },
+                onlyAvailableOnPlan: 'Los campos de informe sólo están disponibles en el plan Control, a partir de ',
+            },
+            netSuite: {
+                title: 'NetSuite',
+                description: `Enjoy automated syncing and reduce manual entries with the Expensify + NetSuite integration. Gain in-depth, realtime financial insights with native and custom segment support, including project and customer mapping.`,
+                onlyAvailableOnPlan: 'Our NetSuite integration is only available on the Control plan, starting at ',
+            },
+            sageIntacct: {
+                title: 'Sage Intacct',
+                description: `Enjoy automated syncing and reduce manual entries with the Expensify + Sage Intacct integration. Gain in-depth, real-time financial insights with user-defined dimensions, as well as expense coding by department, class, location, customer, and project (job).`,
+                onlyAvailableOnPlan: 'Our Sage Intacct integration is only available on the Control plan, starting at ',
             },
             note: {
                 upgradeWorkspace: 'Mejore su espacio de trabajo para acceder a esta función, o',
                 learnMore: 'más información',
                 aboutOurPlans: 'sobre nuestros planes y precios.',
             },
+            pricing: {
+                amount: '$9 ',
+                perActiveMember: 'por miembro activo al mes.',
+            },
             upgradeToUnlock: 'Desbloquear esta función',
             completed: {
                 headline: 'Has mejorado tu espacio de trabajo.',
diff --git a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
index 1dec713058c4..5c1ead37dce1 100755
--- a/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
+++ b/src/libs/Navigation/linkingConfig/FULL_SCREEN_TO_RHP_MAPPING.ts
@@ -2,14 +2,7 @@ import type {FullScreenName} from '@libs/Navigation/types';
 import SCREENS from '@src/SCREENS';
 
 const FULL_SCREEN_TO_RHP_MAPPING: Partial<Record<FullScreenName, string[]>> = {
-    [SCREENS.WORKSPACE.PROFILE]: [
-        SCREENS.WORKSPACE.NAME,
-        SCREENS.WORKSPACE.ADDRESS,
-        SCREENS.WORKSPACE.CURRENCY,
-        SCREENS.WORKSPACE.DESCRIPTION,
-        SCREENS.WORKSPACE.SHARE,
-        SCREENS.WORKSPACE.UPGRADE,
-    ],
+    [SCREENS.WORKSPACE.PROFILE]: [SCREENS.WORKSPACE.NAME, SCREENS.WORKSPACE.ADDRESS, SCREENS.WORKSPACE.CURRENCY, SCREENS.WORKSPACE.DESCRIPTION, SCREENS.WORKSPACE.SHARE],
     [SCREENS.WORKSPACE.REIMBURSE]: [SCREENS.WORKSPACE.RATE_AND_UNIT, SCREENS.WORKSPACE.RATE_AND_UNIT_RATE, SCREENS.WORKSPACE.RATE_AND_UNIT_UNIT],
     [SCREENS.WORKSPACE.MEMBERS]: [
         SCREENS.WORKSPACE.INVITE,
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index faea5965fee4..5620392606b4 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -4,7 +4,7 @@ import type {IOUType} from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.ALL);
+    return true; // !!betas?.includes(CONST.BETAS.ALL);
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index 2c966eebeea4..11f357071728 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -204,6 +204,13 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                     return;
                 }
                 if (isEnabled) {
+                    if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+                        Navigation.navigate(
+                            ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.alias, ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)),
+                        );
+                        return;
+                    }
+
                     Policy.enablePolicyReportFields(policyID, true);
                     return;
                 }
diff --git a/src/pages/workspace/upgrade/UpgradeIntro.tsx b/src/pages/workspace/upgrade/UpgradeIntro.tsx
index 137d699edf13..6af205f6e693 100644
--- a/src/pages/workspace/upgrade/UpgradeIntro.tsx
+++ b/src/pages/workspace/upgrade/UpgradeIntro.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
+import type {ValueOf} from 'type-fest';
 import Badge from '@components/Badge';
 import Button from '@components/Button';
 import Icon from '@components/Icon';
@@ -18,7 +19,7 @@ import ROUTES from '@src/ROUTES';
 type Props = {
     buttonDisabled?: boolean;
     loading?: boolean;
-    feature: (typeof CONST.UPGRADE_FEATURE_INTRO_MAPPING)[0];
+    feature: ValueOf<typeof CONST.UPGRADE_FEATURE_INTRO_MAPPING>;
     onUpgrade: () => void;
 };
 
@@ -26,13 +27,14 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading}: Props) {
     const styles = useThemeStyles();
     const {isExtraSmallScreenWidth, isSmallScreenWidth} = useResponsiveLayout();
     const {translate} = useLocalize();
+    const iconSrc = feature.icon in Illustrations ? Illustrations[feature.icon as keyof typeof Illustrations] : Expensicon[feature.icon as keyof typeof Expensicon];
 
     return (
         <View style={styles.p5}>
             <View style={styles.workspaceUpgradeIntroBox({isExtraSmallScreenWidth, isSmallScreenWidth})}>
                 <View style={[styles.mb3, styles.flexRow, styles.justifyContentBetween]}>
                     <Icon
-                        src={Illustrations[feature.icon]}
+                        src={iconSrc}
                         width={variables.iconSizeExtraLarge}
                         height={variables.iconSizeExtraLarge}
                     />
@@ -46,9 +48,9 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading}: Props) {
                     <Text style={[styles.textHeadlineH1, styles.mb4]}>{translate(feature.title)}</Text>
                     <Text style={[styles.textNormal, styles.textSupporting, styles.mb4]}>{translate(feature.description)}</Text>
                     <Text style={[styles.textNormal, styles.textSupporting]}>
-                        {translate(`workspace.upgrade.${feature.id}.pricing.onlyAvailableOnPlan`)}
-                        <Text style={[styles.themeTextColor, styles.textBold]}>{translate(`workspace.upgrade.${feature.id}.pricing.amount`)}</Text>
-                        {translate(`workspace.upgrade.${feature.id}.pricing.perActiveMember`)}
+                        {translate(`workspace.upgrade.${feature.id}.onlyAvailableOnPlan`)}
+                        <Text style={[styles.themeTextColor, styles.textBold]}>{translate(`workspace.upgrade.pricing.amount`)}</Text>
+                        {translate(`workspace.upgrade.pricing.perActiveMember`)}
                     </Text>
                 </View>
                 <Button
diff --git a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
index 6e5321627872..b10c607e26dd 100644
--- a/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
+++ b/src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx
@@ -19,7 +19,7 @@ type WorkspaceUpgradePageProps = StackScreenProps<SettingsNavigatorParamList, ty
 
 function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
     const policyID = route.params.policyID;
-    const feature = CONST.UPGRADE_FEATURE_INTRO_MAPPING.find((f) => f.alias === route.params.featureName);
+    const feature = Object.values(CONST.UPGRADE_FEATURE_INTRO_MAPPING).find((f) => f.alias === route.params.featureName);
     const {translate} = useLocalize();
     const [policy] = useOnyx(`policy_${policyID}`);
     const {isOffline} = useNetwork();
@@ -41,7 +41,7 @@ function WorkspaceUpgradePage({route}: WorkspaceUpgradePageProps) {
         >
             <HeaderWithBackButton
                 title={translate('common.upgrade')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.WORKSPACE_PROFILE.getRoute(policyID))}
+                onBackButtonPress={() => Navigation.goBack(route.params.backTo ?? ROUTES.WORKSPACE_PROFILE.getRoute(policyID))}
             />
             {isUpgraded && (
                 <UpgradeConfirmation

From 5d162f7af3dcadafde7704a65590873c9a4d3987 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Wed, 10 Jul 2024 21:44:22 +0500
Subject: [PATCH 2/9] permission file changes

---
 src/libs/Permissions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 5620392606b4..faea5965fee4 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -4,7 +4,7 @@ import type {IOUType} from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return true; // !!betas?.includes(CONST.BETAS.ALL);
+    return !!betas?.includes(CONST.BETAS.ALL);
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {

From 8885d840275c43bad83c280f9ff8f13cade2cfd7 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Wed, 10 Jul 2024 21:53:57 +0500
Subject: [PATCH 3/9] add spanish translations

---
 src/languages/es.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/languages/es.ts b/src/languages/es.ts
index 7eb1209ef654..c3de1cd12994 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3350,13 +3350,13 @@ export default {
             },
             netSuite: {
                 title: 'NetSuite',
-                description: `Enjoy automated syncing and reduce manual entries with the Expensify + NetSuite integration. Gain in-depth, realtime financial insights with native and custom segment support, including project and customer mapping.`,
-                onlyAvailableOnPlan: 'Our NetSuite integration is only available on the Control plan, starting at ',
+                description: `Disfruta de la sincronización automática y reduce las entradas manuales con la integración Expensify + NetSuite. Obtén información financiera en profundidad y en tiempo real con la compatibilidad nativa y personalizada con segmentos, incluida la asignación de proyectos y clientes.`,
+                onlyAvailableOnPlan: 'Nuestra integración NetSuite sólo está disponible en el plan Control, a partir de ',
             },
             sageIntacct: {
                 title: 'Sage Intacct',
-                description: `Enjoy automated syncing and reduce manual entries with the Expensify + Sage Intacct integration. Gain in-depth, real-time financial insights with user-defined dimensions, as well as expense coding by department, class, location, customer, and project (job).`,
-                onlyAvailableOnPlan: 'Our Sage Intacct integration is only available on the Control plan, starting at ',
+                description: `Disfruta de una sincronización automatizada y reduce las entradas manuales con la integración Expensify + Sage Intacct. Obtén información financiera en profundidad y en tiempo real con dimensiones definidas por el usuario, así como codificación de gastos por departamento, clase, ubicación, cliente y proyecto (trabajo).`,
+                onlyAvailableOnPlan: 'Nuestra integración Sage Intacct sólo está disponible en el plan Control, a partir de ',
             },
             note: {
                 upgradeWorkspace: 'Mejore su espacio de trabajo para acceder a esta función, o',

From fb2d825e32cd403016283cc90d9e7941768bfb51 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Mon, 15 Jul 2024 13:19:22 +0500
Subject: [PATCH 4/9] add gl codes

---
 src/CONST.ts                                     | 16 ++++++++++++++++
 src/languages/en.ts                              | 10 ++++++++++
 src/languages/es.ts                              | 10 ++++++++++
 .../categories/CategorySettingsPage.tsx          | 16 ++++++++++++++--
 src/pages/workspace/tags/TagSettingsPage.tsx     |  4 ++++
 5 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 4b9240a64cf9..5462b294bd92 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5317,6 +5317,22 @@ const CONST = {
             description: 'workspace.upgrade.sageIntacct.description',
             icon: 'IntacctSquare',
         },
+        glCodes: {
+            id: 'gLCodes',
+            alias: 'gl-codes',
+            name: 'GL codes',
+            title: 'workspace.upgrade.glCodes.title',
+            description: 'workspace.upgrade.glCodes.description',
+            icon: 'Document',
+        },
+        glAndPayrollCodes: {
+            id: 'gLAndPayrollCodes',
+            alias: 'gl-and-payroll-codes',
+            name: 'GL & Payroll codes',
+            title: 'workspace.upgrade.glAndPayrollCodes.title',
+            description: 'workspace.upgrade.glAndPayrollCodes.description',
+            icon: 'Document',
+        },
     },
     REPORT_FIELD_TYPES: {
         TEXT: 'text',
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 80b13d61e14c..23f869fc78df 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3328,6 +3328,16 @@ export default {
                 description: `Enjoy automated syncing and reduce manual entries with the Expensify + Sage Intacct integration. Gain in-depth, real-time financial insights with user-defined dimensions, as well as expense coding by department, class, location, customer, and project (job).`,
                 onlyAvailableOnPlan: 'Our Sage Intacct integration is only available on the Control plan, starting at ',
             },
+            glCodes: {
+                title: 'GL codes',
+                description: `Add GL codes to your categories for easy export of expenses to your accounting and payroll systems.`,
+                onlyAvailableOnPlan: 'GL codes are only available on the Control plan, starting at ',
+            },
+            glAndPayrollCodes: {
+                title: 'GL & Payroll codes',
+                description: `Add GL & Payroll codes to your categories for easy export of expenses to your accounting and payroll systems.`,
+                onlyAvailableOnPlan: 'GL & Payroll codes are only available on the Control plan, starting at ',
+            },
             pricing: {
                 amount: '$9 ',
                 perActiveMember: 'per active member per month.',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 20be1c6af126..0b7d6fe43a0c 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3378,6 +3378,16 @@ export default {
                 description: `Disfruta de una sincronización automatizada y reduce las entradas manuales con la integración Expensify + Sage Intacct. Obtén información financiera en profundidad y en tiempo real con dimensiones definidas por el usuario, así como codificación de gastos por departamento, clase, ubicación, cliente y proyecto (trabajo).`,
                 onlyAvailableOnPlan: 'Nuestra integración Sage Intacct sólo está disponible en el plan Control, a partir de ',
             },
+            glCodes: {
+                title: 'GL codes',
+                description: `Add GL codes to your categories for easy export of expenses to your accounting and payroll systems.`,
+                onlyAvailableOnPlan: 'GL codes are only available on the Control plan, starting at ',
+            },
+            glAndPayrollCodes: {
+                title: 'GL & Payroll codes',
+                description: `Add GL & Payroll codes to your categories for easy export of expenses to your accounting and payroll systems.`,
+                onlyAvailableOnPlan: 'GL & Payroll codes are only available on the Control plan, starting at ',
+            },
             note: {
                 upgradeWorkspace: 'Mejore su espacio de trabajo para acceder a esta función, o',
                 learnMore: 'más información',
diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx
index 959347b621fb..7232a153d8e6 100644
--- a/src/pages/workspace/categories/CategorySettingsPage.tsx
+++ b/src/pages/workspace/categories/CategorySettingsPage.tsx
@@ -140,7 +140,13 @@ function CategorySettingsPage({route, policyCategories, navigation}: CategorySet
                         <MenuItemWithTopDescription
                             title={policyCategory['GL Code']}
                             description={translate(`workspace.categories.glCode`)}
-                            onPress={() => Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_GL_CODE.getRoute(route.params.policyID, policyCategory.name))}
+                            onPress={() => {
+                                if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+                                    Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(route.params.policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias));
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_GL_CODE.getRoute(route.params.policyID, policyCategory.name));
+                            }}
                             shouldShowRightIcon
                         />
                     </OfflineWithFeedback>
@@ -148,7 +154,13 @@ function CategorySettingsPage({route, policyCategories, navigation}: CategorySet
                         <MenuItemWithTopDescription
                             title={policyCategory['Payroll Code']}
                             description={translate(`workspace.categories.payrollCode`)}
-                            onPress={() => Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.getRoute(route.params.policyID, policyCategory.name))}
+                            onPress={() => {
+                                if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+                                    Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(route.params.policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias));
+                                    return;
+                                }
+                                Navigation.navigate(ROUTES.WORKSPACE_CATEGORY_PAYROLL_CODE.getRoute(route.params.policyID, policyCategory.name));
+                            }}
                             shouldShowRightIcon
                             disabled={shouldDisablePayrollCode}
                         />
diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index a059fc4848c7..e1b0cdb5f2b1 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -71,6 +71,10 @@ function TagSettingsPage({route, policyTags, navigation}: TagSettingsPageProps)
     };
 
     const navigateToEditGlCode = () => {
+        if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+            Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(route.params.policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.glCodes.alias));
+            return;
+        }
         Navigation.navigate(ROUTES.WORKSPACE_TAG_GL_CODE.getRoute(route.params.policyID, route.params.orderWeight, currentPolicyTag.name));
     };
 

From 098b5b5cd303417eab8b6aae81045d8b0c3ef13e Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Mon, 15 Jul 2024 14:20:31 +0500
Subject: [PATCH 5/9] handle comments

---
 src/CONST.ts                                        | 8 ++++----
 src/components/ConnectToNetSuiteButton/index.tsx    | 5 +++--
 src/components/ConnectToSageIntacctButton/index.tsx | 7 +++----
 src/libs/Permissions.ts                             | 2 +-
 src/pages/workspace/WorkspaceMoreFeaturesPage.tsx   | 3 ++-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 5462b294bd92..5bb20fb71d2b 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5318,20 +5318,20 @@ const CONST = {
             icon: 'IntacctSquare',
         },
         glCodes: {
-            id: 'gLCodes',
+            id: 'glCodes',
             alias: 'gl-codes',
             name: 'GL codes',
             title: 'workspace.upgrade.glCodes.title',
             description: 'workspace.upgrade.glCodes.description',
-            icon: 'Document',
+            icon: 'Tag',
         },
         glAndPayrollCodes: {
-            id: 'gLAndPayrollCodes',
+            id: 'glAndPayrollCodes',
             alias: 'gl-and-payroll-codes',
             name: 'GL & Payroll codes',
             title: 'workspace.upgrade.glAndPayrollCodes.title',
             description: 'workspace.upgrade.glAndPayrollCodes.description',
-            icon: 'Document',
+            icon: 'FolderOpen',
         },
     },
     REPORT_FIELD_TYPES: {
diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index 72b0b78f45a8..d7e26c324a69 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -7,6 +7,7 @@ import useNetwork from '@hooks/useNetwork';
 import useThemeStyles from '@hooks/useThemeStyles';
 import {removePolicyConnection} from '@libs/actions/connections';
 import Navigation from '@libs/Navigation/Navigation';
+import {isControlPolicy} from '@libs/PolicyUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -24,8 +25,8 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
         <>
             <Button
                 onPress={() => {
-                    if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
-                        Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.netSuite.alias, ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID)));
+                    if (!isControlPolicy(policy)) {
+                        Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.netSuite.alias));
                         return;
                     }
 
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index a095db6f46f2..15fa935db100 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -12,6 +12,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import {removePolicyConnection} from '@libs/actions/connections';
 import {getPoliciesConnectedToSageIntacct} from '@libs/actions/Policy/Policy';
 import Navigation from '@libs/Navigation/Navigation';
+import {isControlPolicy} from '@libs/PolicyUtils';
 import type {AnchorPosition} from '@styles/index';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -61,10 +62,8 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
         <>
             <Button
                 onPress={() => {
-                    if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
-                        Navigation.navigate(
-                            ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.sageIntacct.alias, ROUTES.WORKSPACE_ACCOUNTING.getRoute(policyID)),
-                        );
+                    if (!isControlPolicy(policy)) {
+                        Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.sageIntacct.alias));
                         return;
                     }
 
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 23aabcf3c6d0..2eac6ffa2455 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -4,7 +4,7 @@ import type {IOUType} from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.ALL);
+    return true; // !!betas?.includes(CONST.BETAS.ALL);
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
index 11f357071728..46d897bd0a0f 100644
--- a/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
+++ b/src/pages/workspace/WorkspaceMoreFeaturesPage.tsx
@@ -17,6 +17,7 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {FullScreenNavigatorParamList} from '@libs/Navigation/types';
+import {isControlPolicy} from '@libs/PolicyUtils';
 import * as Category from '@userActions/Policy/Category';
 import * as DistanceRate from '@userActions/Policy/DistanceRate';
 import * as Policy from '@userActions/Policy/Policy';
@@ -204,7 +205,7 @@ function WorkspaceMoreFeaturesPage({policy, route}: WorkspaceMoreFeaturesPagePro
                     return;
                 }
                 if (isEnabled) {
-                    if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+                    if (!isControlPolicy(policy)) {
                         Navigation.navigate(
                             ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.reportFields.alias, ROUTES.WORKSPACE_MORE_FEATURES.getRoute(policyID)),
                         );

From e468be4c123cbee1ecab97dd0a6b981be714ee5a Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Mon, 15 Jul 2024 14:21:56 +0500
Subject: [PATCH 6/9] remove permission changes

---
 src/libs/Permissions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 2eac6ffa2455..23aabcf3c6d0 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -4,7 +4,7 @@ import type {IOUType} from '@src/CONST';
 import type Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return true; // !!betas?.includes(CONST.BETAS.ALL);
+    return !!betas?.includes(CONST.BETAS.ALL);
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {

From 902ca9d026ab6209880f313ee5fefbf27bee7b08 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Mon, 15 Jul 2024 14:24:33 +0500
Subject: [PATCH 7/9] use isControlPolicy

---
 src/pages/workspace/categories/CategorySettingsPage.tsx | 4 ++--
 src/pages/workspace/tags/TagSettingsPage.tsx            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx
index 7232a153d8e6..2732a928b6a4 100644
--- a/src/pages/workspace/categories/CategorySettingsPage.tsx
+++ b/src/pages/workspace/categories/CategorySettingsPage.tsx
@@ -141,7 +141,7 @@ function CategorySettingsPage({route, policyCategories, navigation}: CategorySet
                             title={policyCategory['GL Code']}
                             description={translate(`workspace.categories.glCode`)}
                             onPress={() => {
-                                if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+                                if (!isControlPolicy(policy)) {
                                     Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(route.params.policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias));
                                     return;
                                 }
@@ -155,7 +155,7 @@ function CategorySettingsPage({route, policyCategories, navigation}: CategorySet
                             title={policyCategory['Payroll Code']}
                             description={translate(`workspace.categories.payrollCode`)}
                             onPress={() => {
-                                if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+                                if (!isControlPolicy(policy)) {
                                     Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(route.params.policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.glAndPayrollCodes.alias));
                                     return;
                                 }
diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx
index e1b0cdb5f2b1..d73127593d37 100644
--- a/src/pages/workspace/tags/TagSettingsPage.tsx
+++ b/src/pages/workspace/tags/TagSettingsPage.tsx
@@ -71,7 +71,7 @@ function TagSettingsPage({route, policyTags, navigation}: TagSettingsPageProps)
     };
 
     const navigateToEditGlCode = () => {
-        if (policy?.type !== CONST.POLICY.TYPE.CORPORATE) {
+        if (!PolicyUtils.isControlPolicy(policy)) {
             Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(route.params.policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.glCodes.alias));
             return;
         }

From d00ae772cd41965531f11805efc78d665fb00271 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Mon, 15 Jul 2024 18:10:53 +0500
Subject: [PATCH 8/9] update translations

---
 src/languages/en.ts |  2 +-
 src/languages/es.ts | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 23f869fc78df..1ef9cce28c21 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3330,7 +3330,7 @@ export default {
             },
             glCodes: {
                 title: 'GL codes',
-                description: `Add GL codes to your categories for easy export of expenses to your accounting and payroll systems.`,
+                description: `Add GL codes to your categories and tags for easy export of expenses to your accounting and payroll systems.`,
                 onlyAvailableOnPlan: 'GL codes are only available on the Control plan, starting at ',
             },
             glAndPayrollCodes: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 0b7d6fe43a0c..6803f0c09152 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3379,14 +3379,14 @@ export default {
                 onlyAvailableOnPlan: 'Nuestra integración Sage Intacct sólo está disponible en el plan Control, a partir de ',
             },
             glCodes: {
-                title: 'GL codes',
-                description: `Add GL codes to your categories for easy export of expenses to your accounting and payroll systems.`,
-                onlyAvailableOnPlan: 'GL codes are only available on the Control plan, starting at ',
+                title: 'Códigos de libro mayor',
+                description: `Añada códigos de libro mayor a sus categorías para exportar fácilmente los gastos a sus sistemas de contabilidad y nómina.`,
+                onlyAvailableOnPlan: 'Los códigos de libro mayor solo están disponibles en el plan Control, a partir de ',
             },
             glAndPayrollCodes: {
-                title: 'GL & Payroll codes',
-                description: `Add GL & Payroll codes to your categories for easy export of expenses to your accounting and payroll systems.`,
-                onlyAvailableOnPlan: 'GL & Payroll codes are only available on the Control plan, starting at ',
+                title: 'Códigos de libro mayor y nómina',
+                description: `Añada códigos de libro mayor y nómina a sus categorías para exportar fácilmente los gastos a sus sistemas de contabilidad y nómina.`,
+                onlyAvailableOnPlan: 'Los códigos de libro mayor y nómina solo están disponibles en el plan Control, a partir de ',
             },
             note: {
                 upgradeWorkspace: 'Mejore su espacio de trabajo para acceder a esta función, o',

From 03863a65c01cea8f56030006d25443e6a8dfe2d7 Mon Sep 17 00:00:00 2001
From: Sibtain Ali <allroundexperts@gmail.com>
Date: Wed, 17 Jul 2024 20:25:55 +0500
Subject: [PATCH 9/9] handle comments

---
 src/CONST.ts                                  | 84 ++++++++++---------
 .../ConnectToNetSuiteButton/index.tsx         |  2 +-
 .../ConnectToSageIntacctButton/index.tsx      |  2 +-
 src/languages/en.ts                           |  4 +-
 src/languages/es.ts                           |  4 +-
 src/pages/workspace/upgrade/UpgradeIntro.tsx  | 14 ++--
 6 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index c3812c7f30d4..eb409e1fb838 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -5313,47 +5313,49 @@ const CONST = {
         ILLUSTRATION: 'illustration',
         VIDEO: 'video',
     },
-    UPGRADE_FEATURE_INTRO_MAPPING: {
-        reportFields: {
-            id: 'reportFields',
-            alias: 'report-fields',
-            name: 'Report Fields',
-            title: 'workspace.upgrade.reportFields.title',
-            description: 'workspace.upgrade.reportFields.description',
-            icon: 'Pencil',
-        },
-        netSuite: {
-            id: 'netSuite',
-            alias: 'netsuite',
-            name: 'NetSuite',
-            title: 'workspace.upgrade.netSuite.title',
-            description: 'workspace.upgrade.netSuite.description',
-            icon: 'NetSuiteSquare',
-        },
-        sageIntacct: {
-            id: 'sageIntacct',
-            alias: 'sage-intacct',
-            name: 'Sage Intacct',
-            title: 'workspace.upgrade.sageIntacct.title',
-            description: 'workspace.upgrade.sageIntacct.description',
-            icon: 'IntacctSquare',
-        },
-        glCodes: {
-            id: 'glCodes',
-            alias: 'gl-codes',
-            name: 'GL codes',
-            title: 'workspace.upgrade.glCodes.title',
-            description: 'workspace.upgrade.glCodes.description',
-            icon: 'Tag',
-        },
-        glAndPayrollCodes: {
-            id: 'glAndPayrollCodes',
-            alias: 'gl-and-payroll-codes',
-            name: 'GL & Payroll codes',
-            title: 'workspace.upgrade.glAndPayrollCodes.title',
-            description: 'workspace.upgrade.glAndPayrollCodes.description',
-            icon: 'FolderOpen',
-        },
+    get UPGRADE_FEATURE_INTRO_MAPPING() {
+        return {
+            reportFields: {
+                id: 'reportFields' as const,
+                alias: 'report-fields',
+                name: 'Report Fields',
+                title: 'workspace.upgrade.reportFields.title' as const,
+                description: 'workspace.upgrade.reportFields.description' as const,
+                icon: 'Pencil',
+            },
+            [this.POLICY.CONNECTIONS.NAME.NETSUITE]: {
+                id: this.POLICY.CONNECTIONS.NAME.NETSUITE,
+                alias: 'netsuite',
+                name: this.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.netsuite,
+                title: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.NETSUITE}.title` as const,
+                description: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.NETSUITE}.description` as const,
+                icon: 'NetSuiteSquare',
+            },
+            [this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: {
+                id: this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT,
+                alias: 'sage-intacct',
+                name: this.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.intacct,
+                title: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}.title` as const,
+                description: `workspace.upgrade.${this.POLICY.CONNECTIONS.NAME.SAGE_INTACCT}.description` as const,
+                icon: 'IntacctSquare',
+            },
+            glCodes: {
+                id: 'glCodes' as const,
+                alias: 'gl-codes',
+                name: 'GL codes',
+                title: 'workspace.upgrade.glCodes.title' as const,
+                description: 'workspace.upgrade.glCodes.description' as const,
+                icon: 'Tag',
+            },
+            glAndPayrollCodes: {
+                id: 'glAndPayrollCodes' as const,
+                alias: 'gl-and-payroll-codes',
+                name: 'GL & Payroll codes',
+                title: 'workspace.upgrade.glAndPayrollCodes.title' as const,
+                description: 'workspace.upgrade.glAndPayrollCodes.description' as const,
+                icon: 'FolderOpen',
+            },
+        };
     },
     REPORT_FIELD_TYPES: {
         TEXT: 'text',
diff --git a/src/components/ConnectToNetSuiteButton/index.tsx b/src/components/ConnectToNetSuiteButton/index.tsx
index b76594dec69f..928bc01f12c1 100644
--- a/src/components/ConnectToNetSuiteButton/index.tsx
+++ b/src/components/ConnectToNetSuiteButton/index.tsx
@@ -56,7 +56,7 @@ function ConnectToNetSuiteButton({policyID, shouldDisconnectIntegrationBeforeCon
             <Button
                 onPress={() => {
                     if (!isControlPolicy(policy)) {
-                        Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.netSuite.alias));
+                        Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.netsuite.alias));
                         return;
                     }
 
diff --git a/src/components/ConnectToSageIntacctButton/index.tsx b/src/components/ConnectToSageIntacctButton/index.tsx
index cdd46569dcbe..6c6523ad6e75 100644
--- a/src/components/ConnectToSageIntacctButton/index.tsx
+++ b/src/components/ConnectToSageIntacctButton/index.tsx
@@ -63,7 +63,7 @@ function ConnectToSageIntacctButton({policyID, shouldDisconnectIntegrationBefore
             <Button
                 onPress={() => {
                     if (!isControlPolicy(policy)) {
-                        Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.sageIntacct.alias));
+                        Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.intacct.alias));
                         return;
                     }
 
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 73e1da89dc43..58b712e33c30 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -3347,12 +3347,12 @@ export default {
                 description: `Report fields let you specify header-level details, distinct from tags that pertain to expenses on individual line items. These details can encompass specific project names, business trip information, locations, and more.`,
                 onlyAvailableOnPlan: 'Report fields are only available on the Control plan, starting at ',
             },
-            netSuite: {
+            [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
                 title: 'NetSuite',
                 description: `Enjoy automated syncing and reduce manual entries with the Expensify + NetSuite integration. Gain in-depth, realtime financial insights with native and custom segment support, including project and customer mapping.`,
                 onlyAvailableOnPlan: 'Our NetSuite integration is only available on the Control plan, starting at ',
             },
-            sageIntacct: {
+            [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: {
                 title: 'Sage Intacct',
                 description: `Enjoy automated syncing and reduce manual entries with the Expensify + Sage Intacct integration. Gain in-depth, real-time financial insights with user-defined dimensions, as well as expense coding by department, class, location, customer, and project (job).`,
                 onlyAvailableOnPlan: 'Our Sage Intacct integration is only available on the Control plan, starting at ',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e693149c0c06..cbe2fc4bf088 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -3401,12 +3401,12 @@ export default {
                 description: `Los campos de informe permiten especificar detalles a nivel de cabecera, distintos de las etiquetas que pertenecen a los gastos en partidas individuales. Estos detalles pueden incluir nombres de proyectos específicos, información sobre viajes de negocios, ubicaciones, etc.`,
                 onlyAvailableOnPlan: 'Los campos de informe sólo están disponibles en el plan Control, a partir de ',
             },
-            netSuite: {
+            [CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {
                 title: 'NetSuite',
                 description: `Disfruta de la sincronización automática y reduce las entradas manuales con la integración Expensify + NetSuite. Obtén información financiera en profundidad y en tiempo real con la compatibilidad nativa y personalizada con segmentos, incluida la asignación de proyectos y clientes.`,
                 onlyAvailableOnPlan: 'Nuestra integración NetSuite sólo está disponible en el plan Control, a partir de ',
             },
-            sageIntacct: {
+            [CONST.POLICY.CONNECTIONS.NAME.SAGE_INTACCT]: {
                 title: 'Sage Intacct',
                 description: `Disfruta de una sincronización automatizada y reduce las entradas manuales con la integración Expensify + Sage Intacct. Obtén información financiera en profundidad y en tiempo real con dimensiones definidas por el usuario, así como codificación de gastos por departamento, clase, ubicación, cliente y proyecto (trabajo).`,
                 onlyAvailableOnPlan: 'Nuestra integración Sage Intacct sólo está disponible en el plan Control, a partir de ',
diff --git a/src/pages/workspace/upgrade/UpgradeIntro.tsx b/src/pages/workspace/upgrade/UpgradeIntro.tsx
index 6af205f6e693..3089e0244184 100644
--- a/src/pages/workspace/upgrade/UpgradeIntro.tsx
+++ b/src/pages/workspace/upgrade/UpgradeIntro.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import {View} from 'react-native';
 import type {ValueOf} from 'type-fest';
+import Avatar from '@components/Avatar';
 import Badge from '@components/Badge';
 import Button from '@components/Button';
-import Icon from '@components/Icon';
 import * as Expensicon from '@components/Icon/Expensicons';
 import * as Illustrations from '@components/Icon/Illustrations';
 import Text from '@components/Text';
@@ -12,8 +12,7 @@ import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
-import variables from '@styles/variables';
-import type CONST from '@src/CONST';
+import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
 type Props = {
@@ -33,10 +32,9 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading}: Props) {
         <View style={styles.p5}>
             <View style={styles.workspaceUpgradeIntroBox({isExtraSmallScreenWidth, isSmallScreenWidth})}>
                 <View style={[styles.mb3, styles.flexRow, styles.justifyContentBetween]}>
-                    <Icon
-                        src={iconSrc}
-                        width={variables.iconSizeExtraLarge}
-                        height={variables.iconSizeExtraLarge}
+                    <Avatar
+                        type={CONST.ICON_TYPE_AVATAR}
+                        source={iconSrc}
                     />
                     <Badge
                         icon={Expensicon.Unlock}
@@ -49,7 +47,7 @@ function UpgradeIntro({feature, onUpgrade, buttonDisabled, loading}: Props) {
                     <Text style={[styles.textNormal, styles.textSupporting, styles.mb4]}>{translate(feature.description)}</Text>
                     <Text style={[styles.textNormal, styles.textSupporting]}>
                         {translate(`workspace.upgrade.${feature.id}.onlyAvailableOnPlan`)}
-                        <Text style={[styles.themeTextColor, styles.textBold]}>{translate(`workspace.upgrade.pricing.amount`)}</Text>
+                        <Text style={[styles.textSupporting, styles.textBold]}>{translate(`workspace.upgrade.pricing.amount`)}</Text>
                         {translate(`workspace.upgrade.pricing.perActiveMember`)}
                     </Text>
                 </View>