Skip to content

Commit cc76ed4

Browse files
srikarparsiOSBotify
authored andcommitted
Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect
[CP Staging] Create workspace when new user signs up, selects the "Manage my team's expenses" option and completes the "employee" step (cherry picked from commit 0167316) (CP triggered by marcaaron)
1 parent 3a50e2e commit cc76ed4

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

src/pages/OnboardingEmployees/BaseOnboardingEmployees.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import useLocalize from '@hooks/useLocalize';
1212
import useResponsiveLayout from '@hooks/useResponsiveLayout';
1313
import useThemeStyles from '@hooks/useThemeStyles';
1414
import Navigation from '@libs/Navigation/Navigation';
15+
import * as Policy from '@userActions/Policy/Policy';
1516
import * as Welcome from '@userActions/Welcome';
1617
import * as OnboardingFlow from '@userActions/Welcome/OnboardingFlow';
1718
import CONST from '@src/CONST';
@@ -28,6 +29,7 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE
2829
const {translate} = useLocalize();
2930
const [onboardingCompanySize] = useOnyx(ONYXKEYS.ONBOARDING_COMPANY_SIZE);
3031
const [onboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED);
32+
const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID);
3133
const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
3234
const [selectedCompanySize, setSelectedCompanySize] = useState<OnboardingCompanySizeType | null | undefined>(onboardingCompanySize);
3335
const [error, setError] = useState('');
@@ -61,6 +63,13 @@ function BaseOnboardingEmployees({shouldUseNativeStyles, route}: BaseOnboardingE
6163
return;
6264
}
6365
Welcome.setOnboardingCompanySize(selectedCompanySize);
66+
67+
if (!onboardingPolicyID) {
68+
const {adminsChatReportID, policyID} = Policy.createWorkspace(undefined, true, '', Policy.generatePolicyID(), CONST.ONBOARDING_CHOICES.MANAGE_TEAM);
69+
Welcome.setOnboardingAdminsChatReportID(adminsChatReportID);
70+
Welcome.setOnboardingPolicyID(policyID);
71+
}
72+
6473
Navigation.navigate(ROUTES.ONBOARDING_ACCOUNTING.getRoute(route.params?.backTo));
6574
}}
6675
pressOnEnter

src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx

+6-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ import Navigation from '@libs/Navigation/Navigation';
2020
import OnboardingRefManager from '@libs/OnboardingRefManager';
2121
import type {TOnboardingRef} from '@libs/OnboardingRefManager';
2222
import variables from '@styles/variables';
23+
<<<<<<< HEAD
2324
import * as Policy from '@userActions/Policy/Policy';
25+
=======
26+
>>>>>>> 0167316 (Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect)
2427
import * as Welcome from '@userActions/Welcome';
2528
import CONST from '@src/CONST';
2629
import type {OnboardingPurposeType} from '@src/CONST';
@@ -50,7 +53,6 @@ const menuIcons = {
5053
function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, route}: BaseOnboardingPurposeProps) {
5154
const styles = useThemeStyles();
5255
const {translate} = useLocalize();
53-
const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID);
5456
const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
5557
const {windowHeight} = useWindowDimensions();
5658
// We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to show offline indicator on small screen only
@@ -83,11 +85,14 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
8385
Welcome.setOnboardingErrorMessage('');
8486

8587
if (choice === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) {
88+
<<<<<<< HEAD
8689
if (!onboardingPolicyID) {
8790
const {adminsChatReportID, policyID} = Policy.createWorkspace(undefined, true);
8891
Welcome.setOnboardingAdminsChatReportID(adminsChatReportID);
8992
Welcome.setOnboardingPolicyID(policyID);
9093
}
94+
=======
95+
>>>>>>> 0167316 (Merge pull request #50759 from Expensify/marcaaron-createWorkspaceOnOldDotRedirect)
9196
Navigation.navigate(ROUTES.ONBOARDING_EMPLOYEES.getRoute(route.params?.backTo));
9297
return;
9398
}

0 commit comments

Comments
 (0)