lukechilds
/
ledger-live-desktop
mirror of https://github.com/lukechilds/ledger-live-desktop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #847 from meriadec/acknowledgements 

About section
master
Meriadec Pillet 7 years ago
committed by GitHub
parent
099f97c240 79b6f1fafa
commit
beb643677d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 97 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/components/SettingsPage/ReleaseNotesButton.js
  2. 4
      src/components/SettingsPage/SettingsSection.js
  3. 6
      src/components/SettingsPage/index.js
  4. 45
      src/components/SettingsPage/sections/About.js
  5. 72
      src/components/SettingsPage/sections/Help.js
  6. 2
      src/icons/Currencies.js
  7. 2
      src/icons/Display.js
  8. 2
      src/icons/Help.js
  9. 5
      static/i18n/en/app.yml

2
src/components/SettingsPage/ReleaseNotesButton.js
View File

@ -32,7 +32,7 @@ class ReleaseNotesButton extends PureComponent<Props> {
openModal(MODAL_RELEASES_NOTES, version) openModal(MODAL_RELEASES_NOTES, version)
}} }}
> >
{t('app:settings.about.releaseNotesBtn')} {t('app:settings.help.releaseNotesBtn')}
</Button> </Button>
) )
} }

4
src/components/SettingsPage/SettingsSection.js
View File

@ -24,8 +24,8 @@ const RoundIconContainer = styled(Box).attrs({
bg: p => rgba(p.theme.colors.wallet, 0.2), bg: p => rgba(p.theme.colors.wallet, 0.2),
color: 'wallet', color: 'wallet',
})` })`
height: 30px; height: 34px;
width: 30px; width: 34px;
border-radius: 50%; border-radius: 50%;
` `

6
src/components/SettingsPage/index.js
View File

