diff --git a/src/ui/page/settings/view.jsx b/src/ui/page/settings/view.jsx index 39f716678..b4963ba02 100644 --- a/src/ui/page/settings/view.jsx +++ b/src/ui/page/settings/view.jsx @@ -1,4 +1,7 @@ // @flow +/* eslint react/no-unescaped-entities:0 */ +/* eslint react/jsx-no-comment-textnodes:0 */ + import * as SETTINGS from 'constants/settings'; import * as PAGES from 'constants/pages'; import * as React from 'react'; @@ -208,62 +211,61 @@ class SettingsPage extends React.PureComponent { return ( - {noDaemonSettings && !IS_WEB ? ( + // @if TARGET='app' + {noDaemonSettings ? (
{__('Failed to load settings.')}
) : ( + // @endif
- {!IS_WEB && ( -
-

{__('Download Directory')}

- -
- { - setDaemonSetting('download_dir', newDirectory); - }} - /> -

{__('LBRY downloads will be saved here.')}

-
-
- )} - - {!IS_WEB && ( -
-

{__('Network and Data Settings')}

-
- setDaemonSetting('save_files', !daemonSettings.save_files)} - checked={daemonSettings.save_files} - label={__('Save all viewed content to your downloads directory')} - helper={__( - 'Paid content and some file types are saved by default. Changing this setting will not affect previously downloaded content.' - )} - /> - -
- setDaemonSetting('save_blobs', !daemonSettings.save_blobs)} - checked={daemonSettings.save_blobs} - label={__('Save hosting data to help the LBRY network')} - helper={ - - {__("If disabled, LBRY will be very sad and you won't be helping improve the network.")}{' '} -
- )} + // @if TARGET='app' +
+

{__('Download Directory')}

+
+ { + setDaemonSetting('download_dir', newDirectory); + }} + /> +

{__('LBRY downloads will be saved here.')}

+
+
+ // @endif // @if TARGET='app' +
+

{__('Network and Data Settings')}

+
+ setDaemonSetting('save_files', !daemonSettings.save_files)} + checked={daemonSettings.save_files} + label={__('Save all viewed content to your downloads directory')} + helper={__( + 'Paid content and some file types are saved by default. Changing this setting will not affect previously downloaded content.' + )} + /> + +
+ setDaemonSetting('save_blobs', !daemonSettings.save_blobs)} + checked={daemonSettings.save_blobs} + label={__('Save hosting data to help the LBRY network')} + helper={ + + {__("If disabled, LBRY will be very sad and you won't be helping improve the network.")}{' '} +
+ // @endif

{__('Max Purchase Price')}

@@ -304,7 +306,6 @@ class SettingsPage extends React.PureComponent {

-

{__('Purchase Confirmations')}

@@ -342,7 +343,6 @@ class SettingsPage extends React.PureComponent {

-

{__('Content Settings')}

{ )} />
-

{__('Blocked Channels')}

@@ -389,22 +388,21 @@ class SettingsPage extends React.PureComponent {

- {!IS_WEB && ( -
-

{__('Notifications')}

-
- setClientSetting(SETTINGS.OS_NOTIFICATIONS_ENABLED, !osNotificationsEnabled)} - checked={osNotificationsEnabled} - label={__('Show Desktop Notifications')} - helper={__('Get notified when a publish is confirmed, or when new content is available to watch.')} - /> - -
- )} - + // @if TARGET='app' +
+

{__('Notifications')}

+
+ setClientSetting(SETTINGS.OS_NOTIFICATIONS_ENABLED, !osNotificationsEnabled)} + checked={osNotificationsEnabled} + label={__('Show Desktop Notifications')} + helper={__('Get notified when a publish is confirmed, or when new content is available to watch.')} + /> + +
+ // @endif

{__('Share Diagnostic Data')}

@@ -424,7 +422,6 @@ class SettingsPage extends React.PureComponent { />
-

{__('Appearance')}

@@ -486,110 +483,109 @@ class SettingsPage extends React.PureComponent {
- {!IS_WEB && ( -
-

{__('Wallet Security')}

+ // @if TARGET='app' +
+

{__('Wallet Security')}

-
- this.onChangeEncryptWallet()} - checked={walletEncrypted} - label={__('Encrypt my wallet with a custom password')} - helper={ - - {__('Secure your local wallet data with a custom password.')}{' '} - {__('Lost passwords cannot be recovered.')} -
- )} - {!IS_WEB && ( -
-

{__('Experimental Settings')}

+ setClientSetting(SETTINGS.HIDE_BALANCE, !hideBalance)} + checked={hideBalance} + label={__('Hide wallet balance in header')} + /> + +
+ // @endif // @if TARGET='app' +
+

{__('Experimental Settings')}

-
- setClientSetting(SETTINGS.SUPPORT_OPTION, !supportOption)} - checked={supportOption} - label={__('Enable claim support')} - helper={ - - {__('This will add a Support button along side tipping. Similar to tips, supports help ')} -
- )} + + +
+ // @endif

{__('Application Cache')}

diff --git a/yarn.lock b/yarn.lock index e2831937b..775ac95e6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6755,11 +6755,10 @@ lazy-val@^1.0.3, lazy-val@^1.0.4: yargs "^13.2.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#1af092ce2cb507d9a41711b864874c0bd76935ae: +lbry-redux@lbryio/lbry-redux#f4413a8ab4928a9487274568bb72e440c45875be: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/1af092ce2cb507d9a41711b864874c0bd76935ae" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/f4413a8ab4928a9487274568bb72e440c45875be" dependencies: - mime "^2.4.4" proxy-polyfill "0.1.6" reselect "^3.0.0" uuid "^3.3.2"