diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.tsx b/src/libs/Navigation/AppNavigator/AuthScreens.tsx index 878eeaaa65c4..21d071b98a1c 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.tsx +++ b/src/libs/Navigation/AppNavigator/AuthScreens.tsx @@ -161,6 +161,7 @@ function AuthScreens() { const [isDelegatorFromOldDotIsReady, setIsDelegatorFromOldDotIsReady] = useState(false); const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: true}); + const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true}); const [initialLastUpdateIDAppliedToClient] = useOnyx(ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT, {canBeMissing: true}); const [modal] = useOnyx(ONYXKEYS.MODAL, {canBeMissing: true}); const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true}); @@ -251,7 +252,7 @@ function AuthScreens() { App.reconnectApp(initialLastUpdateIDAppliedToClient); } - App.setUpPoliciesAndNavigate(session); + App.setUpPoliciesAndNavigate(session, introSelected); App.redirectThirdPartyDesktopSignIn(); diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index b3313d3f87a3..ad2b8a1243d1 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1004,6 +1004,7 @@ Onyx.connect({ return acc; } + // eslint-disable-next-line @typescript-eslint/no-deprecated InteractionManager.runAfterInteractions(() => { handlePreexistingReport(report); }); @@ -10475,9 +10476,9 @@ function getReportActionActorAccountID( } } -function createDraftWorkspaceAndNavigateToConfirmationScreen(transactionID: string, actionName: IOUAction): void { +function createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected: OnyxEntry, transactionID: string, actionName: IOUAction): void { const isCategorizing = actionName === CONST.IOU.ACTION.CATEGORIZE; - const {expenseChatReportID, policyID, policyName} = createDraftWorkspace(currentUserEmail); + const {expenseChatReportID, policyID, policyName} = createDraftWorkspace(introSelected, currentUserEmail); setMoneyRequestParticipants(transactionID, [ { selected: true, @@ -10501,6 +10502,7 @@ function createDraftTransactionAndNavigateToParticipantSelector( reportID: string | undefined, actionName: IOUAction, reportActionID: string | undefined, + introSelected: OnyxEntry, isRestrictedToPreferredPolicy = false, preferredPolicyID?: string, ): void { @@ -10628,7 +10630,7 @@ function createDraftTransactionAndNavigateToParticipantSelector( return; } - return createDraftWorkspaceAndNavigateToConfirmationScreen(transactionID, actionName); + return createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected, transactionID, actionName); } /** diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts index f108929ec5e7..6b6115990c5e 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -445,33 +445,40 @@ function endSignOnTransition() { return resolveSignOnTransitionToFinishPromise(); } +type CreateWorkspaceWithPolicyDraftParams = { + introSelected: OnyxEntry; + policyOwnerEmail?: string; + policyName?: string; + transitionFromOldDot?: boolean; + makeMeAdmin?: boolean; + backTo?: string; + policyID?: string; + currency?: string; + file?: File; + routeToNavigateAfterCreate?: Route; + lastUsedPaymentMethod?: OnyxTypes.LastPaymentMethodType; +}; + /** * Create a new draft workspace and navigate to it - * - * @param [policyOwnerEmail] Optional, the email of the account to make the owner of the policy - * @param [policyName] Optional, custom policy name we will use for created workspace - * @param [transitionFromOldDot] Optional, if the user is transitioning from old dot - * @param [makeMeAdmin] Optional, leave the calling account as an admin on the policy - * @param [backTo] An optional return path. If provided, it will be URL-encoded and appended to the resulting URL. - * @param [policyID] Optional, Policy id. - * @param [currency] Optional, selected currency for the workspace - * @param [file], avatar file for workspace - * @param [routeToNavigateAfterCreate], Optional, route to navigate after creating a workspace */ -function createWorkspaceWithPolicyDraftAndNavigateToIt( - policyOwnerEmail = '', - policyName = '', - transitionFromOldDot = false, - makeMeAdmin = false, - backTo = '', - policyID = '', - currency?: string, - file?: File, - routeToNavigateAfterCreate?: Route, - lastUsedPaymentMethod?: OnyxTypes.LastPaymentMethodType, -) { +function createWorkspaceWithPolicyDraftAndNavigateToIt(params: CreateWorkspaceWithPolicyDraftParams) { + const { + introSelected, + policyOwnerEmail = '', + policyName = '', + transitionFromOldDot = false, + makeMeAdmin = false, + backTo = '', + policyID = '', + currency, + file, + routeToNavigateAfterCreate, + lastUsedPaymentMethod, + } = params; + const policyIDWithDefault = policyID || generatePolicyID(); - createDraftInitialWorkspace(policyOwnerEmail, policyName, policyIDWithDefault, makeMeAdmin, currency, file); + createDraftInitialWorkspace(introSelected, policyOwnerEmail, policyName, policyIDWithDefault, makeMeAdmin, currency, file); Navigation.isNavigationReady() .then(() => { if (transitionFromOldDot) { @@ -531,7 +538,7 @@ function savePolicyDraftByNewWorkspace( * When the exitTo route is 'workspace/new', we create a new * workspace and navigate to it */ -function setUpPoliciesAndNavigate(session: OnyxEntry) { +function setUpPoliciesAndNavigate(session: OnyxEntry, introSelected: OnyxEntry) { const currentUrl = getCurrentUrl(); if (!session || !currentUrl?.includes('exitTo')) { endSignOnTransition(); @@ -553,7 +560,13 @@ function setUpPoliciesAndNavigate(session: OnyxEntry) { const shouldCreateFreePolicy = !isLoggingInAsNewUser && isTransitioning && exitTo === ROUTES.WORKSPACE_NEW; if (shouldCreateFreePolicy) { - createWorkspaceWithPolicyDraftAndNavigateToIt(policyOwnerEmail, policyName, true, makeMeAdmin); + createWorkspaceWithPolicyDraftAndNavigateToIt({ + introSelected, + policyOwnerEmail, + policyName, + transitionFromOldDot: true, + makeMeAdmin, + }); return; } if (!isLoggingInAsNewUser && exitTo) { diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index b650a8ed6613..6d3b80ece144 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -280,10 +280,10 @@ Onyx.connect({ callback: (value) => (activePolicyID = value), }); -let introSelected: OnyxEntry; +let deprecatedIntroSelected: OnyxEntry; Onyx.connect({ key: ONYXKEYS.NVP_INTRO_SELECTED, - callback: (value) => (introSelected = value), + callback: (value) => (deprecatedIntroSelected = value), }); /** @@ -1945,7 +1945,15 @@ function buildOptimisticDistanceRateCustomUnits(reportCurrency?: string): Optimi * @param [currency] Optional, selected currency for the workspace * @param [file], avatar file for workspace */ -function createDraftInitialWorkspace(policyOwnerEmail = '', policyName = '', policyID = generatePolicyID(), makeMeAdmin = false, currency = '', file?: File) { +function createDraftInitialWorkspace( + introSelected: OnyxEntry, + policyOwnerEmail = '', + policyName = '', + policyID = generatePolicyID(), + makeMeAdmin = false, + currency = '', + file?: File, +) { const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail); const {customUnits, outputCurrency} = buildOptimisticDistanceRateCustomUnits(currency); const shouldEnableWorkflowsByDefault = @@ -2408,13 +2416,13 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { }; if ( - introSelected !== undefined && - (introSelected.choice === CONST.ONBOARDING_CHOICES.TEST_DRIVE_RECEIVER || !introSelected?.createWorkspace) && + deprecatedIntroSelected !== undefined && + (deprecatedIntroSelected.choice === CONST.ONBOARDING_CHOICES.TEST_DRIVE_RECEIVER || !deprecatedIntroSelected?.createWorkspace) && engagementChoice && shouldAddOnboardingTasks ) { const {onboardingMessages} = getOnboardingMessages(true); - const onboardingData = ReportUtils.prepareOnboardingOnyxData(introSelected, engagementChoice, onboardingMessages[engagementChoice], adminsChatReportID, policyID); + const onboardingData = ReportUtils.prepareOnboardingOnyxData(deprecatedIntroSelected, engagementChoice, onboardingMessages[engagementChoice], adminsChatReportID, policyID); if (!onboardingData) { return {successData, optimisticData, failureData, params}; } @@ -2429,13 +2437,13 @@ function buildPolicyData(options: BuildPolicyDataOptions = {}) { } // For test drive receivers, we want to complete the createWorkspace task in concierge, instead of #admin room - if (introSelected?.choice === CONST.ONBOARDING_CHOICES.TEST_DRIVE_RECEIVER && introSelected.createWorkspace) { - const createWorkspaceTaskReport = {reportID: introSelected.createWorkspace}; + if (deprecatedIntroSelected?.choice === CONST.ONBOARDING_CHOICES.TEST_DRIVE_RECEIVER && deprecatedIntroSelected.createWorkspace) { + const createWorkspaceTaskReport = {reportID: deprecatedIntroSelected.createWorkspace}; const { optimisticData: optimisticCreateWorkspaceTaskData, successData: successCreateWorkspaceTaskData, failureData: failureCreateWorkspaceTaskData, - } = buildTaskData(createWorkspaceTaskReport, introSelected.createWorkspace); + } = buildTaskData(createWorkspaceTaskReport, deprecatedIntroSelected.createWorkspace); optimisticData.push(...optimisticCreateWorkspaceTaskData); successData.push(...successCreateWorkspaceTaskData); @@ -2486,7 +2494,15 @@ function createWorkspace(options: BuildPolicyDataOptions = {}): CreateWorkspaceP * @param [policyName] custom policy name we will use for created workspace * @param [policyID] custom policy id we will use for created workspace */ -function createDraftWorkspace(policyOwnerEmail = '', makeMeAdmin = false, policyName = '', policyID = generatePolicyID(), currency = '', file?: File): CreateWorkspaceParams { +function createDraftWorkspace( + introSelected: OnyxEntry, + policyOwnerEmail = '', + makeMeAdmin = false, + policyName = '', + policyID = generatePolicyID(), + currency = '', + file?: File, +): CreateWorkspaceParams { const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail); const {customUnits, customUnitID, customUnitRateID, outputCurrency} = buildOptimisticDistanceRateCustomUnits(currency); diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx index d84ff052ee21..3b4e0c992806 100644 --- a/src/pages/ReportDetailsPage.tsx +++ b/src/pages/ReportDetailsPage.tsx @@ -172,6 +172,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`, {canBeMissing: true}); const [isDebugModeEnabled = false] = useOnyx(ONYXKEYS.IS_DEBUG_MODE_ENABLED, {canBeMissing: true}); const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: false}); + const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true}); const currentUserPersonalDetails = useCurrentUserPersonalDetails(); const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false); const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false); @@ -429,6 +430,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail actionReportID, CONST.IOU.ACTION.SUBMIT, actionableWhisperReportActionID, + introSelected, isRestrictedToPreferredPolicy, preferredPolicyID, ); @@ -442,7 +444,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail isAnonymousAction: false, shouldShowRightIcon: true, action: () => { - createDraftTransactionAndNavigateToParticipantSelector(iouTransactionID, actionReportID, CONST.IOU.ACTION.CATEGORIZE, actionableWhisperReportActionID); + createDraftTransactionAndNavigateToParticipantSelector(iouTransactionID, actionReportID, CONST.IOU.ACTION.CATEGORIZE, actionableWhisperReportActionID, introSelected); }, }); items.push({ @@ -452,7 +454,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail isAnonymousAction: false, shouldShowRightIcon: true, action: () => { - createDraftTransactionAndNavigateToParticipantSelector(iouTransactionID, actionReportID, CONST.IOU.ACTION.SHARE, actionableWhisperReportActionID); + createDraftTransactionAndNavigateToParticipantSelector(iouTransactionID, actionReportID, CONST.IOU.ACTION.SHARE, actionableWhisperReportActionID, introSelected); }, }); } @@ -571,6 +573,7 @@ function ReportDetailsPage({policy, report, route, reportMetadata}: ReportDetail isSmallScreenWidth, isRestrictedToPreferredPolicy, preferredPolicyID, + introSelected, ]); const displayNamesWithTooltips = useMemo(() => { diff --git a/src/pages/Travel/TravelUpgrade.tsx b/src/pages/Travel/TravelUpgrade.tsx index 06ed46789545..df3a4c058ef1 100644 --- a/src/pages/Travel/TravelUpgrade.tsx +++ b/src/pages/Travel/TravelUpgrade.tsx @@ -8,6 +8,7 @@ import type {WorkspaceConfirmationSubmitFunctionParams} from '@components/Worksp import WorkspaceConfirmationForm from '@components/WorkspaceConfirmationForm'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; +import useOnyx from '@hooks/useOnyx'; import useThemeStyles from '@hooks/useThemeStyles'; import Navigation from '@libs/Navigation/Navigation'; import type {TravelNavigatorParamList} from '@libs/Navigation/types'; @@ -15,6 +16,7 @@ import UpgradeConfirmation from '@pages/workspace/upgrade/UpgradeConfirmation'; import UpgradeIntro from '@pages/workspace/upgrade/UpgradeIntro'; import CONST from '@src/CONST'; import {createDraftWorkspace, createWorkspace} from '@src/libs/actions/Policy/Policy'; +import ONYXKEYS from '@src/ONYXKEYS'; import type SCREENS from '@src/SCREENS'; type TravelUpgradeProps = StackScreenProps; @@ -24,12 +26,13 @@ function TravelUpgrade({route}: TravelUpgradeProps) { const feature = CONST.UPGRADE_FEATURE_INTRO_MAPPING.travel; const {translate} = useLocalize(); const {isOffline} = useNetwork(); + const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true}); const [isUpgraded, setIsUpgraded] = useState(false); const [shouldShowConfirmation, setShouldShowConfirmation] = useState(false); const onSubmit = (params: WorkspaceConfirmationSubmitFunctionParams) => { - createDraftWorkspace('', false, params.name, params.policyID, params.currency, params.avatarFile as File); + createDraftWorkspace(introSelected, '', false, params.name, params.policyID, params.currency, params.avatarFile as File); setShouldShowConfirmation(false); setIsUpgraded(true); createWorkspace({ diff --git a/src/pages/home/report/PureReportActionItem.tsx b/src/pages/home/report/PureReportActionItem.tsx index d9acf90a903c..405864445317 100644 --- a/src/pages/home/report/PureReportActionItem.tsx +++ b/src/pages/home/report/PureReportActionItem.tsx @@ -205,6 +205,9 @@ type PureReportActionItemProps = { /** All the data of the policy collection */ policies: OnyxCollection; + /** Model of onboarding selected */ + introSelected?: OnyxEntry; + /** Report for this action */ report: OnyxEntry; @@ -324,6 +327,7 @@ type PureReportActionItemProps = { reportID: string | undefined, actionName: IOUAction, reportActionID: string, + introSelected: OnyxEntry, isRestrictedToPreferredPolicy?: boolean, preferredPolicyID?: string, ) => void; @@ -406,6 +410,7 @@ const isEmptyHTML = ({props: {html}}: T): boolean = function PureReportActionItem({ allReports, policies, + introSelected, action, report, policy, @@ -788,6 +793,7 @@ function PureReportActionItem({ reportActionReportID, CONST.IOU.ACTION.SUBMIT, action.reportActionID, + introSelected, isRestrictedToPreferredPolicy, preferredPolicyID, ); @@ -801,14 +807,14 @@ function PureReportActionItem({ text: 'actionableMentionTrackExpense.categorize', key: `${action.reportActionID}-actionableMentionTrackExpense-categorize`, onPress: () => { - createDraftTransactionAndNavigateToParticipantSelector(transactionID, reportActionReportID, CONST.IOU.ACTION.CATEGORIZE, action.reportActionID); + createDraftTransactionAndNavigateToParticipantSelector(transactionID, reportActionReportID, CONST.IOU.ACTION.CATEGORIZE, action.reportActionID, introSelected); }, }, { text: 'actionableMentionTrackExpense.share', key: `${action.reportActionID}-actionableMentionTrackExpense-share`, onPress: () => { - createDraftTransactionAndNavigateToParticipantSelector(transactionID, reportActionReportID, CONST.IOU.ACTION.SHARE, action.reportActionID); + createDraftTransactionAndNavigateToParticipantSelector(transactionID, reportActionReportID, CONST.IOU.ACTION.SHARE, action.reportActionID, introSelected); }, }, ); @@ -969,6 +975,7 @@ function PureReportActionItem({ formatPhoneNumber, isOriginalReportArchived, resolveActionableMentionWhisper, + introSelected, ]); /** @@ -1850,6 +1857,7 @@ export default memo(PureReportActionItem, (prevProps, nextProps) => { prevProps.isUserValidated === nextProps.isUserValidated && prevProps.parentReport?.reportID === nextProps.parentReport?.reportID && deepEqual(prevProps.personalDetails, nextProps.personalDetails) && + deepEqual(prevProps.introSelected, nextProps.introSelected) && deepEqual(prevProps.blockedFromConcierge, nextProps.blockedFromConcierge) && prevProps.originalReportID === nextProps.originalReportID && prevProps.isArchivedRoom === nextProps.isArchivedRoom && diff --git a/src/pages/home/report/ReportActionItem.tsx b/src/pages/home/report/ReportActionItem.tsx index 1345b65a0587..c19fb0b15b26 100644 --- a/src/pages/home/report/ReportActionItem.tsx +++ b/src/pages/home/report/ReportActionItem.tsx @@ -94,6 +94,7 @@ function ReportActionItem({ const originalReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${originalReportID}`]; const isOriginalReportArchived = useReportIsArchived(originalReportID); const [currentUserAccountID] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false, selector: accountIDSelector}); + const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true}); const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${getIOUReportIDFromReportActionPreview(action)}`]; const movedFromReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${getMovedReportID(action, CONST.REPORT.MOVE_TYPE.FROM)}`]; const movedToReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${getMovedReportID(action, CONST.REPORT.MOVE_TYPE.TO)}`]; @@ -115,6 +116,7 @@ function ReportActionItem({ // eslint-disable-next-line react/jsx-props-no-spreading {...props} allReports={allReports} + introSelected={introSelected} policies={policies} action={action} report={report} diff --git a/src/pages/iou/request/step/IOURequestStepAccountant.tsx b/src/pages/iou/request/step/IOURequestStepAccountant.tsx index 51608d7d1d39..64211d9c19dd 100644 --- a/src/pages/iou/request/step/IOURequestStepAccountant.tsx +++ b/src/pages/iou/request/step/IOURequestStepAccountant.tsx @@ -24,6 +24,7 @@ function IOURequestStepAccountant({ }: IOURequestStepAccountantProps) { const [currentUserLogin] = useOnyx(ONYXKEYS.SESSION, {selector: emailSelector, canBeMissing: false}); const {translate} = useLocalize(); + const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true}); const setAccountant = useCallback( (accountant: Accountant) => { @@ -36,12 +37,12 @@ function IOURequestStepAccountant({ // Sharing with an accountant involves inviting them to the workspace and that requires admin access. const hasActiveAdminWorkspaces = hasActiveAdminWorkspacesUtil(currentUserLogin); if (!hasActiveAdminWorkspaces) { - createDraftWorkspaceAndNavigateToConfirmationScreen(transactionID, action); + createDraftWorkspaceAndNavigateToConfirmationScreen(introSelected, transactionID, action); return; } Navigation.navigate(ROUTES.MONEY_REQUEST_STEP_PARTICIPANTS.getRoute(iouType, transactionID, reportID, Navigation.getActiveRoute(), action)); - }, [iouType, transactionID, reportID, action, currentUserLogin]); + }, [iouType, transactionID, reportID, action, currentUserLogin, introSelected]); 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 0c430d66cc1d..85e0878f9c89 100644 --- a/src/pages/iou/request/step/IOURequestStepParticipants.tsx +++ b/src/pages/iou/request/step/IOURequestStepParticipants.tsx @@ -122,6 +122,7 @@ function IOURequestStepParticipants({ const [selfDMReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${selfDMReportID}`, {canBeMissing: true}); const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: false}); const [activePolicy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${activePolicyID}`, {canBeMissing: true}); + const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true}); const personalPolicy = useMemo(() => Object.values(allPolicies ?? {}).find((policy) => policy?.type === CONST.POLICY.TYPE.PERSONAL), [allPolicies]); const isActivePolicyRequest = @@ -305,7 +306,7 @@ function IOURequestStepParticipants({ } }); if ((isCategorizing || isShareAction) && numberOfParticipants.current === 0) { - const {expenseChatReportID, policyID, policyName} = createDraftWorkspace(); + const {expenseChatReportID, policyID, policyName} = createDraftWorkspace(introSelected); transactions.forEach((transaction) => { setMoneyRequestParticipants(transaction.transactionID, [ { @@ -350,7 +351,7 @@ function IOURequestStepParticipants({ Navigation.navigate(route); } }); - }, [action, participants, iouType, initialTransaction, transactions, initialTransactionID, reportID, waitForKeyboardDismiss, isMovingTransactionFromTrackExpense, backTo]); + }, [action, participants, iouType, initialTransaction, transactions, initialTransactionID, reportID, waitForKeyboardDismiss, isMovingTransactionFromTrackExpense, backTo, introSelected]); const navigateBack = useCallback(() => { if (backTo) { diff --git a/src/pages/workspace/WorkspaceConfirmationPage.tsx b/src/pages/workspace/WorkspaceConfirmationPage.tsx index 43c8a3df3ea5..0c7510b4f668 100644 --- a/src/pages/workspace/WorkspaceConfirmationPage.tsx +++ b/src/pages/workspace/WorkspaceConfirmationPage.tsx @@ -17,21 +17,23 @@ function WorkspaceConfirmationPage() { // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth const {isSmallScreenWidth} = useResponsiveLayout(); const [lastPaymentMethod] = useOnyx(ONYXKEYS.NVP_LAST_PAYMENT_METHOD, {canBeMissing: true}); + const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true}); const onSubmit = (params: WorkspaceConfirmationSubmitFunctionParams) => { const policyID = params.policyID || generatePolicyID(); const routeToNavigate = isSmallScreenWidth ? ROUTES.WORKSPACE_INITIAL.getRoute(policyID) : ROUTES.WORKSPACE_OVERVIEW.getRoute(policyID); - createWorkspaceWithPolicyDraftAndNavigateToIt( - '', - params.name, - false, - false, - '', + createWorkspaceWithPolicyDraftAndNavigateToIt({ + introSelected, + policyOwnerEmail: '', + policyName: params.name, + transitionFromOldDot: false, + makeMeAdmin: false, + backTo: '', policyID, - params.currency, - params.avatarFile as File, - routeToNavigate, - lastPaymentMethod?.[policyID] as LastPaymentMethodType, - ); + currency: params.currency, + file: params.avatarFile as File, + routeToNavigateAfterCreate: routeToNavigate, + lastUsedPaymentMethod: lastPaymentMethod?.[policyID] as LastPaymentMethodType, + }); }; const currentUrl = getCurrentUrl(); // Approved Accountants and Guides can enter a flow where they make a workspace for other users, diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index 43d6f82ed3a8..2374e1413aa3 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -503,6 +503,7 @@ describe('actions/IOU', () => { selfDMReport.reportID, CONST.IOU.ACTION.CATEGORIZE, reportActionableTrackExpense?.reportActionID, + {choice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM}, ); await waitForBatchedUpdates(); diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts index 45250f5dd771..f3e17ee81cb9 100644 --- a/tests/actions/PolicyTest.ts +++ b/tests/actions/PolicyTest.ts @@ -16,6 +16,7 @@ import type {Onboarding, PolicyJoinMember, Policy as PolicyType, Report, ReportA import type {Participant} from '@src/types/onyx/Report'; import createRandomPolicy from '../utils/collections/policies'; import {createRandomReport} from '../utils/collections/reports'; +import getOnyxValue from '../utils/getOnyxValue'; import * as TestHelper from '../utils/TestHelper'; import type {MockFetch} from '../utils/TestHelper'; import waitForBatchedUpdates from '../utils/waitForBatchedUpdates'; @@ -25,8 +26,14 @@ const ESH_ACCOUNT_ID = 1; const ESH_PARTICIPANT_ADMINS_ROOM: Participant = {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS}; const ESH_PARTICIPANT_EXPENSE_CHAT = {notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS}; const WORKSPACE_NAME = "Esh's Workspace"; - const EMPLOYEE_EMAIL = 'employee@example.com'; +const TEST_EMAIL = 'esh@gmail.com'; +const TEST_EMAIL_2 = 'eshofficial@gmail.com'; +const TEST_ACCOUNT_ID = 1; +const TEST_DISPLAY_NAME = 'Esh Gupta'; +const TEST_PHONE_NUMBER = '1234567890'; +const TEST_NON_PUBLIC_DOMAIN_EMAIL = 'esh@example.com'; +const TEST_SMS_DOMAIN_EMAIL = 'esh@expensify.sms'; OnyxUpdateManager(); describe('actions/Policy', () => { @@ -688,6 +695,87 @@ describe('actions/Policy', () => { }); }); + describe('createDraftInitialWorkspace', () => { + it('creates a policy draft with disabled workflows when onboarding choice does not enable workflows', async () => { + await Onyx.set(ONYXKEYS.SESSION, {email: ESH_EMAIL, accountID: ESH_ACCOUNT_ID}); + await waitForBatchedUpdates(); + + const policyID = Policy.generatePolicyID(); + + Policy.createDraftInitialWorkspace({choice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE}, ESH_EMAIL, WORKSPACE_NAME, policyID, false, CONST.CURRENCY.EUR); + await waitForBatchedUpdates(); + + const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`); + + expect(draft?.areWorkflowsEnabled).toBe(false); + expect(draft?.autoReportingFrequency).toBe(CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT); + expect(draft?.harvesting?.enabled).toBe(true); + expect(draft?.outputCurrency).toBe(CONST.CURRENCY.EUR); + }); + + it('uses generated workspace name when policyName is not provided', async () => { + await Onyx.set(ONYXKEYS.SESSION, {email: ESH_EMAIL, accountID: ESH_ACCOUNT_ID}); + await waitForBatchedUpdates(); + + const policyID = Policy.generatePolicyID(); + const expectedName = Policy.generateDefaultWorkspaceName(ESH_EMAIL); + + Policy.createDraftInitialWorkspace({choice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM}, ESH_EMAIL, '', policyID, false); + await waitForBatchedUpdates(); + + const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`); + + expect(draft?.name).toBe(expectedName); + }); + }); + + describe('createDraftWorkspace', () => { + it('sets key defaults and related drafts when onboarding choice enables workflows', async () => { + await Onyx.set(ONYXKEYS.SESSION, {email: ESH_EMAIL, accountID: ESH_ACCOUNT_ID}); + 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); + await waitForBatchedUpdates(); + + const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`); + + expect(draft?.approvalMode).toBe(CONST.POLICY.APPROVAL_MODE.BASIC); + expect(draft?.areWorkflowsEnabled).toBe(true); + expect(draft?.autoReportingFrequency).toBe(CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE); + expect(draft?.outputCurrency).toBe(CONST.CURRENCY.USD); + expect(draft?.employeeList?.[ESH_EMAIL]?.role).toBe(CONST.POLICY.ROLE.ADMIN); + expect(draft?.chatReportIDAdmins).toBe(Number(params.adminsChatReportID)); + + // Report draft should be set for the expense chat + const expenseReportDraft = await getOnyxValue(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${params.expenseChatReportID}`); + expect(expenseReportDraft).toBeTruthy(); + + // Default categories draft should be created and enabled + const categoriesDraft = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`); + + expect(categoriesDraft && Object.keys(categoriesDraft).length > 0).toBe(true); + expect(Object.values(categoriesDraft ?? {}).every((c) => c.enabled === true)).toBe(true); + }); + + it('disables workflows and sets approval to OPTIONAL when onboarding choice does not enable workflows', async () => { + await Onyx.set(ONYXKEYS.SESSION, {email: ESH_EMAIL, accountID: ESH_ACCOUNT_ID}); + await waitForBatchedUpdates(); + + const policyID = Policy.generatePolicyID(); + Policy.createDraftWorkspace({choice: CONST.ONBOARDING_CHOICES.TRACK_WORKSPACE}, ESH_EMAIL, false, WORKSPACE_NAME, policyID, CONST.CURRENCY.EUR); + await waitForBatchedUpdates(); + + const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.POLICY_DRAFTS}${policyID}`); + + expect(draft?.approvalMode).toBe(CONST.POLICY.APPROVAL_MODE.OPTIONAL); + expect(draft?.areWorkflowsEnabled).toBe(false); + expect(draft?.autoReportingFrequency).toBe(CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT); + expect(draft?.harvesting?.enabled).toBe(true); + expect(draft?.outputCurrency).toBe(CONST.CURRENCY.EUR); + }); + }); + describe('upgradeToCorporate', () => { it('upgradeToCorporate should not alter initial values of autoReporting and autoReportingFrequency', async () => { const autoReporting = true; @@ -1120,14 +1208,6 @@ describe('actions/Policy', () => { }); }); - const TEST_EMAIL = 'esh@gmail.com'; - const TEST_EMAIL_2 = 'eshofficial@gmail.com'; - const TEST_ACCOUNT_ID = 1; - const TEST_DISPLAY_NAME = 'Esh Gupta'; - const TEST_PHONE_NUMBER = '1234567890'; - const TEST_NON_PUBLIC_DOMAIN_EMAIL = 'esh@example.com'; - const TEST_SMS_DOMAIN_EMAIL = 'esh@expensify.sms'; - describe('generateDefaultWorkspaceName', () => { beforeAll(() => { Onyx.set(ONYXKEYS.COLLECTION.POLICY, {});