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

chore: chore/7.16.0 revert more prs #8687

Merged
merged 2 commits into from
Feb 22, 2024
Merged

chore: chore/7.16.0 revert more prs #8687

merged 2 commits into from
Feb 22, 2024

Conversation

Cal-L
Copy link
Contributor

@Cal-L Cal-L commented Feb 22, 2024

Description

Revert conflict comments on 7.16.0

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 clearly explained what problem this PR is solving and how it is solved.
  • I've linked related issues
  • I've included manual testing steps
  • I've included screenshots/recordings if applicable
  • 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.
  • I’ve properly set the pull request status:
    • In case it's not yet "ready for review", I've set it to "draft".
    • In case it's "ready for review", I've changed it from "draft" to "non-draft".

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 review from a team as code owners February 22, 2024 20:30
@Cal-L Cal-L added team-mobile-platform No QA Needed Apply this label when your PR does not need any QA effort. labels Feb 22, 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 the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Feb 22, 2024
@Cal-L Cal-L changed the base branch from main to release/7.16.0 February 22, 2024 20:31
@Cal-L Cal-L merged commit 74e9eb9 into release/7.16.0 Feb 22, 2024
6 checks passed
@Cal-L Cal-L deleted the chore/7.16.0-revert-more-prs branch February 22, 2024 20:32
@github-actions github-actions bot locked and limited conversation to collaborators Feb 22, 2024
@github-actions github-actions bot removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Feb 22, 2024
@metamaskbot metamaskbot added the release-7.16.0 Issue or pull request that will be included in release 7.16.0 label Feb 28, 2024
@metamaskbot
Copy link
Collaborator

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

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

@tommasini tommasini tommasini approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@Cal-L @metamaskbot @tommasini