Skip to content

fix: cherry-pick (#8727)#8766

Merged
blackdevelopa merged 2 commits into
release/7.17.0from
cherrypick-8669
Feb 29, 2024
Merged

fix: cherry-pick (#8727)#8766
blackdevelopa merged 2 commits into
release/7.17.0from
cherrypick-8669

Conversation

@blackdevelopa

@blackdevelopa blackdevelopa commented Feb 28, 2024

Copy link
Copy Markdown
Contributor

Cherry-pick fix for #8727 on version 7.17.0.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

Migrating from a previous version to v7.17.0 should enable Blockaid by
default in the same way it's done with 7.17.0 fresh installs.

Fixes: #8669

1. Install v7.16
2. Update to v7.17
3. Check settings --> see Blockaid is enabled

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

<!-- [screenshots/recordings] -->

<!-- [screenshots/recordings] -->

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained what problem this PR is solving and how it
is solved.
- [x] I've linked related issues
- [x] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [x] I’ve properly set the pull request status:
  - [x] In case it's not yet "ready for review", I've set it to "draft".
- [x] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

- [x] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [x] 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.
@blackdevelopa blackdevelopa requested a review from a team as a code owner February 28, 2024 10:38
@github-actions

Copy link
Copy Markdown
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.

@blackdevelopa blackdevelopa added the team-confirmations-secure-ux-PR PR from the confirmations team label Feb 28, 2024
@blackdevelopa blackdevelopa changed the title fix: cherry pick 8727 (#8727) fix: cherry pick (#8727) Feb 28, 2024
@codecov-commenter

codecov-commenter commented Feb 28, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 81.25000% with 3 lines in your changes are missing coverage. Please review.

❗ No coverage uploaded for pull request base (release/7.17.0@10aaa64). Click here to learn what that means.

Files Patch % Lines
app/store/migrations/030.ts 81.25% 2 Missing and 1 partial ⚠️
Additional details and impacted files
@@                Coverage Diff                @@
##             release/7.17.0    #8766   +/-   ##
=================================================
  Coverage                  ?   41.14%           
=================================================
  Files                     ?     1249           
  Lines                     ?    30440           
  Branches                  ?     2975           
=================================================
  Hits                      ?    12524           
  Misses                    ?    17167           
  Partials                  ?      749           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@blackdevelopa blackdevelopa changed the title fix: cherry pick (#8727) fix: cherry-pick (#8727) Feb 28, 2024
@metamaskbot metamaskbot added the INVALID-PR-TEMPLATE PR's body doesn't match template label Feb 28, 2024
@github-actions

Copy link
Copy Markdown
Contributor

E2E test started on Bitrise: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/fd915f19-d28f-4f95-819b-789e08a1b1f4
You can also kick off another Bitrise E2E smoke test by removing and re-applying the (Run Smoke E2E) label

@sethkfman sethkfman added the regression-RC DEPRECATED: Please use "regresssion-RC-x.y.z" label instead label Feb 28, 2024
Comment thread app/store/migrations/031.test.ts Outdated
Comment thread app/store/migrations/031.ts Outdated
Comment thread app/store/migrations/index.ts Outdated
@sonarqubecloud

Copy link
Copy Markdown

@seaona

seaona commented Feb 29, 2024

Copy link
Copy Markdown
Member

🟢 from QA looks good:

  • ✔️ Blockaid is enabled by default on the migration flow
blockaid-enabled-default-migration.mp4
  • ✔️ Blockaid is enabled by default on a fresh install
blockaid-enabled-default-fresh-install.mp4

@blackdevelopa blackdevelopa merged commit bf433de into release/7.17.0 Feb 29, 2024
@blackdevelopa blackdevelopa deleted the cherrypick-8669 branch February 29, 2024 10:17
@github-actions github-actions Bot locked and limited conversation to collaborators Feb 29, 2024
@metamaskbot metamaskbot added the release-7.17.0 Issue or pull request that will be included in release 7.17.0 label Feb 29, 2024
@metamaskbot

Copy link
Copy Markdown
Collaborator

No release label on PR. Adding release label release-7.17.0 on PR, as PR was cherry-picked in branch 7.17.0.

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

Labels

INVALID-PR-TEMPLATE PR's body doesn't match template regression-RC DEPRECATED: Please use "regresssion-RC-x.y.z" label instead release-7.17.0 Issue or pull request that will be included in release 7.17.0 team-confirmations-secure-ux-PR PR from the confirmations team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants