Merge pull request #1634 from LedgerHQ/develop

Prepare 1.2.5

src/components/Onboarding/steps/Analytics.js

@@ -7,10 +7,13 @@ import { saveSettings } from 'actions/settings'
 import Box from 'components/base/Box'
 import Switch from 'components/base/Switch'
 import FakeLink from 'components/base/FakeLink'
+import { Trans } from 'react-i18next'
 import TrackPage from 'analytics/TrackPage'
 import Track from 'analytics/Track'
 import { openModal } from 'reducers/modals'
 import { MODAL_SHARE_ANALYTICS, MODAL_TECHNICAL_DATA } from 'config/constants'
+import { openURL } from 'helpers/linking'
+import { urls } from 'config/urls'
 import ShareAnalytics from '../../modals/ShareAnalytics'
 import TechnicalData from '../../modals/TechnicalData'
 import { Title, Description, FixedTopContainer, StepContainerInner } from '../helperComponents'
@@ -46,6 +49,9 @@ class Analytics extends PureComponent<StepProps, State> {
     })
   }
 
+  onClickTerms = () => openURL(urls.terms)
+  onClickPrivacy = () => openURL(urls.privacyPolicy)
+
   handleNavBack = () => {
     const { savePassword, prevStep } = this.props
     savePassword(undefined)
@@ -157,6 +163,26 @@ class Analytics extends PureComponent<StepProps, State> {
                 <Switch isChecked={sentryLogsToggle} onChange={this.handleSentryLogsToggle} />
               </Box>
             </Container>
+            <Container>
+              <Box>
+                <Box mb={1}>
+                  <AnalyticsTitle data-e2e="analytics_terms">
+                    {t('onboarding.analytics.terms.title')}
+                  </AnalyticsTitle>
+                </Box>
+                <AnalyticsText>
+                  <div>
+                    <Trans i18nKey="onboarding.analytics.terms.desc">
+                      {'Accept the '}
+                      <HoveredLink onClick={this.onClickTerms}>{'terms of license'}</HoveredLink>
+                      {'and'}
+                      <HoveredLink onClick={this.onClickPrivacy}>{'privacy'}</HoveredLink>
+                      {'.'}
+                    </Trans>
+                  </div>
+                </AnalyticsText>
+              </Box>
+            </Container>
           </Box>
         </StepContainerInner>
         <OnboardingFooter
@@ -204,8 +230,16 @@ const Container = styled(Box).attrs({
   width: 550px;
   justify-content: space-between;
 `
-const LearnMoreWrapper = styled(Box).attrs({})`
+const LearnMoreWrapper = styled(Box)`
   ${FakeLink}:hover {
     color: ${p => p.theme.colors.wallet};
   }
 `
+
+const HoveredLink = styled.span`
+  cursor: pointer;
+  text-decoration: underline;
+  &:hover {
+    color: ${p => p.theme.colors.wallet};
+  }
+`

src/components/modals/AddAccounts/steps/02-step-connect-device.js

@@ -15,6 +15,8 @@ import type { StepProps } from '../index'
 function StepConnectDevice({ t, currency, device, setAppOpened }: StepProps) {
   invariant(currency, 'No crypto asset given')
 
+  const currencyName = `${currency.name} (${currency.ticker})`
+
   return (
     <Fragment>
       <TrackPage category="AddAccounts" name="Step2" />
@@ -23,9 +25,7 @@ function StepConnectDevice({ t, currency, device, setAppOpened }: StepProps) {
         <Box ff="Open Sans" fontSize={4} color="dark" textAlign="center" style={{ width: 370 }}>
           <Trans i18nKey="addAccounts.connectDevice.desc" parent="div">
             {`Follow the steps below to add `}
-            <strong style={{ fontWeight: 'bold' }}>{`${currency.name} (${
-              currency.ticker
-            })`}</strong>
+            <strong style={{ fontWeight: 'bold' }}>{currencyName}</strong>
             {` accounts from your Ledger device.`}
           </Trans>
         </Box>

src/config/urls.js

@@ -16,7 +16,7 @@ export const urls = {
   contactSupport: 'https://support.ledgerwallet.com/hc/en-us/requests/new?ticket_form_id=248165',
   feesMoreInfo: 'https://support.ledgerwallet.com/hc/en-us/articles/360006535873',
   recipientAddressInfo: 'https://support.ledgerwallet.com/hc/en-us/articles/360006433934',
-  privacyPolicy: 'https://www.ledgerwallet.com/privacy-policy',
+  privacyPolicy: 'https://www.ledgerwallet.com/pages/privacy-policy',
 
   githubIssues:
     'https://github.com/LedgerHQ/ledger-live-desktop/issues?q=is%3Aissue+is%3Aopen+label%3Abug+sort%3Acomments-desc',

static/i18n/en/app.json

@@ -186,6 +186,9 @@
       "import": "Accounts",
       "finish": "Confirmation"
     },
+    "connectDevice": {
+      "desc": "Follow the steps below to add <1><0>{{currencyName}}</0></1> accounts"
+    },
     "accountAlreadyImportedSubtitle": "Accounts already in portfolio ({{count}})",
     "accountToImportSubtitle": "Add existing account",
     "accountToImportSubtitle_plural": "Add existing accounts",
@@ -674,6 +677,10 @@
           "item4": "Application language or region",
           "item5": "OS language or region"
         }
+      },
+      "terms": {
+        "title": "Terms *",
+        "desc": "By continuing, you acknowledge that you have read and agree to the <1>Terms of Use</1> and <3>Privacy Policy</3>."
       }
     },
     "finish": {