Skip to content

Commit ff0856a

Browse files
fix: ensure hooks are only called at the top level
1 parent 13367e4 commit ff0856a

5 files changed

Lines changed: 7 additions & 5 deletions

File tree

src/components/TestDrive/Modal/EmployeeTestDriveModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ function EmployeeTestDriveModal() {
3434
const [bossEmail, setBossEmail] = useState(route.params?.bossEmail ?? '');
3535
const [formError, setFormError] = useState<string | undefined>();
3636
const [isLoading, setIsLoading] = useState(false);
37+
const {testDrive} = useOnboardingMessages();
3738

3839
const onBossEmailChange = useCallback((value: string) => {
3940
setBossEmail(value);
@@ -73,7 +74,6 @@ function EmployeeTestDriveModal() {
7374
selected: true,
7475
},
7576
]);
76-
const {testDrive} = useOnboardingMessages();
7777
setMoneyRequestAmount(transactionID, testDrive.EMPLOYEE_FAKE_RECEIPT.AMOUNT, testDrive.EMPLOYEE_FAKE_RECEIPT.CURRENCY);
7878
setMoneyRequestDescription(transactionID, testDrive.EMPLOYEE_FAKE_RECEIPT.DESCRIPTION, true);
7979
setMoneyRequestMerchant(transactionID, testDrive.EMPLOYEE_FAKE_RECEIPT.MERCHANT, true);

src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount
101101
const StyleUtils = useStyleUtils();
102102
const {translate} = useLocalize();
103103
const {setRootStatusBarEnabled} = useContext(CustomStatusBarAndBackgroundContext);
104+
const {onboardingMessages} = useOnboardingMessages();
104105

105106
// We need to use isSmallScreenWidth, see navigateAfterOnboarding function comment
106107
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -217,7 +218,6 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount
217218
setOnboardingPolicyID(policyID);
218219
}
219220

220-
const {onboardingMessages} = useOnboardingMessages();
221221
completeOnboarding({
222222
engagementChoice: onboardingPurposeSelected,
223223
onboardingMessage: onboardingMessages[onboardingPurposeSelected],

src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
4040
const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST, {canBeMissing: true});
4141
const [onboardingValues] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {canBeMissing: true});
4242
const [conciergeChatReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID, {canBeMissing: true});
43+
const {onboardingMessages} = useOnboardingMessages();
44+
4345
// When we merge public email with work email, we now want to navigate to the
4446
// concierge chat report of the new work email and not the last accessed report.
4547
const mergedAccountConciergeReportID = !onboardingValues?.shouldRedirectToClassicAfterMerge && onboardingValues?.shouldValidate ? conciergeChatReportID : undefined;
@@ -62,7 +64,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
6264
if (!onboardingPurposeSelected) {
6365
return;
6466
}
65-
const {onboardingMessages} = useOnboardingMessages();
6667
completeOnboardingReport({
6768
engagementChoice: onboardingPurposeSelected,
6869
onboardingMessage: onboardingMessages[onboardingPurposeSelected],

src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
5151
const {translate} = useLocalize();
5252
const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
5353
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
54+
const {onboardingMessages} = useOnboardingMessages();
5455

5556
const isPrivateDomainAndHasAccessiblePolicies = !account?.isFromPublicDomain && !!account?.hasAccessibleDomainPolicies;
5657

@@ -87,7 +88,6 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
8788
}
8889

8990
if (isPrivateDomainAndHasAccessiblePolicies && personalDetailsForm?.firstName && personalDetailsForm?.lastName) {
90-
const {onboardingMessages} = useOnboardingMessages();
9191
completeOnboarding({
9292
engagementChoice: choice,
9393
onboardingMessage: onboardingMessages[choice],

src/pages/OnboardingWorkspaces/BaseOnboardingWorkspaces.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
3333
const {isOffline} = useNetwork();
3434
const styles = useThemeStyles();
3535
const {translate} = useLocalize();
36+
const {onboardingMessages} = useOnboardingMessages();
37+
3638
// We need to use isSmallScreenWidth, see navigateAfterOnboarding function comment
3739
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
3840
const {onboardingIsMediumOrLargerScreenWidth, isSmallScreenWidth} = useResponsiveLayout();
@@ -57,7 +59,6 @@ function BaseOnboardingWorkspaces({route, shouldUseNativeStyles}: BaseOnboarding
5759
} else {
5860
askToJoinPolicy(policy.policyID);
5961
}
60-
const {onboardingMessages} = useOnboardingMessages();
6162
completeOnboarding({
6263
engagementChoice: CONST.ONBOARDING_CHOICES.LOOKING_AROUND,
6364
onboardingMessage: onboardingMessages[CONST.ONBOARDING_CHOICES.LOOKING_AROUND],

0 commit comments

Comments
 (0)