Merge pull request Expensify#67477 from daledah/fix/65697

fix: default new WS to Control if user is in annual subscription

Author: stitesExpensify

src/libs/API/parameters/CreateWorkspaceParams.ts

@@ -16,6 +16,7 @@ type CreateWorkspaceParams = {
     file?: File;
     companySize?: string;
     userReportedIntegration?: string;
+    isAnnualSubscription?: boolean;
 };
 
 export default CreateWorkspaceParams;

src/libs/actions/App.ts

@@ -435,7 +435,9 @@ function endSignOnTransition() {
  * @param [currency] Optional, selected currency for the workspace
  * @param [file], avatar file for workspace
  * @param [routeToNavigateAfterCreate], Optional, route to navigate after creating a workspace
+ * @param [isAnnualSubscription] Optional, does user have an annual subscription
  */
+// eslint-disable-next-line @typescript-eslint/max-params
 function createWorkspaceWithPolicyDraftAndNavigateToIt(
     policyOwnerEmail = '',
     policyName = '',
@@ -447,6 +449,7 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt(
     file?: File,
     routeToNavigateAfterCreate?: Route,
     lastUsedPaymentMethod?: OnyxTypes.LastPaymentMethodType,
+    isAnnualSubscription = false,
 ) {
     const policyIDWithDefault = policyID || generatePolicyID();
     createDraftInitialWorkspace(policyOwnerEmail, policyName, policyIDWithDefault, makeMeAdmin, currency, file);
@@ -457,7 +460,7 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt(
                 Navigation.goBack();
             }
             const routeToNavigate = routeToNavigateAfterCreate ?? ROUTES.WORKSPACE_INITIAL.getRoute(policyIDWithDefault, backTo);
-            savePolicyDraftByNewWorkspace(policyIDWithDefault, policyName, policyOwnerEmail, makeMeAdmin, currency, file, lastUsedPaymentMethod);
+            savePolicyDraftByNewWorkspace(policyIDWithDefault, policyName, policyOwnerEmail, makeMeAdmin, currency, file, lastUsedPaymentMethod, isAnnualSubscription);
             Navigation.navigate(routeToNavigate, {forceReplace: !transitionFromOldDot});
         })
         .then(endSignOnTransition);
@@ -472,6 +475,7 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt(
  * @param [makeMeAdmin] Optional, leave the calling account as an admin on the policy
  * @param [currency] Optional, selected currency for the workspace
  * @param [file] Optional, avatar file for workspace
+ * @param [isAnnualSubscription] Optional, does user have an annual subscription
  */
 function savePolicyDraftByNewWorkspace(
     policyID?: string,
@@ -481,6 +485,7 @@ function savePolicyDraftByNewWorkspace(
     currency = '',
     file?: File,
     lastUsedPaymentMethod?: OnyxTypes.LastPaymentMethodType,
+    isAnnualSubscription = false,
 ) {
     createWorkspace({
         policyOwnerEmail,
@@ -491,6 +496,7 @@ function savePolicyDraftByNewWorkspace(
         currency,
         file,
         lastUsedPaymentMethod,
+        isAnnualSubscription,
     });
 }
 

src/libs/actions/Policy/Policy.ts

@@ -157,6 +157,7 @@ type BuildPolicyDataOptions = {
     shouldAddOnboardingTasks?: boolean;
     companySize?: OnboardingCompanySize;
     userReportedIntegration?: OnboardingAccounting;
+    isAnnualSubscription?: boolean;
     featuresMap?: Feature[];
     lastUsedPaymentMethod?: LastPaymentMethodType;
 };
@@ -1850,8 +1851,9 @@ function buildOptimisticDistanceRateCustomUnits(reportCurrency?: string): Optimi
  * @param [makeMeAdmin] leave the calling account as an admin on the policy
  * @param [currency] Optional, selected currency for the workspace
  * @param [file], avatar file for workspace
+ * @param [isAnnualSubscription] Optional, does user have an annual subscription
  */
-function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', policyID = generatePolicyID(), makeMeAdmin = false, currency = '', file?: File) {
+function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', policyID = generatePolicyID(), makeMeAdmin = false, currency = '', file?: File, isAnnualSubscription = false) {
     const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail);
     const {customUnits, outputCurrency} = buildOptimisticDistanceRateCustomUnits(currency);
     const shouldEnableWorkflowsByDefault =
@@ -1863,15 +1865,15 @@ function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', pol
             key: `${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`,
             value: {
                 id: policyID,
-                type: CONST.POLICY.TYPE.TEAM,
+                type: isAnnualSubscription ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM,
                 name: workspaceName,
                 role: CONST.POLICY.ROLE.ADMIN,
                 owner: sessionEmail,
                 ownerAccountID: sessionAccountID,
                 isPolicyExpenseChatEnabled: true,
                 areCategoriesEnabled: true,
                 approver: sessionEmail,
-                areCompanyCardsEnabled: true,
+                areCompanyCardsEnabled: !isAnnualSubscription,
                 areExpensifyCardsEnabled: false,
                 outputCurrency,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
@@ -1936,6 +1938,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) {
         shouldAddOnboardingTasks = true,
         companySize,
         userReportedIntegration,
+        isAnnualSubscription = false,
         featuresMap,
         lastUsedPaymentMethod,
     } = options;
@@ -1969,7 +1972,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) {
     // Determine workspace type based on selected features or user reported integration
     const isCorporateFeature = featuresMap?.some((feature) => !feature.enabledByDefault && feature.enabled && feature.requiresUpdate) ?? false;
     const isCorporateIntegration = userReportedIntegration && (CONST.POLICY.CONNECTIONS.CORPORATE as readonly string[]).includes(userReportedIntegration);
-    const workspaceType = isCorporateFeature || isCorporateIntegration ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;
+    const workspaceType = isCorporateFeature || !!isCorporateIntegration || isAnnualSubscription ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;
 
     // WARNING: The data below should be kept in sync with the API so we create the policy with the correct configuration.
     const optimisticData: OnyxUpdate[] = [
@@ -1996,7 +1999,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) {
                 },
                 customUnits,
                 areCategoriesEnabled: true,
-                areCompanyCardsEnabled: true,
+                areCompanyCardsEnabled: workspaceType === CONST.POLICY.TYPE.TEAM,
                 areTagsEnabled: false,
                 areDistanceRatesEnabled: false,
                 areWorkflowsEnabled: shouldEnableWorkflowsByDefault,

src/pages/workspace/WorkspaceConfirmationPage.tsx

@@ -7,6 +7,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import {createWorkspaceWithPolicyDraftAndNavigateToIt} from '@libs/actions/App';
 import {generatePolicyID} from '@libs/actions/Policy/Policy';
 import getCurrentUrl from '@libs/Navigation/currentUrl';
+import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {LastPaymentMethodType} from '@src/types/onyx';
@@ -16,6 +17,8 @@ function WorkspaceConfirmationPage() {
     // shouldUseNarrowLayout cannot be used to determine that as this screen is displayed in RHP and shouldUseNarrowLayout always returns true.
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
     const {isSmallScreenWidth} = useResponsiveLayout();
+    const [privateSubscription] = useOnyx(ONYXKEYS.NVP_PRIVATE_SUBSCRIPTION, {canBeMissing: false});
+    const isAnnualSubscription = privateSubscription?.type === CONST.SUBSCRIPTION.TYPE.ANNUAL;
     const [lastPaymentMethod] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD, {canBeMissing: true});
     const onSubmit = (params: WorkspaceConfirmationSubmitFunctionParams) => {
         const policyID = params.policyID || generatePolicyID();
@@ -31,6 +34,7 @@ function WorkspaceConfirmationPage() {
             params.avatarFile as File,
             routeToNavigate,
             lastPaymentMethod?.[policyID] as LastPaymentMethodType,
+            isAnnualSubscription,
         );
     };
     const currentUrl = getCurrentUrl();