Fix avatar and confirm page loading infinitely in offline by jnowakow · Pull Request #88120 · Expensify/App

jnowakow · 2026-04-16T14:07:35Z

Explanation of Change

Bug 1 — Avatar opens "Not here" page
Optimistically created action missed actorID which should be equal to current user.

Bug 2 — Confirm page loads infinitely
Search always return originalCurrency for transactions even if it is not set. (Auth code). It was copied to transaction object when transaction was undeleted even if it shouldn't be there. The proper fix it to modify backend code but this PR provides hot fix (not copying originalCurrency when it is equal to currency. originalCurrency is used to display loading page:

App/src/pages/iou/request/step/IOURequestStepConfirmation.tsx

Line 1319 in 47c4779

const isLoading = !!transaction?.originalCurrency;

Fixed Issues

$ #88034
PROPOSAL:

Tests

Precondition:

Have a deleted expense.

Go to staging.new.expensify.com
Go to Reports > Expenses.
Click filters > Status > select Deleted > Apply.
Go offline.
Select the expense via checkbox.
Click dropdown button > Undelete.
Go to self DM.
Open the undeleted expense.
Click on the report header.
Click avatar.
→ Avatar preview opens
Close the avatar view.
Click Submit it to someone.
Select workspace chat.
→ Confirm page loads normally.

Verify that no errors appear in the JS console

Offline tests

Precondition:

Have a deleted expense.

Go to staging.new.expensify.com
Go to Reports > Expenses.
Click filters > Status > select Deleted > Apply.
Go offline.
Select the expense via checkbox.
Click dropdown button > Undelete.
Go to self DM.
Open the undeleted expense.
Click on the report header.
Click avatar.
→ Avatar preview opens
Close the avatar view.
Click Submit it to someone.
Select workspace chat.
→ Confirm page loads normally.

QA Steps

Precondition:

Have a deleted expense.

Go to staging.new.expensify.com
Go to Reports > Expenses.
Click filters > Status > select Deleted > Apply.
Go offline.
Select the expense via checkbox.
Click dropdown button > Undelete.
Go to self DM.
Open the undeleted expense.
Click on the report header.
Click avatar.
→ Avatar preview opens
Close the avatar view.
Click Submit it to someone.
Select workspace chat.
→ Confirm page loads normally.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

avatar-and-submit.mov

melvin-bot · 2026-04-16T14:07:44Z

@rojiphil 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]

melvin-bot · 2026-04-16T14:08:29Z

@stitesExpensify 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: 407053d2e8

ℹ️ 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-04-16T14:15:58Z

+                originalAmount: shouldCopyOriginalAmount ? transaction.originalAmount : null,
+                originalCurrency: shouldCopyOriginalCurrency ? transaction.originalCurrency : null,


Restore original FX fields on move failure

The optimistic merge now force-clears originalAmount and originalCurrency, but the corresponding failure rollback for this transaction still restores only reportID, comment, and converted-amount state. If CHANGE_TRANSACTIONS_REPORT fails (offline/server error), these optimistic nulls persist and the transaction loses its prior original-currency metadata, which can leave incorrect values in UI/search until a full refetch.

Useful? React with 👍 / 👎.

github-actions · 2026-04-16T14:18:28Z

                ...transaction,
                reportID,
                comment,
+                originalAmount: shouldCopyOriginalAmount ? transaction.originalAmount : null,


❌ CONSISTENCY-6 (docs)

The optimistic data now explicitly overrides originalAmount and originalCurrency (setting them to null when they match amount/currency), but the failureData block at lines 1081-1090 does not restore these fields. If the API call fails, originalAmount and originalCurrency will remain null instead of being reverted to their original values from transaction.originalAmount and transaction.originalCurrency.

Every field explicitly overridden in optimisticData should have a corresponding restoration in failureData. Add the original values to the failure block:

