Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🍒 Cherry pick PR #5706 to staging 🍒 #5847

Merged
merged 3 commits into from
Oct 14, 2021
Merged

🍒 Cherry pick PR #5706 to staging 🍒 #5847

merged 3 commits into from
Oct 14, 2021

Conversation

OSBotify
Copy link
Contributor

🍒 Cherry pick #5706 to staging 🍒

OSBotify and others added 2 commits October 14, 2021 15:42
@OSBotify
Merge pull request #5846 from Expensify/version-BUILD-daf81bcf39f720a…
9538ced 
…6facb4823ca935b8354dc0949

(cherry picked from commit ba63b53)
@marcaaron
Merge pull request #5706 from Expensify/Rory-FixLoadingSpinnerRaceCon…
7adf523 
…dition

Add shouldCreateNewPolicy param to getPolicySummaries action

(cherry picked from commit 30ce47c)
@OSBotify OSBotify requested a review from a team as a code owner October 14, 2021 15:42
@MelvinBot MelvinBot removed the request for review from a team October 14, 2021 15:42
@OSBotify
Copy link
Contributor Author

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.

@AndrewGable
Copy link
Contributor

Please review @roryabraham, fixed three conflicts by:

  1. Keeping outputCurrency since it's on main and appears to be used
  2. Remove the conflicted create function and use the one you wrote in your PR

roryabraham
roryabraham approved these changes Oct 14, 2021
View reviewed changes
Copy link
Contributor

@roryabraham roryabraham left a comment

Choose a reason for hiding this comment

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

Okay, thanks @AndrewGable LGTM 👍

@roryabraham roryabraham merged commit 23a7395 into staging Oct 14, 2021
@roryabraham roryabraham deleted the AndrewGable-cherry-pick-staging-5706 branch October 14, 2021 16:15
@OSBotify
Copy link
Contributor Author

🚀 Cherry-picked to staging by @AndrewGable in version: 1.1.7-18 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor Author

🚀 Deployed to production by @AndrewGable in version: 1.1.7-24 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roryabraham roryabraham roryabraham approved these changes

Assignees

@AndrewGable AndrewGable

Labels
automerge Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@OSBotify @AndrewGable @roryabraham @marcaaron