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.

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

fix: Update settings copy for Blockaid feature #7796

Merged
merged 3 commits into from
Nov 15, 2023

Conversation

blackdevelopa
Copy link
Contributor

@blackdevelopa blackdevelopa commented Nov 14, 2023

Description

This PR updates the blockaid description in Experimental to match the extension copy

Related issues

Fixes: https://github.com/MetaMask/MetaMask-planning/issues/1669

Manual testing steps

  1. Go to Settings > Experimental
  2. Should see blockaid toggle

Screenshots/Recordings

Before

Screenshot 2023-11-15 at 13 08 56

After

Screenshot 2023-11-15 at 13 04 55

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.

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.

@blackdevelopa blackdevelopa added the team-confirmations-secure-ux-PR PR from the confirmations team label Nov 14, 2023
@blackdevelopa blackdevelopa changed the title Update settings copy for Blockaid feature fix: Update settings copy for Blockaid feature Nov 14, 2023
@jpuri
Copy link
Contributor

jpuri commented Nov 14, 2023

@blackdevelopa : this is how it looks now:

Screenshot 2023-11-14 at 11 22 16 PM

@bschorchit
Copy link

Minor and not a blocker: can we use the same font size and color for the "Privacy preserving ...." that we use for the "This feature alerts you ..."?

@blackdevelopa blackdevelopa marked this pull request as ready for review November 15, 2023 12:10
@blackdevelopa blackdevelopa requested a review from a team as a code owner November 15, 2023 12:10
Copy link
Contributor

E2E test started on Bitrise: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/48ee246c-a368-4deb-babe-9d44fbc7eb10
You can also kick off another Bitrise E2E smoke test by removing and re-applying the (Run Smoke E2E) label

@blackdevelopa blackdevelopa added needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) and removed Run Smoke E2E labels Nov 15, 2023
@blackdevelopa blackdevelopa self-assigned this Nov 15, 2023
Copy link

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
0.0% 0.0% Duplication

@blackdevelopa blackdevelopa merged commit 9432ad8 into main Nov 15, 2023
52 checks passed
@blackdevelopa blackdevelopa deleted the 1669/update-settings-copy-blockaid branch November 15, 2023 15:21
@github-actions github-actions bot locked and limited conversation to collaborators Nov 15, 2023
@github-actions github-actions bot removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Nov 15, 2023
@metamaskbot metamaskbot added the release-7.12.0 Issue or pull request that will be included in release 7.12.0 label Nov 15, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
release-7.12.0 Issue or pull request that will be included in release 7.12.0 team-confirmations-secure-ux-PR PR from the confirmations team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants