Skip to content

[CP Staging] Partial revert 72366#73585

Merged
inimaga merged 1 commit into
mainfrom
cmartins-partialrevert72366
Oct 27, 2025
Merged

[CP Staging] Partial revert 72366#73585
inimaga merged 1 commit into
mainfrom
cmartins-partialrevert72366

Conversation

@luacmartins

@luacmartins luacmartins commented Oct 27, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Explanation of Change

Partial revert of https://github.com/Expensify/App/pull/72366/files.

Fixed Issues

$ #73510

Tests

Preconditions:

Create three accounts to be used as:

  • Owner
  • Approver
  • Employee
    Sign in as Owner and create a workspace
    Invite Employee and Approver to the workspace
    Navigate to Workspace > Workflows and set Approver account as Approver
    Sign in as Employee on and submit two expenses in the workspace chat

Steps:

  1. Open the app.
  2. Sign in as Approver
  3. Navigate to the workspace chat where an expense report was submitted by an employee.
  4. Tap the report preview.
  5. Tap the More button.
  6. Tap Hold.
  7. Enter any reason and tap the confirmation button.
  8. Verify that you can hold the expense
  • Verify that no errors appear in the JS console

Offline tests

N/A

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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 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)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 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.
  • 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.
  • 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

Screen.Recording.2025-10-27.at.12.29.30.PM.mov
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@luacmartins luacmartins self-assigned this Oct 27, 2025
@inimaga inimaga self-requested a review October 27, 2025 18:30
@luacmartins luacmartins marked this pull request as ready for review October 27, 2025 18:31
@luacmartins luacmartins requested a review from a team as a code owner October 27, 2025 18:31
@melvin-bot melvin-bot Bot requested review from parasharrajat and removed request for a team October 27, 2025 18:31
@melvin-bot

melvin-bot Bot commented Oct 27, 2025

Copy link
Copy Markdown

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

@luacmartins luacmartins changed the title Partial revert 72366 [CP Staging] Partial revert 72366 Oct 27, 2025
@parasharrajat

parasharrajat commented Oct 27, 2025

Copy link
Copy Markdown
Member

@luacmartins Does it need C+ testing?

@codecov

codecov Bot commented Oct 27, 2025 •
edited
Loading

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
src/pages/iou/HoldReasonPage.tsx 0.00% 2 Missing ⚠️
Files with missing lines Coverage Δ
src/pages/iou/HoldReasonPage.tsx 0.00% <0.00%> (ø)

... and 15 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

inimaga
inimaga approved these changes Oct 27, 2025
View reviewed changes

@inimaga inimaga 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.

The fix works:

All.good.mp4

@inimaga inimaga merged commit 3ccdada into main Oct 27, 2025
31 of 34 checks passed
@inimaga inimaga deleted the cmartins-partialrevert72366 branch October 27, 2025 18:44
OSBotify pushed a commit that referenced this pull request Oct 27, 2025
@inimaga @OSBotify
Merge pull request #73585 from Expensify/cmartins-partialrevert72366
61244db 
[CP Staging] Partial revert 72366

(cherry picked from commit 3ccdada)

(cherry-picked to staging by puneetlath)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Oct 27, 2025
@OSBotify OSBotify mentioned this pull request Oct 27, 2025
Closed
71 tasks
@github-actions github-actions Bot mentioned this pull request Oct 27, 2025
Closed
@OSBotify

OSBotify commented Oct 27, 2025

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.2.38-5 🚀

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

@OSBotify

OSBotify commented Oct 27, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.2.38-5 🚀

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

@OSBotify

OSBotify commented Oct 27, 2025

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.2.39-0 🚀

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

@OSBotify

OSBotify commented Oct 28, 2025

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.2.39-3 🚀

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

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

Reviewers

@puneetlath puneetlath puneetlath approved these changes

@inimaga inimaga inimaga approved these changes

@parasharrajat parasharrajat Awaiting requested review from parasharrajat

Assignees

@luacmartins luacmartins

Labels

CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@luacmartins @parasharrajat @OSBotify @puneetlath @inimaga