Skip to content

🍒 Cherry pick PR #43237 to staging 🍒#43297

Merged
roryabraham merged 4 commits intostagingfrom
Julesssss-cherry-pick-staging-43237-1
Jun 7, 2024
Merged

🍒 Cherry pick PR #43237 to staging 🍒#43297
roryabraham merged 4 commits intostagingfrom
Julesssss-cherry-pick-staging-43237-1

Conversation

@os-botify
Copy link
Copy Markdown

@os-botify os-botify bot commented Jun 7, 2024

🍒 Cherry pick #43237 to staging 🍒

OSBotify and others added 2 commits June 7, 2024 14:21
(cherry picked from commit 5c1b32f)
Revert "feat: hold expense in one transaction view"

(cherry picked from commit 4fcc5a9)
@os-botify os-botify bot requested a review from a team as a code owner June 7, 2024 14:21
@os-botify
Copy link
Copy Markdown
Author

os-botify bot commented Jun 7, 2024

This pull request has merge conflicts and can not be automatically merged. 😞
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 melvin-bot bot removed the request for review from a team June 7, 2024 14:22
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Jun 7, 2024

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

@melvin-bot melvin-bot bot requested a review from puneetlath June 7, 2024 14:22
@roryabraham
Copy link
Copy Markdown
Contributor

roryabraham commented Jun 7, 2024

Most checks are skipped for OSBotify PRs, so I'm going to manually run some checks:

  • npm run typecheck
  • npm run lint
  • npm run test
  • npm run prettier

Then will do some manual testing on a dev build

edit: npm run test is failing for me locally, but is also failing in seemingly the same way on main. So going to optimistically assume that's a red herring.

Copy link
Copy Markdown
Contributor

@srikarparsi srikarparsi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know how to check the cherry pick related files like Info.plist and build.gradle but I manually compared the diffs between this PR and the original PR and it seems to be right. I also tried holding a single expense and verified that the button didn't show up and the header's UI looks fine.

@roryabraham roryabraham merged commit 16de4ad into staging Jun 7, 2024
@roryabraham roryabraham deleted the Julesssss-cherry-pick-staging-43237-1 branch June 7, 2024 18:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants