diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index ae4c802d789d..576f6123eb6a 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -11409,9 +11409,9 @@ function canLeaveChat(report: OnyxEntry, policy: OnyxEntry, isRe ); } -function createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected: OnyxEntry, transactionID: string, actionName: IOUAction): void { +function createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected: OnyxEntry, transactionID: string, actionName: IOUAction, workspaceName: string): void { const isCategorizing = actionName === CONST.IOU.ACTION.CATEGORIZE; - const {expenseChatReportID, policyID, policyName} = createDraftWorkspace(introSelected, deprecatedCurrentUserEmail); + const {expenseChatReportID, policyID, policyName} = createDraftWorkspace(introSelected, workspaceName, deprecatedCurrentUserEmail); setMoneyRequestParticipants(transactionID, [ { selected: true, @@ -11602,7 +11602,7 @@ function createDraftTransactionAndNavigateToParticipantSelector({ return; } - return createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected, transactionID, actionName); + return createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected, transactionID, actionName, ''); } /** diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index 5975ed6324c4..ec08dbd4afb1 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -2971,23 +2971,16 @@ function createWorkspace(options: CreateWorkspaceDataOptions): CreateWorkspacePa /** * Creates a draft workspace for various money request flows - * - * @param [policyOwnerEmail] the email of the account to make the owner of the policy - * @param [makeMeAdmin] leave the calling account as an admin on the policy - * @param [policyName] custom policy name we will use for created workspace - * @param [policyID] custom policy id we will use for created workspace */ function createDraftWorkspace( introSelected: OnyxEntry, + workspaceName: string, policyOwnerEmail = '', makeMeAdmin = false, - policyName = '', policyID = generatePolicyID(), currency = '', file?: File, ): CreateWorkspaceParams { - const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail); - const {customUnits, customUnitID, customUnitRateID, outputCurrency} = buildOptimisticDistanceRateCustomUnits(currency); const {expenseChatData, adminsChatReportID, adminsCreatedReportActionID, expenseChatReportID, expenseCreatedReportActionID} = ReportUtils.buildOptimisticWorkspaceChats( diff --git a/src/pages/Travel/WorkspaceConfirmationForTravelPage.tsx b/src/pages/Travel/WorkspaceConfirmationForTravelPage.tsx index ce46e17d99ca..186a2ddd5a0b 100644 --- a/src/pages/Travel/WorkspaceConfirmationForTravelPage.tsx +++ b/src/pages/Travel/WorkspaceConfirmationForTravelPage.tsx @@ -30,7 +30,7 @@ function WorkspaceConfirmationForTravelPage({route}: WorkspaceConfirmationForTra }; const onSubmit = (params: WorkspaceConfirmationSubmitFunctionParams) => { - createDraftWorkspace(introSelected, '', false, params.name, params.policyID, params.currency, params.avatarFile as File); + createDraftWorkspace(introSelected, params.name, '', false, params.policyID, params.currency, params.avatarFile as File); createWorkspace({ policyName: params.name, policyID: params.policyID, diff --git a/src/pages/iou/request/step/IOURequestStepAccountant.tsx b/src/pages/iou/request/step/IOURequestStepAccountant.tsx index ed94a455c051..063ff756942d 100644 --- a/src/pages/iou/request/step/IOURequestStepAccountant.tsx +++ b/src/pages/iou/request/step/IOURequestStepAccountant.tsx @@ -1,10 +1,11 @@ -import {activeAdminPoliciesSelector} from '@selectors/Policy'; +import {activeAdminPoliciesSelector, lastWorkspaceNumberSelector} from '@selectors/Policy'; import React, {useCallback} from 'react'; import type {OnyxCollection} from 'react-native-onyx'; import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; import {setMoneyRequestAccountant} from '@libs/actions/IOU'; +import {newGenerateDefaultWorkspaceName} from '@libs/actions/Policy/Policy'; import Navigation from '@libs/Navigation/Navigation'; import {createDraftWorkspaceAndNavigateToConfirmationScreen} from '@libs/ReportUtils'; import MoneyRequestAccountantSelector from '@pages/iou/request/MoneyRequestAccountantSelector'; @@ -25,14 +26,16 @@ function IOURequestStepAccountant({ }, }: IOURequestStepAccountantProps) { const {translate} = useLocalize(); - const {login} = useCurrentUserPersonalDetails(); + const {login, email = ''} = useCurrentUserPersonalDetails(); const selector = useCallback( (policies: OnyxCollection) => { return activeAdminPoliciesSelector(policies, login ?? ''); }, [login], ); + const lastWorkspaceNumberWithEmailSelector = useCallback((policies: OnyxCollection) => lastWorkspaceNumberSelector(policies, email), [email]); const [adminPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector}); + const [lastWorkspaceNumber] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: lastWorkspaceNumberWithEmailSelector}); const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED); const setAccountant = useCallback( @@ -46,12 +49,12 @@ function IOURequestStepAccountant({ // Sharing with an accountant involves inviting them to the workspace and that requires admin access. const hasActiveAdminWorkspaces = (adminPolicies?.length ?? 0) > 0; if (!hasActiveAdminWorkspaces) { - createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected, transactionID, action); + createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected, transactionID, action, newGenerateDefaultWorkspaceName(email, lastWorkspaceNumber, translate)); return; } Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID, Navigation.getActiveRoute(), action)); - }, [adminPolicies?.length, iouType, transactionID, reportID, action, introSelected]); + }, [adminPolicies?.length, iouType, transactionID, reportID, action, introSelected, email, lastWorkspaceNumber, translate]); const navigateBack = useCallback(() => { Navigation.goBack(backTo); diff --git a/src/pages/iou/request/step/IOURequestStepParticipants.tsx b/src/pages/iou/request/step/IOURequestStepParticipants.tsx index 07a1ee39f94f..003ee691fec2 100644 --- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx +++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx @@ -34,11 +34,12 @@ import { setMoneyRequestTag, } from '@userActions/IOU'; import {setSplitShares} from '@userActions/IOU/Split'; -import {createDraftWorkspace} from '@userActions/Policy/Policy'; +import {createDraftWorkspace, newGenerateDefaultWorkspaceName} from '@userActions/Policy/Policy'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; +import {lastWorkspaceNumberSelector} from '@src/selectors/Policy'; import type {Policy} from '@src/types/onyx'; import type {Participant} from '@src/types/onyx/IOU'; import getEmptyArray from '@src/types/utils/getEmptyArray'; @@ -328,7 +329,9 @@ function IOURequestStepParticipants({ } } if ((isCategorizing || isShareAction) && numberOfParticipants.current === 0) { - const {expenseChatReportID, policyID, policyName} = createDraftWorkspace(introSelected); + const email = currentUserPersonalDetails.email ?? ''; + const lastWorkspaceNumber = lastWorkspaceNumberSelector(allPolicies, email); + const {expenseChatReportID, policyID, policyName} = createDraftWorkspace(introSelected, newGenerateDefaultWorkspaceName(email, lastWorkspaceNumber, translate)); for (const transaction of draftTransactions) { setMoneyRequestParticipants(transaction.transactionID, [ { @@ -394,6 +397,7 @@ function IOURequestStepParticipants({ introSelected, backTo, selfDMReportID, + translate, ], ); diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts index cb7b78cded14..a361a60c0f3a 100644 --- a/tests/actions/PolicyTest.ts +++ b/tests/actions/PolicyTest.ts @@ -1821,7 +1821,7 @@ describe('actions/Policy', () => { await waitForBatchedUpdates(); const policyID = Policy.generatePolicyID(); - const params = Policy.createDraftWorkspace({choice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM}, ESH_EMAIL, true, WORKSPACE_NAME, policyID, CONST.CURRENCY.USD); + const params = Policy.createDraftWorkspace({choice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM}, WORKSPACE_NAME, ESH_EMAIL, true, policyID, CONST.CURRENCY.USD); await waitForBatchedUpdates(); const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`); @@ -1849,7 +1849,7 @@ describe('actions/Policy', () => { await waitForBatchedUpdates(); const policyID = Policy.generatePolicyID(); - Policy.createDraftWorkspace({choice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE}, ESH_EMAIL, false, WORKSPACE_NAME, policyID, CONST.CURRENCY.EUR); + Policy.createDraftWorkspace({choice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE}, WORKSPACE_NAME, ESH_EMAIL, false, policyID, CONST.CURRENCY.EUR); await waitForBatchedUpdates(); const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`);