From 856431390f0801fe3aff2e7f514be6a0b38a4095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= Date: Fri, 29 Jun 2018 11:59:48 +0200 Subject: [PATCH 1/3] Pixel push step import --- src/components/base/AccountsList/index.js | 2 +- .../modals/AddAccounts/steps/03-step-import.js | 18 +++++++++--------- static/i18n/en/app.yml | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/base/AccountsList/index.js b/src/components/base/AccountsList/index.js index 024c050c..2793d33c 100644 --- a/src/components/base/AccountsList/index.js +++ b/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 })) diff --git a/src/components/modals/AddAccounts/steps/03-step-import.js b/src/components/modals/AddAccounts/steps/03-step-import.js index 6f8385af..b84586cc 100644 --- a/src/components/modals/AddAccounts/steps/03-step-import.js +++ b/src/components/modals/AddAccounts/steps/03-step-import.js @@ -213,7 +213,7 @@ class StepImport extends PureComponent { }) 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 { - {importedAccounts.length === 0 ? null : ( - - )} {importableAccounts.length === 0 ? null : ( { hideAmount /> )} + {importedAccounts.length === 0 ? null : ( + + )} {scanStatus === 'scanning' ? ( diff --git a/static/i18n/en/app.yml b/static/i18n/en/app.yml index e85caab8..80f2cf63 100644 --- a/static/i18n/en/app.yml +++ b/static/i18n/en/app.yml @@ -150,9 +150,9 @@ addAccounts: connectDevice: Connect device import: Select 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 +162,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}} before you can create a new account.' noAccountToCreate: No <1><0>{{currencyName}} account was found to create somethingWentWrong: Something went wrong during synchronization, please try again. @@ -257,7 +257,7 @@ send: totalSpent: Total 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 From 3626489e8090f46d2247bf6db10919ad472cda6f Mon Sep 17 00:00:00 2001 From: Anastasia Poupeney Date: Fri, 29 Jun 2018 12:26:12 +0200 Subject: [PATCH 2/3] fix double opening of external links and changing empty account tile image --- src/components/DashboardPage/index.js | 9 +++-- src/components/SettingsPage/sections/About.js | 4 +-- static/images/empty-account-tile.svg | 34 +++++++++++++++++-- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/src/components/DashboardPage/index.js b/src/components/DashboardPage/index.js index f9c0f3da..f652cb31 100644 --- a/src/components/DashboardPage/index.js +++ b/src/components/DashboardPage/index.js @@ -192,13 +192,17 @@ class DashboardPage extends PureComponent { /> ) : ( - + + + {t('app:dashboard.emptyAccountTile.desc')} @@ -247,4 +251,5 @@ const Wrapper = styled(Box).attrs({ })` border: 1px dashed ${p => p.theme.colors.fog}; border-radius: 4px; + height: 215px; ` diff --git a/src/components/SettingsPage/sections/About.js b/src/components/SettingsPage/sections/About.js index 24ef9871..b691e823 100644 --- a/src/components/SettingsPage/sections/About.js +++ b/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 ( - + - + ) diff --git a/static/images/empty-account-tile.svg b/static/images/empty-account-tile.svg index 1e35c66b..359028c9 100644 --- a/static/images/empty-account-tile.svg +++ b/static/images/empty-account-tile.svg @@ -1,2 +1,32 @@ - - + + + + + + + + + + + + + + + + + + + + + From d583d88f0da5a843ec7572d162db922d7fa30c26 Mon Sep 17 00:00:00 2001 From: Anastasia Poupeney Date: Fri, 29 Jun 2018 12:30:48 +0200 Subject: [PATCH 3/3] change wording for market indicators --- static/i18n/en/app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/i18n/en/app.yml b/static/i18n/en/app.yml index e85caab8..7a3544d5 100644 --- a/static/i18n/en/app.yml +++ b/static/i18n/en/app.yml @@ -312,7 +312,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}})