Skip to content

[NO QA] Fix Consolidated Travel Billing toggle lock icon flashing while loading - #98800

Merged
rlinoz merged 4 commits into
Expensify:mainfrom
ishpaul777:fix-travel-billing-lock-flicker-reopen
Aug 19, 2026
Merged

[NO QA] Fix Consolidated Travel Billing toggle lock icon flashing while loading#98800
rlinoz merged 4 commits into
Expensify:mainfrom
ishpaul777:fix-travel-billing-lock-flicker-reopen

Conversation

@ishpaul777

@ishpaul777 ishpaul777 commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

The Consolidated Travel Billing toggle flashes a lock icon on the Travel settings page. Switch renders the lock whenever disabled is true, regardless of the showLockIcon prop, and the toggle's disabled included isLoading. openPolicyTravelPage pulses cardSettings.isLoading true then false on every page focus, so the lock blinked on and off with each pulse.

Dropped isLoading out of the toggle's disabled so the lock is only driven by the stable reasons (!canWriteMoreFeatures || isOnWaitlist || hasOutstandingBalance, matching the existing showLockIcon). Added an early if (isLoading) return in handleToggle so the toggle still can't be flipped mid-request, since that was the only thing disabled was doing there (pendingAction doesn't block presses).

Fixed Issues

$ #94909
PROPOSAL:

Tests

  1. As a workspace admin, open Workspace Settings > More Features > Travel with a Travel Billing workspace configured.
  2. Load the Travel admin page and verify the toggle's lock icon does not flicker on/off on load.
  3. Leave and revisit the page a few times, verify the lock never flashes.
  4. On a workspace with an outstanding travel balance, verify the lock icon still shows and stays on the toggle (unchanged).
  5. As a read-only member, verify the toggle still shows the lock (unchanged).
  • Verify that no errors appear in the JS console

Offline tests

The lock is derived from Travel Invoicing card settings already in Onyx, so it renders the same offline. An outstanding balance still shows the lock offline, and a loading pulse never shows one.

QA Steps

Same as tests.

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • 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 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

before

Screen.Recording.2026-08-18.at.2.12.33.AM.mov

After

Screen.Recording.2026-08-18.at.2.12.52.AM.mov

Switch renders the lock icon whenever `disabled` is true, and the
toggle's `disabled` included `isLoading`. openPolicyTravelPage pulses
cardSettings.isLoading on every page focus, so the lock blinked on and
off with each pulse. Drop isLoading from disabled and guard
handleToggle directly instead, since pendingAction doesn't block
presses on its own.
@ishpaul777
ishpaul777 requested review from a team as code owners August 17, 2026 20:24
@melvin-bot
melvin-bot Bot requested a review from ChavdaSachin August 17, 2026 20:24
@melvin-bot

melvin-bot Bot commented Aug 17, 2026

Copy link
Copy Markdown

@ChavdaSachin 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
melvin-bot Bot requested review from flaviadefaria and removed request for a team August 17, 2026 20:24
@ishpaul777
ishpaul777 marked this pull request as draft August 17, 2026 20:26
Comment thread tests/ui/WorkspaceTravelBillingSectionTest.tsx
@ishpaul777
ishpaul777 marked this pull request as ready for review August 17, 2026 20:44
Comment thread tests/ui/WorkspaceTravelInvoicingSectionTest.tsx Outdated
@ishpaul777
ishpaul777 requested a review from blimpich August 17, 2026 20:50
@codecov

codecov Bot commented Aug 17, 2026

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
...workspace/travel/WorkspaceTravelBillingSection.tsx 90.95% <66.66%> (-0.45%) ⬇️
... and 221 files with indirect coverage changes

@blimpich
blimpich requested review from rlinoz and removed request for ChavdaSachin and flaviadefaria August 18, 2026 19:40

@blimpich blimpich left a comment

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.

LGTM! Nice job!

@rlinoz

rlinoz commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

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 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 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)
  • 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)
  • 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.
  • 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: mWeb Safari
MacOS: Chrome / Safari

@rlinoz
rlinoz merged commit b0f583c into Expensify:main Aug 19, 2026
36 of 39 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 rlinoz has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.4.57-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

I reviewed the changes in this PR against the help site articles under App/docs/articles, and no updates are needed — so I did not open a draft docs PR.

Why: This is a purely visual bug fix. It stops the Consolidated Travel Billing toggle's lock icon from flashing on/off during the isLoading pulse that openPolicyTravelPage triggers on page focus. It does this by dropping isLoading from the toggle's disabled and blocking mid-request presses with an early return in handleToggle. No feature, setting, label, or documented behavior changes.

What I checked
  • The lock icon still shows for the real, documented lock reasons (read-only member, outstanding balance, waitlist) — that behavior is unchanged by this PR.
  • The Consolidated Travel Billing articles were reviewed:
    • Enable-Consolidated-Travel-Billing-in-a-Workspace.md
    • Book-Travel-Using-Consolidated-Travel-Billing.md
    • Complete-a-Hotel-Stay-Using-Consolidated-Travel-Billing.md
  • The only "lock" mention in these docs is that the Travel toggle in More features is locked while Consolidated Travel Billing is enabled — a different toggle, unaffected by this change.
  • The transient loading flicker is an internal UI glitch and is not (and should not be) documented.

Since there's no help site PR to link, there's nothing further for you to review on the docs side, @ishpaul777. If you believe any of the above behavior is actually documented incorrectly and should change, reply with the specifics and I'll draft the doc updates.


view run

@izarutskaya

Copy link
Copy Markdown

What account should we use for this PR? We don't have account with outstanding travel balance. let me know if I missed anything

First 3 steps passed

Recording.3941.mp4

@rlinoz

rlinoz commented Aug 20, 2026

Copy link
Copy Markdown
Contributor

hmmm the cardtest domain also doesn't have pending balance anymore, thoughts @blimpich ?

@blimpich

Copy link
Copy Markdown
Contributor

Eh lets just say NO QA. Not worth belaboring

@blimpich blimpich changed the title Fix Consolidated Travel Billing toggle lock icon flashing while loading [NO QA] Fix Consolidated Travel Billing toggle lock icon flashing while loading Aug 20, 2026
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Beamanator in version: 9.4.57-3 🚀

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

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants