From 9228600522c16d548ef5512450a48bfaa7c1fdda Mon Sep 17 00:00:00 2001
From: Juan Cortes Ross <juan@bohem.io>
Date: Sun, 25 Nov 2018 16:52:23 +0100
Subject: [PATCH 1/6] Moves the account exporter from the experimental to a top
 level tab

Tried to stay as true as possible to the design while removing the references to QrCodes
I kept the experimental tab available but without content right now.
---
 src/components/Onboarding/helperComponents.js |  13 ++
 src/components/SettingsPage/index.js          |   6 +
 .../SettingsPage/sections/Export.js           | 166 ++++++++++++++++++
 src/components/SettingsPage/sections/Tools.js |  42 +----
 .../Receive/steps/02-step-connect-device.js   |   2 +-
 src/components/modals/Send/index.js           |  10 +-
 static/i18n/en/app.json                       |  13 ++
 7 files changed, 205 insertions(+), 47 deletions(-)
 create mode 100644 src/components/SettingsPage/sections/Export.js

diff --git a/src/components/Onboarding/helperComponents.js b/src/components/Onboarding/helperComponents.js
index c9e62747..632d79e3 100644
--- a/src/components/Onboarding/helperComponents.js
+++ b/src/components/Onboarding/helperComponents.js
@@ -69,6 +69,19 @@ export function OptionRow({ step, ...p }: { step: StepType }) {
     </Box>
   )
 }
