From 75fadb8a1de64158741b866c81c0112c863e80d5 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Wed, 29 Aug 2018 03:23:09 +0700 Subject: [PATCH 1/4] added learn more faq to wallet security section --- src/renderer/page/settings/view.jsx | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx index 729ba7059..ed1c7620c 100644 --- a/src/renderer/page/settings/view.jsx +++ b/src/renderer/page/settings/view.jsx @@ -348,12 +348,17 @@ class SettingsPage extends React.PureComponent { name="encrypt_wallet" onChange={e => this.onChangeEncryptWallet(e)} checked={walletEncrypted} - postfix={__('Encrypt my wallet with a custom password.')} - helper={__( + postfix={__('Encrypt my wallet with a custom password.')}/> +
{__( 'Secure your local wallet data with a custom password. Lost passwords cannot be recovered.' - )} - /> - + )}{' '} +
+ +
{__('Application Cache')}
From afa8c1627e870462262b55d73da507a214ac925b Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Wed, 29 Aug 2018 03:26:27 +0700 Subject: [PATCH 2/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5b8f113e..ae34201ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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)) * 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 wallet security area ([#1917](https://github.com/lbryio/lbry-desktop/pull/1917)) ### Changed * 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 From 6f91908005b509edb680faec5a7d6d595ec392c2 Mon Sep 17 00:00:00 2001 From: YULIUS KURNIAWAN KRISTIANTO Date: Wed, 29 Aug 2018 04:15:29 +0700 Subject: [PATCH 3/4] Update view.jsx --- src/renderer/page/settings/view.jsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx index ed1c7620c..107ea6d45 100644 --- a/src/renderer/page/settings/view.jsx +++ b/src/renderer/page/settings/view.jsx @@ -348,16 +348,15 @@ class SettingsPage extends React.PureComponent { name="encrypt_wallet" onChange={e => this.onChangeEncryptWallet(e)} checked={walletEncrypted} - postfix={__('Encrypt my wallet with a custom password.')}/> -
{__( + postfix={__('Encrypt my wallet with a custom password.')} + helper={__( 'Secure your local wallet data with a custom password. Lost passwords cannot be recovered.' - )}{' '} -
- + )}/> +
{__('Application Cache')}
From edf8cd65e561df389fda64de261e76bc8bf9a171 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Tue, 28 Aug 2018 20:05:14 -0400 Subject: [PATCH 4/4] update formatting --- src/renderer/page/settings/view.jsx | 23 ++++++++++++++--------- yarn.lock | 4 ++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx index 107ea6d45..ab844c95c 100644 --- a/src/renderer/page/settings/view.jsx +++ b/src/renderer/page/settings/view.jsx @@ -349,15 +349,20 @@ class SettingsPage extends React.PureComponent { onChange={e => this.onChangeEncryptWallet(e)} checked={walletEncrypted} postfix={__('Encrypt my wallet with a custom password.')} - helper={__( - 'Secure your local wallet data with a custom password. Lost passwords cannot be recovered.' - )}/> -
+ helper={ + + {__( + 'Secure your local wallet data with a custom password. Lost passwords cannot be recovered.' + )}{' '} +