failureData.push({ onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction.transactionID}`, value: { reportID: transaction.reportID, comment: transaction.comment, originalAmount: transaction.originalAmount, originalCurrency: transaction.originalCurrency, ...(shouldClearAmount && {pendingAction: transaction.pendingAction ?? null}), ...(shouldClearAmount && {convertedAmount: transaction.convertedAmount}), }, });

Reviewed at: 407053d | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

luacmartins · 2026-04-16T14:57:24Z

@rojiphil are you available to review this one?

rojiphil · 2026-04-16T15:02:28Z

Yes. Available. Will come to this one soon.

rojiphil · 2026-04-16T16:13:06Z

Looking into this one now.

rojiphil · 2026-04-16T21:20:09Z

@jnowakow For consistency, let us reset the values of originalAmount and originalCurrency in failureData as mentioned in codex review. Otherwise, the changes LGTM.

88120-web-chrome-001.mp4

joekaufmanexpensify

Good for product

rojiphil · 2026-04-17T21:29:40Z

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
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

88120-android-hybrid-001.mp4

Android: mWeb Chrome

88120-mweb-chrome-001.mp4

iOS: HybridApp

88120-ios-hybrid-001.mp4

iOS: mWeb Safari

88120-mweb-safari-001.mp4

MacOS: Chrome / Safari

88120-web-chrome-002.mp4

rojiphil

Thanks @jnowakow for the updated PR.

@luacmartins Changes LGTM and works well.
Over to you. Thanks.

OSBotify · 2026-04-17T22:06:22Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-04-21T11:41:39Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.3.61-0 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-21T11:42:47Z

I reviewed the changes in this PR. The diff modifies only src/libs/actions/Transaction.ts with two internal bug fixes:

Missing actorAccountID — adds the current user's account ID to optimistically created report actions (fixes avatar showing "Not here" page)
Conditional originalAmount/originalCurrency copy — prevents copying these fields when they match the base transaction values (fixes infinite loading on confirm page)

These are purely internal logic fixes to transaction handling. They don't introduce or change any user-facing features, workflows, settings labels, or UI elements.

No help site changes are required.

izarutskaya · 2026-04-21T13:28:17Z

@jnowakow Do we need any QA steps here?

jnowakow · 2026-04-21T13:43:34Z

@izarutskaya whoops, I didn't noticed that testing steps are empty 🫣 I've updated PR description

jnowakow added 3 commits April 16, 2026 14:53

Fix displaying avatar when transaction is undeleted in offline mode

590e09d

don't copy original currency if it's the same as curency

c380907

fix prettier

407053d

jnowakow requested review from a team as code owners April 16, 2026 14:07

melvin-bot Bot assigned jnowakow Apr 16, 2026

melvin-bot Bot requested review from rojiphil and trjExpensify and removed request for a team and trjExpensify April 16, 2026 14:07

melvin-bot Bot removed the request for review from a team April 16, 2026 14:07

jnowakow requested review from a team and luacmartins April 16, 2026 14:07

melvin-bot Bot requested review from joekaufmanexpensify and stitesExpensify and removed request for a team April 16, 2026 14:07

chatgpt-codex-connector Bot reviewed Apr 16, 2026

View reviewed changes

github-actions Bot reviewed Apr 16, 2026

View reviewed changes

luacmartins removed the request for review from stitesExpensify April 17, 2026 00:45

fix failureData

9dc5590

jnowakow changed the title ~~Jnowowakow/fix avatar when undelete in offline~~ Fix avatar and confirm page loading infinitely in offline Apr 17, 2026

joekaufmanexpensify approved these changes Apr 17, 2026

View reviewed changes

rojiphil approved these changes Apr 17, 2026

View reviewed changes

luacmartins approved these changes Apr 17, 2026

View reviewed changes

luacmartins merged commit efd610b into Expensify:main Apr 17, 2026
35 of 36 checks passed

OSBotify mentioned this pull request Apr 21, 2026

Deploy Checklist: New Expensify 2026-04-21 #88394

Open

		originalAmount: shouldCopyOriginalAmount ? transaction.originalAmount : null,
		originalCurrency: shouldCopyOriginalCurrency ? transaction.originalCurrency : null,

Conversation

jnowakow commented Apr 16, 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 Apr 16, 2026

Uh oh!

melvin-bot Bot commented Apr 16, 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 Apr 16, 2026

Choose a reason for hiding this comment

Uh oh!

github-actions Bot Apr 16, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-6 (docs)

Uh oh!

luacmartins commented Apr 16, 2026

Uh oh!

rojiphil commented Apr 16, 2026

Uh oh!

rojiphil commented Apr 16, 2026

Uh oh!

rojiphil commented Apr 16, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

rojiphil commented Apr 17, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

rojiphil left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Apr 17, 2026

Uh oh!

OSBotify commented Apr 21, 2026

Uh oh!

MelvinBot commented Apr 21, 2026

Uh oh!

izarutskaya commented Apr 21, 2026

Uh oh!

jnowakow commented Apr 21, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

jnowakow commented Apr 16, 2026 •

edited

Loading