Skip to content

Fix implementation of useCurrentUserPersonalDetails #69864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mountiny merged 15 commits into from
Sep 10, 2025
Merged

Fix implementation of useCurrentUserPersonalDetails #69864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c31d19f
fix impl of useCurrentUserPersonalDetails
SzymczakJ Sep 4, 2025
7d60468
Merge branch 'main' into @szymczak/fix-useCurrentUserPersonalDetails
SzymczakJ Sep 5, 2025
2b00ce0
Merge branch 'main' into @szymczak/fix-useCurrentUserPersonalDetails
SzymczakJ Sep 8, 2025
400c146
fix lint
SzymczakJ Sep 8, 2025
6196396
Merge branch 'main' into @szymczak/fix-useCurrentUserPersonalDetails
SzymczakJ Sep 9, 2025
a5fb2e0
change useCurrentUserPersonalDetails implementation to use context
SzymczakJ Sep 9, 2025
de1b87a
fix tests
SzymczakJ Sep 9, 2025
92398f8
Merge branch 'main' into @szymczak/fix-useCurrentUserPersonalDetails
SzymczakJ Sep 9, 2025
9632b2e
fix tests
SzymczakJ Sep 9, 2025
4463755
Merge branch 'main' into @szymczak/fix-useCurrentUserPersonalDetails
SzymczakJ Sep 9, 2025
84e8df6
fix tests
SzymczakJ Sep 9, 2025
3c6e716
make selector reference stable
SzymczakJ Sep 9, 2025
19dcda4
fix PR comments
SzymczakJ Sep 10, 2025
441e919
Merge branch 'main' into @szymczak/fix-useCurrentUserPersonalDetails
SzymczakJ Sep 10, 2025
d246d9d
fix lint warnings
SzymczakJ Sep 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {ActionSheetAwareScrollViewProvider} from './components/ActionSheetAwareS
import ActiveElementRoleProvider from './components/ActiveElementRoleProvider';
import ColorSchemeWrapper from './components/ColorSchemeWrapper';
import ComposeProviders from './components/ComposeProviders';
import {CurrentUserPersonalDetailsProvider} from './components/CurrentUserPersonalDetailsProvider';
import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackground';
import CustomStatusBarAndBackgroundContextProvider from './components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider';
import ErrorBoundary from './components/ErrorBoundary';
Expand Down Expand Up @@ -88,6 +89,7 @@ function App() {
<ComposeProviders
components={[
OnyxListItemProvider,
CurrentUserPersonalDetailsProvider,
ThemeProvider,
ThemeStylesProvider,
ThemeIllustrationsProvider,
Expand Down
31 changes: 31 additions & 0 deletions src/components/CurrentUserPersonalDetailsProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React, {createContext, useCallback} from 'react';
import type {OnyxEntry} from 'react-native-onyx';
import useOnyx from '@hooks/useOnyx';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {PersonalDetails, PersonalDetailsList} from '@src/types/onyx';
import {useSession} from './OnyxListItemProvider';

const defaultCurrentUserPersonalDetails: PersonalDetails = {
accountID: CONST.DEFAULT_NUMBER_ID,
};

const CurrentUserPersonalDetailsContext = createContext<PersonalDetails>(defaultCurrentUserPersonalDetails);

function CurrentUserPersonalDetailsProvider({children}: {children: React.ReactNode}) {
const session = useSession();
const userAccountID = session?.accountID ?? CONST.DEFAULT_NUMBER_ID;
const userAccountSelector = useCallback(
(allPersonalDetails: OnyxEntry<PersonalDetailsList>): PersonalDetails => {
const personalDetailsForUser = allPersonalDetails?.[userAccountID] ?? ({} as PersonalDetails);
personalDetailsForUser.accountID = userAccountID;
return personalDetailsForUser;
},
[userAccountID],
);
const [currentUserPersonalDetails = defaultCurrentUserPersonalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: userAccountSelector, canBeMissing: true});

@shubham1206agra shubham1206agra Dec 22, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We forgot to add dependencies for the selector, which caused #74176


return <CurrentUserPersonalDetailsContext.Provider value={currentUserPersonalDetails}>{children}</CurrentUserPersonalDetailsContext.Provider>;
}

export {CurrentUserPersonalDetailsContext, CurrentUserPersonalDetailsProvider};
14 changes: 3 additions & 11 deletions src/hooks/useCurrentUserPersonalDetails.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
import {useMemo} from 'react';
import {usePersonalDetails, useSession} from '@components/OnyxListItemProvider';
import CONST from '@src/CONST';
import type {PersonalDetails} from '@src/types/onyx';
import {useContext} from 'react';
import {CurrentUserPersonalDetailsContext} from '@components/CurrentUserPersonalDetailsProvider';

function useCurrentUserPersonalDetails() {
const session = useSession();
const personalDetails = usePersonalDetails();
const accountID = session?.accountID ?? CONST.DEFAULT_NUMBER_ID;
const accountPersonalDetails = personalDetails?.[accountID];
const currentUserPersonalDetails: PersonalDetails = useMemo(() => ({...accountPersonalDetails, accountID}), [accountPersonalDetails, accountID]);

return currentUserPersonalDetails;
return useContext(CurrentUserPersonalDetailsContext);
}

export default useCurrentUserPersonalDetails;
3 changes: 2 additions & 1 deletion tests/ui/PersonalDetailsOnboarding.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {act, fireEvent, render, screen, waitFor} from '@testing-library/react-na
import React from 'react';
import Onyx from 'react-native-onyx';
import ComposeProviders from '@components/ComposeProviders';
import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
import {LocaleContextProvider} from '@components/LocaleContextProvider';
import OnyxListItemProvider from '@components/OnyxListItemProvider';
import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID';
Expand Down Expand Up @@ -41,7 +42,7 @@ const renderOnboardingPersonalDetailsPage = (
initialParams: OnboardingModalNavigatorParamList[typeof SCREENS.ONBOARDING.PERSONAL_DETAILS],
) => {
return render(
<ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
<ComposeProviders components={[OnyxListItemProvider, CurrentUserPersonalDetailsProvider, LocaleContextProvider, CurrentReportIDContextProvider]}>
<PortalProvider>
<NavigationContainer>
<Stack.Navigator initialRouteName={initialRouteName}>
Expand Down
103 changes: 55 additions & 48 deletions tests/ui/components/IOURequestStepConfirmationPageTest.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {fireEvent, render, screen} from '@testing-library/react-native';
import React from 'react';
import Onyx from 'react-native-onyx';
import {CurrentUserPersonalDetailsProvider} from '@components/CurrentUserPersonalDetailsProvider';
import {LocaleContextProvider} from '@components/LocaleContextProvider';
import OnyxListItemProvider from '@components/OnyxListItemProvider';
import {translateLocal} from '@libs/Localize';
Expand Down Expand Up @@ -101,22 +102,24 @@ describe('IOURequestStepConfirmationPageTest', () => {

render(
<OnyxListItemProvider>
<LocaleContextProvider>
<IOURequestStepConfirmationWithWritableReportOrNotFound
route={{
key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
name: 'Money_Request_Step_Confirmation',
params: {
action: 'create',
iouType: 'invoice',
transactionID: TRANSACTION_ID,
reportID: routeReportID,
},
}}
// @ts-expect-error we don't need navigation param here.
navigation={undefined}
/>
</LocaleContextProvider>
<CurrentUserPersonalDetailsProvider>
<LocaleContextProvider>
<IOURequestStepConfirmationWithWritableReportOrNotFound
route={{
key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
name: 'Money_Request_Step_Confirmation',
params: {
action: 'create',
iouType: 'invoice',
transactionID: TRANSACTION_ID,
reportID: routeReportID,
},
}}
// @ts-expect-error we don't need navigation param here.
navigation={undefined}
/>
</LocaleContextProvider>
</CurrentUserPersonalDetailsProvider>
</OnyxListItemProvider>,
);

Expand All @@ -138,22 +141,24 @@ describe('IOURequestStepConfirmationPageTest', () => {

render(
<OnyxListItemProvider>
<LocaleContextProvider>
<IOURequestStepConfirmationWithWritableReportOrNotFound
route={{
key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
name: 'Money_Request_Step_Confirmation',
params: {
action: 'create',
iouType: 'split',
transactionID: TRANSACTION_ID,
reportID: REPORT_ID,
},
}}
// @ts-expect-error we don't need navigation param here.
navigation={undefined}
/>
</LocaleContextProvider>
<CurrentUserPersonalDetailsProvider>
<LocaleContextProvider>
<IOURequestStepConfirmationWithWritableReportOrNotFound
route={{
key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
name: 'Money_Request_Step_Confirmation',
params: {
action: 'create',
iouType: 'split',
transactionID: TRANSACTION_ID,
reportID: REPORT_ID,
},
}}
// @ts-expect-error we don't need navigation param here.
navigation={undefined}
/>
</LocaleContextProvider>
</CurrentUserPersonalDetailsProvider>
</OnyxListItemProvider>,
);

Expand Down Expand Up @@ -182,22 +187,24 @@ describe('IOURequestStepConfirmationPageTest', () => {

render(
<OnyxListItemProvider>
<LocaleContextProvider>
<IOURequestStepConfirmationWithWritableReportOrNotFound
route={{
key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
name: 'Money_Request_Step_Confirmation',
params: {
action: 'create',
iouType: 'split',
transactionID: TRANSACTION_ID,
reportID: REPORT_ID,
},
}}
// @ts-expect-error we don't need navigation param here.
navigation={undefined}
/>
</LocaleContextProvider>
<CurrentUserPersonalDetailsProvider>
<LocaleContextProvider>
<IOURequestStepConfirmationWithWritableReportOrNotFound
route={{
key: 'Money_Request_Step_Confirmation--30aPPAdjWan56sE5OpcG',
name: 'Money_Request_Step_Confirmation',
params: {
action: 'create',
iouType: 'split',
transactionID: TRANSACTION_ID,
reportID: REPORT_ID,
},
}}
// @ts-expect-error we don't need navigation param here.
navigation={undefined}
/>
</LocaleContextProvider>
</CurrentUserPersonalDetailsProvider>
</OnyxListItemProvider>,
);

Expand Down
Loading