+export function BulletRow({ step, ...p }: { step: StepType }) {
+  const { icon, desc } = step
+  return (
+    <Box horizontal my="7px">
+      <Box {...p} mr="7px">
+        {icon}
+      </Box>
+      <Box justify="center" shrink>
+        <OptionRowDesc>{desc}</OptionRowDesc>
+      </Box>
+    </Box>
+  )
+}
 export const OptionRowDesc = styled(Box).attrs({
   ff: 'Open Sans|Regular',
   fontSize: 4,
diff --git a/src/components/SettingsPage/index.js b/src/components/SettingsPage/index.js
index 5652f5f3..35afee4d 100644
--- a/src/components/SettingsPage/index.js
+++ b/src/components/SettingsPage/index.js
@@ -15,6 +15,7 @@ import SectionDisplay from './sections/Display'
 import SectionCurrencies from './sections/Currencies'
 import SectionHelp from './sections/Help'
 import SectionAbout from './sections/About'
+import SectionExport from './sections/Export'
 import SectionTools from './sections/Tools'
 
 const mapStateToProps = state => ({
@@ -48,6 +49,11 @@ class SettingsPage extends PureComponent<Props, State> {
         label: <Trans i18nKey="settings.tabs.currencies" />,
         value: SectionCurrencies,
       },
+      {
+        key: 'export',
+        label: <Trans i18nKey="settings.tabs.export" />,
+        value: SectionExport,
+      },
       {
         key: 'about',
         label: <Trans i18nKey="settings.tabs.about" />,
diff --git a/src/components/SettingsPage/sections/Export.js b/src/components/SettingsPage/sections/Export.js
new file mode 100644
index 00000000..a00c6c72
--- /dev/null
+++ b/src/components/SettingsPage/sections/Export.js
@@ -0,0 +1,166 @@
+// @flow
+
+import React, { PureComponent } from 'react'
+import { Trans, translate } from 'react-i18next'
+
+import type { T } from 'types/common'
+
+import TrackPage from 'analytics/TrackPage'
+import styled from 'styled-components'
+import { SettingsSection as Section, SettingsSectionHeader as Header } from '../SettingsSection'
+import IconShare from '../../../icons/Share'
+import Button from '../../base/Button'
+import Modal, { ModalBody, ModalContent, ModalFooter, ModalTitle } from '../../base/Modal'
+import Box from '../../base/Box'
+import QRCodeExporter from '../../QRCodeExporter'
+import { BulletRow } from '../../Onboarding/helperComponents'
+import Text from '../../base/Text'
+
+const BulletRowIcon = styled(Box).attrs({
+  ff: 'Open Sans|Regular',
+  fontSize: 12,
+  textAlign: 'center',
+  color: 'wallet',
+  pl: 2,
+})`
+  background-color: rgba(100, 144, 241, 0.1);
+  border-radius: 12px;
+  display: inline-flex;
+  height: 18px;
+  width: 18px;
+  padding: 0px;
+`
+
+type Props = {
+  t: T,
+}
+
+type State = {
+  isModalOpened: boolean,
+}
+
+class SectionExport extends PureComponent<Props, State> {
+  state = {
+    isModalOpened: false,
+  }
+
+  onModalOpen = () => {
+    this.setState({ isModalOpened: true })
+  }
+
+  onModalClose = () => {
+    this.setState({ isModalOpened: false })
+  }
+
+  renderModal = ({ onClose }: any) => {
+    const { t } = this.props
+    const stepsImportMobile = [
+      {
+        key: 'step1',
+        icon: <BulletRowIcon>{'1'}</BulletRowIcon>,
+        desc: (
+          <Box style={{ display: 'block' }}>
+            <Trans i18nKey="settings.export.modal.step1">
+              {'Go to'}
+              <Text ff="Open Sans|SemiBold" color="dark">
+                {'Accounts'}
+              </Text>
+            </Trans>
+          </Box>
+        ),
+      },
+      {
+        key: 'step2',
+        icon: <BulletRowIcon>{'2'}</BulletRowIcon>,
+        desc: (
+          <Box style={{ display: 'block' }}>
+            <Trans i18nKey="settings.export.modal.step2">
+              {'Click on the'}
+              <Text ff="Open Sans|SemiBold" color="dark">
+                {'+'}
+              </Text>
+              {'button'}
+            </Trans>
+          </Box>
+        ),
+      },
+      {
+        key: 'step3',
+        icon: <BulletRowIcon>{'3'}</BulletRowIcon>,
+        desc: (
+          <Box style={{ display: 'block' }}>
+            <Trans i18nKey="settings.export.modal.step3">
+              {'Select'}
+              <Text ff="Open Sans|SemiBold" color="dark">
+                {'Import accounts'}
+              </Text>
+            </Trans>
+          </Box>
+        ),
+      },
+      {
+        key: 'step4',
+        icon: <BulletRowIcon>{'4'}</BulletRowIcon>,
+        desc: (
+          <Box style={{ display: 'block' }}>
+            <Trans i18nKey="settings.export.modal.step4">
+              {'Scan the image'}
+              <Text ff="Open Sans|SemiBold" color="dark">
+                {'until the loader hits 100%'}
+              </Text>
+            </Trans>
+          </Box>
+        ),
+      },
+    ]
+
+    return (
+      <ModalBody onClose={onClose}>
+        <ModalTitle>{'Export accounts'}</ModalTitle>
+        <ModalContent flow={2} justify="center" align="center">
+          <Box flow={2}>
+            <QRCodeExporter size={330} />
+          </Box>
+          <Box shrink style={{ width: 330, fontSize: 13, marginTop: 20 }}>
+            <Text ff="Open Sans|SemiBold" color="dark">
+              {t('settings.export.modal.listTitle')}
+            </Text>
+          </Box>
+          <Box style={{ width: 330 }}>
+            {stepsImportMobile.map(step => <BulletRow key={step.key} step={step} />)}
+          </Box>
+        </ModalContent>
+        <ModalFooter horizontal align="center" justify="flex-end" flow={2}>
+          <Button small onClick={onClose} primary>
+            {t('settings.export.modal.button')}
+          </Button>
+        </ModalFooter>
+      </ModalBody>
+    )
+  }
+
+  render() {
+    const { t } = this.props
+    const { isModalOpened } = this.state
+
+    return (
+      <Section style={{ flowDirection: 'column' }}>
+        <TrackPage category="Settings" name="Export" />
+
+        <Header
+          icon={<IconShare size={16} />}
+          title={t('settings.tabs.export')}
+          desc={t('settings.export.desc')}
+          renderRight={
+            <Button small onClick={this.onModalOpen} primary>
+              {t('settings.export.button')}
+            </Button>
+          }
+        />
+        <Modal isOpened={isModalOpened} onClose={this.onModalClose} render={this.renderModal} />
+      </Section>
+    )
+  }
+}
+
+export default translate()(SectionExport)
diff --git a/src/components/SettingsPage/sections/Tools.js b/src/components/SettingsPage/sections/Tools.js
index 23192ed1..d16ebc62 100644
--- a/src/components/SettingsPage/sections/Tools.js
+++ b/src/components/SettingsPage/sections/Tools.js
@@ -3,54 +3,14 @@
 /* eslint-disable react/jsx-no-literals */
 
 import React, { PureComponent } from 'react'
-import liveCommonPkg from '@ledgerhq/live-common/package.json'
 import { translate } from 'react-i18next'
 import Box, { Card } from 'components/base/Box'
-import Modal, { ModalBody, ModalContent, ModalTitle } from 'components/base/Modal'
-import Button from 'components/base/Button'
-import QRCodeExporter from 'components/QRCodeExporter'
 
 class TabProfile extends PureComponent<*, *> {
-  state = {
-    qrcodeMobileExportModal: false,
-  }
-
-  onQRCodeMobileExport = () => {
-    this.setState({ qrcodeMobileExportModal: true })
-  }
-
-  onRequestClose = () => {
-    this.setState({ qrcodeMobileExportModal: false })
-  }
-
-  renderQRCodeModal = ({ onClose }: any) => (
-    <ModalBody onClose={onClose} justify="center" align="center">
-      <ModalTitle>{'QRCode Mobile Export'}</ModalTitle>
-      <ModalContent flow={2}>
-        <Box>Scan this animated QRCode with Ledger Live Mobile App</Box>
-        <Box flow={2}>
-          <QRCodeExporter />
-        </Box>
-        <Box style={{ textAlign: 'right' }}>{liveCommonPkg.version}</Box>
-      </ModalContent>
-    </ModalBody>
-  )
-
   render() {
-    const { qrcodeMobileExportModal } = this.state
     return (
       <Card flow={3}>
-        <Box horizontal>
-          <Button small onClick={this.onQRCodeMobileExport} primary>
-            QRCode Mobile Export
-          </Button>
-
-          <Modal
-            isOpened={qrcodeMobileExportModal}
-            onClose={this.onRequestClose}
-            render={this.renderQRCodeModal}
-          />
-        </Box>
+        <Box horizontal>Nothing here</Box>
       </Card>
     )
   }
diff --git a/src/components/modals/Receive/steps/02-step-connect-device.js b/src/components/modals/Receive/steps/02-step-connect-device.js
index ecd156ae..2b8ec6be 100644
--- a/src/components/modals/Receive/steps/02-step-connect-device.js
+++ b/src/components/modals/Receive/steps/02-step-connect-device.js
@@ -8,8 +8,8 @@ import EnsureDeviceApp from 'components/EnsureDeviceApp'
 import CurrencyDownStatusAlert from 'components/CurrencyDownStatusAlert'
 import TrackPage from 'analytics/TrackPage'
 
-import type { StepProps } from '../index'
 import { Trans } from 'react-i18next'
+import type { StepProps } from '../index'
 
 export default function StepConnectDevice({ account, onChangeAppOpened }: StepProps) {
   return (
diff --git a/src/components/modals/Send/index.js b/src/components/modals/Send/index.js
index 724c1b53..6ed05d4c 100644
--- a/src/components/modals/Send/index.js
+++ b/src/components/modals/Send/index.js
@@ -4,7 +4,7 @@ import React, { PureComponent } from 'react'
 import invariant from 'invariant'
 import { compose } from 'redux'
 import { connect } from 'react-redux'
-import {Trans, translate} from 'react-i18next'
+import { Trans, translate } from 'react-i18next'
 import { createStructuredSelector } from 'reselect'
 import type { Account, Operation } from '@ledgerhq/live-common/lib/types'
 
@@ -75,26 +75,26 @@ export type StepProps<Transaction> = DefaultStepProps & {
 const createSteps = () => [
   {
     id: 'amount',
-    label: <Trans i18nKey='send.steps.amount.title'/>,
+    label: <Trans i18nKey="send.steps.amount.title" />,
     component: StepAmount,
     footer: StepAmountFooter,
   },
   {
     id: 'device',
-    label: <Trans i18nKey='send.steps.connectDevice.title'/>,
+    label: <Trans i18nKey="send.steps.connectDevice.title" />,
     component: StepConnectDevice,
     footer: StepConnectDeviceFooter,
     onBack: ({ transitionTo }) => transitionTo('amount'),
   },
   {
     id: 'verification',
-    label: <Trans i18nKey='send.steps.verification.title'/>,
+    label: <Trans i18nKey="send.steps.verification.title" />,
     component: StepVerification,
     shouldPreventClose: true,
   },
   {
     id: 'confirmation',
-    label: <Trans i18nKey='send.steps.confirmation.title'/>,
+    label: <Trans i18nKey="send.steps.confirmation.title" />,
     component: StepConfirmation,
     footer: StepConfirmationFooter,
     onBack: ({ transitionTo, onRetry }) => {
diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json
index 65d182f0..59ee4edc 100644
--- a/static/i18n/en/app.json
+++ b/static/i18n/en/app.json
@@ -347,10 +347,23 @@
     "title": "Settings",
     "tabs": {
       "display": "General",
+      "export": "Export accounts",
       "currencies": "Currencies",
       "help": "Help",
       "about": "About"
     },
+    "export": {
+      "desc": "Import accounts on your Ledger Live Mobile app",
+      "button": "Export",
+      "modal":{
+        "button": "Done",
+        "listTitle": "To import accounts on your Ledger Live Mobile app:",
+        "step1": "Go to <1><0>Accounts</0></1>",
+        "step2": "Click on the <1><0>+</0></1> button",
+        "step3": "Select <1><0>Import accounts</0></1>",
+        "step4": "Scan the image <1><0>until the loader hits 100%</0></1>"
+      }
+    },
     "display": {
       "desc": "Configure general Ledger Live settings.",
       "language": "Display language",

From b3df6109fecc381fd24b56ecb2e8304ac62773f9 Mon Sep 17 00:00:00 2001
From: Juan Cortes Ross <juan@bohem.io>
Date: Tue, 27 Nov 2018 19:12:45 +0100
Subject: [PATCH 2/6] Updated literals

---
 .../SettingsPage/sections/Export.js           | 33 ++++---------------
 static/i18n/en/app.json                       |  8 ++---
 2 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/src/components/SettingsPage/sections/Export.js b/src/components/SettingsPage/sections/Export.js
index a00c6c72..2d5fbf73 100644
--- a/src/components/SettingsPage/sections/Export.js
+++ b/src/components/SettingsPage/sections/Export.js
@@ -61,10 +61,11 @@ class SectionExport extends PureComponent<Props, State> {
         desc: (
           <Box style={{ display: 'block' }}>
             <Trans i18nKey="settings.export.modal.step1">
-              {'Go to'}
+              {'Tap the'}
               <Text ff="Open Sans|SemiBold" color="dark">
-                {'Accounts'}
+                {'+'}
               </Text>
+              {'button in Accounts'}
             </Trans>
           </Box>
         ),
@@ -75,11 +76,10 @@ class SectionExport extends PureComponent<Props, State> {
         desc: (
           <Box style={{ display: 'block' }}>
             <Trans i18nKey="settings.export.modal.step2">
-              {'Click on the'}
+              {'Tap'}
               <Text ff="Open Sans|SemiBold" color="dark">
-                {'+'}
+                {'Import desktop accounts'}
               </Text>
-              {'button'}
             </Trans>
           </Box>
         ),
@@ -89,26 +89,7 @@ class SectionExport extends PureComponent<Props, State> {
         icon: <BulletRowIcon>{'3'}</BulletRowIcon>,
         desc: (
           <Box style={{ display: 'block' }}>
-            <Trans i18nKey="settings.export.modal.step3">
-              {'Select'}
-              <Text ff="Open Sans|SemiBold" color="dark">
-                {'Import accounts'}
-              </Text>
-            </Trans>
-          </Box>
-        ),
-      },
-      {
-        key: 'step4',
-        icon: <BulletRowIcon>{'4'}</BulletRowIcon>,
-        desc: (
-          <Box style={{ display: 'block' }}>
-            <Trans i18nKey="settings.export.modal.step4">
-              {'Scan the image'}
-              <Text ff="Open Sans|SemiBold" color="dark">
-                {'until the loader hits 100%'}
-              </Text>
-            </Trans>
+            <Trans i18nKey="settings.export.modal.step3" />
           </Box>
         ),
       },
@@ -116,7 +97,7 @@ class SectionExport extends PureComponent<Props, State> {
 
     return (
       <ModalBody onClose={onClose}>
-        <ModalTitle>{'Export accounts'}</ModalTitle>
+        <ModalTitle>{t('settings.export.modal.title')}</ModalTitle>
         <ModalContent flow={2} justify="center" align="center">
           <Box flow={2}>
             <QRCodeExporter size={330} />
diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json
index 59ee4edc..9a49099f 100644
--- a/static/i18n/en/app.json
+++ b/static/i18n/en/app.json
@@ -357,11 +357,11 @@
       "button": "Export",
       "modal":{
         "button": "Done",
+        "title": "Scan to export to mobile",
         "listTitle": "To import accounts on your Ledger Live Mobile app:",
-        "step1": "Go to <1><0>Accounts</0></1>",
-        "step2": "Click on the <1><0>+</0></1> button",
-        "step3": "Select <1><0>Import accounts</0></1>",
-        "step4": "Scan the image <1><0>until the loader hits 100%</0></1>"
+        "step1": "Tap the <1><0>+</0></1> button in Account",
+        "step2": "Tap <1><0>Import desktop accounts</0></1>",
+        "step3": "Scan until the loader hits 100%"
       }
     },
     "display": {

From 5c57f87e66ba59d95e3d1c6317c82535875d270e Mon Sep 17 00:00:00 2001
From: meriadec <meriadec.pillet@gmail.com>
Date: Wed, 28 Nov 2018 11:38:23 +0100
Subject: [PATCH 3/6] Install libudev-dev on CI and clear CI cache

---
 .circleci/config.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3d1b8ee6..e590dbc9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,6 +9,8 @@ jobs:
   build:
     <<: *defaults
     steps:
+      - run: sudo apt-get update
+      - run: sudo apt-get install -y libudev-dev
       - run:
           name: Install latest yarn
           command: |
@@ -19,10 +21,10 @@ jobs:
       - checkout
       - restore_cache:
           keys:
-            - v11-yarn-packages-{{ checksum "yarn.lock" }}
+            - v12-yarn-packages-{{ checksum "yarn.lock" }}
       - run: yarn install
       - save_cache:
-          key: v11-yarn-packages-{{ checksum "yarn.lock" }}
+          key: v12-yarn-packages-{{ checksum "yarn.lock" }}
           paths:
             - node_modules
       - run: yarn lint

From 486ee24b585c896fb09e8aa0b596bdab1f434152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <renaudeau.gaetan@gmail.com>
Date: Wed, 28 Nov 2018 13:08:24 +0100
Subject: [PATCH 4/6] Less Sentry events

---
 src/sentry/install.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/sentry/install.js b/src/sentry/install.js
index 5d75ed47..7f2b3622 100644
--- a/src/sentry/install.js
+++ b/src/sentry/install.js
@@ -14,13 +14,17 @@ export default (Raven: any, shouldSendCallback: () => boolean, userId: string) =
     tags: {
       git_commit: __GIT_REVISION__,
     },
+    sampleRate: 0.01,
     environment: __DEV__ ? 'development' : 'production',
     shouldSendCallback,
     ignoreErrors: [
+      'failed with status code',
       'status code 404',
       'timeout',
       'socket hang up',
-      'getaddrinfo ',
+      'getaddrinfo',
+      'could not read from HID device',
+      'ENOTFOUND',
       'ETIMEDOUT',
       'ECONNRESET',
       'ENETUNREACH',

From c7158fc7cb07eb5cf041ec24033539c604a3b87c Mon Sep 17 00:00:00 2001
From: Juan Cortes Ross <juan@bohem.io>
Date: Wed, 28 Nov 2018 20:00:14 +0100
Subject: [PATCH 5/6] Fixed some wording

Along with the missing S and fixed font, I fixed some missing wording
---
 src/components/EnsureDeviceApp.js              |  4 ++--
 src/components/GenuineCheck.js                 |  8 ++++----
 src/components/SettingsPage/sections/Export.js |  5 +++--
 static/i18n/en/app.json                        | 13 +++++--------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/components/EnsureDeviceApp.js b/src/components/EnsureDeviceApp.js
index 1d300a98..e742a663 100644
--- a/src/components/EnsureDeviceApp.js
+++ b/src/components/EnsureDeviceApp.js
@@ -77,7 +77,7 @@ class EnsureDeviceApp extends Component<{
     const cur = account ? account.currency : currency
     invariant(cur, 'No currency given')
     return (
-      <Trans i18nKey="deviceConnect.step2.open" parent="div">
+      <Trans i18nKey="deviceConnect.step2" parent="div">
         {'Open the '}
         <Bold>{cur.managerAppName}</Bold>
         {' app on your device'}
@@ -97,7 +97,7 @@ class EnsureDeviceApp extends Component<{
           {
             id: 'device',
             title: (
-              <Trans i18nKey="deviceConnect.step1.connect" parent="div">
+              <Trans i18nKey="deviceConnect.step1" parent="div">
                 {'Connect and unlock your '}
                 <Bold>{'Ledger device'}</Bold>
               </Trans>
diff --git a/src/components/GenuineCheck.js b/src/components/GenuineCheck.js
index 325f9dfa..aef771e9 100644
--- a/src/components/GenuineCheck.js
+++ b/src/components/GenuineCheck.js
@@ -124,7 +124,7 @@ class GenuineCheck extends PureComponent<Props> {
       {
         id: 'device',
         title: (
-          <Trans i18nKey="deviceConnect.step1.connect" parent="div">
+          <Trans i18nKey="deviceConnect.step1" parent="div">
             {'Connect and unlock your '}
             <Bold>{'Ledger device'}</Bold>
           </Trans>
@@ -135,10 +135,10 @@ class GenuineCheck extends PureComponent<Props> {
       {
         id: 'deviceInfo',
         title: (
-          <Trans i18nKey="deviceConnect:dashboard.open" parent="div">
+          <Trans i18nKey="deviceConnect.step2" parent="div">
             {'Navigate to the '}
             <Bold>{'dashboard'}</Bold>
-            {' on your device'}
+            {' app on your device'}
           </Trans>
         ),
         icon: homeIcon,
@@ -147,7 +147,7 @@ class GenuineCheck extends PureComponent<Props> {
       {
         id: 'isGenuine',
         title: (
-          <Trans i18nKey="deviceConnect:stepGenuine.open" parent="div">
+          <Trans i18nKey="deviceConnect.step3" parent="div">
             {'Allow '}
             <Bold>{'Ledger Manager'}</Bold>
             {' on your device'}
diff --git a/src/components/SettingsPage/sections/Export.js b/src/components/SettingsPage/sections/Export.js
index 2d5fbf73..17932932 100644
--- a/src/components/SettingsPage/sections/Export.js
+++ b/src/components/SettingsPage/sections/Export.js
@@ -17,8 +17,8 @@ import { BulletRow } from '../../Onboarding/helperComponents'
 import Text from '../../base/Text'
 
 const BulletRowIcon = styled(Box).attrs({
-  ff: 'Open Sans|Regular',
-  fontSize: 12,
+  ff: 'Rubik|Regular',
+  fontSize: 10,
   textAlign: 'center',
   color: 'wallet',
   pl: 2,
@@ -29,6 +29,7 @@ const BulletRowIcon = styled(Box).attrs({
   height: 18px;
   width: 18px;
   padding: 0px;
+  padding-top: 2px;
 `
 
 type Props = {
diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json
index 9a49099f..d4f947f9 100644
--- a/static/i18n/en/app.json
+++ b/static/i18n/en/app.json
@@ -138,12 +138,9 @@
     "messageIfSkipped": "Your {{currencyName}} address has not been confirmed on your Ledger device. Please verify it for optimal security."
   },
   "deviceConnect": {
-    "step1": {
-      "connect": "Connect and unlock your <1>Ledger device</1>"
-    },
-    "step2": {
-      "open": "Open the <1><0>{{managerAppName}}</0></1> app on your device"
-    }
+    "step1": "Connect and unlock your <1>Ledger device</1>",
+    "step2": "Navigate to the <1><0>{{managerAppName}}</0></1> app on your device",
+    "step3": "Allow <1><0>Ledger Manager</0></1> on your device"
   },
   "emptyState": {
     "sidebar": {
@@ -359,7 +356,7 @@
         "button": "Done",
         "title": "Scan to export to mobile",
         "listTitle": "To import accounts on your Ledger Live Mobile app:",
-        "step1": "Tap the <1><0>+</0></1> button in Account",
+        "step1": "Tap the <1><0>+</0></1> button in Accounts",
         "step2": "Tap <1><0>Import desktop accounts</0></1>",
         "step3": "Scan until the loader hits 100%"
       }
@@ -632,7 +629,7 @@
       "step2": {
         "title": "Did you save your recovery phrase by yourself?"
       },
-      "step3": {
+      "step3":{
         "title": "Is your Ledger device genuine?"
       },
       "isGenuinePassed": "Your device is genuine",

From bce8acfc7ec4f9837b89f537550fc304473cfcaf Mon Sep 17 00:00:00 2001
From: Juan Cortes Ross <juan@bohem.io>
Date: Thu, 29 Nov 2018 11:35:18 +0100
Subject: [PATCH 6/6] Made the export only visible if experimental tooling flag
 is on

And removed the non-used tools section
---
 src/components/SettingsPage/index.js          | 10 ++--------
 src/components/SettingsPage/sections/Tools.js | 19 -------------------
 2 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 src/components/SettingsPage/sections/Tools.js

diff --git a/src/components/SettingsPage/index.js b/src/components/SettingsPage/index.js
index 35afee4d..9c773cd7 100644
--- a/src/components/SettingsPage/index.js
+++ b/src/components/SettingsPage/index.js
@@ -16,7 +16,6 @@ import SectionCurrencies from './sections/Currencies'
 import SectionHelp from './sections/Help'
 import SectionAbout from './sections/About'
 import SectionExport from './sections/Export'
-import SectionTools from './sections/Tools'
 
 const mapStateToProps = state => ({
   accountsCount: accountsSelector(state).length,
@@ -49,11 +48,6 @@ class SettingsPage extends PureComponent<Props, State> {
         label: <Trans i18nKey="settings.tabs.currencies" />,
         value: SectionCurrencies,
       },
-      {
-        key: 'export',
-        label: <Trans i18nKey="settings.tabs.export" />,
-        value: SectionExport,
-      },
       {
         key: 'about',
         label: <Trans i18nKey="settings.tabs.about" />,
@@ -67,10 +61,10 @@ class SettingsPage extends PureComponent<Props, State> {
     ]
 
     if (EXPERIMENTAL_TOOLS_SETTINGS) {
-      this._items.push({
+      this._items.splice(2, 0, {
         key: 'tool',
         label: 'Experimental Tools',
-        value: SectionTools,
+        value: SectionExport,
       })
     }
 
diff --git a/src/components/SettingsPage/sections/Tools.js b/src/components/SettingsPage/sections/Tools.js
deleted file mode 100644
index d16ebc62..00000000
--- a/src/components/SettingsPage/sections/Tools.js
+++ /dev/null
@@ -1,19 +0,0 @@
-// @flow
-
-/* eslint-disable react/jsx-no-literals */
-
-import React, { PureComponent } from 'react'
-import { translate } from 'react-i18next'
-import Box, { Card } from 'components/base/Box'
-
-class TabProfile extends PureComponent<*, *> {
-  render() {
-    return (
-      <Card flow={3}>
-        <Box horizontal>Nothing here</Box>
-      </Card>
-    )
-  }
-}
-
-export default translate()(TabProfile)