diff --git a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap index c68e7759e419..516b27b2a38b 100644 --- a/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap +++ b/ui/pages/onboarding-flow/metametrics/__snapshots__/metametrics.test.js.snap @@ -146,7 +146,7 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy

- MetaMask would like to gather usage data to better understand how our users interact with MetaMask. This data will be used to provide the service, which includes improving the service based on your use. + We’d like to gather basic usage and diagnostics data to improve MetaMask. Know that we never sell the data you provide here.

- MetaMask will... + When we gather metrics, it will always be...

    -
  • - - Always allow you to opt-out via Settings -
    • -
  • - - Send anonymized click and pageview events -
  • @@ -192,9 +178,9 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy - Never + Private: - collect information we don’t need to provide the service (such as keys, addresses, transaction hashes, or balances) + clicks and views on the app are stored, but other details (like your public address) are not.
    @@ -204,8 +190,8 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy class="box box--flex-direction-row" > @@ -213,9 +199,9 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy - Never + General: - collect your full IP address* + we temporarily use your IP address to detect a general location (like your country or region), but it's never stored.

@@ -225,8 +211,8 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy class="box box--flex-direction-row" > @@ -234,42 +220,47 @@ exports[`Onboarding Metametrics Component should match snapshot after new policy - Never + Optional: - sell data. Ever! + you decide if you want to share or delete your usage data via settings any time.
-
- This data is aggregated and is therefore anonymous for the purposes of General Data Protection Regulation (EU) 2016/679. -
+ + + + + We’ll use this data to learn how you interact with our marketing communications. We may share relevant news (like product features). + +
- * When you use Infura as your default RPC provider in MetaMask, Infura will collect your IP address and your Ethereum wallet address when you send a transaction. We don’t store this information in a way that allows our systems to associate those two pieces of data. For more information on how MetaMask and Infura interact from a data collection perspective, see our update - - here - - . For more information on our privacy practices in general, see our + We’ll let you know if we decide to use this data for other purposes. You can review our - Privacy Policy here + Privacy Policy - . + for more information. Remember, you can go to settings and opt out at any time.
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js index f874c99ca5e0..8fe4246ca332 100644 --- a/ui/pages/onboarding-flow/metametrics/metametrics.js +++ b/ui/pages/onboarding-flow/metametrics/metametrics.js @@ -35,7 +35,6 @@ import { IconName, IconSize, } from '../../../components/component-library'; -import { PRIVACY_POLICY_DATE } from '../../../helpers/constants/privacy-policy'; import Box from '../../../components/ui/box/box'; import { FirstTimeFlowType } from '../../../../shared/constants/onboarding'; @@ -45,9 +44,6 @@ export default function OnboardingMetametrics() { const dispatch = useDispatch(); const history = useHistory(); - const newPrivacyPolicyDate = new Date(PRIVACY_POLICY_DATE); - const currentDate = new Date(Date.now()); - const nextRoute = useSelector(getFirstTimeFlowTypeRouteAfterMetaMetricsOptIn); const firstTimeFlowType = useSelector(getFirstTimeFlowType); @@ -108,298 +104,135 @@ export default function OnboardingMetametrics() { history.push(nextRoute); }; - const renderLegacyOnboarding = () => { - return ( -
+ - - {t('onboardingMetametricsTitle')} - - - {t('onboardingMetametricsDescriptionLegacy')} - - - {t('onboardingMetametricsDescription2Legacy')} - -
- ); - }; - - const renderOnboarding = () => { - return ( -
+ {t('onboardingMetametricsNeverCollectIPEmphasis')} + , + ])} + + +
  • + + + {t('onboardingMetametricsNeverSellData', [ + + {t('onboardingMetametricsNeverSellDataEmphasis')} + , + ])} + {' '} +
    • + + + dispatch(setDataCollectionForMarketing(!dataCollectionForMarketing)) + } + label={t('onboardingMetametricsUseDataCheckbox')} + paddingBottom={3} + /> + - - {t('onboardingMetametricsTitle')} - - - {t('onboardingMetametricsDescription')} - - + {t('onboardingMetametricsInfuraTermsPolicy')} + , + ])} + + +
    + - -
    + {t('onboardingMetametricsDisagree')} +
    - ); - }; - - return currentDate >= newPrivacyPolicyDate - ? renderOnboarding() - : renderLegacyOnboarding(); + + ); } diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.test.js b/ui/pages/onboarding-flow/metametrics/metametrics.test.js index 487987a0f5f5..5318d0ca1821 100644 --- a/ui/pages/onboarding-flow/metametrics/metametrics.test.js +++ b/ui/pages/onboarding-flow/metametrics/metametrics.test.js @@ -140,13 +140,4 @@ describe('Onboarding Metametrics Component', () => { ); expect(queryByTestId('onboarding-metametrics')).toBeInTheDocument(); }); - - it('should render the Legacy Onboarding component when the current date is before the new privacy policy date', () => { - jest.useFakeTimers().setSystemTime(new Date('2020-01-01')); - const { queryByTestId } = renderWithProvider( - , - mockStore, - ); - expect(queryByTestId('onboarding-legacy-metametrics')).toBeInTheDocument(); - }); });