From d46c60da86d8268a01e717b91e4a94664fb135fc Mon Sep 17 00:00:00 2001 From: Amit Nandan P Date: Fri, 8 Jun 2018 22:38:09 -0500 Subject: [PATCH 01/26] #1556 Adding ability to open log file and log folder from help page --- src/renderer/page/help/index.js | 7 ++++++- src/renderer/page/help/view.jsx | 35 ++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/renderer/page/help/index.js b/src/renderer/page/help/index.js index 6a59becb9..cfabb784b 100644 --- a/src/renderer/page/help/index.js +++ b/src/renderer/page/help/index.js @@ -1,12 +1,14 @@ import { connect } from 'react-redux'; import { doAuthNavigate } from 'redux/actions/navigation'; import { doFetchAccessToken } from 'redux/actions/user'; +import { selectDaemonSettings } from 'redux/selectors/settings'; import { selectAccessToken, selectUser } from 'redux/selectors/user'; import HelpPage from './view'; const select = state => ({ user: selectUser(state), accessToken: selectAccessToken(state), + deamonSettings: selectDaemonSettings(state), }); const perform = dispatch => ({ @@ -14,4 +16,7 @@ const perform = dispatch => ({ fetchAccessToken: () => dispatch(doFetchAccessToken()), }); -export default connect(select, perform)(HelpPage); +export default connect( + select, + perform +)(HelpPage); diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx index eb8da4aae..d1260ca64 100644 --- a/src/renderer/page/help/view.jsx +++ b/src/renderer/page/help/view.jsx @@ -1,13 +1,19 @@ // @TODO: Customize advice based on OS import React from 'react'; +import { shell } from 'electron'; import { Lbry } from 'lbry-redux'; import Native from 'native'; import Button from 'component/button'; import BusyIndicator from 'component/common/busy-indicator'; -import Icon from 'component/common/icon'; import Page from 'component/page'; import * as icons from 'constants/icons'; +type Props = { + deamonSettings: { + data_dir: ?string, + }, +}; + class HelpPage extends React.PureComponent { constructor(props) { super(props); @@ -56,7 +62,8 @@ class HelpPage extends React.PureComponent { let platform; let newVerLink; - const { accessToken, doAuth, user } = this.props; + const { accessToken, doAuth, user, deamonSettings } = this.props; + const { data_dir: dataDirectory } = deamonSettings; if (this.state.versionInfo) { ver = this.state.versionInfo; @@ -108,12 +115,34 @@ class HelpPage extends React.PureComponent { +
+
{__('View your Log')}
+

+ {__( + 'Do you find something wrong? Have a look in your log, or send your log to support for some help.' + )} +

+
+
+
+
{__('Report a Bug or Suggest a New Feature')}

{__('Did you find something wrong? Think LBRY could add something useful and cool?')}

