Expensify / App

Welcome to New Expensify: a complete re-imagination of financial collaboration, centered around chat. Help us build the next generation of Expensify by sharing feedback and contributing to the code.
https://new.expensify.com
MIT License
4.03k stars 3.03k forks source link

🍒 Cherry pick PR #56370 to staging 🍒 #56382

Closed os-botify[bot] closed 1 week ago

os-botify[bot] commented 1 week ago

🍒 Cherry pick https://github.com/Expensify/App/pull/56370 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:

```bash
git fetch
git checkout roryabraham-cherry-pick-staging-56370-1
git cherry-pick -S -x --mainline 1 6486b1d1961d4c6de85154905d57af5118b33ff9
```

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

```bash
git commit --amend -m "Update version to 9.0.94-3

(cherry picked from commit dea414d066f8e62bd1bddacd098d36f1fab6ba1a)" -m "(CP triggered by roryabraham)"



    That will help us keep track of who triggered this CP. Once all that's done, push your changes with `git push origin roryabraham-cherry-pick-staging-56370-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.
os-botify[bot] commented 1 week ago

This pull request has merge conflicts and can not be automatically merged. :disappointed: Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge. Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

melvin-bot[bot] commented 1 week ago

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

roryabraham commented 1 week ago

Noticing that the version-bump is now out of date, so I'll just redo the CP. But this issue template needs to be improved. And maybe we can post some instructions on bumping the version again to ensure that this is 1 higher than the version on staging

roryabraham commented 1 week ago

🍒 Cherry pick https://github.com/Expensify/App/pull/56382 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:

```bash
git fetch
git checkout roryabraham-cherry-pick-staging-56382-1
git cherry-pick -S -x --mainline 1 6486b1d1961d4c6de85154905d57af5118b33ff9
```

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

```bash
git commit --amend -m "Dont skip tests for manual CPs" -m "(CP triggered by roryabraham)"
```

That will help us keep track of who triggered this CP. Once all that's done, push your changes with `git push origin roryabraham-cherry-pick-staging-6486b1d1961d4c6de85154905d57af5118b33ff9-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.
roryabraham commented 1 week ago

🍒 Cherry pick https://github.com/Expensify/App/pull/56382 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:

```bash git fetch git checkout roryabraham-cherry-pick-staging-56382-1 git cherry-pick -S -x --mainline 1 6486b1d1961d4c6de85154905d57af5118b33ff9 ```

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

```bash git commit --amend -m \"$(git log -1 --pretty=%B)\" -m \"(CP triggered by roryabraham)\" ```

That will help us keep track of who triggered this CP. Once all that's done, push your changes with `git push origin roryabraham-cherry-pick-staging-6486b1d1961d4c6de85154905d57af5118b33ff9-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.

roryabraham commented 1 week ago

🍒 Cherry pick https://github.com/Expensify/App/pull/56382 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 roryabraham-cherry-pick-staging-56382-1
git cherry-pick -S -x --mainline 1 6486b1d1961d4c6de85154905d57af5118b33ff9

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 roryabraham)\"

That will help us keep track of who triggered this CP. Once all that's done, push your changes with git push origin roryabraham-cherry-pick-staging-6486b1d1961d4c6de85154905d57af5118b33ff9-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.

roryabraham commented 1 week ago

🍒 Cherry pick https://github.com/Expensify/App/pull/56382 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 roryabraham-cherry-pick-staging-56382-1
git cherry-pick -S -x --mainline 1 6486b1d1961d4c6de85154905d57af5118b33ff9

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 roryabraham)"

That will help us keep track of who triggered this CP. Once all that's done, push your changes with git push origin roryabraham-cherry-pick-staging-6486b1d1961d4c6de85154905d57af5118b33ff9-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.

roryabraham commented 1 week ago

🍒 Cherry pick https://github.com/Expensify/App/pull/56382 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:

Auto-merging src/CONST.ts On branch Rory-DontSkipTestsForManualCPs You are currently cherry-picking commit 6486b1d1961. (all conflicts fixed: run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: .github/workflows/cherryPick.yml

Untracked files: (use "git add ..." to include in what will be committed) .sdkmanrc output.csv scripts/temp.sh setupOctokit.js

no changes added to commit (use "git add" and/or "git commit -a")

Then manually resolve conflicts, and commit the change with On branch Rory-DontSkipTestsForManualCPs You are currently cherry-picking commit 6486b1d1961. (all conflicts fixed: run "git cherry-pick --continue") (use "git cherry-pick --skip" to skip this patch) (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git restore ..." to discard changes in working directory) modified: .github/workflows/cherryPick.yml

Untracked files: (use "git add ..." to include in what will be committed) .sdkmanrc output.csv scripts/temp.sh setupOctokit.js

no changes added to commit (use "git add" and/or "git commit -a"). Lastly, please run:

That will help us keep track of who triggered this CP. Once all that's done, push your changes with , 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.

PR Author Checklist

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop
roryabraham commented 1 week ago

🍒 Cherry pick https://github.com/Expensify/App/pull/56382 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 roryabraham-cherry-pick-staging-56382-1
git cherry-pick -S -x --mainline 1 6486b1d1961d4c6de85154905d57af5118b33ff9

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 roryabraham)"

That will help us keep track of who triggered this CP. Once all that's done, push your changes with git push origin roryabraham-cherry-pick-staging-6486b1d1961d4c6de85154905d57af5118b33ff9-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.

PR Author Checklist

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop