From ad503fc24ccb5fd2e0acc77e0b9cc2c5882fd514 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 24 Sep 2025 16:33:13 +0700 Subject: [PATCH 1/6] update createWorkspace API params --- .../API/parameters/CreateWorkspaceParams.ts | 1 + src/libs/actions/Policy/Policy.ts | 69 +------------------ .../BaseOnboardingInterestedFeatures.tsx | 22 ++---- .../OnboardingInterestedFeatures/types.ts | 3 - 4 files changed, 8 insertions(+), 87 deletions(-) diff --git a/src/libs/API/parameters/CreateWorkspaceParams.ts b/src/libs/API/parameters/CreateWorkspaceParams.ts index 2c84acc79b07..be05cd6582b4 100644 --- a/src/libs/API/parameters/CreateWorkspaceParams.ts +++ b/src/libs/API/parameters/CreateWorkspaceParams.ts @@ -18,6 +18,7 @@ type CreateWorkspaceParams = { userReportedIntegration?: string; areDistanceRatesEnabled?: boolean; memberData?: string; + selectedFeatures?: string[]; }; export default CreateWorkspaceParams; diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 9e6eac38b01a..8fbad6745538 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -68,7 +68,6 @@ import type { } from '@libs/API/parameters'; import type SetPolicyCashExpenseModeParams from '@libs/API/parameters/SetPolicyCashExpenseModeParams'; import type UpdatePolicyMembersCustomFieldsParams from '@libs/API/parameters/UpdatePolicyMembersCustomFieldsParams'; -import type {ApiRequestCommandParameters} from '@libs/API/types'; import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types'; import * as CurrencyUtils from '@libs/CurrencyUtils'; @@ -90,7 +89,6 @@ import type {PolicySelector} from '@pages/home/sidebar/FloatingActionButtonAndPo import type {Feature} from '@pages/OnboardingInterestedFeatures/types'; import * as PaymentMethods from '@userActions/PaymentMethods'; import * as PersistedRequests from '@userActions/PersistedRequests'; -import type {EnablePolicyFeatureCommand} from '@userActions/RequestConflictUtils'; import {buildTaskData} from '@userActions/Task'; import {getOnboardingMessages} from '@userActions/Welcome/OnboardingFlow'; import type {OnboardingCompanySize, OnboardingPurpose} from '@userActions/Welcome/OnboardingFlow'; @@ -174,6 +172,7 @@ type BuildPolicyDataOptions = { lastUsedPaymentMethod?: LastPaymentMethodType; areDistanceRatesEnabled?: boolean; adminParticipant?: Participant; + selectedFeatures?: string[]; }; type DuplicatePolicyDataOptions = { @@ -1968,6 +1967,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { lastUsedPaymentMethod, areDistanceRatesEnabled, adminParticipant, + selectedFeatures, } = options; const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail); @@ -2332,6 +2332,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { companySize, userReportedIntegration: userReportedIntegration ?? undefined, areDistanceRatesEnabled, + selectedFeatures, }; if ( @@ -6221,69 +6222,6 @@ function setIsComingFromGlobalReimbursementsFlow(value: boolean) { Onyx.set(ONYXKEYS.IS_COMING_FROM_GLOBAL_REIMBURSEMENTS_FLOW, value); } -function updateFeature( - request: { - endpoint: EnablePolicyFeatureCommand | typeof WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM; - parameters: ApiRequestCommandParameters[EnablePolicyFeatureCommand | typeof WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM]; - }, - policyID: string, -) { - if (request.endpoint === WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM) { - API.write(WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM, { - policyID, - enabled: request.parameters.enabled, - customUnitID: generateCustomUnitID(), - }); - return; - } - // eslint-disable-next-line rulesdir/no-multiple-api-calls - API.writeWithNoDuplicatesEnableFeatureConflicts(request.endpoint, request.parameters); -} - -function updateInterestedFeatures(features: Feature[], policyID: string, type: string | undefined) { - let shouldUpgradeToCorporate = false; - - const requests: Array<{ - endpoint: EnablePolicyFeatureCommand | typeof WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM; - parameters: ApiRequestCommandParameters[EnablePolicyFeatureCommand | typeof WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM]; - }> = []; - - features.forEach((feature) => { - // If the feature is not enabled by default but it's enabled now, we need to enable it - if (!feature.enabledByDefault && feature.enabled) { - if (feature.requiresUpdate && !shouldUpgradeToCorporate) { - shouldUpgradeToCorporate = true; - } - requests.push({ - endpoint: feature.apiEndpoint, - parameters: { - policyID, - enabled: true, - }, - }); - } - // If the feature is enabled by default but it's not enabled now, we need to disable it - if (feature.enabledByDefault && !feature.enabled) { - requests.push({ - endpoint: feature.apiEndpoint, - parameters: { - policyID, - enabled: false, - }, - }); - } - }); - - const isCorporate = type === CONST.POLICY.TYPE.CORPORATE; - if (shouldUpgradeToCorporate && !isCorporate) { - API.write(WRITE_COMMANDS.UPGRADE_TO_CORPORATE, {policyID}); - } - - requests.forEach((request) => { - updateFeature(request, policyID); - }); -} - function clearPolicyTitleFieldError(policyID: string) { if (!policyID) { return; @@ -6415,7 +6353,6 @@ export { setPolicyAttendeeTrackingEnabled, setPolicyReimbursableMode, getCashExpenseReimbursableMode, - updateInterestedFeatures, clearPolicyTitleFieldError, inviteWorkspaceEmployeesToUber, }; diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx index eeddbac1a926..734dbdd3b984 100644 --- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx +++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx @@ -22,10 +22,9 @@ import usePrevious from '@hooks/usePrevious'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeStyles from '@hooks/useThemeStyles'; import {openOldDotLink} from '@libs/actions/Link'; -import {createWorkspace, generatePolicyID, updateInterestedFeatures} from '@libs/actions/Policy/Policy'; +import {createWorkspace, generatePolicyID} from '@libs/actions/Policy/Policy'; import {completeOnboarding} from '@libs/actions/Report'; import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@libs/actions/Welcome'; -import {WRITE_COMMANDS} from '@libs/API/types'; import {navigateAfterOnboardingWithMicrotaskQueue} from '@libs/navigateAfterOnboarding'; import Navigation from '@libs/Navigation/Navigation'; import {waitForIdle} from '@libs/Network/SequentialQueue'; @@ -73,65 +72,55 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin title: translate('workspace.moreFeatures.categories.title'), icon: Illustrations.FolderOpen, enabledByDefault: true, - apiEndpoint: WRITE_COMMANDS.ENABLE_POLICY_CATEGORIES, }, { id: FEATURE_IDS.ACCOUNTING, title: translate('workspace.moreFeatures.connections.title'), icon: Illustrations.Accounting, enabledByDefault: !!userReportedIntegration, - apiEndpoint: WRITE_COMMANDS.ENABLE_POLICY_CONNECTIONS, }, { id: FEATURE_IDS.COMPANY_CARDS, title: translate('workspace.moreFeatures.companyCards.title'), icon: Illustrations.CompanyCard, enabledByDefault: true, - apiEndpoint: WRITE_COMMANDS.ENABLE_POLICY_COMPANY_CARDS, }, { id: FEATURE_IDS.WORKFLOWS, title: translate('workspace.moreFeatures.workflows.title'), icon: Illustrations.Workflows, enabledByDefault: true, - apiEndpoint: WRITE_COMMANDS.ENABLE_POLICY_WORKFLOWS, }, { id: FEATURE_IDS.INVOICES, title: translate('workspace.moreFeatures.invoices.title'), icon: Illustrations.InvoiceBlue, - apiEndpoint: WRITE_COMMANDS.ENABLE_POLICY_INVOICING, }, { id: FEATURE_IDS.RULES, title: translate('workspace.moreFeatures.rules.title'), icon: Illustrations.Rules, - apiEndpoint: WRITE_COMMANDS.SET_POLICY_RULES_ENABLED, requiresUpdate: true, }, { id: FEATURE_IDS.DISTANCE_RATES, title: translate('workspace.moreFeatures.distanceRates.title'), icon: Illustrations.Car, - apiEndpoint: WRITE_COMMANDS.ENABLE_POLICY_DISTANCE_RATES, }, { id: FEATURE_IDS.EXPENSIFY_CARD, title: translate('workspace.moreFeatures.expensifyCard.title'), icon: Illustrations.HandCard, - apiEndpoint: WRITE_COMMANDS.ENABLE_POLICY_EXPENSIFY_CARDS, }, { id: FEATURE_IDS.TAGS, title: translate('workspace.moreFeatures.tags.title'), icon: Illustrations.Tag, - apiEndpoint: WRITE_COMMANDS.ENABLE_POLICY_TAGS, }, { id: FEATURE_IDS.PER_DIEM, title: translate('workspace.moreFeatures.perDiem.title'), icon: Illustrations.PerDiem, - apiEndpoint: WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM, requiresUpdate: true, }, ]; @@ -178,7 +167,7 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin // We need `adminsChatReportID` for `completeOnboarding`, but at the same time, we don't want to call `createWorkspace` more than once. // If we have already created a workspace, we want to reuse the `onboardingAdminsChatReportID` and `onboardingPolicyID`. - const {adminsChatReportID, policyID, type} = shouldCreateWorkspace + const {adminsChatReportID, policyID} = shouldCreateWorkspace ? createWorkspace({ policyOwnerEmail: undefined, makeMeAdmin: true, @@ -191,12 +180,9 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin companySize: onboardingCompanySize, userReportedIntegration: newUserReportedIntegration, featuresMap, + selectedFeatures, }) - : {adminsChatReportID: onboardingAdminsChatReportID, policyID: onboardingPolicyID, type: undefined}; - - if (policyID) { - updateInterestedFeatures(featuresMap, policyID, type); - } + : {adminsChatReportID: onboardingAdminsChatReportID, policyID: onboardingPolicyID}; if (shouldCreateWorkspace) { setOnboardingAdminsChatReportID(adminsChatReportID); diff --git a/src/pages/OnboardingInterestedFeatures/types.ts b/src/pages/OnboardingInterestedFeatures/types.ts index ac2d50e73b69..a13dd2e4add5 100644 --- a/src/pages/OnboardingInterestedFeatures/types.ts +++ b/src/pages/OnboardingInterestedFeatures/types.ts @@ -1,5 +1,3 @@ -import type {EnablePolicyFeatureCommand} from '@libs/actions/RequestConflictUtils'; -import type {WRITE_COMMANDS} from '@libs/API/types'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {OnboardingModalNavigatorParamList} from '@libs/Navigation/types'; import type SCREENS from '@src/SCREENS'; @@ -17,7 +15,6 @@ type Feature = { title: string; icon: IconAsset; enabledByDefault?: boolean; - apiEndpoint: EnablePolicyFeatureCommand | typeof WRITE_COMMANDS.TOGGLE_POLICY_PER_DIEM; requiresUpdate?: boolean; enabled?: boolean; }; From 11efeb54f0e69a57e3d6e8689462b5a9cbbe939d Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 25 Sep 2025 11:17:42 +0700 Subject: [PATCH 2/6] update interested feature key --- src/CONST/index.ts | 23 ++++--------------- .../API/parameters/CreateWorkspaceParams.ts | 2 +- src/libs/actions/Policy/Policy.ts | 2 +- .../BaseOnboardingInterestedFeatures.tsx | 22 +++++++++--------- 4 files changed, 18 insertions(+), 31 deletions(-) diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 9395b1b2ea43..0b28d89f36ce 100755 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -7271,24 +7271,11 @@ const CONTINUATION_DETECTION_SEARCH_FILTER_KEYS = [ CONST.SEARCH.SYNTAX_FILTER_KEYS.ATTENDEE, ] as SearchFilterKey[]; -const FEATURE_IDS = { - CATEGORIES: 'categories', - ACCOUNTING: 'accounting', - COMPANY_CARDS: 'company-cards', - TAGS: 'tags', - WORKFLOWS: 'workflows', - INVOICES: 'invoices', - RULES: 'rules', - PER_DIEM: 'per-diem', - DISTANCE_RATES: 'distance-rates', - EXPENSIFY_CARD: 'expensify-card', -}; - const TASK_TO_FEATURE: Record = { - [CONST.ONBOARDING_TASK_TYPE.SETUP_CATEGORIES]: FEATURE_IDS.CATEGORIES, - [CONST.ONBOARDING_TASK_TYPE.ADD_ACCOUNTING_INTEGRATION]: FEATURE_IDS.ACCOUNTING, - [CONST.ONBOARDING_TASK_TYPE.CONNECT_CORPORATE_CARD]: FEATURE_IDS.COMPANY_CARDS, - [CONST.ONBOARDING_TASK_TYPE.SETUP_TAGS]: FEATURE_IDS.TAGS, + [CONST.ONBOARDING_TASK_TYPE.SETUP_CATEGORIES]: CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED, + [CONST.ONBOARDING_TASK_TYPE.ADD_ACCOUNTING_INTEGRATION]: CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED, + [CONST.ONBOARDING_TASK_TYPE.CONNECT_CORPORATE_CARD]: CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED, + [CONST.ONBOARDING_TASK_TYPE.SETUP_TAGS]: CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED, }; const FRAUD_PROTECTION_EVENT = { @@ -7320,6 +7307,6 @@ type CancellationType = ValueOf; export type {Country, IOUAction, IOUType, IOURequestType, SubscriptionType, FeedbackSurveyOptionID, CancellationType, OnboardingInvite, OnboardingAccounting, IOUActionParams}; -export {CONTINUATION_DETECTION_SEARCH_FILTER_KEYS, TASK_TO_FEATURE, FEATURE_IDS, FRAUD_PROTECTION_EVENT}; +export {CONTINUATION_DETECTION_SEARCH_FILTER_KEYS, TASK_TO_FEATURE, FRAUD_PROTECTION_EVENT}; export default CONST; diff --git a/src/libs/API/parameters/CreateWorkspaceParams.ts b/src/libs/API/parameters/CreateWorkspaceParams.ts index be05cd6582b4..07415d97bd9a 100644 --- a/src/libs/API/parameters/CreateWorkspaceParams.ts +++ b/src/libs/API/parameters/CreateWorkspaceParams.ts @@ -18,7 +18,7 @@ type CreateWorkspaceParams = { userReportedIntegration?: string; areDistanceRatesEnabled?: boolean; memberData?: string; - selectedFeatures?: string[]; + selectedFeatures?: string; }; export default CreateWorkspaceParams; diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 8fbad6745538..3c768f500ced 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -2332,7 +2332,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { companySize, userReportedIntegration: userReportedIntegration ?? undefined, areDistanceRatesEnabled, - selectedFeatures, + selectedFeatures: selectedFeatures ? JSON.stringify(selectedFeatures) : undefined, }; if ( diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx index 734dbdd3b984..4d402352a146 100644 --- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx +++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx @@ -32,7 +32,7 @@ import {shouldOnboardingRedirectToOldDot} from '@libs/OnboardingUtils'; import {isPaidGroupPolicy, isPolicyAdmin} from '@libs/PolicyUtils'; import {closeReactNativeApp} from '@userActions/HybridApp'; import CONFIG from '@src/CONFIG'; -import CONST, {FEATURE_IDS} from '@src/CONST'; +import CONST from '@src/CONST'; import type {TranslationPaths} from '@src/languages/types'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; @@ -68,57 +68,57 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin const features: Feature[] = useMemo(() => { return [ { - id: FEATURE_IDS.CATEGORIES, + id: CONST.POLICY.MORE_FEATURES.ARE_CATEGORIES_ENABLED, title: translate('workspace.moreFeatures.categories.title'), icon: Illustrations.FolderOpen, enabledByDefault: true, }, { - id: FEATURE_IDS.ACCOUNTING, + id: CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED, title: translate('workspace.moreFeatures.connections.title'), icon: Illustrations.Accounting, enabledByDefault: !!userReportedIntegration, }, { - id: FEATURE_IDS.COMPANY_CARDS, + id: CONST.POLICY.MORE_FEATURES.ARE_COMPANY_CARDS_ENABLED, title: translate('workspace.moreFeatures.companyCards.title'), icon: Illustrations.CompanyCard, enabledByDefault: true, }, { - id: FEATURE_IDS.WORKFLOWS, + id: CONST.POLICY.MORE_FEATURES.ARE_WORKFLOWS_ENABLED, title: translate('workspace.moreFeatures.workflows.title'), icon: Illustrations.Workflows, enabledByDefault: true, }, { - id: FEATURE_IDS.INVOICES, + id: CONST.POLICY.MORE_FEATURES.ARE_INVOICES_ENABLED, title: translate('workspace.moreFeatures.invoices.title'), icon: Illustrations.InvoiceBlue, }, { - id: FEATURE_IDS.RULES, + id: CONST.POLICY.MORE_FEATURES.ARE_RULES_ENABLED, title: translate('workspace.moreFeatures.rules.title'), icon: Illustrations.Rules, requiresUpdate: true, }, { - id: FEATURE_IDS.DISTANCE_RATES, + id: CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED, title: translate('workspace.moreFeatures.distanceRates.title'), icon: Illustrations.Car, }, { - id: FEATURE_IDS.EXPENSIFY_CARD, + id: CONST.POLICY.MORE_FEATURES.ARE_EXPENSIFY_CARDS_ENABLED, title: translate('workspace.moreFeatures.expensifyCard.title'), icon: Illustrations.HandCard, }, { - id: FEATURE_IDS.TAGS, + id: CONST.POLICY.MORE_FEATURES.ARE_TAGS_ENABLED, title: translate('workspace.moreFeatures.tags.title'), icon: Illustrations.Tag, }, { - id: FEATURE_IDS.PER_DIEM, + id: CONST.POLICY.MORE_FEATURES.ARE_PER_DIEM_RATES_ENABLED, title: translate('workspace.moreFeatures.perDiem.title'), icon: Illustrations.PerDiem, requiresUpdate: true, From be8dd0b7c3fb15866844adf80dac85ba227c656c Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 2 Oct 2025 21:24:34 +0700 Subject: [PATCH 3/6] update selectedFeatures --- src/libs/actions/Policy/Policy.ts | 12 +++++++++--- .../BaseOnboardingInterestedFeatures.tsx | 1 - 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 3c768f500ced..11c02cd2e7b8 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -172,7 +172,6 @@ type BuildPolicyDataOptions = { lastUsedPaymentMethod?: LastPaymentMethodType; areDistanceRatesEnabled?: boolean; adminParticipant?: Participant; - selectedFeatures?: string[]; }; type DuplicatePolicyDataOptions = { @@ -1967,7 +1966,6 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { lastUsedPaymentMethod, areDistanceRatesEnabled, adminParticipant, - selectedFeatures, } = options; const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail); @@ -2314,6 +2312,14 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { // We need to clone the file to prevent non-indexable errors. const clonedFile = file ? (createFile(file) as File) : undefined; + const selectedFeaturesMap = featuresMap?.reduce( + (acc, feature) => ({ + ...acc, + [feature.id]: feature.enabled, + }), + {}, + ); + const params: CreateWorkspaceParams = { policyID, adminsChatReportID, @@ -2332,7 +2338,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { companySize, userReportedIntegration: userReportedIntegration ?? undefined, areDistanceRatesEnabled, - selectedFeatures: selectedFeatures ? JSON.stringify(selectedFeatures) : undefined, + selectedFeatures: selectedFeaturesMap ? JSON.stringify(selectedFeaturesMap) : undefined, }; if ( diff --git a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx index 4d402352a146..409a90f525ec 100644 --- a/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx +++ b/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx @@ -180,7 +180,6 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin companySize: onboardingCompanySize, userReportedIntegration: newUserReportedIntegration, featuresMap, - selectedFeatures, }) : {adminsChatReportID: onboardingAdminsChatReportID, policyID: onboardingPolicyID}; From ac0ad18bd1f4ee3d1b69009aef9bf17271fb81d8 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Thu, 2 Oct 2025 22:59:25 +0700 Subject: [PATCH 4/6] update selectedFeaturesMap --- src/libs/actions/Policy/Policy.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index b43860e5618c..30878448c5c4 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -2312,13 +2312,10 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { // We need to clone the file to prevent non-indexable errors. const clonedFile = file ? (createFile(file) as File) : undefined; - const selectedFeaturesMap = featuresMap?.reduce( - (acc, feature) => ({ - ...acc, - [feature.id]: feature.enabled, - }), - {}, - ); + const selectedFeaturesMap = featuresMap?.reduce>((acc, feature) => { + acc[feature.id] = !!feature.enabled; + return acc; + }, {}); const params: CreateWorkspaceParams = { policyID, From 3f28c7e20bce13bfb9f71a707503ed51f7eecc82 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Mon, 6 Oct 2025 10:35:39 +0700 Subject: [PATCH 5/6] rename selectedFeatrues --- src/libs/API/parameters/CreateWorkspaceParams.ts | 2 +- src/libs/actions/Policy/Policy.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/API/parameters/CreateWorkspaceParams.ts b/src/libs/API/parameters/CreateWorkspaceParams.ts index 07415d97bd9a..fb938034ba13 100644 --- a/src/libs/API/parameters/CreateWorkspaceParams.ts +++ b/src/libs/API/parameters/CreateWorkspaceParams.ts @@ -18,7 +18,7 @@ type CreateWorkspaceParams = { userReportedIntegration?: string; areDistanceRatesEnabled?: boolean; memberData?: string; - selectedFeatures?: string; + features?: string; }; export default CreateWorkspaceParams; diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 0045e396e6ac..37985e4e51d3 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -2319,7 +2319,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { // We need to clone the file to prevent non-indexable errors. const clonedFile = file ? (createFile(file) as File) : undefined; - const selectedFeaturesMap = featuresMap?.reduce>((acc, feature) => { + const features = featuresMap?.reduce>((acc, feature) => { acc[feature.id] = !!feature.enabled; return acc; }, {}); @@ -2342,7 +2342,7 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { companySize, userReportedIntegration: userReportedIntegration ?? undefined, areDistanceRatesEnabled, - selectedFeatures: selectedFeaturesMap ? JSON.stringify(selectedFeaturesMap) : undefined, + features: features ? JSON.stringify(features) : undefined, }; if ( From 493bc2eee9ecda1bf5ced2772710674f33802296 Mon Sep 17 00:00:00 2001 From: dukenv0307 Date: Wed, 8 Oct 2025 14:57:41 +0700 Subject: [PATCH 6/6] remove areDistanceRatesEnabled --- src/libs/API/parameters/CreateWorkspaceParams.ts | 1 - src/libs/actions/Policy/Policy.ts | 7 +++---- src/pages/iou/request/step/IOURequestStepUpgrade.tsx | 7 ++++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/libs/API/parameters/CreateWorkspaceParams.ts b/src/libs/API/parameters/CreateWorkspaceParams.ts index fb938034ba13..6836b599ae75 100644 --- a/src/libs/API/parameters/CreateWorkspaceParams.ts +++ b/src/libs/API/parameters/CreateWorkspaceParams.ts @@ -16,7 +16,6 @@ type CreateWorkspaceParams = { file?: File; companySize?: string; userReportedIntegration?: string; - areDistanceRatesEnabled?: boolean; memberData?: string; features?: string; }; diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 37985e4e51d3..d8af8babfc86 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -175,9 +175,8 @@ type BuildPolicyDataOptions = { shouldAddOnboardingTasks?: boolean; companySize?: OnboardingCompanySize; userReportedIntegration?: OnboardingAccounting; - featuresMap?: Feature[]; + featuresMap?: Array>; lastUsedPaymentMethod?: LastPaymentMethodType; - areDistanceRatesEnabled?: boolean; adminParticipant?: Participant; }; @@ -1971,7 +1970,6 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { userReportedIntegration, featuresMap, lastUsedPaymentMethod, - areDistanceRatesEnabled, adminParticipant, } = options; const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail); @@ -2006,6 +2004,8 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { 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 areDistanceRatesEnabled = !!featuresMap?.find((feature) => feature.id === CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED && feature.enabled); + // WARNING: The data below should be kept in sync with the API so we create the policy with the correct configuration. const optimisticData: OnyxUpdate[] = [ { @@ -2341,7 +2341,6 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { file: clonedFile, companySize, userReportedIntegration: userReportedIntegration ?? undefined, - areDistanceRatesEnabled, features: features ? JSON.stringify(features) : undefined, }; diff --git a/src/pages/iou/request/step/IOURequestStepUpgrade.tsx b/src/pages/iou/request/step/IOURequestStepUpgrade.tsx index f763b7ceadab..33e152e19430 100644 --- a/src/pages/iou/request/step/IOURequestStepUpgrade.tsx +++ b/src/pages/iou/request/step/IOURequestStepUpgrade.tsx @@ -113,7 +113,12 @@ function IOURequestStepUpgrade({ policyID: undefined, engagementChoice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE, currency: currentUserPersonalDetails?.localCurrencyCode ?? '', - areDistanceRatesEnabled: isDistanceRateUpgrade, + featuresMap: [ + { + id: CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED, + enabled: isDistanceRateUpgrade, + }, + ], adminParticipant, }); setIsUpgraded(true);