@ -13,6 +13,7 @@ import Pills from 'components/base/Pills'
import Box from 'components/base/Box' import Box from 'components/base/Box'
import SectionDisplay from './sections/Display' import SectionDisplay from './sections/Display'
import SectionCurrencies from './sections/Currencies' import SectionCurrencies from './sections/Currencies'
import SectionHelp from './sections/Help'
import SectionAbout from './sections/About' import SectionAbout from './sections/About'
import SectionTools from './sections/Tools' import SectionTools from './sections/Tools'
@ -52,6 +53,11 @@ class SettingsPage extends PureComponent<Props, State> {
label: props.t('app:settings.tabs.about'), label: props.t('app:settings.tabs.about'),
value: SectionAbout, value: SectionAbout,
}, },
{
key: 'help',
label: props.t('app:settings.tabs.help'),
value: SectionHelp,
},
] ]
if (EXPERIMENTAL_TOOLS_SETTINGS) { if (EXPERIMENTAL_TOOLS_SETTINGS) {

45
src/components/SettingsPage/sections/About.js
View File

@ -2,15 +2,13 @@
import React, { PureComponent } from 'react' import React, { PureComponent } from 'react'
import { translate } from 'react-i18next' import { translate } from 'react-i18next'
import type { T } from 'types/common' import type { T } from 'types/common'
import TrackPage from 'analytics/TrackPage' import TrackPage from 'analytics/TrackPage'
import IconHelp from 'icons/Help'
import resolveLogsDirectory from 'helpers/resolveLogsDirectory'
import { urls } from 'config/support' import { urls } from 'config/support'
import IconLoader from 'icons/Loader'
import ExportLogsBtn from 'components/ExportLogsBtn'
import CleanButton from '../CleanButton'
import ResetButton from '../ResetButton'
import ReleaseNotesButton from '../ReleaseNotesButton' import ReleaseNotesButton from '../ReleaseNotesButton'
import AboutRowItem from '../AboutRowItem' import AboutRowItem from '../AboutRowItem'
@ -25,7 +23,7 @@ type Props = {
t: T, t: T,
} }
class SectionAbout extends PureComponent<Props> { class SectionHelp extends PureComponent<Props> {
render() { render() {
const { t } = this.props const { t } = this.props
const version = __APP_VERSION__ const version = __APP_VERSION__
@ -35,44 +33,19 @@ class SectionAbout extends PureComponent<Props> {
<TrackPage category="Settings" name="About" /> <TrackPage category="Settings" name="About" />
<Header <Header
icon={<IconHelp size={16} />} icon={<IconLoader size={16} />}
title={t('app:settings.tabs.about')} title={t('app:settings.tabs.about')}
desc={t('app:settings.about.desc')} desc={t('app:settings.about.desc')}
/> />
<Body> <Body>
<Row title={t('app:settings.about.version')} desc={`Ledger Live ${version}`}> <Row title={t('app:settings.help.version')} desc={`Ledger Live ${version}`}>
<ReleaseNotesButton /> <ReleaseNotesButton />
</Row> </Row>
<Row
title={t('app:settings.profile.softResetTitle')}
desc={t('app:settings.profile.softResetDesc')}
>
<CleanButton />
</Row>
<Row
title={t('app:settings.profile.hardResetTitle')}
desc={t('app:settings.profile.hardResetDesc')}
>
<ResetButton />
</Row>
<Row
title={t('app:settings.exportLogs.title')}
desc={t('app:settings.exportLogs.desc', { logsDirectory: resolveLogsDirectory() })}
>
<ExportLogsBtn />
</Row>
<AboutRowItem
title={t('app:settings.about.faq')}
desc={t('app:settings.about.faqDesc')}
url={urls.faq}
/>
<AboutRowItem <AboutRowItem
title={t('app:settings.about.terms')} title={t('app:settings.help.terms')}
desc={t('app:settings.about.termsDesc')} desc={t('app:settings.help.termsDesc')}
url={urls.terms} url={urls.terms}
/> />
</Body> </Body>
@ -81,4 +54,4 @@ class SectionAbout extends PureComponent<Props> {
} }
} }
export default translate()(SectionAbout) export default translate()(SectionHelp)

72
src/components/SettingsPage/sections/Help.js
View File

@ -0,0 +1,72 @@
// @flow
import React, { PureComponent } from 'react'
import { translate } from 'react-i18next'
import type { T } from 'types/common'
import TrackPage from 'analytics/TrackPage'
import IconHelp from 'icons/Help'
import resolveLogsDirectory from 'helpers/resolveLogsDirectory'
import { urls } from 'config/support'
import ExportLogsBtn from 'components/ExportLogsBtn'
import CleanButton from '../CleanButton'
import ResetButton from '../ResetButton'
import AboutRowItem from '../AboutRowItem'
import {
SettingsSection as Section,
SettingsSectionHeader as Header,
SettingsSectionBody as Body,
SettingsSectionRow as Row,
} from '../SettingsSection'
type Props = {
t: T,
}
class SectionHelp extends PureComponent<Props> {
render() {
const { t } = this.props
return (
<Section>
<TrackPage category="Settings" name="Help" />
<Header
icon={<IconHelp size={16} />}
title={t('app:settings.tabs.help')}
desc={t('app:settings.help.desc')}
/>
<Body>
<Row
title={t('app:settings.profile.softResetTitle')}
desc={t('app:settings.profile.softResetDesc')}
>
<CleanButton />
</Row>
<Row
title={t('app:settings.profile.hardResetTitle')}
desc={t('app:settings.profile.hardResetDesc')}
>
<ResetButton />
</Row>
<Row
title={t('app:settings.exportLogs.title')}
desc={t('app:settings.exportLogs.desc', { logsDirectory: resolveLogsDirectory() })}
>
<ExportLogsBtn />
</Row>
<AboutRowItem
title={t('app:settings.help.faq')}
desc={t('app:settings.help.faqDesc')}
url={urls.faq}
/>
</Body>
</Section>
)
}
}
export default translate()(SectionHelp)

2
src/icons/Currencies.js
View File

@ -5,7 +5,7 @@ import React from 'react'
const path = ( const path = (
<path <path
fill="currentColor" fill="currentColor"
d="M8 5.581c-3.865 0-7-1.083-7-2.79C1 1.083 4.135 0 8 0s7 1.083 7 2.79c0 1.708-3.135 2.791-7 2.791zm-7-2.79c0-.309.241-.558.538-.558.298 0 .539.25.539.558v10.418c0 .28.516.704 1.517 1.05 1.142.396 2.714.625 4.406.625 1.692 0 3.264-.23 4.406-.625 1.001-.346 1.517-.77 1.517-1.05V2.791c0-.309.241-.558.539-.558.297 0 .538.25.538.558v10.418C15 14.921 11.88 16 8 16s-7-1.08-7-2.79V2.79zM13.923 8c0-.308.241-.558.539-.558.297 0 .538.25.538.558 0 1.711-3.12 2.79-7 2.79S1 9.712 1 8c0-.308.241-.558.538-.558.298 0 .539.25.539.558 0 .28.516.704 1.517 1.05 1.142.395 2.714.624 4.406.624 1.692 0 3.264-.229 4.406-.624 1.001-.346 1.517-.77 1.517-1.05zM8 4.465c1.682 0 3.254-.23 4.399-.625 1.004-.347 1.524-.772 1.524-1.05 0-.277-.52-.702-1.524-1.048-1.145-.396-2.717-.626-4.399-.626s-3.254.23-4.399.626c-1.004.346-1.524.771-1.524 1.049 0 .277.52.702 1.524 1.049 1.145.395 2.717.625 4.399.625z" d="M2.75,5.15508428 L2.75,8.00000015 C2.75,8.47106568 5.0832134,9.25 8,9.25 C10.9167866,9.25 13.25,8.47106568 13.25,8 L13.25,5.15508428 C12.0122098,5.75709992 10.119699,6.08333333 8,6.08333333 C5.88030098,6.08333333 3.98779024,5.75709992 2.75,5.15508428 Z M1.25,3.33333333 C1.25,1.59133795 4.27401384,0.583333333 8,0.583333333 C11.7259862,0.583333333 14.75,1.59133795 14.75,3.33333333 L14.75,12.6666667 C14.75,14.4120112 11.7406635,15.4166667 8,15.4166667 C4.25933652,15.4166667 1.25,14.4120112 1.25,12.6666667 L1.25,3.33333333 Z M13.25,9.82541772 C12.0146597,10.4256664 10.1253772,10.75 8,10.75 C5.87462278,10.75 3.98534032,10.4256664 2.75,9.82541772 L2.75,12.6666667 C2.75,13.1377323 5.0832134,13.9166667 8,13.9166667 C10.9167866,13.9166667 13.25,13.1377323 13.25,12.6666667 L13.25,9.82541772 Z M8,4.58333333 C10.9014308,4.58333333 13.25,3.80047695 13.25,3.33333333 C13.25,2.86618972 10.9014308,2.08333333 8,2.08333333 C5.09856916,2.08333333 2.75,2.86618972 2.75,3.33333333 C2.75,3.80047695 5.09856916,4.58333333 8,4.58333333 Z"
/> />
) )

2
src/icons/Display.js
View File

@ -5,7 +5,7 @@ import React from 'react'
const path = ( const path = (
<path <path
fill="currentColor" fill="currentColor"
d="M3.2 2.26c-.552 0-1 .471-1 1.051v6.547c0 .58.448 1.05 1 1.05h9.6c.552 0 1-.47 1-1.05V3.31c0-.58-.448-1.05-1-1.05H3.2zm5.4 9.909v1.57h1.96c.331 0 .6.283.6.63 0 .349-.269.631-.6.631H5.44c-.331 0-.6-.282-.6-.63 0-.348.269-.63.6-.63H7.4v-1.571H3.2c-1.215 0-2.2-1.035-2.2-2.311V3.31C1 2.035 1.985 1 3.2 1h9.6C14.015 1 15 2.035 15 3.311v6.547c0 1.276-.985 2.311-2.2 2.311H8.6z" d="M3.33333333,2.75 C2.6429774,2.75 2.08333333,3.30964406 2.08333333,4 L2.08333333,9.33333333 C2.08333333,10.0236893 2.6429774,10.5833333 3.33333333,10.5833333 L12.6666667,10.5833333 C13.3570226,10.5833333 13.9166667,10.0236893 13.9166667,9.33333333 L13.9166667,4 C13.9166667,3.30964406 13.3570226,2.75 12.6666667,2.75 L3.33333333,2.75 Z M8.75,12.0833333 L8.75,13.25 L10.6666667,13.25 C11.0808802,13.25 11.4166667,13.5857864 11.4166667,14 C11.4166667,14.4142136 11.0808802,14.75 10.6666667,14.75 L5.33333333,14.75 C4.91911977,14.75 4.58333333,14.4142136 4.58333333,14 C4.58333333,13.5857864 4.91911977,13.25 5.33333333,13.25 L7.25,13.25 L7.25,12.0833333 L3.33333333,12.0833333 C1.81455027,12.0833333 0.583333333,10.8521164 0.583333333,9.33333333 L0.583333333,4 C0.583333333,2.48121694 1.81455027,1.25 3.33333333,1.25 L12.6666667,1.25 C14.1854497,1.25 15.4166667,2.48121694 15.4166667,4 L15.4166667,9.33333333 C15.4166667,10.8521164 14.1854497,12.0833333 12.6666667,12.0833333 L8.75,12.0833333 Z"
/> />
) )

2
src/icons/Help.js
View File

@ -5,7 +5,7 @@ import React from 'react'
const path = ( const path = (
<path <path
fill="currentColor" fill="currentColor"
d="M3.3 4.007a6.167 6.167 0 1 0 .707-.707l2.135 2.135a3.167 3.167 0 1 1-.707.707L3.3 4.007zM8 15.167A7.167 7.167 0 1 1 8 .833a7.167 7.167 0 0 1 0 14.334zm0-5a2.167 2.167 0 1 0 0-4.334 2.167 2.167 0 0 0 0 4.334zm1.387-4.054c0-.128.048-.256.146-.353l2.353-2.354a.5.5 0 0 1 .708.708L10.24 6.467a.5.5 0 0 1-.707-.707l2.827-2.827a.5.5 0 0 1 .707.707L10.24 6.467a.5.5 0 0 1-.853-.354zm.146 4.127a.5.5 0 0 1 .707-.707l2.827 2.827a.5.5 0 1 1-.707.707L9.533 10.24zM3.64 13.067a.5.5 0 1 1-.707-.707L5.76 9.533a.5.5 0 1 1 .707.707L3.64 13.067z" d="M8,15.4166667 C3.90388811,15.4166667 0.583333333,12.0961119 0.583333333,8 C0.583333333,3.90388811 3.90388811,0.583333333 8,0.583333333 C12.0961119,0.583333333 15.4166667,3.90388811 15.4166667,8 C15.4166667,12.0961119 12.0961119,15.4166667 8,15.4166667 Z M8,13.9166667 C11.2676848,13.9166667 13.9166667,11.2676848 13.9166667,8 C13.9166667,4.73231523 11.2676848,2.08333333 8,2.08333333 C4.73231523,2.08333333 2.08333333,4.73231523 2.08333333,8 C2.08333333,11.2676848 4.73231523,13.9166667 8,13.9166667 Z M8,11.4166667 C6.1130271,11.4166667 4.58333333,9.8869729 4.58333333,8 C4.58333333,6.1130271 6.1130271,4.58333333 8,4.58333333 C9.8869729,4.58333333 11.4166667,6.1130271 11.4166667,8 C11.4166667,9.8869729 9.8869729,11.4166667 8,11.4166667 Z M8,9.91666667 C9.05854577,9.91666667 9.91666667,9.05854577 9.91666667,8 C9.91666667,6.94145423 9.05854577,6.08333333 8,6.08333333 C6.94145423,6.08333333 6.08333333,6.94145423 6.08333333,8 C6.08333333,9.05854577 6.94145423,9.91666667 8,9.91666667 Z M2.75633658,3.81699675 C2.46344336,3.52410353 2.46344336,3.0492298 2.75633658,2.75633658 C3.0492298,2.46344336 3.52410353,2.46344336 3.81699675,2.75633658 L6.64366342,5.58300325 C6.93655664,5.87589647 6.93655664,6.3507702 6.64366342,6.64366342 C6.3507702,6.93655664 5.87589647,6.93655664 5.58300325,6.64366342 L2.75633658,3.81699675 Z M9.35633658,10.4169968 C9.06344336,10.1241035 9.06344336,9.6492298 9.35633658,9.35633658 C9.6492298,9.06344336 10.1241035,9.06344336 10.4169968,9.35633658 L13.2436634,12.1830032 C13.5365566,12.4758965 13.5365566,12.9507702 13.2436634,13.2436634 C12.9507702,13.5365566 12.4758965,13.5365566 12.1830032,13.2436634 L9.35633658,10.4169968 Z M10.4169968,6.64366342 C10.1241035,6.93655664 9.6492298,6.93655664 9.35633658,6.64366342 C9.06344336,6.3507702 9.06344336,5.87589647 9.35633658,5.58300325 L11.7096699,3.22966991 C12.0025631,2.9367767 12.4774369,2.9367767 12.7703301,3.22966991 C13.0632233,3.52256313 13.0632233,3.99743687 12.7703301,4.29033009 L10.4169968,6.64366342 Z M3.81699675,13.2436634 C3.52410353,13.5365566 3.0492298,13.5365566 2.75633658,13.2436634 C2.46344336,12.9507702 2.46344336,12.4758965 2.75633658,12.1830032 L5.58300325,9.35633658 C5.87589647,9.06344336 6.3507702,9.06344336 6.64366342,9.35633658 C6.93655664,9.6492298 6.93655664,10.1241035 6.64366342,10.4169968 L3.81699675,13.2436634 Z"
/> />
) )

5
static/i18n/en/app.yml
View File

@ -313,7 +313,8 @@ settings: # Always ensure descriptions carry full stops (.)
display: General display: General
currencies: Currencies currencies: Currencies
profile: Profile profile: Profile
about: Help help: Help
about: About
display: display:
desc: Change settings that affect Ledger Live in general. desc: Change settings that affect Ledger Live in general.
language: Display language language: Display language
@ -358,6 +359,8 @@ settings: # Always ensure descriptions carry full stops (.)
reportErrors: Report bugs reportErrors: Report bugs
reportErrorsDesc: Share anonymous usage and diagnostics data to help improve Ledger products, services and security features. reportErrorsDesc: Share anonymous usage and diagnostics data to help improve Ledger products, services and security features.
about: about:
desc: Learn about Ledger Live features
help:
desc: Learn about Ledger Live features or get help. desc: Learn about Ledger Live features or get help.
version: Version version: Version
releaseNotesBtn: Details # Close button instead of continue. releaseNotesBtn: Details # Close button instead of continue.

Write Preview
Loading…
Cancel
Save