🍒 Cherry pick PR #60048 to staging 🍒 #60072

os-botify · 2025-04-10T22:19:27Z

🍒 Cherry pick #60048 to staging 🍒

This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:

git fetch
git checkout cherry-pick-staging-60048-14391327356-1
git cherry-pick -S -x --mainline 1 4751e06abe09feed19815aa9b419c3c78e3f2c89

Then manually resolve conflicts, and commit the change with git cherry-pick --continue. Lastly, please run:

git commit --amend -m "$(git log -1 --pretty=%B)" -m "(CP triggered by luacmartins)"

That will help us keep track of who triggered this CP. Once all that's done, push your changes with git push origin cherry-pick-staging-60048-14391327356-1, and then open this PR for review.

Note that you must test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.

Pro-tip: If this PR appears to have conflicts against the staging base, it means that the version on staging has been updated. The easiest thing to do if you see this is to close the PR and re-run the CP.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

(cherry picked from commit a37f46e)

[CP Staging] fix: Paid expense preview shows Approve button after reset (cherry picked from commit 4751e06) (CP triggered by luacmartins)

luacmartins · 2025-04-10T22:27:49Z

src/libs/actions/IOU.ts

@@ -8635,7 +8635,7 @@ function canApproveIOU(
    const isCurrentUserManager = managerID === userAccountID;
    const isOpenExpenseReport = isOpenExpenseReportReportUtils(iouReport);
    const isApproved = isReportApproved({report: iouReport});
-    const iouSettled = isSettled(iouReport?.reportID);
+    const iouSettled = isSettled(iouReport);
    const reportNameValuePairs = chatReportRNVP ?? getReportNameValuePairs(iouReport?.reportID);


Conflict was on line 8639. I changed it to what is currently on staging - https://github.com/Expensify/App/blob/staging/src/libs/actions/IOU.ts#L8639

jasperhuangg · 2025-04-10T22:38:50Z

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: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

github-actions · 2025-04-10T22:42:42Z

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 9.1.26-9 🚀

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

github-actions · 2025-04-10T23:27:29Z

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 9.1.26-10 🚀

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

github-actions · 2025-04-11T00:06:45Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.26-10 🚀

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

github-actions · 2025-04-11T00:52:34Z

🚀 Deployed to staging by https://github.com/jasperhuangg in version: 9.1.27-0 🚀

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

github-actions · 2025-04-16T22:15:07Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.28-15 🚀

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

OSBotify added 2 commits April 10, 2025 22:19

Update version to 9.1.26-10

259eda9

(cherry picked from commit a37f46e)

Update Mobile-Expensify submodule version to 9.1.26-10

c8afc99

os-botify bot requested a review from a team as a code owner April 10, 2025 22:19

os-botify bot added Engineering Hourly KSv2 labels Apr 10, 2025

melvin-bot bot removed the request for review from a team April 10, 2025 22:19

os-botify bot assigned luacmartins Apr 10, 2025

Merge pull request #60048 from daledah/fix/59973

451a252

[CP Staging] fix: Paid expense preview shows Approve button after reset (cherry picked from commit 4751e06) (CP triggered by luacmartins)

luacmartins reviewed Apr 10, 2025

View reviewed changes

jasperhuangg approved these changes Apr 10, 2025

View reviewed changes

jasperhuangg merged commit 8b62897 into staging Apr 10, 2025
4 of 5 checks passed

jasperhuangg deleted the cherry-pick-staging-60048-14391327356-1 branch April 10, 2025 22:39

github-actions bot mentioned this pull request Apr 10, 2025

Deploy Checklist: New Expensify 2025-04-10 #59968

Closed

65 tasks

github-actions bot mentioned this pull request Apr 11, 2025

Deploy Checklist: New Expensify 2025-04-11 #60076

Closed

33 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🍒 Cherry pick PR #60048 to staging 🍒 #60072

🍒 Cherry pick PR #60048 to staging 🍒 #60072

os-botify bot commented Apr 10, 2025 •

edited by luacmartins

Loading

luacmartins Apr 10, 2025 •

edited

Loading

jasperhuangg commented Apr 10, 2025

github-actions bot commented Apr 10, 2025

github-actions bot commented Apr 10, 2025

github-actions bot commented Apr 11, 2025

github-actions bot commented Apr 11, 2025

github-actions bot commented Apr 16, 2025

🍒 Cherry pick PR #60048 to staging 🍒 #60072

🍒 Cherry pick PR #60048 to staging 🍒 #60072

Conversation

os-botify bot commented Apr 10, 2025 • edited by luacmartins Loading

PR Author Checklist

Screenshots/Videos

luacmartins Apr 10, 2025 • edited Loading

Choose a reason for hiding this comment

jasperhuangg commented Apr 10, 2025

Reviewer Checklist

Screenshots/Videos

github-actions bot commented Apr 10, 2025

github-actions bot commented Apr 10, 2025

github-actions bot commented Apr 11, 2025

github-actions bot commented Apr 11, 2025

github-actions bot commented Apr 16, 2025

os-botify bot commented Apr 10, 2025 •

edited by luacmartins

Loading

luacmartins Apr 10, 2025 •

edited

Loading