Skip to content

Commit 495aedc

Browse files
nkdengineernkdengineer
committed
remove canUseDefaultRooms param
1 parent cc37884 commit 495aedc

7 files changed

Lines changed: 13 additions & 43 deletions

File tree

‎src/libs/navigateAfterOnboarding.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import {isConciergeChatReport} from './ReportUtils';
77

88
const navigateAfterOnboarding = (
99
isSmallScreenWidth: boolean,
10-
canUseDefaultRooms: boolean | undefined,
1110
lastAccessedReport: OnyxEntry<Report>,
1211
onboardingPolicyID?: string,
1312
onboardingAdminsChatReportID?: string,
@@ -53,14 +52,13 @@ const navigateAfterOnboarding = (
5352

5453
const navigateAfterOnboardingWithMicrotaskQueue = (
5554
isSmallScreenWidth: boolean,
56-
canUseDefaultRooms: boolean | undefined,
5755
lastAccessedReport: OnyxEntry<Report>,
5856
onboardingPolicyID?: string,
5957
onboardingAdminsChatReportID?: string,
6058
shouldPreventOpenAdminRoom = false,
6159
) => {
6260
Navigation.setNavigationActionToMicrotaskQueue(() => {
63-
navigateAfterOnboarding(isSmallScreenWidth, canUseDefaultRooms, lastAccessedReport, onboardingPolicyID, onboardingAdminsChatReportID, shouldPreventOpenAdminRoom);
61+
navigateAfterOnboarding(isSmallScreenWidth, lastAccessedReport, onboardingPolicyID, onboardingAdminsChatReportID, shouldPreventOpenAdminRoom);
6462
});
6563
};
6664

‎src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
233233
// We need to wait the policy is created before navigating out the onboarding flow
234234
navigateAfterOnboardingWithMicrotaskQueue(
235235
isSmallScreenWidth,
236-
isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
237236
lastAccessReport,
238237
policyID,
239238
adminsChatReportID,
@@ -254,7 +253,6 @@ function BaseOnboardingInterestedFeatures({shouldUseNativeStyles}: BaseOnboardin
254253
currentUserPersonalDetails?.firstName,
255254
currentUserPersonalDetails?.lastName,
256255
isSmallScreenWidth,
257-
isBetaEnabled,
258256
lastAccessReport,
259257
shouldPreventOpenAdminRoom,
260258
]);

‎src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -83,25 +83,9 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
8383
setOnboardingAdminsChatReportID();
8484
setOnboardingPolicyID();
8585

86-
navigateAfterOnboardingWithMicrotaskQueue(
87-
isSmallScreenWidth,
88-
isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
89-
lastAccessReport,
90-
onboardingPolicyID,
91-
mergedAccountConciergeReportID,
92-
false,
93-
);
86+
navigateAfterOnboardingWithMicrotaskQueue(isSmallScreenWidth, lastAccessReport, onboardingPolicyID, mergedAccountConciergeReportID, false);
9487
},
95-
[
96-
onboardingPurposeSelected,
97-
onboardingAdminsChatReportID,
98-
onboardingMessages,
99-
onboardingPolicyID,
100-
lastAccessReport,
101-
isBetaEnabled,
102-
isSmallScreenWidth,
103-
mergedAccountConciergeReportID,
104-
],
88+
[onboardingPurposeSelected, onboardingAdminsChatReportID, onboardingMessages, onboardingPolicyID, lastAccessReport, isSmallScreenWidth, mergedAccountConciergeReportID],
10589
);
10690

10791
const handleSubmit = useCallback(

‎src/pages/OnboardingWorkspaceInvite/BaseOnboardingWorkspaceInvite.tsx‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ function BaseOnboardingWorkspaceInvite({shouldUseNativeStyles}: BaseOnboardingWo
238238

239239
navigateAfterOnboardingWithMicrotaskQueue(
240240
isSmallScreenWidth,
241-
isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
242241
lastAccessReport,
243242
onboardingPolicyID,
244243
onboardingAdminsChatReportID,
@@ -253,7 +252,6 @@ function BaseOnboardingWorkspaceInvite({shouldUseNativeStyles}: BaseOnboardingWo
253252
onboardingAdminsChatReportID,
254253
onboardingPolicyID,
255254
isSmallScreenWidth,
256-
isBetaEnabled,
257255
lastAccessReport,
258256
shouldPreventOpenAdminRoom,
259257
]);

‎src/pages/OnboardingWorkspaceOptional/BaseOnboardingWorkspaceOptional.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ function BaseOnboardingWorkspaceOptional({shouldUseNativeStyles}: BaseOnboarding
9191
setOnboardingAdminsChatReportID();
9292
setOnboardingPolicyID();
9393

94-
navigateAfterOnboardingWithMicrotaskQueue(isSmallScreenWidth, isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS), lastAccessReport, onboardingPolicyID, mergedAccountConciergeReportID, false);
94+
navigateAfterOnboardingWithMicrotaskQueue(isSmallScreenWidth, lastAccessReport, onboardingPolicyID, mergedAccountConciergeReportID, false);
9595
}, [
9696
onboardingPurposeSelected,
9797
currentUserPersonalDetails.firstName,
@@ -101,7 +101,6 @@ function BaseOnboardingWorkspaceOptional({shouldUseNativeStyles}: BaseOnboarding
101101
onboardingPolicyID,
102102
lastAccessReport,
103103
isSmallScreenWidth,
104-
isBetaEnabled,
105104
mergedAccountConciergeReportID,
106105
]);
107106

‎src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,9 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
7676
setOnboardingAdminsChatReportID();
7777
setOnboardingPolicyID(policy.policyID);
7878

79-
navigateAfterOnboardingWithMicrotaskQueue(
80-
isSmallScreenWidth,
81-
isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
82-
lastAccessReport,
83-
policy.automaticJoiningEnabled ? policy.policyID : undefined,
84-
undefined,
85-
false,
86-
);
79+
navigateAfterOnboardingWithMicrotaskQueue(isSmallScreenWidth, lastAccessReport, policy.automaticJoiningEnabled ? policy.policyID : undefined, undefined, false);
8780
},
88-
[onboardingMessages, onboardingPersonalDetails?.firstName, onboardingPersonalDetails?.lastName, lastAccessReport, isSmallScreenWidth, isBetaEnabled],
81+
[onboardingMessages, onboardingPersonalDetails?.firstName, onboardingPersonalDetails?.lastName, lastAccessReport, isSmallScreenWidth],
8982
);
9083

