Browse Source

Merge branch 'develop' into polish

master
Gaëtan Renaudeau 7 years ago
committed by GitHub
parent
commit
b8440cf8b6
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      src/components/DashboardPage/index.js
  2. 4
      src/components/SettingsPage/sections/About.js
  3. 2
      src/components/base/AccountsList/index.js
  4. 18
      src/components/modals/AddAccounts/steps/03-step-import.js
  5. 63
      static/i18n/en/app.yml
  6. 34
      static/images/empty-account-tile.svg

7
src/components/DashboardPage/index.js

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

4
src/components/SettingsPage/sections/About.js

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

2
src/components/base/AccountsList/index.js

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

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

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

63
static/i18n/en/app.yml

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

34
static/images/empty-account-tile.svg

@ -1,2 +1,32 @@
<svg width="190" height="60" xmlns="http://www.w3.org/2000/svg">
<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> <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>

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Loading…
Cancel
Save