fix: can save vacation delegate that isn't associated with an account by truph01 · Pull Request #83608 · Expensify/App

truph01 · 2026-02-26T18:57:33Z

Explanation of Change

Fixed Issues

$ #77509
PROPOSAL: #77509 (comment)

Tests

Open the NewDot app
Tap on the Profile button
Tap on the status
Tap on the Vacation delegate
Enter a brand new Expensifail account that does not exist yet (note that have an error message)
Verify that an error modal was shown

Verify that no errors appear in the JS console

Offline tests

Open the NewDot app. Go offline
Tap on the Profile button
Tap on the status
Tap on the Vacation delegate
Verify the offline screen is shown

QA Steps

// TODO: These must be filled out, or the issue title must include ""[No QA].""

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-02-27.at.01.49.15.mov

Android: mWeb Chrome

Screen.Recording.2026-02-27.at.01.57.04.mov

iOS: Native

Screen.Recording.2026-02-27.at.01.56.16.mov

iOS: mWeb Safari

Screen.Recording.2026-02-27.at.01.48.24.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-27.at.01.47.38.mov

melvin-bot · 2026-02-26T18:57:41Z

@aimane-chnaif Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: bde8cfaf6c

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx

codecov · 2026-02-26T21:15:47Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
...ponents/BaseVacationDelegateSelectionComponent.tsx	`0.00% <0.00%> (ø)`
...ings/Profile/CustomStatus/VacationDelegatePage.tsx	`0.00% <0.00%> (ø)`
... and 13 files with indirect coverage changes

aimane-chnaif · 2026-03-01T14:56:07Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

video.mov

src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx

aimane-chnaif · 2026-03-01T15:07:46Z

Please correct Tests steps.

This is not tied to Expensifail account only.
And there should be Offline tests.

Header (back button and title) missing when offline

truph01 · 2026-03-04T09:09:18Z

@aimane-chnaif I resolved your comment as well.

aimane-chnaif · 2026-03-04T11:47:30Z

job 7 failure seems not related

aimane-chnaif · 2026-03-04T11:53:29Z

Bug: there should not be offline status indicator on mobile

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 46d184e24a

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-03-04T11:55:45Z

