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: handle blockaid initialisation failure on settings page #8145

Merged
merged 10 commits into from
Dec 19, 2023

Conversation

jpuri
Copy link
Contributor

@jpuri jpuri commented Dec 18, 2023

Description

If PPOM initialisation fails prompt user to try again.

Related issues

Fixes: #8068

Manual testing steps

  1. Disconnect device from internet
  2. Enable blockaid in settings -> experimental
  3. It should show message that initialisation failed

Screenshots/Recordings

Screen.Recording.2023-12-18.at.8.47.24.PM.mov

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.

@jpuri jpuri added needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) team-confirmations-secure-ux-PR PR from the confirmations team labels Dec 18, 2023
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.

@jpuri jpuri changed the title Handle blockaid initialisation failure on settings page fix: handle blockaid initialisation failure on settings page Dec 18, 2023
@jpuri jpuri marked this pull request as ready for review December 18, 2023 16:30
@jpuri jpuri requested a review from a team as a code owner December 18, 2023 16:30
Copy link
Contributor

E2E test started on Bitrise: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/941a6ae3-a8bd-4a22-b637-570871c6926c
You can also kick off another Bitrise E2E smoke test by removing and re-applying the (Run Smoke E2E) label

Copy link

socket-security bot commented Dec 18, 2023

Updated dependencies detected. Learn more about Socket for GitHub ↗︎

Packages Version New capabilities Transitives Size Publisher
@metamask/ppom-validator 0.15.0...0.16.0 None +9/-0 943 kB metamaskbot

Copy link

socket-security bot commented Dec 18, 2023

👍 Dependency issues cleared. Learn more about Socket for GitHub ↗︎

This PR previously contained dependency changes with security issues that have been resolved, removed, or ignored.

Ignoring: @metamask/eth-query@4.0.0, eth-block-tracker@8.1.0, @metamask/eth-json-rpc-middleware@12.0.1

Next steps

Take a deeper look at the dependency

Take a moment to review the security alert above. Review the linked package source code to understand the potential risk. Ensure the package is not malicious before proceeding. If you're unsure how to proceed, reach out to your security team or ask the Socket team for help at support [AT] socket [DOT] dev.

Remove the package

If you happen to install a dependency that Socket reports as Known Malware you should immediately remove it and select a different dependency. For other alert types, you may may wish to investigate alternative packages or consider if there are other ways to mitigate the specific risk posed by the dependency.

Mark a package as acceptable risk

To ignore an alert, reply with a comment starting with @SocketSecurity ignore followed by a space separated list of package-name@version specifiers. e.g. @SocketSecurity ignore foo@1.0.0 bar@* or ignore all packages with @SocketSecurity ignore-all

@jpuri
Copy link
Contributor Author

jpuri commented Dec 18, 2023

@SocketSecurity ignore @metamask/eth-json-rpc-middleware@12.0.1
@SocketSecurity ignore @metamask/eth-query@4.0.0
@SocketSecurity ignore eth-block-tracker@8.1.0
@SocketSecurity ignore @metamask/ppom-validator@0.16.0

locales/languages/en.json Outdated Show resolved Hide resolved
segun
segun previously approved these changes Dec 19, 2023
@segun
Copy link
Contributor

segun commented Dec 19, 2023

PR looks good, just to fix CI failures.

blackdevelopa
blackdevelopa previously approved these changes Dec 19, 2023
Copy link
Contributor

@blackdevelopa blackdevelopa left a comment

Choose a reason for hiding this comment

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

looks good to me

@jpuri jpuri dismissed stale reviews from blackdevelopa and segun via 6f7d95d December 19, 2023 12:27
Copy link

sonarcloud bot commented Dec 19, 2023

@jpuri
Copy link
Contributor Author

jpuri commented Dec 19, 2023

@jpuri jpuri merged commit 14cdb61 into main Dec 19, 2023
26 checks passed
@jpuri jpuri deleted the blockaid_init_failures branch December 19, 2023 18:14
@github-actions github-actions bot locked and limited conversation to collaborators Dec 19, 2023
@github-actions github-actions bot removed the needs-dev-review PR needs reviews from other engineers (in order to receive required approvals) label Dec 19, 2023
@metamaskbot metamaskbot added the release-7.15.0 Issue or pull request that will be included in release 7.15.0 label Dec 19, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
release-7.15.0 Issue or pull request that will be included in release 7.15.0 team-confirmations-secure-ux-PR PR from the confirmations team
Projects
None yet
5 participants