pixel push from wording sessions

src/components/DashboardPage/EmptyState.js

@@ -53,7 +53,7 @@ class EmptyState extends PureComponent<Props, *> {
             </Button>
             <Button
               padded
-              primary
+              outline
               style={{ minWidth: 120 }}
               onClick={() => openModal(MODAL_ADD_ACCOUNTS)}
             >
@@ -79,6 +79,7 @@ export const Description = styled(Box).attrs({
 })`
   margin: 10px auto 25px;
   display: block;
+  text-align: center;
 `
 export default compose(
   connect(

src/components/Onboarding/helperComponents.js

@@ -97,6 +97,7 @@ export function DisclaimerBox({ disclaimerNotes, ...p }: { disclaimerNotes: any
   )
 }
 
+// Not enough styled as a warning
 const DisclaimerBoxContainer = styled(Box).attrs({
   shrink: 1,
   grow: true,

src/components/Onboarding/steps/Finish.js

@@ -58,15 +58,14 @@ export default (props: StepProps) => {
         <Box color="positiveGreen">
           <IconCheckCircle size={44} />
         </Box>
-        <Box pt={5} align="center" mb={5}>
+        <Box pt={5} align="center">
           <Title>{t('onboarding:finish.title')}</Title>
           <Description>{t('onboarding:finish.desc')}</Description>
         </Box>
-        <Button primary padded onClick={() => finish()}>
-          {t('onboarding:finish.openAppButton')}
-        </Button>
-        <Box alignItems="center" mt={7}>
-          <FollowUsDesc>{t('onboarding:finish.followUsLabel')}</FollowUsDesc>
+        <Box p={5}>
+          <Button primary padded onClick={() => finish()}>
+            {t('onboarding:finish.openAppButton')}
+          </Button>
         </Box>
         <Box horizontal mt={3} flow={5} color="grey">
           {socialMedia.map(socMed => <SocialMediaBox key={socMed.key} socMed={socMed} />)}

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

@@ -257,23 +257,14 @@ export const StepImportFooter = ({
     return account && account.operations.length > 0
   })
 
-  const addedAccountsCount = checkedAccountsIds.filter(id => {
-    const account = scannedAccounts.find(acc => acc.id === id)
-    return account && account.operations.length > 0
-  }).length
+  const count = checkedAccountsIds.length
 
   const ctaWording =
     scanStatus === 'scanning'
       ? t('app:common.sync.syncing')
-      : willCreateAccount && willAddAccounts
-        ? `${t('app:addAccounts.cta.create')} / ${t('app:addAccounts.cta.import', {
-            count: addedAccountsCount,
-          })}`
-        : willCreateAccount
-          ? t('app:addAccounts.cta.create')
-          : willAddAccounts
-            ? t('app:addAccounts.cta.import', { count: addedAccountsCount })
-            : t('app:common.close')
+      : willCreateAccount || willAddAccounts
+        ? t('app:addAccounts.cta.add', { count })
+        : t('app:common.close')
 
   const willClose = !willCreateAccount && !willAddAccounts
   const onClick = willClose

src/config/cryptocurrencies.js

@@ -31,5 +31,7 @@ const supported: CryptoCurrencyIds[] = [
 ]
 
 export const listCryptoCurrencies = memoize((withDevCrypto?: boolean) =>
-  listCC(withDevCrypto).filter(c => supported.includes(c.id)),
+  listCC(withDevCrypto)
+    .filter(c => supported.includes(c.id))
+    .sort((a, b) => a.name.localeCompare(b.name)),
 )

static/i18n/en/app.yml

@@ -125,8 +125,8 @@ emptyState:
   sidebar:
     text: Press the + button to add an account to your portfolio.
   dashboard:
-    title: 'Let’s set up your portfolio!'
-    desc: Open the Manager to install apps on your device or add accounts if your device already has apps installed.
+    title: 'Add accounts to your portfolio'
+    desc: Your portfolio has no accounts the first time Ledger Live is launched. Open the Manager to install apps on your Ledger device before you start adding accounts to your portfolio.
     buttons:
       addAccount: Add accounts
       installApp: Open Manager
@@ -142,7 +142,7 @@ genuinecheck:
 addAccounts:
   title: Add accounts
   breadcrumb:
-    informations: Choose asset
+    informations: Crypto asset
     connectDevice: Connect device
     import: Select accounts
     finish: Confirmation
@@ -162,9 +162,8 @@ addAccounts:
     noAccountToCreate: No {{currencyName}} account was found to create.
   somethingWentWrong: Something went wrong during synchronization, please try again.
   cta:
-    create: 'Add account'
-    import: 'Add account' # Remove
-    import_plural: 'Add accounts'
+    add: 'Add account'
+    add_plural: 'Add accounts'
 operationDetails:
   title: Operation details
   account: Account

static/i18n/en/onboarding.yml

@@ -1,8 +1,8 @@
 breadcrumb:
   selectDevice: Select device
-  selectPIN: Choose PIN
+  selectPIN: PIN code
   writeSeed: Recovery phrase
-  genuineCheck: Security check
+  genuineCheck: Security checklist
   setPassword: Encrypt data
   analytics: Analytics
 start:
@@ -10,6 +10,7 @@ start:
   startBtn: Get started
 init:
   title: Get started with your Ledger device
+  desc: The unified crypto portfolio, backed by the security of your Ledger device.
   newDevice:
     title: Initialize a new Ledger device
   restoreDevice:
@@ -38,13 +39,13 @@ selectPIN:
     note2: An 8-digit PIN code offers an optimum level of security.
     note3:   Never use a device supplied with a PIN code or a 24-word recovery phrase.
   initialize:
-    title: Start initialization - Choose your PIN code
+    title: Choose your PIN code
     instructions:
       nano:
         step1: Connect the Ledger Nano S to your computer.
         step2: Press both buttons simultaneously as instructed on the screen.
         step3: Press the right button to select Configure as new device?. # <bold>Configure as new device?<bold>.
-        step4: 'Choose a PIN code between 4 and 8 digits long. Then select the checkmark (✓).'
+        step4: 'Choose a PIN code between 4 and 8 digits long followed by the checkmark (✓).'
       blue:
         step1: Connect the Ledger Blue to your computer.
         step2: Tap on Configure as new device.
@@ -56,7 +57,7 @@ selectPIN:
         step1: Connect the Ledger Nano S to your computer.
         step2: Press both buttons simultaneously as instructed on the screen.
         step3: Press the left button to cancel Initialize as new device?. Press the right button to select Restore configuration?. #  <bold>Initialize as new device?</bold>  <bold>Restore configuration?</bold>.
-        step4: 'Choose a PIN code between 4 and 8 digits long. Then select the checkmark (✓).'
+        step4: 'Choose a PIN code between 4 and 8 digits long followed by the checkmark (✓).'
       blue:
         step1: Connect the Ledger Blue to your computer.
         step2: Tap on Restore configuration. # <bold>Restore configuration</bold>.
@@ -87,14 +88,14 @@ writeSeed:
       step3: Repeat the process until the last word.
   disclaimer:
     note1: Carefully secure your 24-word recovery phrase out of sight.
-    note2: Ledger does not keep any backup of your recovery phrase.
-    note3: Make sure you are the sole holder of your recovery phrase.
+    note2: Make sure you are the sole holder of your recovery phrase.
+    note3: Ledger does not keep any backup of your recovery phrase.
     note4: Never use a device supplied with a recovery phrase or a PIN code.
 genuineCheck:
-  title: Final security check
-  descNano: Your Ledger Nano S should now display Your device is now ready. Before getting started, please confirm that
-  descBlue: Your Ledger Blue should now display Your device is now ready. Before getting started, please confirm that
-  descRestore: Before getting started, please confirm that
+  title: Security checklist
+  descNano: Before getting started, please confirm
+  descBlue: Before getting started, please confirm
+  descRestore: Before getting started, please confirm
   step1:
     title: Did you choose your PIN code by yourself?
   step2:
@@ -103,18 +104,18 @@ genuineCheck:
     title: Do you have a genuine Ledger device?
   isGenuinePassed: Your device is genuine
   buttons:
-    genuineCheck: Genuine check
+    genuineCheck: Check now
     contactSupport: Ledger Support
   errorPage:
     ledgerNano:
       title: Oops, something went wrong...
-      desc: Go back to the security check or request Ledger Support assistance.
+      desc: Go back to the security checklist or request Ledger Support assistance.
     ledgerBlue:
       title: Oops, something went wrong...
-      desc: Go back to the security check or request Ledger Support assistance.
+      desc: Go back to the security checklist or request Ledger Support assistance.
 setPassword:
   title: Encrypt Ledger Live data
-  desc: Enhance your privacy. Set a password to encrypt Ledger Live data stored on your computer, including account names, balances, transactions and public addresses.
+  desc: Set a password to encrypt Ledger Live data stored on your computer, including account names, balances, transactions and public addresses.
   disclaimer:
     note1: Make sure to remember your password. Do not share it.
     note2: Losing your password requires resetting Ledger Live and re-adding accounts.
@@ -130,9 +131,8 @@ analytics:
     desc: Enable analytics of anonymous data to help Ledger improve the user experience. This includes the operating system, language, firmware versions and the number of added accounts.
   sentryLogs:
     title: Report bugs
-    desc: Automatically send bug reports to help Ledger developers diagnose issues and improve Ledger Live performance.
+    desc: Automatically send reports to help Ledger fix bugs.
 finish:
-  title: Welcome to Ledger Live
-  desc: The unified crypto portfolio, backed by the security of your Ledger device.
-  openAppButton: Launch
-  followUsLabel: Follow us
+  title: Your device is ready!
+  desc: Proceed to your porfolio and start adding your accounts...
+  openAppButton: Open Ledger Live