Skip to content

Update all usage of User(ONYXKEYS.USER), to use Account(ONYXKEYS.ACCOUNT) #60851

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
merged 9 commits into from
May 1, 2025
Merged

Update all usage of User(ONYXKEYS.USER), to use Account(ONYXKEYS.ACCOUNT) #60851

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
094bc6a
First batch of changes to replace onyxkeys.user usage with onyxkeys.a…
inimaga Apr 24, 2025
3e158c7
Second batch of changes in merging User and Account model
inimaga Apr 24, 2025
acf8209
Further changes related to splacing Onyx.User with Onyx.Account
inimaga Apr 24, 2025
574321b
Prettier fix
inimaga Apr 24, 2025
44fcbd9
Merge branch 'main' into issa-update-usage-of-ONYXKEYS_USER-to-ONYXKE…
inimaga Apr 25, 2025
c488d24
Fix lint issues
inimaga Apr 25, 2025
6ed6bb7
Add comment to indicate that the model for user data is being deprecated
inimaga Apr 29, 2025
d47628c
Merge branch 'main' into issa-update-usage-of-ONYXKEYS_USER-to-ONYXKE…
inimaga Apr 30, 2025
0dc6555
Suppress lint deprecation warning at the export statement for User model
inimaga Apr 30, 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
3 changes: 1 addition & 2 deletions src/components/AccountSwitcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ function AccountSwitcher() {
const {shouldUseNarrowLayout} = useResponsiveLayout();
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false});
const [user] = useOnyx(ONYXKEYS.USER, {canBeMissing: true});
const buttonRef = useRef<HTMLDivElement>(null);
const {windowHeight} = useWindowDimensions();
const {canUseLeftHandBar} = usePermissions();
Expand Down Expand Up @@ -179,7 +178,7 @@ function AccountSwitcher() {
>
{Str.removeSMSDomain(currentUserPersonalDetails?.login ?? '')}
</Text>
{!!user?.isDebugModeEnabled && (
{!!account?.isDebugModeEnabled && (
<Text
style={[styles.textLabelSupporting, styles.mt1, styles.w100]}
numberOfLines={1}
Expand Down
14 changes: 7 additions & 7 deletions src/components/HTMLEngineProvider/HTMLRenderers/ImageRenderer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ import tryResolveUrlFromApiRoot from '@libs/tryResolveUrlFromApiRoot';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type {User} from '@src/types/onyx';
import type {Account} from '@src/types/onyx';

type ImageRendererWithOnyxProps = {
/** Current user */
/** Current user account */
// Following line is disabled because the onyx prop is only being used on the memo HOC
// eslint-disable-next-line react/no-unused-prop-types
user: OnyxEntry<User>;
account: OnyxEntry<Account>;
};

type ImageRendererProps = ImageRendererWithOnyxProps & CustomRendererProps<TBlock>;
Expand All @@ -41,7 +41,7 @@ function ImageRenderer({tnode}: ImageRendererProps) {
//
// - Chat Attachment images
//
// Images uploaded by the user via the app or email.
// Images uploaded by the user account via the app or email.
// These have a full-sized image `htmlAttribs[CONST.ATTACHMENT_SOURCE_ATTRIBUTE]`
// and a thumbnail `htmlAttribs.src`. Both of these URLs need to have
// an authToken added to them in order to control who
Expand Down Expand Up @@ -139,16 +139,16 @@ ImageRenderer.displayName = 'ImageRenderer';

const ImageRendererMemorize = memo(
ImageRenderer,
(prevProps, nextProps) => prevProps.tnode.attributes === nextProps.tnode.attributes && prevProps.user?.shouldUseStagingServer === nextProps.user?.shouldUseStagingServer,
(prevProps, nextProps) => prevProps.tnode.attributes === nextProps.tnode.attributes && prevProps.account?.shouldUseStagingServer === nextProps.account?.shouldUseStagingServer,
);

function ImageRendererWrapper(props: CustomRendererProps<TBlock>) {
const [user] = useOnyx(ONYXKEYS.USER);
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: false});
return (
<ImageRendererMemorize
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
user={user}
account={account}
/>
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/Navigation/NavigationTabBar/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function NavigationTabBar({selectedTab, isTooltipAllowed = false}: NavigationTab
const {translate} = useLocalize();
const {activeWorkspaceID} = useActiveWorkspace();
const {orderedReportIDs} = useSidebarOrderedReportIDs();
const [user] = useOnyx(ONYXKEYS.USER, {canBeMissing: false});
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: false});
const [reportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS, {canBeMissing: true});
const [reports = []] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {
selector: (values) => orderedReportIDs.map((reportID) => values?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]),
Expand Down Expand Up @@ -202,7 +202,7 @@ function NavigationTabBar({selectedTab, isTooltipAllowed = false}: NavigationTab
if (!shouldUseNarrowLayout && canUseLeftHandBar) {
return (
<>
{!!user?.isDebugModeEnabled && (
{!!account?.isDebugModeEnabled && (
<DebugTabView
selectedTab={selectedTab}
chatTabBrickRoad={chatTabBrickRoad}
Expand Down Expand Up @@ -311,7 +311,7 @@ function NavigationTabBar({selectedTab, isTooltipAllowed = false}: NavigationTab

return (
<>
{!!user?.isDebugModeEnabled && (
{!!account?.isDebugModeEnabled && (
<DebugTabView
selectedTab={selectedTab}
chatTabBrickRoad={chatTabBrickRoad}
Expand Down
14 changes: 7 additions & 7 deletions src/components/TestToolMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import {expireSessionWithDelay, invalidateAuthToken, invalidateCredentials} from
import {setIsDebugModeEnabled, setShouldUseStagingServer} from '@userActions/User';
import CONFIG from '@src/CONFIG';
import ONYXKEYS from '@src/ONYXKEYS';
import type {User as UserOnyx} from '@src/types/onyx';
import type {Account as AccountOnyx} from '@src/types/onyx';
import Button from './Button';
import Switch from './Switch';
import TestCrash from './TestCrash';
import TestToolRow from './TestToolRow';
import Text from './Text';

const USER_DEFAULT: UserOnyx = {
const ACCOUNT_DEFAULT: AccountOnyx = {
shouldUseStagingServer: undefined,
isSubscribedToNewsletter: false,
validated: false,
Expand All @@ -26,11 +26,11 @@ const USER_DEFAULT: UserOnyx = {
};

function TestToolMenu() {
const [network] = useOnyx(ONYXKEYS.NETWORK);
const [user = USER_DEFAULT] = useOnyx(ONYXKEYS.USER);
const [isUsingImportedState] = useOnyx(ONYXKEYS.IS_USING_IMPORTED_STATE);
const shouldUseStagingServer = user?.shouldUseStagingServer ?? isUsingStagingApi();
const isDebugModeEnabled = !!user?.isDebugModeEnabled;
const [network] = useOnyx(ONYXKEYS.NETWORK, {canBeMissing: true});
const [account = ACCOUNT_DEFAULT] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
Copy link
Contributor

Choose a reason for hiding this comment

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

For my own understanding, how do you determine if canBeMissing can safely be set to true?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I looked at the usage of the key being called to see if there is a sensible default incase its not provided or if it is being accessed in a safe manner.

In the case of the code you've highlighted, account gets set to ACCOUNT_DEFAULT if ONYXKEYS.ACCOUNT is missing.

For network, its being accessed in a null safe way so if its missing, the places where it is used will still work okay.

const [isUsingImportedState] = useOnyx(ONYXKEYS.IS_USING_IMPORTED_STATE, {canBeMissing: true});
const shouldUseStagingServer = account?.shouldUseStagingServer ?? isUsingStagingApi();
const isDebugModeEnabled = !!account?.isDebugModeEnabled;
const styles = useThemeStyles();
const {translate} = useLocalize();

Expand Down
2 changes: 1 addition & 1 deletion src/libs/ApiUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ getEnvironment().then((envName) => {

// We connect here, so we have the updated ENV_NAME when Onyx callback runs
Onyx.connect({
key: ONYXKEYS.USER,
key: ONYXKEYS.ACCOUNT,
callback: (value) => {
// Toggling between APIs is not allowed on production and internal dev environment
if (ENV_NAME === CONST.ENVIRONMENT.PRODUCTION || CONFIG.IS_USING_LOCAL_WEB) {
Expand Down
4 changes: 2 additions & 2 deletions src/libs/BankAccountUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import {Str} from 'expensify-common';
import type {OnyxEntry} from 'react-native-onyx';
import type * as OnyxTypes from '@src/types/onyx';

function getDefaultCompanyWebsite(session: OnyxEntry<OnyxTypes.Session>, user: OnyxEntry<OnyxTypes.User>): string {
return user?.isFromPublicDomain ? '' : `https://www.${Str.extractEmailDomain(session?.email ?? '')}`;
function getDefaultCompanyWebsite(session: OnyxEntry<OnyxTypes.Session>, account: OnyxEntry<OnyxTypes.Account>): string {
return account?.isFromPublicDomain ? '' : `https://www.${Str.extractEmailDomain(session?.email ?? '')}`;
}

function getLastFourDigits(bankAccountNumber: string): string {
Expand Down
4 changes: 2 additions & 2 deletions src/libs/Navigation/AppNavigator/Navigators/OnboardingModalNavigator.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ function OnboardingModalNavigator() {
const styles = useThemeStyles();
const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
const outerViewRef = React.useRef<View>(null);
const [user] = useOnyx(ONYXKEYS.USER, {canBeMissing: true});
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});

const isOnPrivateDomainAndHasAccessiblePolicies = !user?.isFromPublicDomain && user?.hasAccessibleDomainPolicies;
const isOnPrivateDomainAndHasAccessiblePolicies = !account?.isFromPublicDomain && account?.hasAccessibleDomainPolicies;

const [accountID] = useOnyx(ONYXKEYS.SESSION, {
selector: (session) => session?.accountID ?? CONST.DEFAULT_NUMBER_ID,
Expand Down
3 changes: 1 addition & 2 deletions src/libs/Navigation/NavigationRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N

const currentReportIDValue = useCurrentReportID();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const [user] = useOnyx(ONYXKEYS.USER, {canBeMissing: true});

const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
const [isOnboardingCompleted = true] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {
Expand All @@ -112,7 +111,7 @@ function NavigationRoot({authenticated, lastVisitedPath, initialUrl, onReady}: N
return getAdaptedStateFromPath(lastVisitedPath, linkingConfig.config);
}

if (!user || user.isFromPublicDomain) {
if (!account || account.isFromPublicDomain) {
return;
}

Expand Down
4 changes: 2 additions & 2 deletions src/libs/actions/App.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ Onyx.connect({

let preservedShouldUseStagingServer: boolean | undefined;
Onyx.connect({
key: ONYXKEYS.USER,
key: ONYXKEYS.ACCOUNT,
callback: (value) => {
preservedShouldUseStagingServer = value?.shouldUseStagingServer;
},
Expand Down Expand Up @@ -618,7 +618,7 @@ function clearOnyxAndResetApp(shouldNavigateToHomepage?: boolean) {
}

if (shouldUseStagingServer) {
Onyx.set(ONYXKEYS.USER, {shouldUseStagingServer});
Onyx.set(ONYXKEYS.ACCOUNT, {shouldUseStagingServer});
}
})
.then(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/libs/actions/Session/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,7 +612,7 @@ function signInAfterTransitionFromOldDot(hybridAppSettings: string) {
classicRedirect: {completedHybridAppOnboarding},
nudgeMigration: nudgeMigrationTimestamp ? {timestamp: new Date(nudgeMigrationTimestamp)} : undefined,
},
[ONYXKEYS.USER]: {shouldUseStagingServer: isStaging},
[ONYXKEYS.ACCOUNT]: {shouldUseStagingServer: isStaging},
}).then(() => Onyx.merge(ONYXKEYS.ACCOUNT, {primaryLogin, requiresTwoFactorAuth, needsTwoFactorAuthSetup})),
)
.then(() => {
Expand Down
17 changes: 5 additions & 12 deletions src/libs/actions/User.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,20 @@ function requestContactMethodValidateCode(contactMethod: string) {
}

/**
* Sets whether the user is subscribed to Expensify news
* Sets whether the user account is subscribed to Expensify news
*/
function updateNewsletterSubscription(isSubscribed: boolean) {
const optimisticData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.USER,
key: ONYXKEYS.ACCOUNT,
value: {isSubscribedToNewsletter: isSubscribed},
},
];
const failureData: OnyxUpdate[] = [
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.USER,
key: ONYXKEYS.ACCOUNT,
value: {isSubscribedToNewsletter: !isSubscribed},
},
];
Expand Down Expand Up @@ -522,13 +522,6 @@ function validateSecondaryLogin(loginList: OnyxEntry<LoginList>, contactMethod:
validated: true,
},
},
{
onyxMethod: Onyx.METHOD.MERGE,
key: ONYXKEYS.USER,
value: {
validated: true,
},
},
];
// If the primary login isn't validated yet, set the secondary login as the primary login
if (!loginList?.[currentEmail].validatedDate) {
Expand Down Expand Up @@ -1018,7 +1011,7 @@ function setShouldUseStagingServer(shouldUseStagingServer: boolean) {
if (CONFIG.IS_HYBRID_APP) {
HybridAppModule.shouldUseStaging(shouldUseStagingServer);
}
Onyx.merge(ONYXKEYS.USER, {shouldUseStagingServer});
Onyx.merge(ONYXKEYS.ACCOUNT, {shouldUseStagingServer});
}

function togglePlatformMute(platform: Platform, mutedPlatforms: Partial<Record<Platform, true>>) {
Expand Down Expand Up @@ -1384,7 +1377,7 @@ function requestRefund() {
}

function setIsDebugModeEnabled(isDebugModeEnabled: boolean) {
Onyx.merge(ONYXKEYS.USER, {isDebugModeEnabled});
Onyx.merge(ONYXKEYS.ACCOUNT, {isDebugModeEnabled});
}

export {
Expand Down
10 changes: 5 additions & 5 deletions src/libs/actions/Welcome/OnboardingFlow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import CONST from '@src/CONST';
import NAVIGATORS from '@src/NAVIGATORS';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import type Account from '@src/types/onyx/Account';
import type Onboarding from '@src/types/onyx/Onboarding';
import type User from '@src/types/onyx/User';

let onboardingInitialPath = '';
const onboardingLastVisitedPathConnection = Onyx.connect({
Expand All @@ -35,14 +35,14 @@ Onyx.connect({
},
});

let user: User;
let userAccount: Account;
Onyx.connect({
key: ONYXKEYS.USER,
key: ONYXKEYS.ACCOUNT,
callback: (value) => {
if (value === undefined) {
return;
}
user = value;
userAccount = value;
},
});

Expand All @@ -65,7 +65,7 @@ function startOnboardingFlow(isPrivateDomain?: boolean) {

function getOnboardingInitialPath(isPrivateDomain?: boolean): string {
const state = getStateFromPath(onboardingInitialPath, linkingConfig.config);
const isUserFromPublicDomain = user?.isFromPublicDomain;
const isUserFromPublicDomain = userAccount?.isFromPublicDomain;
const isVsb = onboardingValues && 'signupQualifier' in onboardingValues && onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.VSB;
const isSmb = onboardingValues && 'signupQualifier' in onboardingValues && onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.SMB;
const isIndividual = onboardingValues && 'signupQualifier' in onboardingValues && onboardingValues.signupQualifier === CONST.ONBOARDING_SIGNUP_QUALIFIERS.INDIVIDUAL;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
const [onboardingPurposeSelected] = useOnyx(ONYXKEYS.ONBOARDING_PURPOSE_SELECTED, {canBeMissing: true});
const [onboardingPolicyID] = useOnyx(ONYXKEYS.ONBOARDING_POLICY_ID, {canBeMissing: true});
const [onboardingAdminsChatReportID] = useOnyx(ONYXKEYS.ONBOARDING_ADMINS_CHAT_REPORT_ID, {canBeMissing: true});
const [user] = useOnyx(ONYXKEYS.USER, {canBeMissing: true});
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});
const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST, {canBeMissing: true});
const [onboardingValues] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {canBeMissing: true});
const [conciergeChatReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID, {canBeMissing: true});
Expand All @@ -52,7 +52,7 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
const {canUseDefaultRooms} = usePermissions();
const {activeWorkspaceID} = useActiveWorkspace();

const isPrivateDomainAndHasAccesiblePolicies = !user?.isFromPublicDomain && !!user?.hasAccessibleDomainPolicies;
const isPrivateDomainAndHasAccesiblePolicies = !account?.isFromPublicDomain && !!account?.hasAccessibleDomainPolicies;
const isValidated = isCurrentUserValidated(loginList);

useEffect(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/OnboardingPurpose/BaseOnboardingPurpose.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ function BaseOnboardingPurpose({shouldUseNativeStyles, shouldEnableMaxHeight, ro
const {translate} = useLocalize();
const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();
const {windowHeight} = useWindowDimensions();
const [user] = useOnyx(ONYXKEYS.USER, {canBeMissing: true});
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});

const isPrivateDomainAndHasAccesiblePolicies = !user?.isFromPublicDomain && !!user?.hasAccessibleDomainPolicies;
const isPrivateDomainAndHasAccesiblePolicies = !account?.isFromPublicDomain && !!account?.hasAccessibleDomainPolicies;

// We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to show offline indicator on small screen only
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
Expand Down
5 changes: 4 additions & 1 deletion src/pages/ProfilePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ function ProfilePage({route}: ProfilePageProps) {
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: true});
const [personalDetailsMetadata] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_METADATA, {canBeMissing: true});
const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false});
const [isDebugModeEnabled] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.isDebugModeEnabled, canBeMissing: true});
const [isDebugModeEnabled] = useOnyx(ONYXKEYS.ACCOUNT, {
selector: (account) => !!account?.isDebugModeEnabled,
canBeMissing: true,
});
const [guideCalendarLink] = useOnyx(ONYXKEYS.ACCOUNT, {
selector: (account) => account?.guideCalendarLink,
canBeMissing: true,
Expand Down
8 changes: 4 additions & 4 deletions src/pages/ReimbursementAccount/USD/BusinessInfo/subSteps/WebsiteBusiness.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ const STEP_FIELDS = [COMPANY_WEBSITE_KEY];

function WebsiteBusiness({onNext, onMove, isEditing}: SubStepProps) {
const {translate} = useLocalize();
const [reimbursementAccount, reimbursementAccountResult] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT);
const [reimbursementAccount, reimbursementAccountResult] = useOnyx(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {canBeMissing: true});
const isLoadingReimbursementAccount = isLoadingOnyxValue(reimbursementAccountResult);
const [session] = useOnyx(ONYXKEYS.SESSION);
const [user] = useOnyx(ONYXKEYS.USER);
const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: true});
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: true});

const defaultWebsiteExample = useMemo(() => getDefaultCompanyWebsite(session, user), [session, user]);
const defaultWebsiteExample = useMemo(() => getDefaultCompanyWebsite(session, account), [session, account]);
const defaultCompanyWebsite = reimbursementAccount?.achData?.website ?? defaultWebsiteExample;

const validate = useCallback(
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ReportDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta

/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`, {canBeMissing: true});
const [isDebugModeEnabled] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.isDebugModeEnabled, canBeMissing: false});
const [isDebugModeEnabled] = useOnyx(ONYXKEYS.ACCOUNT, {selector: (account) => !!account?.isDebugModeEnabled, canBeMissing: false});
const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {canBeMissing: false});
const [session] = useOnyx(ONYXKEYS.SESSION, {canBeMissing: false});
const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function BaseReportActionContextMenu({
});
const transactionID = getLinkedTransactionID(reportActionID, reportID);
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, {canBeMissing: false});
const [user] = useOnyx(ONYXKEYS.USER, {canBeMissing: false});
const [account] = useOnyx(ONYXKEYS.ACCOUNT, {canBeMissing: false});
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {canBeMissing: false});
const [originalReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${originalReportID}`, {canBeMissing: false});
const isOriginalReportArchived = useReportIsArchived(originalReportID);
Expand Down Expand Up @@ -222,7 +222,7 @@ function BaseReportActionContextMenu({
isProduction,
moneyRequestAction,
areHoldRequirementsMet,
user,
account,
}),
);

Expand Down
Loading