LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Merge pull request #1917 from ykris45/patch-1

Browse source 
added learn more faq to wallet security section
This commit is contained in:
Sean Yesmunt 2018-08-28 20:25:22 -04:00 committed by GitHub
commit ccd5f4c7ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -17,7 +17,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
* 3D File viewer features and performance/memory usage improvements ([#1870](https://github.com/lbryio/lbry-desktop/pull/1870)) * 3D File viewer features and performance/memory usage improvements ([#1870](https://github.com/lbryio/lbry-desktop/pull/1870))
* Desktop notification when publish is completed ([#1892](https://github.com/lbryio/lbry-desktop/pull/1892)) * Desktop notification when publish is completed ([#1892](https://github.com/lbryio/lbry-desktop/pull/1892))
* FAQ to Publishing Area ([#1833](https://github.com/lbryio/lbry-desktop/pull/1833)) * FAQ to Publishing Area ([#1833](https://github.com/lbryio/lbry-desktop/pull/1833))
* FAQ to wallet security area ([#1917](https://github.com/lbryio/lbry-desktop/pull/1917))
### Changed ### Changed
* Upgraded LBRY Protocol to [version 0.21.2](https://github.com/lbryio/lbry/releases/tag/v0.21.2) fixing a download bug. * Upgraded LBRY Protocol to [version 0.21.2](https://github.com/lbryio/lbry/releases/tag/v0.21.2) fixing a download bug.
* Searching now shows results by default, including direct lbry:// URL tile * Searching now shows results by default, including direct lbry:// URL tile

15
src/renderer/page/settings/view.jsx
View file

@ -349,9 +349,18 @@ class SettingsPage extends React.PureComponent<Props, State> {
onChange={e => this.onChangeEncryptWallet(e)} onChange={e => this.onChangeEncryptWallet(e)}
checked={walletEncrypted} checked={walletEncrypted}
postfix={__('Encrypt my wallet with a custom password.')} postfix={__('Encrypt my wallet with a custom password.')}
helper={__( helper={
'Secure your local wallet data with a custom password. Lost passwords cannot be recovered.' <React.Fragment>
)} {__(
'Secure your local wallet data with a custom password. Lost passwords cannot be recovered.'
)}{' '}
<Button
button="link"
label={__('Learn more')}
href="https://lbry.io/faq/wallet-encryption"
/>.
</React.Fragment>
}
/> />
</section> </section>
<section className="card card--section"> <section className="card card--section">