Merge branch 'develop' into wording

package.json

@@ -3,7 +3,7 @@
   "productName": "Ledger Live",
   "description": "Ledger Live - Desktop",
   "repository": "https://github.com/LedgerHQ/ledger-live-desktop",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "author": "Ledger",
   "license": "MIT",
   "scripts": {

src/components/ExchangePage/index.js

@@ -72,10 +72,22 @@ const cards = shuffle([
     logo: <img src={i('logos/exchanges/genesis.svg')} alt="Genesis" width={150} />,
   },
   {
-    key: 'kyber',
-    id: 'kyber',
-    url: urls.kyber,
-    logo: <img src={i('logos/exchanges/kyber.svg')} alt="KYBER" width={150} />,
+    key: 'kyberSwap',
+    id: 'kyberSwap',
+    url: urls.kyberSwap,
+    logo: <img src={i('logos/exchanges/kyber-swap.png')} alt="KyberSwap" width={150} />,
+  },
+  {
+    key: 'changeNow',
+    id: 'changeNow',
+    url: urls.changeNow,
+    logo: <img src={i('logos/exchanges/change-now.png')} alt="ChangeNow" width={150} />,
+  },
+  {
+    key: 'thorSwap',
+    id: 'thorSwap',
+    url: urls.thorSwap,
+    logo: <img src={i('logos/exchanges/thor-swap.png')} alt="ThorSwap" width={150} />,
   },
 ])
 

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.ledger.com/pages/privacy-policy',
 
   githubIssues:
     'https://github.com/LedgerHQ/ledger-live-desktop/issues?q=is%3Aissue+is%3Aopen+label%3Abug+sort%3Acomments-desc',
@@ -30,7 +30,10 @@ export const urls = {
   luno: 'http://luno.go2cloud.org/aff_c?offer_id=4&aff_id=1001&source=ledger',
   shapeshift: 'https://shapeshift.io/#/coins?affiliate=ledger',
   genesis: 'https://genesistrading.com/ledger-live/',
-  kyber: 'http://kyber.network/swap?ref=0xE2D8481eeF31CDA994833974FFfEccd576f8D71E',
+  kyberSwap: 'http://kyber.network/swap?ref=0xE2D8481eeF31CDA994833974FFfEccd576f8D71E',
+  changeNow: 'https://changenow.io/?utm_source=ledger_wallet',
+  thorSwap:
+    'https://www.thorswap.com/?utm_source=Wallet&utm_medium=ledger&utm_campaign=EmbedLink&utm_content=Link1',
 
   // Errors
   errors: {
@@ -38,6 +41,5 @@ export const urls = {
   },
 
   // Currencies status
-  currenciesStatus:
-    'https://s3-eu-west-1.amazonaws.com/ledger-ledgerlive-resources-prod/public_resources/currencies.json',
+  currenciesStatus: 'http://resources.live.ledger.app/public_resources/currencies.json',
 }

static/i18n/en/app.json

@@ -170,7 +170,9 @@
     "luno": "Luno makes it safe and easy to buy, store and learn about cryptocurrencies like Bitcoin and Ethereum",
     "shapeshift": "ShapeShift is an online marketplace where users can buy and sell digital assets. It is a fast and secure way for the world to buy and sell digital assets, with no lengthy signup process, no counterparty risk, and no friction.",
     "genesis": "Genesis is an institutional trading firm offering liquidity and borrow for digital currencies, including bitcoin, bitcoin cash, ethereum, ethereum classic, litecoin, and XRP.",
-    "kyber": "Kyber is a trading platform for exchange and conversion of ERC-20 tokens"
+    "kyberSwap": "Fast, simple and secure token swap platform. Powered by Kyber Network's on-chain liquidity protocol.",
+    "thorSwap": "ThorSwap is an instant, safe and fair crypto asset market powered by decentralized atomic swap technologies. It is the most convenient way to start trading, no registration or KYC for small amount transactions.",
+    "changeNow": "ChangeNOW is one of the leading custody-free instant exchange services"
   },
   "genuinecheck": {
     "modal": {
@@ -185,7 +187,10 @@
       "import": "Accounts",
       "finish": "Confirmation"
     },
-    "accountAlreadyImportedSubtitle": "Accounts already in Portfolio ({{count}})",
+    "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",
     "selectAll": "Select all ({{count}})",
@@ -674,6 +679,10 @@
           "item4": "",
           "item5": ""
         }
+      },
+      "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": {