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 #5747 to staging 🍒 #5845

Closed
wants to merge 2 commits into from
Closed

🍒 Cherry pick PR #5747 to staging 🍒 #5845

wants to merge 2 commits into from

Conversation

OSBotify
Copy link
Contributor

🍒 Cherry pick #5747 to staging 🍒

OSBotify and others added 2 commits October 14, 2021 15:11
@OSBotify
Merge pull request #5844 from Expensify/version-BUILD-c9926d910fd3ebe…
e7cdf9b 
…4ebb16d0c7cea43dea0a732c3

(cherry picked from commit daf81bc)
@nkuoch
Merge pull request #5747 from Expensify/alberto-routeCard
35c0dea 
Route to the main workspace screen now that it is in rightpane

(cherry picked from commit 00d3ea4)
@OSBotify OSBotify requested a review from a team as a code owner October 14, 2021 15:11
@MelvinBot MelvinBot removed the request for review from a team October 14, 2021 15:11
@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
AndrewGable reviewed Oct 14, 2021
View reviewed changes
src/libs/actions/Policy.js
updateAllPolicies(policyDataToStore);
}

if (shouldCreateNewPolicy) {
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like this variable is missing from the function, so I am thinking there is more code that needs to be CP-ed in a certain order..

Copy link
Contributor

Choose a reason for hiding this comment

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

I think we might be missing this PR: #5706

Copy link
Contributor

Choose a reason for hiding this comment

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

Looks like you're right! #5706 is not present on staging, so we can't CP this to staging without first CP'ing that.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok great, thanks! I will CP #5706 first, then CP this again.

@AndrewGable AndrewGable deleted the AndrewGable-cherry-pick-staging-5747 branch October 14, 2021 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndrewGable AndrewGable AndrewGable left review comments

@roryabraham roryabraham roryabraham left review comments

Assignees

@AndrewGable AndrewGable

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

Successfully merging this pull request may close these issues.

None yet
4 participants
@OSBotify @AndrewGable @roryabraham @nkuoch