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

Version v11.16.12 #25330

Merged
merged 3 commits into from
Jun 17, 2024
Merged

Version v11.16.12 #25330

merged 3 commits into from
Jun 17, 2024

Conversation

danjm
Copy link
Contributor

@danjm danjm commented Jun 14, 2024

No description provided.

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.

@metamaskbot metamaskbot added the INVALID-PR-TEMPLATE PR's body doesn't match template label Jun 14, 2024
Base automatically changed from Version-v11.16.11 to master June 14, 2024 19:05
@metamaskbot metamaskbot added the release-11.16.12 Issue or pull request that will be included in release 11.16.12 label Jun 14, 2024
@darkwing darkwing force-pushed the Version-v11.16.12 branch from 89df3b9 to 7253f78 Compare June 14, 2024 20:32
Adds data collection for marketing toggles (and toasts/warnings) on:
- Onboarding
- Toast in Wallet
- Settings page

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

<!--
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?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/24605?quickstart=1)

Fixes:
MetaMask/MetaMask-planning#2437
MetaMask/MetaMask-planning#2438
MetaMask/MetaMask-planning#2526

Onboarding checkbox:
Make the `metametrics.js` to return `renderOnboarding` instead of
`renderLegacyOnboarding`
1. Start a new account
2. There should be a new checkbox that asks for marketing consent
3. Checking it should set the marketing consent to true (check at
Settings, Securty tab page)

Security tab:
1. Go to Security tab
2. When checking the "Data collection for marketing" to `true`, the
"Participate in MetaMetrics" toggle should turn to `true`
3. When checking "Participate in MetaMetrics" to `false`, "Data
collection for marketing" should be set to `false`
4. When "Participate in Metametrics" is `true` and "Data collection for
marketing" is `true`, and the latter is set to `false`, a warning
message should appear.

Toast:
An already onboarded user will have the "dataCollectionForMarketing"
value as `null` (neither `true` or `false`). This will trigger the
toast.
1. By clicking on "I accept", it should set the "Data collection for
marketing" to `true`.
2. By closing the toast or clicking on "No thanks", it should set the
"Data collection for marketing" to `false`.

All of these actions should trigger subsequent Segment events.

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

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

<img width="646" alt="Screenshot 2024-05-20 at 14 19 53"
src="https://github.com/MetaMask/metamask-extension/assets/11148144/a13b70ec-1d89-4e9f-8df1-2096dd56e642">

https://github.com/MetaMask/metamask-extension/assets/11148144/5eb59902-768d-4d07-a112-5aeb5471587d

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

- [ ] 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.

---------

Co-authored-by: Mircea Nistor <[email protected]>
Co-authored-by: NidhiKJha <[email protected]>
Co-authored-by: David Walsh <[email protected]>
Co-authored-by: legobeat <[email protected]>
Co-authored-by: Nidhi Kumari <[email protected]>
Fixes lint errors and e2e failures on v11.16.12, which would have been
introduced during conflict resolution when cherry-picking #24605

Specifically:
- `test/e2e/default-fixture.js` is deleted as that file does not exist
on master yet and is not used. However, importantly, the change made in
`test/e2e/default-fixture.js` in #24605 is now applied to
`test/e2e/fixture-builder.js` (this was needed for e2e tests to pass)
- delete
`ui/pages/settings/security-tab/metametrics-toggle/metametrics-toggle.tsx`
and the associated test file, as these seem to be unused
- delete unused variables in
`ui/pages/settings/security-tab/security-tab.component.js`
@metamaskbot
Copy link
Collaborator

Builds ready [3e8ce07]
Page Load Metrics (230 ± 237 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint80174992211
domContentLoaded10281852
load431760230494237
domInteractive10281852

@danjm danjm marked this pull request as ready for review June 17, 2024 20:52
@danjm danjm requested a review from a team as a code owner June 17, 2024 20:52
@danjm
Copy link
Contributor Author

danjm commented Jun 17, 2024

Tested by David, Hester and myself

@danjm danjm merged commit ed0cc1e into master Jun 17, 2024
75 of 76 checks passed
@danjm danjm deleted the Version-v11.16.12 branch June 17, 2024 20:53
@github-actions github-actions bot locked and limited conversation to collaborators Jun 17, 2024
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 release-11.16.12 Issue or pull request that will be included in release 11.16.12
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants