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 #523 from MortalKastor/release-notes 

Show version and release notes on about page
master
Meriadec Pillet 7 years ago
committed by GitHub
parent
72ac5de7a0 845e287117
commit
73924d41d3
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 3 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. 29
      src/components/SettingsPage/sections/About.js
  2. 4
      src/components/modals/ReleaseNotes.js
  3. 2
      src/reducers/settings.js

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

@ -2,11 +2,16 @@
import React, { PureComponent } from 'react' import React, { PureComponent } from 'react'
import { shell } from 'electron' import { shell } from 'electron'
import { connect } from 'react-redux'
import type { T } from 'types/common' import type { T } from 'types/common'
import IconHelp from 'icons/Help' import IconHelp from 'icons/Help'
import IconExternalLink from 'icons/ExternalLink' import IconExternalLink from 'icons/ExternalLink'
import Button from 'components/base/Button'
import { openModal } from 'reducers/modals'
import { MODAL_RELEASES_NOTES } from 'config/constants'
import { import {
SettingsSection as Section, SettingsSection as Section,
@ -17,13 +22,20 @@ import {
type Props = { type Props = {
t: T, t: T,
openModal: Function,
}
const mapDispatchToProps = {
openModal,
} }
class SectionAbout extends PureComponent<Props> { class SectionAbout extends PureComponent<Props> {
handleOpenLink = (url: string) => () => shell.openExternal(url) handleOpenLink = (url: string) => () => shell.openExternal(url)
render() { render() {
const { t } = this.props const { t, openModal } = this.props
const version = __APP_VERSION__
return ( return (
<Section> <Section>
<Header <Header
@ -32,6 +44,16 @@ class SectionAbout extends PureComponent<Props> {
desc="Lorem ipsum dolor sit amet" desc="Lorem ipsum dolor sit amet"
/> />
<Body> <Body>
<Row title="Version" desc={version}>
<Button
primary
onClick={() => {
openModal(MODAL_RELEASES_NOTES, version)
}}
>
Show release notes
</Button>
</Row>
<Row <Row
onClick={this.handleOpenLink('https://support.ledgerwallet.com/hc/en-us')} onClick={this.handleOpenLink('https://support.ledgerwallet.com/hc/en-us')}
title={t('app:settings.about.faq')} title={t('app:settings.about.faq')}
@ -59,4 +81,7 @@ class SectionAbout extends PureComponent<Props> {
} }
} }
export default SectionAbout export default connect(
null,
mapDispatchToProps,
)(SectionAbout)

4
src/components/modals/ReleaseNotes.js
View File

@ -156,6 +156,10 @@ class ReleaseNotes extends PureComponent<Props, State> {
fetchNotes = version => { fetchNotes = version => {
if (!this.state.loading) { if (!this.state.loading) {
this.setState({
loading: true,
})
axios axios
.get(`https://api.github.com/repos/LedgerHQ/ledger-live-desktop/releases/tags/v${version}`) .get(`https://api.github.com/repos/LedgerHQ/ledger-live-desktop/releases/tags/v${version}`)
.then(response => { .then(response => {

2
src/reducers/settings.js
View File

@ -74,7 +74,7 @@ const INITIAL_STATE: SettingsState = {
loaded: false, loaded: false,
shareAnalytics: false, shareAnalytics: false,
sentryLogs: false, sentryLogs: false,
lastUsedVersion: '0.1.0-alpha.7', // Temp hack to show release notes on update to alpha 8, should ne replaced by __APP_VERSION__ lastUsedVersion: __APP_VERSION__,
} }
function asCryptoCurrency(c: Currency): ?CryptoCurrency { function asCryptoCurrency(c: Currency): ?CryptoCurrency {

Write Preview
Loading…
Cancel
Save