🍒 Cherry pick PR #95233 to staging 🍒#95266
Conversation
(cherry picked from commit 17748ff) (cherry-picked to staging by cristipaval)
|
@carlosmiceli 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: 22589e9a38
ℹ️ 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".
| </array> | ||
| <key>CFBundleVersion</key> | ||
| <string>9.4.26.6</string> | ||
| <string>9.4.26.7</string> |
There was a problem hiding this comment.
Bump the LiveActivity extension version too
When this iOS build is packaged, NewExpensify embeds LiveActivityExtension.appex from ios/NewExpensify.xcodeproj/project.pbxproj, but that target still uses ios/LiveActivity/Info.plist with CFBundleShortVersionString/CFBundleVersion at 9.3.26/9.3.26.4. Updating the containing app to 9.4.26.7 without updating that embedded extension leaves the IPA with mismatched app-extension bundle versions, which blocks TestFlight/App Store validation for builds that include the LiveActivity target; include ios/LiveActivity/Info.plist in this bump.
Useful? React with 👍 / 👎.
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppAndroid: mWeb ChromeiOS: HybridAppiOS: mWeb SafariMacOS: Chrome / Safari |
🍒 Cherry pick #95233 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:
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-staging-95233-28650615538-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 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
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, 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.ScrollViewcomponent to make it scrollable when more elements are added to the page.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