src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx


            if (result.action === ModalActions.CONFIRM) {
-                await setVacationDelegate(currentUserLogin, delegateLogin, true, vacationDelegate?.delegate);
+                await setVacationDelegate(currentUserLogin, delegateLogin, true, vacationDelegateRef.current?.delegate);


Preserve original delegate when confirming warning

Using vacationDelegateRef.current?.delegate here loses the original delegate after a policy-diff warning flow: the first setVacationDelegate(..., false, ...) call already optimistically sets delegate to the new login and stores the original in previousDelegate, so the confirm call rewrites previousDelegate to the new login. If the confirm request then fails (e.g., transient API/network failure), StatusPage’s onCloseError rollback uses this overwritten previousDelegate, so the UI cannot restore the user’s actual prior delegate and can leave an unsaved delegate displayed.

Useful? React with 👍 / 👎.

@MelvinBot To address this concern, I plan to update it to:

if (result.action === ModalActions.CONFIRM) { const response = await setVacationDelegate(currentUserLogin, delegateLogin, true, vacationDelegateRef.current?.delegate); if (!response?.jsonCode) { clearVacationDelegateError(vacationDelegateRef.current?.previousDelegate); } Navigation.goBack(ROUTES.SETTINGS_STATUS); return; }

Does it look good?

aimane-chnaif · 2026-03-04T11:55:51Z

I think this behavior is quite buggy and confusing user.

Screen.Recording.2026-03-04.at.11.54.15.am.mov

trjExpensify

The copy here can be improved, it's somewhat broken English.

Suggestion:

Add vacation delegate
Account does not exist. Please select an existing account to be a delegate.
[Got it]

CC: @jamesdeanexpensify

aimane-chnaif · 2026-03-10T14:57:56Z

@truph01 can you please address last 4 comments above?

truph01 · 2026-03-12T09:51:04Z

I think this behavior is quite buggy and confusing user.

@aimane-chnaif Could you give me more details about the actual result and the expected result shown in your video?

melvin-bot · 2026-03-12T09:51:27Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

MelvinBot · 2026-03-12T11:32:07Z

The proposed change doesn't fully address the concern. Here's why:

The core problem: When the warning modal flow is triggered, the first setVacationDelegate call (line 68) optimistically writes the new delegate login into delegate and stores the original in previousDelegate. By the time the user confirms the warning modal, vacationDelegateRef.current?.delegate is already the new delegate login, not the original.

So in the proposed code:

const response = await setVacationDelegate(currentUserLogin, delegateLogin, true, vacationDelegateRef.current?.delegate);

This still passes the new delegate as currentDelegate, which means the second call's optimistic update overwrites previousDelegate with the new delegate value instead of the original. If the confirm request then fails, rollback can't restore the original delegate.

The clearVacationDelegateError addition has the same issue — vacationDelegateRef.current?.previousDelegate would already be overwritten to the new delegate value by the second setVacationDelegate call's optimistic update, so the rollback target is wrong.

The fix should be: Pass vacationDelegateRef.current?.previousDelegate instead of vacationDelegateRef.current?.delegate on line 50:

if (result.action === ModalActions.CONFIRM) {
    await setVacationDelegate(currentUserLogin, delegateLogin, true, vacationDelegateRef.current?.previousDelegate);
    Navigation.goBack(ROUTES.SETTINGS_STATUS);
    return;
}

This preserves the original delegate through the confirm flow — after the first optimistic update stores the original in previousDelegate, the confirm call correctly passes that original value, so if the second request fails, rollback restores to the right delegate.

The additional clearVacationDelegateError call for !response?.jsonCode shouldn't be needed with this fix, since setVacationDelegate already has failureData that handles API failures, and the previousDelegate will be correct for any rollback path.

MelvinBot · 2026-03-15T17:58:53Z

Code Review

The core fix — using vacationDelegateRef.current?.previousDelegate instead of vacationDelegate?.delegate in the confirm path — is correct. After the first setVacationDelegate call optimistically sets delegate to the new login, previousDelegate correctly holds the original delegate for rollback. The EXP_ERROR handling and offline blocking are also good additions. I found two issues worth addressing:

1. `showErrorModal` should be wrapped in `useCallback`

showErrorModal is defined as a plain async arrow function (line 28) but is included in the dependency array of onSelectRow (line 87). Since it's recreated on every render, onSelectRow will also be recreated on every render, defeating useCallback. It should be wrapped similarly to showWarningModal:

const showErrorModal = useCallback(async (message?: string) => {
    await showConfirmModal({
        title: translate('statusPage.addVacationDelegate'),
        prompt: message ?? translate('statusPage.vacationDelegateError'),
        confirmText: translate('common.buttonConfirm'),
        shouldShowCancelButton: false,
    });

    clearVacationDelegateError(vacationDelegateRef.current?.previousDelegate);
}, [showConfirmModal, translate]);

2. `DomainMemberVacationDelegatePage` needs `shouldShowOfflineIndicator={false}`

BaseVacationDelegateSelectionComponent is shared between two pages. The PR adds FullPageOfflineBlockingView inside the shared component and correctly sets shouldShowOfflineIndicator={false} on VacationDelegatePage's ScreenWrapper. But DomainMemberVacationDelegatePage (src/pages/domain/Members/DomainMemberVacationDelegatePage.tsx:55) also uses this component and does not set shouldShowOfflineIndicator={false} — so when offline, users will see both the FullPageOfflineBlockingView blocking content and the default bottom offline indicator bar from ScreenWrapper.

It should also set shouldShowOfflineIndicator={false}:

<ScreenWrapper
    enableEdgeToEdgeBottomSafeAreaPadding
    testID="DomainMemberVacationDelegate"
    shouldShowOfflineIndicator={false}
>

Everything else looks good

The useRef + useEffect pattern for tracking the latest Onyx value inside async callbacks is correct and standard.
The previousDelegate rollback logic is correct for both the POLICY_DIFF_WARNING confirm path and the EXP_ERROR path.
The offline blocking and language translations are consistent.

aimane-chnaif · 2026-03-15T18:07:06Z

@trjExpensify please confirm the behavior is correct

The video has following cases in order:

existing user
non-existing user
offline

video.mov

aimane-chnaif · 2026-03-15T18:12:15Z

I think this behavior is quite buggy and confusing user.

@aimane-chnaif Could you give me more details about the actual result and the expected result shown in your video?

@trjExpensify what do you think of this behavior?

ios.mov

chatgpt-codex-connector · 2026-03-15T18:24:53Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

Failed to set up container

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

aimane-chnaif · 2026-03-25T16:46:27Z

@truph01 please pull main

iwiznia · 2026-04-01T10:11:20Z

@codex review

iwiznia · 2026-04-01T10:15:16Z

Please address @trjExpensify comment @truph01
The rest looks good

chatgpt-codex-connector · 2026-04-01T10:27:49Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

Failed to set up container

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

aimane-chnaif · 2026-04-02T18:15:15Z

Please address @trjExpensify comment @truph01 The rest looks good

If you meant to update copy, it's coming from backend

fix: can save vacation delegate that isn't associated with an account

bde8cfa

truph01 requested review from a team as code owners February 26, 2026 18:57

melvin-bot bot assigned truph01 Feb 26, 2026

melvin-bot bot requested review from aimane-chnaif and trjExpensify and removed request for a team February 26, 2026 18:57

melvin-bot bot removed the request for review from a team February 26, 2026 18:57

fix: lint

a5e8c28

chatgpt-codex-connector bot reviewed Feb 26, 2026

View reviewed changes

src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx Outdated Show resolved Hide resolved

aimane-chnaif reviewed Mar 1, 2026

View reviewed changes

src/pages/settings/Profile/CustomStatus/VacationDelegatePage.tsx Outdated Show resolved Hide resolved

truph01 added 5 commits March 4, 2026 15:10

Merge branch 'Expensify:main' into fix/77509

4a06338

fix: offline page has no back button

ce87af9

fix: lint

c1b24c6

fix: remove useCallback

82c32e1

fix: create ref to track vacationDelegate value

46d184e

chatgpt-codex-connector bot reviewed Mar 4, 2026

View reviewed changes

trjExpensify requested changes Mar 4, 2026

View reviewed changes

truph01 added 3 commits March 12, 2026 16:25

fix: conflicts

f17b805

fix: conflicts

f299aa2

fix: remove offline status indicator on mobile

0a592e2

fix: update model title

db138ac

truph01 added 4 commits March 12, 2026 17:33

fix: address codex's comment

12e5041

fix: add missing deps

018e65f

fix: revert change

c2b5524

fix: address codex comment

fcee2cf

fix: apply melvin suggestion

5d5455a

Merge branch 'Expensify:main' into fix/77509

f4121d0

aimane-chnaif approved these changes Mar 30, 2026

View reviewed changes

melvin-bot bot requested a review from iwiznia March 30, 2026 16:34

truph01 added 2 commits April 6, 2026 15:23

Merge branch 'Expensify:main' into fix/77509

5ff61d9

Merge branch 'Expensify:main' into fix/77509

3e89b9b

Conversation

truph01 commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 26, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

codecov bot commented Feb 26, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

aimane-chnaif commented Mar 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

aimane-chnaif commented Mar 1, 2026

Uh oh!

truph01 commented Mar 4, 2026

Uh oh!

aimane-chnaif commented Mar 4, 2026

Uh oh!

aimane-chnaif commented Mar 4, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Mar 4, 2026

Choose a reason for hiding this comment

Uh oh!

truph01 Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Mar 4, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Mar 10, 2026

Uh oh!

truph01 commented Mar 12, 2026

Uh oh!

melvin-bot bot commented Mar 12, 2026

Uh oh!

MelvinBot commented Mar 12, 2026

Uh oh!

MelvinBot commented Mar 15, 2026

Code Review

1. showErrorModal should be wrapped in useCallback

2. DomainMemberVacationDelegatePage needs shouldShowOfflineIndicator={false}

Everything else looks good

Uh oh!

aimane-chnaif commented Mar 15, 2026

Uh oh!

aimane-chnaif commented Mar 15, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 15, 2026

Uh oh!

aimane-chnaif commented Mar 25, 2026

Uh oh!

iwiznia commented Apr 1, 2026

Uh oh!

iwiznia commented Apr 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chatgpt-codex-connector bot commented Apr 1, 2026

Uh oh!

truph01 commented Feb 26, 2026 •

edited

Loading

codecov bot commented Feb 26, 2026 •

edited by github-actions bot

Loading

aimane-chnaif commented Mar 1, 2026 •

edited

Loading

1. `showErrorModal` should be wrapped in `useCallback`

2. `DomainMemberVacationDelegatePage` needs `shouldShowOfflineIndicator={false}`

iwiznia commented Apr 1, 2026 •

edited

Loading