[No QA] Cherry-pick Mobile-Expensify version bumps to Mobile-Expensify staging #59635

roryabraham · 2025-04-03T23:43:26Z

Explanation of Change

When CP'ing E/App PRs to staging, we create a new version in both E/App main and Mobile-Expensify main and update the Mobile-Expensify submodule in E/App main to contain the new version.

Then, we must cherry-pick the version bump to staging. However, we currently only cherry-pick the E/App version bump, and not the Mobile-Expensify version bump. This is the problem fixed by this PR.

To accomplish that, we:

Checkout the Mobile-Expensify submodule
Fetch history in the Mobile-Expensify submodule using the same commands as E/App
Find the version bump commit in Mobile-Expensify using the same commands as E/App.
Cherry-pick the Mobile-Expensify version bump from Mobile-Expensify main to Mobile-Expensify staging. Push that cherry-picked commit to Mobile-Expensify staging
CP the E/App version bump from main to staging as we do today - no changes there
Update the Mobile-Expensify submodule in E/App staging to point at the updated version of Mobile-Expensify staging, including the version bump.
Proceed with the CP as usual.

Fixed Issues

$ https://expensify.slack.com/archives/C03V9A4TB/p1743718938055549
also related to #58775. and #58777

Tests

I have not tested this in App-Test-Fork.

Verify that no errors appear in the JS console

Offline tests

None.

QA Steps

None.

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

MacOS: Desktop

…dule

melvin-bot · 2025-04-03T23:43:52Z

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

.github/workflows/cherryPick.yml

roryabraham · 2025-04-04T08:06:57Z

Did some local testing, found some stuff out that I didn't expect, updated the PR. It definitely would not have worked before, but I'm thinking it will work in its current state.

The Enable branch-switching in the Mobile-Expensify submodule commit was the most critical one

francoisl · 2025-04-04T16:45: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: 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

francoisl · 2025-04-04T16:45:26Z

All yours for final review @AndrewGable and @puneetlath

[No QA] Cherry-pick Mobile-Expensify version bumps to Mobile-Expensify staging (cherry picked from commit 16ce291) (CP triggered by roryabraham)

OSBotify · 2025-04-05T01:12:19Z

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

github-actions · 2025-04-05T01:45:34Z

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

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

github-actions · 2025-04-07T20:33:52Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.1.23-7 🚀

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

roryabraham added 4 commits April 3, 2025 16:23

Create tags in Mobile-Expensify as well as E/App

5426f18

Use working-directory instead of cd

9720c5f

Cherry-pick Mobile-Expensify version bump to staging and update submo…

66df51d

…dule

Push cherry-picked version bump in Mobile-Expensify

42f3bad

roryabraham self-assigned this Apr 3, 2025

roryabraham requested a review from a team as a code owner April 3, 2025 23:43

roryabraham requested review from AndrewGable and francoisl April 3, 2025 23:43

melvin-bot bot requested a review from puneetlath April 3, 2025 23:43

melvin-bot bot removed the request for review from a team April 3, 2025 23:43

francoisl previously approved these changes Apr 4, 2025

View reviewed changes

.github/workflows/cherryPick.yml Outdated Show resolved Hide resolved

Tell git to stop searching after first match is found

014f9ce

roryabraham dismissed francoisl’s stale review via 014f9ce April 4, 2025 06:06

roryabraham requested a review from francoisl April 4, 2025 06:06

roryabraham added 4 commits April 3, 2025 23:13

Improve logs

791a98f

Enable branch-switching in the Mobile-Expensify submodule

2aea82b

Simplify submodule update in E/App

1b54658

Remove unused step id

4b01eac

francoisl approved these changes Apr 4, 2025

View reviewed changes

AndrewGable approved these changes Apr 4, 2025

View reviewed changes

roryabraham merged commit 16ce291 into main Apr 5, 2025
9 checks passed

roryabraham deleted the Rory-FixHybridAppCP branch April 5, 2025 01:04

OSBotify pushed a commit that referenced this pull request Apr 5, 2025

Merge pull request #59635 from Expensify/Rory-FixHybridAppCP

b8e23d2

[No QA] Cherry-pick Mobile-Expensify version bumps to Mobile-Expensify staging (cherry picked from commit 16ce291) (CP triggered by roryabraham)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Apr 5, 2025

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

Deploy Checklist: New Expensify 2025-04-03 #59590

Closed

86 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[No QA] Cherry-pick Mobile-Expensify version bumps to Mobile-Expensify staging #59635

[No QA] Cherry-pick Mobile-Expensify version bumps to Mobile-Expensify staging #59635

Uh oh!

roryabraham commented Apr 3, 2025 •

edited

Loading

Uh oh!

melvin-bot bot commented Apr 3, 2025

Uh oh!

Uh oh!

roryabraham commented Apr 4, 2025 •

edited

Loading

Uh oh!

francoisl commented Apr 4, 2025

Uh oh!

francoisl commented Apr 4, 2025

Uh oh!

Uh oh!

OSBotify commented Apr 5, 2025

Uh oh!

github-actions bot commented Apr 5, 2025

Uh oh!

github-actions bot commented Apr 7, 2025

Uh oh!

Uh oh!

[No QA] Cherry-pick Mobile-Expensify version bumps to Mobile-Expensify staging #59635

[No QA] Cherry-pick Mobile-Expensify version bumps to Mobile-Expensify staging #59635

Uh oh!

Conversation

roryabraham commented Apr 3, 2025 • 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 3, 2025

Uh oh!

Uh oh!

roryabraham commented Apr 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

francoisl commented Apr 4, 2025

Reviewer Checklist

Screenshots/Videos

Uh oh!

francoisl commented Apr 4, 2025

Uh oh!

Uh oh!

OSBotify commented Apr 5, 2025

Uh oh!

github-actions bot commented Apr 5, 2025

Uh oh!

github-actions bot commented Apr 7, 2025

Uh oh!

Uh oh!

roryabraham commented Apr 3, 2025 •

edited

Loading

roryabraham commented Apr 4, 2025 •

edited

Loading