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: blockaid banner should not be visible if option has not been enabled in settings #7798

Merged
merged 12 commits into from
Nov 15, 2023

Conversation

jpuri
Copy link
Contributor

@jpuri jpuri commented Nov 14, 2023

Description

blockaid banner should not be visible if option has not been enabled in settings

Related issues

Fixes: #7780

Manual testing steps

  1. Disable blockaid in settings
  2. Submit a transaction
  3. Blockaid banner should not be visible

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.

@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 Nov 14, 2023
@jpuri jpuri requested a review from a team as a code owner November 14, 2023 15:57
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.

@codecov-commenter
Copy link

codecov-commenter commented Nov 14, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (b29fa7e) 35.08% compared to head (1fe2bf5) 35.08%.
Report is 6 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #7798   +/-   ##
=======================================
  Coverage   35.08%   35.08%           
=======================================
  Files        1039     1039           
  Lines       27628    27638   +10     
  Branches     2336     2337    +1     
=======================================
+ Hits         9693     9697    +4     
- Misses      17412    17418    +6     
  Partials      523      523           

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

@jpuri
Copy link
Contributor Author

jpuri commented Nov 14, 2023

ios/Podfile.lock Outdated Show resolved Hide resolved
blackdevelopa
blackdevelopa previously approved these changes Nov 15, 2023
Copy link
Contributor

E2E test started on Bitrise: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/c441b88f-e0f9-4681-bf01-21ffe6fd5192
You can also kick off another Bitrise E2E smoke test by removing and re-applying the (Run Smoke E2E) label

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

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@jpuri jpuri merged commit 17965f7 into main Nov 15, 2023
26 checks passed
@jpuri jpuri deleted the blockaid_setting_fix branch November 15, 2023 15:13
@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.

[Bug]: PPOM - Blockaid Warning is displayed even when the feature is disabled from settings
5 participants