wording/pixel push on Settings

src/components/IsUnlocked.js

@@ -192,6 +192,7 @@ class IsUnlocked extends Component<Props, State> {
             onClose={this.handleCloseHardResetModal}
             onReject={this.handleCloseHardResetModal}
             onConfirm={this.handleHardReset}
+            confirmText={t('app:common.reset')}
             title={t('app:settings.hardResetModal.title')}
             desc={t('app:settings.hardResetModal.desc')}
             renderIcon={this.hardResetIconRender}

src/components/RenderError.js

@@ -116,6 +116,7 @@ ${error.stack}
           onClose={this.handleCloseHardResetModal}
           onReject={this.handleCloseHardResetModal}
           onConfirm={this.handleHardReset}
+          confirmText={t('app:common.reset')}
           title={t('app:settings.hardResetModal.title')}
           desc={t('app:settings.hardResetModal.desc')}
           renderIcon={this.hardResetIconRender}

src/components/SettingsPage/SettingsSection.js

@@ -102,7 +102,7 @@ export function SettingsSectionRow({
 }) {
   return (
     <SettingsSectionRowContainer onClick={onClick} tabIndex={-1}>
-      <Box grow shrink style={{ marginRight: '20%' }}>
+      <Box grow shrink style={{ marginRight: '10%' }}>
         <Box ff="Open Sans|SemiBold" color="dark" fontSize={4}>
           {title}
         </Box>

src/components/SettingsPage/sections/About.js

@@ -39,12 +39,6 @@ const ITEMS = [
     desc: t => t('app:settings.about.faqDesc'),
     url: 'https://support.ledgerwallet.com/hc/en-us',
   },
-  {
-    key: 'contact',
-    title: t => t('app:settings.about.contactUs'),
-    desc: t => t('app:settings.about.contactUsDesc'),
-    url: 'https://support.ledgerwallet.com/hc/en-us/requests/new',
-  },
   {
     key: 'terms',
     title: t => t('app:settings.about.terms'),

src/components/SettingsPage/sections/Currencies.js

@@ -115,9 +115,11 @@ class TabCurrencies extends PureComponent<Props, State> {
           {currency !== intermediaryCurrency ? (
             <Row
               title={t('app:settings.currencies.exchange', {
-                ticker: `${currency.ticker}${intermediaryCurrency.ticker}`,
+                ticker: currency.ticker,
+              })}
+              desc={t('app:settings.currencies.exchangeDesc', {
+                currencyName: currency.name,
               })}
-              desc={t('app:settings.currencies.exchangeDesc')}
             >
               <ExchangeSelect
                 small

src/components/SettingsPage/sections/Display.js

@@ -158,16 +158,27 @@ class TabProfile extends PureComponent<Props, State> {
             title={t('app:settings.display.counterValue')}
             desc={t('app:settings.display.counterValueDesc')}
           >
-            <Box flow={2}>
-              <Select
-                small
-                minWidth={250}
-                onChange={this.handleChangeCounterValue}
-                itemToString={item => (item ? item.name : '')}
-                renderSelected={item => item && item.name}
-                options={fiats}
-                value={cvOption}
-              />
+            <Select
+              small
+              minWidth={250}
+              onChange={this.handleChangeCounterValue}
+              itemToString={item => (item ? item.name : '')}
+              renderSelected={item => item && item.name}
+              options={fiats}
+              value={cvOption}
+            />
+          </Row>
+          {counterValueCurrency ? (
+            <Row
+              title={t('app:settings.display.exchange', {
+                ticker: counterValueCurrency.ticker,
+                fiat: counterValueCurrency.name,
+              })}
+              desc={t('app:settings.display.exchangeDesc', {
+                fiat: counterValueCurrency.name,
+                ticker: counterValueCurrency.ticker,
+              })}
+            >
               <SelectExchange
                 small
                 from={intermediaryCurrency}
@@ -176,8 +187,8 @@ class TabProfile extends PureComponent<Props, State> {
                 onChange={this.handleChangeExchange}
                 minWidth={200}
               />
-            </Box>
-          </Row>
+            </Row>
+          ) : null}
           <Row
             title={t('app:settings.display.language')}
             desc={t('app:settings.display.languageDesc')}

src/components/SettingsPage/sections/Profile.js

@@ -168,16 +168,6 @@ class TabProfile extends PureComponent<Props, State> {
               <CheckBox isChecked={isPasswordEnabled} onChange={this.handleChangePasswordCheck} />
             </Box>
           </Row>
-          <Row
-            title={t('app:settings.profile.developerMode')}
-            desc={t('app:settings.profile.developerModeDesc')}
-          >
-            <Track onUpdate event={settings.developerMode ? 'DevModeEnabled' : 'DevModeDisabled'} />
-            <CheckBox
-              isChecked={settings.developerMode}
-              onChange={developerMode => saveSettings({ developerMode })}
-            />
-          </Row>
           <Row
             title={t('app:settings.profile.reportErrors')}
             desc={t('app:settings.profile.reportErrorsDesc')}
@@ -201,6 +191,16 @@ class TabProfile extends PureComponent<Props, State> {
               onChange={shareAnalytics => saveSettings({ shareAnalytics })}
             />
           </Row>
+          <Row
+            title={t('app:settings.profile.developerMode')}
+            desc={t('app:settings.profile.developerModeDesc')}
+          >
+            <Track onUpdate event={settings.developerMode ? 'DevModeEnabled' : 'DevModeDisabled'} />
+            <CheckBox
+              isChecked={settings.developerMode}
+              onChange={developerMode => saveSettings({ developerMode })}
+            />
+          </Row>
           <Row
             title={t('app:settings.profile.softResetTitle')}
             desc={t('app:settings.profile.softResetDesc')}
@@ -209,6 +209,9 @@ class TabProfile extends PureComponent<Props, State> {
               {t('app:settings.profile.softReset')}
             </Button>
           </Row>
+          <Row title={t('app:settings.exportLogs.title')} desc={t('app:settings.exportLogs.desc')}>
+            <ExportLogsBtn />
+          </Row>
           <Row
             title={t('app:settings.profile.hardResetTitle')}
             desc={t('app:settings.profile.hardResetDesc')}
@@ -217,9 +220,6 @@ class TabProfile extends PureComponent<Props, State> {
               {t('app:settings.profile.hardReset')}
             </Button>
           </Row>
-          <Row title={t('app:settings.exportLogs.title')} desc={t('app:settings.exportLogs.desc')}>
-            <ExportLogsBtn />
-          </Row>
         </Body>
 
         <ConfirmModal
@@ -240,6 +240,7 @@ class TabProfile extends PureComponent<Props, State> {
           onClose={this.handleCloseHardResetModal}
           onReject={this.handleCloseHardResetModal}
           onConfirm={this.handleHardReset}
+          confirmText={t('app:common.reset')}
           title={t('app:settings.hardResetModal.title')}
           desc={t('app:settings.hardResetModal.desc')}
           renderIcon={this.hardResetIconRender}

static/i18n/en/app.yml

@@ -26,6 +26,7 @@ common:
   max: Max
   next: Next
   back: Back
+  reset: Reset
   retry: Retry
   stop: Stop
   close: Close
@@ -296,7 +297,7 @@ releaseNotes:
 settings: # Always ensure descriptions carry full stops (.)
   title: Settings
   tabs:
-    display: Display
+    display: General
     currencies: Currencies
     profile: Profile
     about: Help
@@ -304,18 +305,18 @@ settings: # Always ensure descriptions carry full stops (.)
     desc: Unneeded description # Remove this, it controls multiple settings tabs and is not required.
     language: Display language
     languageDesc: Set the language displayed in Ledger Live.
-    counterValue: Base currency
+    counterValue: Countervalue
     counterValueDesc: Choose the currency to display next to your balance and operations.
-    exchange: Rate provider ({{ticker}})
-    exchangeDesc: Choose the provider of the exchange rate between Bitcoin and your selected base currency.
+    exchange: Rate provider
+    exchangeDesc: Choose the provider of the exchange rate from Bitcoin to {{fiat}}.
     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 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}})
-    exchangeDesc: Choose the provider of the rate between the selected crypto asset and Bitcoin. This intermediary calculation enables the calculation of your balance in your base currency, for indicative purposes only.
+    exchange: Rate provider ({{ticker}} → BTC)
+    exchangeDesc: Choose the provider of the rate between {{currencyName}} and Bitcoin. This intermediary calculation enables the calculation of your balance in your base currency, for indicative purposes only.
     confirmationsToSpend: Number of confirmations required to spend
     confirmationsToSpendDesc: Set the number of network confirmations required for your crypto assets to be spendable. # A higher number of confirmations decreases the probability that a transaction is rejected.
     confirmationsNb: Number of confirmations
@@ -326,8 +327,8 @@ settings: # Always ensure descriptions carry full stops (.)
     explorerDesc: Choose which explorer is used to look up the operation details in the blockchain.
   profile:
     desc: Set the preferences for your profile.
-    password: Data encryption
-    passwordDesc: Enhance your privacy. Set a password to encrypt Ledger Live data stored on your computer, including account names, balances, transactions and public addresses.
+    password: Password lock
+    passwordDesc: Set a password to prevent unauthorized access to Ledger Live data stored on your computer, including account names, balances, transactions and public addresses.
     changePassword: Change password
     sync: Synchronize accounts
     syncDesc: Resynchronize your accounts with the network.
@@ -343,7 +344,7 @@ settings: # Always ensure descriptions carry full stops (.)
     developerModeDesc: Show developer apps in the Manager and enable testnet apps.
     analytics: Analytics
     analyticsDesc: 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.
-    reportErrors: Usage and diagnostics
+    reportErrors: Report bugs
     reportErrorsDesc: Share anonymous usage and diagnostics data to help improve Ledger products, services and security features.
   about:
     desc: Learn about Ledger Live features or get help.
@@ -351,8 +352,6 @@ settings: # Always ensure descriptions carry full stops (.)
     releaseNotesBtn: Show release notes # Close button instead of continue.
     faq: Ledger Support
     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 conditions
     termsDesc: By using Ledger Live you are deemed to have accepted our terms and conditions.
     #privacy: Privacy policy
@@ -382,7 +381,7 @@ password:
   errorMessageNotMatchingPassword: Passwords don't match
   inputFields:
     newPassword:
-      label: Password
+      label: New password
       placeholder: #remove
     confirmPassword:
       label: Confirm password
@@ -391,15 +390,15 @@ password:
       label: Current password
       placeholder:
   changePassword:
-    title: Data encryption
+    title: Password lock
     subTitle: Change your password
     desc: Make sure to remember your password. Losing your password requires resetting Ledger Live and re-adding accounts.
   setPassword:
-    title: Enable data encryption
+    title: Enable password lock
     subTitle: Set a password
     desc: Make sure to remember your password. Losing your password requires resetting Ledger Live and re-adding accounts.
   disablePassword:
-    title: Disable data encryption
+    title: Disable password lock
     desc: Ledger Live data will be stored unencrypted on your computer. This includes account names, balances, transactions and public addresses.
 update:
   newVersionReady: A new update is available

static/i18n/en/language.yml

@@ -1,3 +1,3 @@
-system: Use system locale
+system: Use system language
 en: English
 fr: French