9184
const policyIDItems = useMemo(() => {

‎tests/unit/navigateAfterOnboardingTest.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ describe('navigateAfterOnboarding', () => {
6666
const navigate = jest.spyOn(Navigation, 'navigate');
6767
const testSession = {email: 'realaccount@gmail.com'};
6868

69-
navigateAfterOnboarding(false, true, undefined, undefined, ONBOARDING_ADMINS_CHAT_REPORT_ID, (testSession?.email ?? '').includes('+'));
69+
navigateAfterOnboarding(false, undefined, undefined, ONBOARDING_ADMINS_CHAT_REPORT_ID, (testSession?.email ?? '').includes('+'));
7070
expect(navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(ONBOARDING_ADMINS_CHAT_REPORT_ID));
7171
});
7272

7373
it('should not navigate to the admin room report if onboardingAdminsChatReportID is not provided on larger screens', () => {
74-
navigateAfterOnboarding(false, true, undefined, undefined, undefined);
74+
navigateAfterOnboarding(false, undefined, undefined, undefined);
7575
expect(Navigation.navigate).not.toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(undefined));
7676
});
7777

@@ -90,15 +90,15 @@ describe('navigateAfterOnboarding', () => {
9090
await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, lastAccessedReport);
9191
mockShouldOpenOnAdminRoom.mockReturnValue(false);
9292

93-
navigateAfterOnboarding(true, true, lastAccessedReport, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID);
93+
navigateAfterOnboarding(true, lastAccessedReport, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID);
9494
expect(navigate).not.toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(REPORT_ID));
9595
});
9696

9797
it('should not navigate to last accessed report if it is onboarding expense chat on small screens', () => {
9898
const lastAccessedReport = {reportID: REPORT_ID, policyID: ONBOARDING_POLICY_ID};
9999
mockShouldOpenOnAdminRoom.mockReturnValue(false);
100100

101-
navigateAfterOnboarding(true, true, lastAccessedReport, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID);
101+
navigateAfterOnboarding(true, lastAccessedReport, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID);
102102
expect(Navigation.navigate).not.toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(REPORT_ID));
103103
});
104104

@@ -107,7 +107,7 @@ describe('navigateAfterOnboarding', () => {
107107
const lastAccessedReport = {reportID: REPORT_ID};
108108
mockShouldOpenOnAdminRoom.mockReturnValue(true);
109109

110-
navigateAfterOnboarding(true, true, lastAccessedReport, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID);
110+
navigateAfterOnboarding(true, lastAccessedReport, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID);
111111
expect(navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(REPORT_ID));
112112
});
113113

@@ -117,15 +117,15 @@ describe('navigateAfterOnboarding', () => {
117117
mockShouldOpenOnAdminRoom.mockReturnValue(true);
118118
const testSession = {email: 'test+account@gmail.com'};
119119

120-
navigateAfterOnboarding(true, true, lastAccessedReport, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID, (testSession?.email ?? '').includes('+'));
120+
navigateAfterOnboarding(true, lastAccessedReport, ONBOARDING_POLICY_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID, (testSession?.email ?? '').includes('+'));
121121
expect(navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(REPORT_ID));
122122
});
123123

124124
it('should navigate to Test Drive Modal if user wants to manage a small team', async () => {
125125
const navigate = jest.spyOn(Navigation, 'navigate');
126126
jest.spyOn(Navigation, 'isNavigationReady').mockReturnValue(Promise.resolve());
127127

128-
navigateAfterOnboarding(true, true, undefined);
128+
navigateAfterOnboarding(true, undefined);
129129
await waitFor(() => expect(navigate).toHaveBeenCalledWith(ROUTES.TEST_DRIVE_MODAL_ROOT.route));
130130
});
131131
});

0 commit comments

Comments
 (0)