馃崚 Cherry pick PR #101104 to production 馃崚 - #101246
os-botify[bot] wants to merge 2 commits into
Conversation
(cherry picked from commit 11d405c) (cherry-picked to production by luacmartins)
|
@aldo-expensify 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] |
There was a problem hiding this comment.
馃挕 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 35ad688280
鈩癸笍 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".
| { | ||
| "name": "new.expensify", | ||
| "version": "9.4.77-4", | ||
| "version": "9.4.79-0", |
There was a problem hiding this comment.
Apply PR #101104 before publishing the version bump
In this production cherry-pick, the commit changes only version metadata and the Mobile-Expensify version pointer; none of the changes from merge 15012f0e52c5420b643afd1f022ac79e2f53cbf8 requested in the commit message are present. Merging this revision would therefore deploy version 9.4.79-0 without the fix from PR #101104, so complete the instructed manual cherry-pick and include its resolved diff before merging.
Useful? React with 馃憤聽/ 馃憥.
|
Gonna close this one given we're close to deploying |
馃崚 Cherry pick #101104 to production 馃崚
This PR had conflicts when we tried to cherry-pick it to production. You'll need to manually perform the cherry-pick, using the following steps:
Then manually resolve conflicts, and commit the change with
git cherry-pick --continue. Lastly, please run:This last part is important. It will help us keep track of who triggered this CP, and will ensure that version bumps are tracked correctly. Once all that's done, push your changes with
git push origin cherry-pick-production-101104-35015704781-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.
Important
This PR should ideally be merged by a member of the mobile-deployers team. If it is merged by someone who is not a deployer, the staging deploy triggered by the merge will fail and will need to be manually re-triggered (not just retried) via the deploy workflow.
Pro-tip: If this PR appears to have conflicts against the production base, it means that the version on production 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
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectionAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari