Skip to content

Part of #20163 for file ui\components\app\terms-of-use-popup\terms-of-use-popup.js#20618

Merged
georgewrmarshall merged 14 commits intoMetaMask:developfrom
PrgrmrHarshShukla:Part-of-#20163-for-file-ui-components-app-terms-of-use-popup-terms-of-use-popup.js
Jan 24, 2024
Merged

Part of #20163 for file ui\components\app\terms-of-use-popup\terms-of-use-popup.js#20618
georgewrmarshall merged 14 commits intoMetaMask:developfrom
PrgrmrHarshShukla:Part-of-#20163-for-file-ui-components-app-terms-of-use-popup-terms-of-use-popup.js

Conversation

@PrgrmrHarshShukla
Copy link
Copy Markdown
Contributor

Explanation

This PR is a part of the issue #20163 Replace deprecated CheckBox component with Checkbox from the component-library for file
ui\components\app\terms-of-use-popup\terms-of-use-popup.js

Also fixed a small typo in
ui\components\app\snaps\install-error\install-error.stories.js

Screenshots/Screencaps

Before

Screenshot 2023-08-25 075322

After

Screenshot 2023-08-25 075410

Manual Testing Steps

Pre-merge author checklist

  • I've clearly explained:
    • What problem this PR is solving
    • How this problem was solved
    • How reviewers can test my changes
  • Sufficient automated test coverage has been added

Pre-merge reviewer checklist

  • Manual testing (e.g. pull and build branch, run in browser, test code being changed)
  • PR is linked to the appropriate GitHub issue
  • IF this PR fixes a bug in the release milestone, add this PR to the release milestone

If further QA is required (e.g. new feature, complex testing steps, large refactor), add the Extension QA Board label.

In this case, a QA Engineer approval will be be required.

@PrgrmrHarshShukla PrgrmrHarshShukla requested review from a team as code owners August 26, 2023 16:41
@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.

@PrgrmrHarshShukla
Copy link
Copy Markdown
Contributor Author

Hey @garrettbear and @georgewrmarshall ,

Kindly look at the positioning of the checkbox and label text.
There is some change in their positioning in the before and after UI.
I thought it would be better to ask if it should be made to follow the earlier positioning.

Also,
the label text was bold earlier.
I could not make out how to do so, please help me with some idea on how to do that, in case it is needed.

@PrgrmrHarshShukla
Copy link
Copy Markdown
Contributor Author

Also,
please let me know if I should move the typo problem to a new PR to keep things separate.
I thought it is a relatively small problem, so it might be okay to keep it here.

Regards,
Harsh

@georgewrmarshall georgewrmarshall added the team-design-system All issues relating to design system in Extension label Aug 28, 2023
Copy link
Copy Markdown
Contributor

@georgewrmarshall georgewrmarshall left a comment

Choose a reason for hiding this comment

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

Hey @PrgrmrHarshShukla, these changes look good! Great call out on the visual regressions! This is an issue with the Checkbox component that can be addressed separately. There are some failing e2e tests that will need to be resolved for the PR to get merged. If you can kindly see to those that would be great!

@PrgrmrHarshShukla
Copy link
Copy Markdown
Contributor Author

Sure @georgewrmarshall ,
Will definitely do that.

Regards

@PrgrmrHarshShukla
Copy link
Copy Markdown
Contributor Author

Hey @georgewrmarshall ,
Both the e2e tests are failing because of the same reason.
The reason being TimeoutError while waiting for an element ( probably Checkbox element, we can get a hint here [data-testid="terms-of-use-checkbox"] below ) to be located by the CSS selector.

Screenshot 2023-08-29 072550

Screenshot 2023-08-29 072622

Also

while updating the snapshots for another PR #20535 , I encountered this,

Screenshot 2023-08-29 072650

Probably, these are connected in some way.

Possible Solution

Probably we can let the CSS selector grab the just higher level component of the Checkbox,
that is, the div with className="create-new-vault__terms".
image

Also,
here the Checkbox is rendered conditionally and the condition includeTerms is initially false, this might be making it unavailable for the CSS selector to grab.

🙏🏼
@georgewrmarshall , please share your insights on this.

Regards,
Harsh

…ents-app-terms-of-use-popup-terms-of-use-popup.js
…ents-app-terms-of-use-popup-terms-of-use-popup.js
Copy link
Copy Markdown
Contributor

@georgewrmarshall georgewrmarshall left a comment

Choose a reason for hiding this comment

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

Left some suggestions

PrgrmrHarshShukla and others added 7 commits September 26, 2023 20:32
Co-authored-by: George Marshall <georgewrmarshall@gmail.com>
Co-authored-by: George Marshall <georgewrmarshall@gmail.com>
…ents-app-terms-of-use-popup-terms-of-use-popup.js
…ents-app-terms-of-use-popup-terms-of-use-popup.js
…ents-app-terms-of-use-popup-terms-of-use-popup.js
…ents-app-terms-of-use-popup-terms-of-use-popup.js
…ents-app-terms-of-use-popup-terms-of-use-popup.js
Copy link
Copy Markdown
Contributor

@georgewrmarshall georgewrmarshall left a comment

Choose a reason for hiding this comment

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

LGTM! Not sure why the e2e tests are failing here will try updating from develop

…ents-app-terms-of-use-popup-terms-of-use-popup.js
@PrgrmrHarshShukla
Copy link
Copy Markdown
Contributor Author

Hey @garrettbear ,
Your help is probably needed here.

…ents-app-terms-of-use-popup-terms-of-use-popup.js
…ents-app-terms-of-use-popup-terms-of-use-popup.js
@codecov
Copy link
Copy Markdown

codecov bot commented Jan 17, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (1e5e386) 68.15% compared to head (0c811fe) 68.15%.

Files Patch % Lines
...nents/app/terms-of-use-popup/terms-of-use-popup.js 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop   #20618      +/-   ##
===========================================
- Coverage    68.15%   68.15%   -0.01%     
===========================================
  Files         1083     1083              
  Lines        42491    42491              
  Branches     11333    11333              
===========================================
- Hits         28959    28956       -3     
- Misses       13532    13535       +3     

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

…ents-app-terms-of-use-popup-terms-of-use-popup.js
Copy link
Copy Markdown
Contributor

@georgewrmarshall georgewrmarshall left a comment

Choose a reason for hiding this comment

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

LGTM ✅

  • checked storybook

@georgewrmarshall georgewrmarshall merged commit d212d3b into MetaMask:develop Jan 24, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Jan 24, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

team-design-system All issues relating to design system in Extension

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants