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

fix: Resolve 7.20.0 merge conflicts #9229

Merged
merged 4 commits into from
Apr 12, 2024
Merged

fix: Resolve 7.20.0 merge conflicts #9229

merged 4 commits into from
Apr 12, 2024

Conversation

Cal-L
Copy link
Contributor

@Cal-L Cal-L commented Apr 12, 2024 •
edited

Description

This PR fixes merge conflicts with 7.20.0

original PR - #9149
cherry pick PR - #9222

Related issues

Fixes:

Manual testing steps

  1. Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

  • I’ve followed MetaMask Coding Standards.
  • I've completed the PR template to the best of my ability
  • I’ve included tests if applicable
  • I’ve documented my code using JSDoc format if applicable
  • I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

Pre-merge reviewer checklist

  • I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
  • I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

@Cal-L Cal-L requested a review from a team as a code owner April 12, 2024 22:18
@Cal-L Cal-L added the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Apr 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@Cal-L Cal-L added No QA Needed/E2E Only Apply this label when your PR does not need any QA effort. Run Smoke E2E Triggers smoke e2e on Bitrise labels Apr 12, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 12, 2024 •
edited by metamaskbot

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: 46ccff0
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/18a91dda-4fe5-40c5-8a7a-64bdbf5468eb

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Apr 12, 2024

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@Cal-L Cal-L removed the Run Smoke E2E Triggers smoke e2e on Bitrise label Apr 12, 2024
sethkfman
sethkfman approved these changes Apr 12, 2024
View reviewed changes
Copy link
Contributor

@sethkfman sethkfman left a comment

Choose a reason for hiding this comment

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

LGTM

@Cal-L Cal-L merged commit 1141149 into release/7.21.0 Apr 12, 2024
27 checks passed
@Cal-L Cal-L deleted the fix/resolve-controller-util-yarn-lock branch April 12, 2024 23:16
@github-actions github-actions bot locked and limited conversation to collaborators Apr 12, 2024
@github-actions github-actions bot removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Apr 12, 2024
@Cal-L Cal-L changed the title fix: Resolve missed controller-util yarn lock versions fix: Resolve 7.20.0 merge conflicts Apr 12, 2024
@metamaskbot metamaskbot added the release-7.21.0 Issue or pull request that will be included in release 7.21.0 label Apr 25, 2024
@metamaskbot
Copy link
Collaborator

No release label on PR. Adding release label release-7.21.0 on PR, as PR was added to branch 7.21.0 when release was cut.

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

@sethkfman sethkfman sethkfman approved these changes

Assignees
No one assigned
Labels
No QA Needed/E2E Only Apply this label when your PR does not need any QA effort. release-7.21.0 Issue or pull request that will be included in release 7.21.0
Projects
PR review queue
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@Cal-L @metamaskbot @sethkfman