Merge branch 'develop' into polish

src/components/DashboardPage/index.js

@@ -192,13 +192,17 @@ class DashboardPage extends PureComponent<Props> {
                               />
                             ) : (
                               <Wrapper>
-                                <img alt="" src={imagePath} />
+                                <Box mt={2}>
+                                  <img alt="" src={imagePath} />
+                                </Box>
                                 <Box
                                   ff="Open Sans"
                                   fontSize={3}
-                                  color="graphite"
+                                  color="grey"
                                   pb={2}
+                                  mt={3}
                                   textAlign="center"
+                                  style={{ maxWidth: 150 }}
                                 >
                                   {t('app:dashboard.emptyAccountTile.desc')}
                                 </Box>
@@ -247,4 +251,5 @@ const Wrapper = styled(Box).attrs({
 })`
   border: 1px dashed ${p => p.theme.colors.fog};
   border-radius: 4px;
+  height: 215px;
 `

src/components/SettingsPage/sections/About.js

@@ -105,9 +105,9 @@ class AboutRowItem extends PureComponent<{
     const { onClick, title, desc, url } = this.props
     const boundOnClick = () => onClick(url)
     return (
-      <Row onClick={boundOnClick} title={title} desc={desc}>
+      <Row title={title} desc={desc}>
         <Tabbable p={2} borderRadius={1} onClick={boundOnClick}>
-          <IconExternalLink size={16} />
+          <IconExternalLink style={{ cursor: 'pointer' }} size={16} />
         </Tabbable>
       </Row>
     )

src/components/base/AccountsList/index.js

@@ -32,7 +32,7 @@ class AccountsList extends Component<
   },
 > {
   state = {
-    collapsed: false,
+    collapsed: !!this.props.collapsible,
   }
   toggleCollapse = () => {
     this.setState(({ collapsed }) => ({ collapsed: !collapsed }))

src/components/modals/AddAccounts/steps/03-step-import.js

@@ -213,7 +213,7 @@ class StepImport extends PureComponent<StepProps> {
     })
 
     const importedAccountsListTitle = t('app:addAccounts.accountAlreadyImportedSubtitle', {
-      count: importableAccounts.length,
+      count: importedAccounts.length,
     })
 
     const importableAccountsEmpty = t('app:addAccounts.noAccountToImport', { currencyName })
@@ -224,14 +224,6 @@ class StepImport extends PureComponent<StepProps> {
       <Fragment>
         <TrackPage category="AddAccounts" name="Step3" />
         <Box mt={-4}>
-          {importedAccounts.length === 0 ? null : (
-            <AccountsList
-              title={importedAccountsListTitle}
-              accounts={importedAccounts}
-              editedNames={editedNames}
-              collapsible
-            />
-          )}
           {importableAccounts.length === 0 ? null : (
             <AccountsList
               title={importableAccountsListTitle}
@@ -278,6 +270,14 @@ class StepImport extends PureComponent<StepProps> {
               hideAmount
             />
           )}
+          {importedAccounts.length === 0 ? null : (
+            <AccountsList
+              title={importedAccountsListTitle}
+              accounts={importedAccounts}
+              editedNames={editedNames}
+              collapsible
+            />
+          )}
           {scanStatus === 'scanning' ? (
             <LoadingRow>
               <Spinner color="grey" size={16} />

static/i18n/en/app.yml

@@ -73,7 +73,7 @@ sidebar:
   menu: Menu
   accounts: Accounts ({{count}})
   manager: Manager
-  exchange: Exchange
+  exchange: Exchanges
 account:
   balance: Balance
   receive: Receive
@@ -111,14 +111,14 @@ dashboard:
   summary: "Here's the summary of your account"
   summary_plural: "Here's the summary of your {{count}} accounts"
   noAccounts: No accounts yet
-  recentActivity: Recent activity
+  recentActivity: Last operations
   totalBalance: Total balance
   accountsOrder:
     name: name
     balance: balance
 currentAddress:
   title: Current address
-  for: Address for <1><0>{{accountName}}</0></1>
+  for: Address for account <1><0>{{accountName}}</0></1>
   message: Your receive address has not been confirmed on your Ledger device. Please verify the address for optimal security.
 deviceConnect:
   step1:
@@ -135,9 +135,10 @@ emptyState:
       addAccount: Add accounts
       installApp: Open Manager
 exchange:
-  title: Exchange
+  title: Exchanges
+  desc: Try a selection of exchange services offered by our sponsors
   visitWebsite: Visit website
-  coinhouse: 'Coinhouse is the trusted platform for individuals and institutional investors looking to analyze, acquire, sell and securely store crypto assets.'
+  coinhouse: 'Coinhouse is a trusted platform for individuals and institutional investors looking to analyze, acquire, sell and securely store crypto assets.'
   changelly: 'Changelly is a popular instant crypto asset exchange with 100+ coins and tokens listed.'
   coinmama: 'Coinmama is a financial service that makes it fast, safe and fun to buy digital assets, anywhere in the world.'
 genuinecheck:
@@ -147,12 +148,12 @@ addAccounts:
   title: Add accounts
   breadcrumb:
     informations: Crypto asset
-    connectDevice: Connect device
-    import: Select accounts
+    connectDevice: Device
+    import: Accounts
     finish: Confirmation
-  accountAlreadyImportedSubtitle: Already in portfolio
-  accountToImportSubtitle: 'Select account'
-  accountToImportSubtitle_plural: 'Select accounts'
+  accountAlreadyImportedSubtitle: '{{count}} Already in portfolio'
+  accountToImportSubtitle: 'Add existing account'
+  accountToImportSubtitle_plural: 'Add existing accounts'
   selectAll: Select all ({{count}})
   unselectAll: Deselect all ({{count}})
   editName: Edit name
@@ -162,7 +163,7 @@ addAccounts:
   success: Account added to your portfolio
 # success_plural: Accounts successfully added to your portfolio.
   createNewAccount:
-    title: Create a new account
+    title: Add a new account
     noOperationOnLastAccount: 'You have to receive crypto assets on <1><0>{{accountName}}</0></1> before you can create a new account.'
     noAccountToCreate: No <1><0>{{currencyName}}</0></1> account was found to create
   somethingWentWrong: Something went wrong during synchronization, please try again.
@@ -186,7 +187,7 @@ operationDetails:
   showMore: Show {{recipients}} more
   showLess: Show less
 operationList:
-  noMoreOperations: That's all!
+  noMoreOperations: That's all
 manager:
   yourDeviceIsGenuine: Your device is genuine
   tabs:
@@ -236,33 +237,33 @@ receive:
   title: Receive
   steps:
     chooseAccount:
-      title: Choose account
-      label: Account
+      title: Account
+      label: Account to credit
     connectDevice:
-      title: Connect device
-      withoutDevice: Receive without device
+      title: Device
+      withoutDevice: Don't have your device?
     confirmAddress:
-      title: Confirm address
+      title: Verification
       action: Confirm address on device
-      text: To receive crypto assets, confirm the address on your device
-      support: Ledger Support
+      text: Verify that the address below matches the address displayed on your device
+      support: Contact us
       error:
         title: Receive address rejected
         text: Please try again or contact Support when in doubt
     receiveFunds:
-      title: Receive crypto assets
+      title: Receive
       label: Amount (optional)
 send:
   title: Send
-  totalSpent: Total
+  totalSpent: Total to debit
   steps:
     amount:
-      title: Send crypto assets
+      title: crypto assets
       selectAccountDebit: Select an account to debit
       recipientAddress: Recipient address # can't control the tooltip!
       amount: Amount
       max: Max
-      fees: Fees
+      fees: Network fees
       advancedOptions: Advanced options
       useRBF: Use a replace-by-fee transaction
       message: Leave a message (140)
@@ -271,14 +272,12 @@ send:
       unitPerByte: '{{unit}} per byte'
       feePerByte: Fees per byte
     connectDevice:
-      title: Connect device
+      title: Device
     verification:
       title: Verification
       warning: |
-        Carefully verify the transaction details displayed one by one on your device before you proceed.
-      # blue
-      # nano
-      body: Press the right button to confirm the transaction
+        Carefully verify all transaction details now displayed on your device screen
+      body: Once verified, press the right button to confirm and sign the transaction
     confirmation:
       title: Confirmation
       success:
@@ -312,7 +311,7 @@ settings: # Always ensure descriptions carry full stops (.)
     region: Region
     regionDesc: Choose the region in which you’re located to set the Ledger Live's time zone.
     stock: Regional market indicator
-    stockDesc: Choose Western to display an increase in market value in blue. Choose Eastern to display an increase in market value in red.
+    stockDesc: Choose Western to display an increase in market value in green. Choose Eastern to display an increase in market value in red.
   currencies:
     desc: Select a crypto asset to edit its settings.
     exchange: Rate provider ({{ticker}})
@@ -354,8 +353,10 @@ settings: # Always ensure descriptions carry full stops (.)
     faqDesc: A problem? Learn about Ledger Live, Ledger devices, supported crypto assets and apps.
     contactUs: Contact us
     contactUsDesc: Need help? Request assistance from Ledger Support by email or chat.
-    terms: --- Terms and Privacy policy ---
-    termsDesc: --- Check with Legal ---
+    terms: Terms and conditions
+    termsDesc: By using Ledger Live you are deemed to have accepted our terms and conditions.
+    #privacy: Privacy policy
+    #termsDesc: Refer to our privacy policy to learn what personal data we collect, and why and how we use it.
   hardResetModal:
     title: Reset Ledger Live
     desc: Erase all Ledger Live data stored on your computer, including your accounts, transaction history and settings. The private keys to access your crypto assets in the blockchain remain secure on your Ledger device and on your Recovery sheet.

static/images/empty-account-tile.svg

@@ -1,2 +1,32 @@
-
-<svg width="224" height="94" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><rect id="b" x="20" y="12" width="142" height="40" rx="4"/><filter x="-28.9%" y="-55%" width="157.7%" height="305%" filterUnits="objectBoundingBox" id="a"><feOffset dy="19" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="10.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0" in="shadowBlurOuter1"/></filter><rect id="d" x="10" y="9" width="162" height="38" rx="4"/><filter x="-25.3%" y="-57.9%" width="150.6%" height="315.8%" filterUnits="objectBoundingBox" id="c"><feOffset dy="19" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="10.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0" in="shadowBlurOuter1"/></filter><rect id="f" width="182" height="42" rx="4"/><filter x="-22.5%" y="-52.4%" width="145.1%" height="295.2%" filterUnits="objectBoundingBox" id="e"><feOffset dy="19" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur stdDeviation="10.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"/><feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.03 0" in="shadowBlurOuter1"/></filter><path d="M5.62 0h1.7v3.058h-1.7V0zm1.7 0v3.058h-1.7V0h1.7zM5.813 12.942h1.7V16h-1.7v-3.058zm1.7 0V16h-1.7v-3.058h1.7zM2.406 0h1.7v3.058h-1.7V0zm1.7 0v3.058h-1.7V0h1.7zM2.6 12.942h1.7V16H2.6v-3.058zm1.7 0V16H2.6v-3.058h1.7zM.666 8.813V1.95h.85l6.139.002c1.807.11 3.212 1.566 3.118 3.254l-.002.279c.111 1.744-1.298 3.217-3.168 3.328H.666zm.85 0l.85-.85v4.32h5.608c.95-.025 1.676-.727 1.659-1.557v-.37c.019-.814-.707-1.518-1.637-1.543h-6.48zm7.557-3.275l.001-.378c.042-.77-.62-1.457-1.471-1.51H2.366v3.463h5.205c.899-.063 1.552-.753 1.502-1.575zM2.366 7.113l5.186.002.467-.002c1.86.05 3.355 1.5 3.314 3.262v.334c.036 1.779-1.458 3.224-3.337 3.273H.666V7.113h1.7zm0 0v.85l-.85-.85h.85z" id="g"/></defs><g fill="none" fill-rule="evenodd"><g transform="translate(21 2)"><use fill="#000" filter="url(#a)" xlink:href="#b"/><use fill="#FFF" xlink:href="#b"/></g><g transform="translate(21 2)"><use fill="#000" filter="url(#c)" xlink:href="#d"/><use fill="#FFF" xlink:href="#d"/></g><g transform="translate(21 2)"><use fill="#000" filter="url(#e)" xlink:href="#f"/><use fill="#FFF" xlink:href="#f"/><rect fill="#999" x="39" y="13" width="120" height="5" rx="2.5"/><rect fill="#D8D8D8" x="39" y="23" width="70" height="5" rx="2.5"/><g transform="translate(17 13)"><use fill="#FCB653" fill-rule="nonzero" xlink:href="#g"/></g></g></g></svg>
+<svg width="190" height="60" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <filter
+      x="-3.8%"
+      y="-9.6%"
+      width="107.7%"
+      height="126.9%"
+      filterUnits="objectBoundingBox"
+      id="a"
+    >
+      <feOffset dy="2" in="SourceAlpha" result="shadowOffsetOuter1" />
+      <feGaussianBlur stdDeviation="2" in="shadowOffsetOuter1" result="shadowBlurOuter1" />
+      <feColorMatrix
+        values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.06 0"
+        in="shadowBlurOuter1"
+        result="shadowMatrixOuter1"
+      />
+      <feMerge>
+        <feMergeNode in="shadowMatrixOuter1" />
+        <feMergeNode in="SourceGraphic" />
+      </feMerge>
+    </filter>
+  </defs>
+  <g filter="url(#a)" transform="translate(4 2)" fill="none" fill-rule="evenodd">
+    <path d="M20 47h142v1a4 4 0 0 1-4 4H24a4 4 0 0 1-4-4v-1z" fill="#FFF" opacity=".5" />
+    <rect fill="#FFF" opacity=".7" x="10" y="9" width="162" height="38" rx="4" />
+    <rect fill="#FFF" width="182" height="42" rx="4" />
+    <circle fill="#D8D8D8" cx="17.5" cy="20.5" r="7.5" />
+    <rect fill="#999" x="40" y="13" width="120" height="5" rx="2.5" />
+    <rect fill="#D8D8D8" x="40" y="23" width="70" height="5" rx="2.5" />
+  </g>
+</svg>