-
); @@ -92,22 +94,18 @@ export class FormField extends React.PureComponent { })} > {prefix && ( -
{__('More ways to get LBRY Credits')}
diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx index 766391ce8..544673afa 100644 --- a/src/renderer/page/settings/view.jsx +++ b/src/renderer/page/settings/view.jsx @@ -273,20 +273,18 @@ class SettingsPage extends React.PureComponent {
{__('Share Diagnostic Data')}
-
- -
+
{
diff --git a/src/renderer/scss/_gui.scss b/src/renderer/scss/_gui.scss index 48f9b54fc..45161152e 100644 --- a/src/renderer/scss/_gui.scss +++ b/src/renderer/scss/_gui.scss @@ -121,6 +121,10 @@ input::placeholder { opacity: 0.5; } +label { + cursor: pointer; +} + button + input { margin-left: $spacing-vertical * 2/3; } diff --git a/src/renderer/scss/component/_form-field.scss b/src/renderer/scss/component/_form-field.scss index 9dd03b5d7..d93a1885b 100644 --- a/src/renderer/scss/component/_form-field.scss +++ b/src/renderer/scss/component/_form-field.scss @@ -84,7 +84,7 @@ .form-field__help { color: var(--color-help); - padding-top: $spacing-vertical * 1/3; + padding-top: $spacing-vertical * 2/3; } .form-field__error { @@ -94,6 +94,14 @@ .form-field__prefix, .form-field__postfix { font-family: 'metropolis-medium'; + + &.form-field--fix-no-height { + line-height: 1; + } + + &.form-field--align-center { + align-self: center; + } } .form-field__prefix { -- 2.45.3 From bb748b060a4179b121658eccaac890140417cea0 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 13 Jun 2018 10:59:08 -0400 Subject: [PATCH 10/26] remove subscription for clear cache subtitle --- src/renderer/page/settings/view.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx index 544673afa..9823645de 100644 --- a/src/renderer/page/settings/view.jsx +++ b/src/renderer/page/settings/view.jsx @@ -315,7 +315,7 @@ class SettingsPage extends React.PureComponent {
{__('Application Cache')}
- {__("This will delete your subscriptions, and clear the app's cache")} + {__('This will clear the application cache. Your wallet will not be affected.')}
+ +
+ {showQR && } +
+

diff --git a/src/renderer/scss/_gui.scss b/src/renderer/scss/_gui.scss index e7266b68b..c71dbcbb6 100644 --- a/src/renderer/scss/_gui.scss +++ b/src/renderer/scss/_gui.scss @@ -359,4 +359,7 @@ p { &.qr-code--right-padding { padding-right: $spacing-vertical * 2/3; } + &.qr-code--top-padding { + padding-top: $spacing-vertical * 2/3; + } } -- 2.45.3 From f6ed24a1d66ce2eeca89f0ef5636363abe6f9194 Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Wed, 13 Jun 2018 11:43:04 -0400 Subject: [PATCH 12/26] add qr-code border --- src/renderer/component/common/qr-code.jsx | 6 ++---- src/renderer/component/walletAddress/view.jsx | 2 +- src/renderer/scss/_gui.scss | 7 +++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/renderer/component/common/qr-code.jsx b/src/renderer/component/common/qr-code.jsx index 41b506bc5..daf08d9c3 100644 --- a/src/renderer/component/common/qr-code.jsx +++ b/src/renderer/component/common/qr-code.jsx @@ -7,18 +7,16 @@ type Props = { value: string, paddingRight?: boolean, paddingTop?: boolean, - size?: number, }; class QRCode extends React.Component { static defaultProps = { paddingRight: false, paddingTop: false, - size: 128, }; render() { - const { value, paddingRight, paddingTop, size } = this.props; + const { value, paddingRight, paddingTop } = this.props; return (

{ 'qr-code--top-padding': paddingTop, })} > - +
); } diff --git a/src/renderer/component/walletAddress/view.jsx b/src/renderer/component/walletAddress/view.jsx index 208416a2a..1cfc6dd39 100644 --- a/src/renderer/component/walletAddress/view.jsx +++ b/src/renderer/component/walletAddress/view.jsx @@ -67,7 +67,7 @@ class WalletAddress extends React.PureComponent {
- {showQR && } + {showQR && }
diff --git a/src/renderer/scss/_gui.scss b/src/renderer/scss/_gui.scss index c71dbcbb6..8d8bb175e 100644 --- a/src/renderer/scss/_gui.scss +++ b/src/renderer/scss/_gui.scss @@ -356,10 +356,13 @@ p { } .qr-code { + border: 3px solid var(--color-white); + height: 134px; + width: 134px; &.qr-code--right-padding { - padding-right: $spacing-vertical * 2/3; + margin-right: $spacing-vertical * 2/3; } &.qr-code--top-padding { - padding-top: $spacing-vertical * 2/3; + margin-top: $spacing-vertical * 2/3; } } -- 2.45.3 From 61bddf3ea3b28bf2241a129c6962e5c48ab482db Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Tue, 12 Jun 2018 15:22:20 -0400 Subject: [PATCH 13/26] pass app version info to internal APIs --- src/renderer/redux/actions/user.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/renderer/redux/actions/user.js b/src/renderer/redux/actions/user.js index 1893fb13a..f8e04f404 100644 --- a/src/renderer/redux/actions/user.js +++ b/src/renderer/redux/actions/user.js @@ -1,6 +1,6 @@ import * as ACTIONS from 'constants/action_types'; import Lbryio from 'lbryio'; -import { doNotify, MODALS } from 'lbry-redux'; +import { Lbry, doNotify, MODALS } from 'lbry-redux'; import { doClaimRewardType, doRewardList } from 'redux/actions/rewards'; import { selectEmailToVerify, @@ -9,6 +9,7 @@ import { } from 'redux/selectors/user'; import rewards from 'rewards'; import analytics from 'analytics'; +import pjson from 'package.json'; export function doFetchInviteStatus() { return dispatch => { @@ -35,6 +36,21 @@ export function doFetchInviteStatus() { }; } +export function doInstallNew() { + return dispatch => { + const payload = {app_version: pjson.version}; + Lbry.status().then(status => { + payload.app_id = status.installation_id; + Lbry.version().then(version => { + payload.daemon_version = version.lbrynet_version; + payload.platform = version.platform; + Lbryio.call('install', 'new', payload); + }); + }); + }; +} + + export function doAuthenticate() { return dispatch => { dispatch({ @@ -49,6 +65,7 @@ export function doAuthenticate() { }); dispatch(doRewardList()); dispatch(doFetchInviteStatus()); + dispatch(doInstallNew()); }) .catch(error => { dispatch(doNotify({ id: MODALS.AUTHENTICATION_FAILURE })); -- 2.45.3 From 35942280691b57f4cac1a5faa3299793a4c39d48 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Tue, 12 Jun 2018 17:44:20 -0400 Subject: [PATCH 14/26] add operating system lbrynet-cli version { "build": "rc", "lbrynet_version": "0.20.0rc14", "lbryschema_version": "0.0.16rc2", "lbryum_version": "3.2.2rc1", "os_release": "10", "os_system": "Windows", "platform": "Windows-10-10.0.17134", "processor": "Intel64 Family 6 Model 158 Stepping 9, GenuineIntel", "python_version": "2.7.15" } --- src/renderer/redux/actions/user.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/redux/actions/user.js b/src/renderer/redux/actions/user.js index f8e04f404..cc247b32f 100644 --- a/src/renderer/redux/actions/user.js +++ b/src/renderer/redux/actions/user.js @@ -43,6 +43,7 @@ export function doInstallNew() { payload.app_id = status.installation_id; Lbry.version().then(version => { payload.daemon_version = version.lbrynet_version; + payload.operating_system = version.os_system; payload.platform = version.platform; Lbryio.call('install', 'new', payload); }); -- 2.45.3 From 20dc820e06dacf1c58631190b93a13de4eaa4b17 Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Wed, 13 Jun 2018 14:36:00 -0400 Subject: [PATCH 15/26] refactor doInstallNew w/o dispatch; call directly --- src/renderer/redux/actions/user.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/renderer/redux/actions/user.js b/src/renderer/redux/actions/user.js index cc247b32f..7b9e96d66 100644 --- a/src/renderer/redux/actions/user.js +++ b/src/renderer/redux/actions/user.js @@ -37,21 +37,18 @@ export function doFetchInviteStatus() { } export function doInstallNew() { - return dispatch => { - const payload = {app_version: pjson.version}; - Lbry.status().then(status => { - payload.app_id = status.installation_id; - Lbry.version().then(version => { - payload.daemon_version = version.lbrynet_version; - payload.operating_system = version.os_system; - payload.platform = version.platform; - Lbryio.call('install', 'new', payload); - }); + const payload = { app_version: pjson.version }; + Lbry.status().then(status => { + payload.app_id = status.installation_id; + Lbry.version().then(version => { + payload.daemon_version = version.lbrynet_version; + payload.operating_system = version.os_system; + payload.platform = version.platform; + Lbryio.call('install', 'new', payload); }); - }; + }); } - export function doAuthenticate() { return dispatch => { dispatch({ @@ -66,7 +63,7 @@ export function doAuthenticate() { }); dispatch(doRewardList()); dispatch(doFetchInviteStatus()); - dispatch(doInstallNew()); + doInstallNew(); }) .catch(error => { dispatch(doNotify({ id: MODALS.AUTHENTICATION_FAILURE })); -- 2.45.3 From 453c50fc2aa3bef9caed2ce51f209c69eb4dbdf3 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Wed, 13 Jun 2018 15:15:47 -0400 Subject: [PATCH 16/26] Fix wording + add link Fixed wording and added link to support FAQ --- src/renderer/page/help/view.jsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx index cc8dd13fc..ce92cc1e3 100644 --- a/src/renderer/page/help/view.jsx +++ b/src/renderer/page/help/view.jsx @@ -152,9 +152,8 @@ class HelpPage extends React.PureComponent {
{__('View your Log')}

- {__( - 'Do you find something wrong? Have a look in your log, or send your log to support for some help.' - )} + {__('Did something go wrong? Have a look in your log file, or send it to')}{' '} +

) : (
- {isPlayable ? ( -