From d46c60da86d8268a01e717b91e4a94664fb135fc Mon Sep 17 00:00:00 2001
From: Amit Nandan P <amit_nndn@yahoo.co.in>
Date: Fri, 8 Jun 2018 22:38:09 -0500
Subject: [PATCH 1/9] #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 {
           </div>
         </section>
 
+        <section className="card card--section">
+          <div className="card__title">{__('View your Log')}</div>
+          <p className="card__subtitle">
+            {__(
+              'Do you find something wrong? Have a look in your log, or send your log to support for some help.'
+            )}
+          </p>
+          <div className="card__actions">
+            <Button
+              button="primary"
+              label={__('Open Log')}
+              icon={icons.REPORT}
+              onClick={() => shell.openItem(`${dataDirectory}/lbrynet.log`)}
+            />
+            <Button
+              button="primary"
+              label={__('Open Log Folder')}
+              icon={icons.REPORT}
+              onClick={() => shell.showItemInFolder(dataDirectory)}
+            />
+          </div>
+        </section>
+
         <section className="card card--section">
           <div className="card__title">{__('Report a Bug or Suggest a New Feature')}</div>
           <p className="card__subtitle">
             {__('Did you find something wrong? Think LBRY could add something useful and cool?')}
           </p>
-
           <div className="card__actions">
             <Button
               navigate="/report"
-- 
2.45.3


From 4045fadc40fbf39b36f11b2eca1e906d84d0337f Mon Sep 17 00:00:00 2001
From: Amit Nandan P <amit_nndn@yahoo.co.in>
Date: Sat, 9 Jun 2018 17:33:23 -0500
Subject: [PATCH 2/9] #1556 Checking for OS before opening the log file

---
 src/renderer/page/help/view.jsx | 48 +++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 11 deletions(-)

diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index d1260ca64..47f2db2cc 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -1,21 +1,36 @@
 // @TODO: Customize advice based on OS
-import React from 'react';
+// @flow
+import * as React from 'react';
 import { shell } from 'electron';
 import { Lbry } from 'lbry-redux';
-import Native from 'native';
+import * as Native from 'native';
 import Button from 'component/button';
 import BusyIndicator from 'component/common/busy-indicator';
 import Page from 'component/page';
 import * as icons from 'constants/icons';
 
-type Props = {
-  deamonSettings: {
-    data_dir: ?string,
-  },
+type DeamonSettings = {
+  data_dir: string,
 };
 
-class HelpPage extends React.PureComponent {
-  constructor(props) {
+type Props = {
+  deamonSettings: DeamonSettings,
+  accessToken: string,
+  fetchAccessToken: () => void,
+  doAuth: () => void,
+  user: any,
+};
+
+type State = {
+  versionInfo: any,
+  lbryId: any,
+  uiVersion: any,
+  upgradeAvailable: any,
+  accessTokenHidden: any,
+};
+
+class HelpPage extends React.PureComponent<Props, State> {
+  constructor(props: Props) {
     super(props);
 
     this.state = {
@@ -26,11 +41,12 @@ class HelpPage extends React.PureComponent {
       accessTokenHidden: true,
     };
 
-    this.showAccessToken = this.showAccessToken.bind(this);
+    (this: any).showAccessToken = this.showAccessToken.bind(this);
+    (this: any).openLogFile = this.openLogFile.bind(this);
   }
 
   componentDidMount() {
-    Native.getAppVersionInfo().then(({ remoteVersion, localVersion, upgradeAvailable }) => {
+    Native.getAppVersionInfo().then(({ localVersion, upgradeAvailable }) => {
       this.setState({
         uiVersion: localVersion,
         upgradeAvailable,
@@ -56,6 +72,16 @@ class HelpPage extends React.PureComponent {
     });
   }
 
+  openLogFile(userHomeDirectory: string) {
+    const logFileName = 'lbrynet.log';
+    const os = this.state.versionInfo.os_system;
+    if (os === 'Darwin' || os === 'Linux') {
+      shell.openItem(`${userHomeDirectory}/${logFileName}`);
+    } else {
+      shell.openItem(`${userHomeDirectory}\\${logFileName}`);
+    }
+  }
+
   render() {
     let ver;
     let osName;
@@ -127,7 +153,7 @@ class HelpPage extends React.PureComponent {
               button="primary"
               label={__('Open Log')}
               icon={icons.REPORT}
-              onClick={() => shell.openItem(`${dataDirectory}/lbrynet.log`)}
+              onClick={() => this.openLogFile(dataDirectory)}
             />
             <Button
               button="primary"
-- 
2.45.3


From c6ff859d459891a6448297170ed8f01286c11fa4 Mon Sep 17 00:00:00 2001
From: Amit Nandan P <amit_nndn@yahoo.co.in>
Date: Sat, 9 Jun 2018 18:19:04 -0500
Subject: [PATCH 3/9] #1556 Fixing eslint issues

---
 src/renderer/page/help/view.jsx | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index 47f2db2cc..26034359f 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -10,7 +10,7 @@ import Page from 'component/page';
 import * as icons from 'constants/icons';
 
 type DeamonSettings = {
-  data_dir: string,
+  data_dir: string | any,
 };
 
 type Props = {
@@ -21,12 +21,20 @@ type Props = {
   user: any,
 };
 
+type VersionInfo = {
+  os_system: string,
+  os_release: string,
+  platform: string,
+  lbrynet_version: string,
+  lbryum_version: string,
+};
+
 type State = {
-  versionInfo: any,
+  versionInfo: VersionInfo | any,
   lbryId: any,
-  uiVersion: any,
-  upgradeAvailable: any,
-  accessTokenHidden: any,
+  uiVersion: ?string,
+  upgradeAvailable: ?boolean,
+  accessTokenHidden: ?boolean,
 };
 
 class HelpPage extends React.PureComponent<Props, State> {
-- 
2.45.3


From 733ebf3e34b3bc5e9d15c757ab25d62ca8e9f1ac Mon Sep 17 00:00:00 2001
From: Amit Nandan P <amit_nndn@yahoo.co.in>
Date: Sat, 9 Jun 2018 18:20:29 -0500
Subject: [PATCH 4/9] #1556 Updating Flow config file to resolve eslint issues

---
 .flowconfig                     | 1 +
 src/renderer/page/help/view.jsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.flowconfig b/.flowconfig
index 664b2d8de..1eaa4969e 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -20,5 +20,6 @@ module.name_mapper='^lbry\(.*\)$' -> '<PROJECT_ROOT>/src/renderer/lbry\1'
 module.name_mapper='^rewards\(.*\)$' -> '<PROJECT_ROOT>/src/renderer/rewards\1'
 module.name_mapper='^modal\(.*\)$' -> '<PROJECT_ROOT>/src/renderer/modal\1'
 module.name_mapper='^app\(.*\)$' -> '<PROJECT_ROOT>/src/renderer/app\1'
+module.name_mapper='^native\(.*\)$' -> '<PROJECT_ROOT>/src/renderer/native\1'
 
 [strict]
diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index 26034359f..f535111f7 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -31,7 +31,7 @@ type VersionInfo = {
 
 type State = {
   versionInfo: VersionInfo | any,
-  lbryId: any,
+  lbryId: String | any,
   uiVersion: ?string,
   upgradeAvailable: ?boolean,
   accessTokenHidden: ?boolean,
-- 
2.45.3


From 369cbe7d29144b016383b092391cf9a4c7a7f43c Mon Sep 17 00:00:00 2001
From: Amit Nandan P <amit_nndn@yahoo.co.in>
Date: Sat, 9 Jun 2018 18:22:36 -0500
Subject: [PATCH 5/9] #1556 Resolving error in import statement

---
 src/renderer/page/help/view.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index f535111f7..cc8dd13fc 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -3,7 +3,7 @@
 import * as React from 'react';
 import { shell } from 'electron';
 import { Lbry } from 'lbry-redux';
-import * as Native from 'native';
+import Native from 'native';
 import Button from 'component/button';
 import BusyIndicator from 'component/common/busy-indicator';
 import Page from 'component/page';
-- 
2.45.3


From 9c75d3dde238588d7b434d745c40c2053c39e1b2 Mon Sep 17 00:00:00 2001
From: Amit Nandan P <amit_nndn@yahoo.co.in>
Date: Sat, 9 Jun 2018 18:32:32 -0500
Subject: [PATCH 6/9] #1556 Updating changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00bd560df..b8c585a9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
 ### Added
 
+   * Add ability to open log file and log directory in the help page ([#1556](https://github.com/lbryio/lbry-app/issues/1556))
    * Add ability to resend verification email ([#1492](https://github.com/lbryio/lbry-app/issues/1492))
    * Add Narrative about Feature Request on Help Page and Report Page ([#1551](https://github.com/lbryio/lbry-app/pull/1551))
    * Add keyboard shortcut to quit the app on Windows ([#1202](https://github.com/lbryio/lbry-app/pull/1202))
-- 
2.45.3


From aa493f997bd99dd9ef620484bf3585d6604b4d0f Mon Sep 17 00:00:00 2001
From: Amit Nandan P <amit_nndn@yahoo.co.in>
Date: Sun, 10 Jun 2018 17:13:11 -0500
Subject: [PATCH 7/9] #741 Fixing content address extending outside of visible
 area in card

---
 CHANGELOG.md                           | 1 +
 src/renderer/scss/component/_card.scss | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8c585a9e..8af50eb4b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
    * Move rewards logic to interal api ([#1509](https://github.com/lbryio/lbry-app/pull/1509))
 
 ### Fixed
+   * Fixing content address extending outside of visible area. ([#741](https://github.com/lbryio/lbry-app/issues/741))
    * Fix content-type not shown correctly in file description ([#863](https://github.com/lbryio/lbry-app/pull/863))
    * Fix [Flow](https://flow.org/) ([#1197](https://github.com/lbryio/lbry-app/pull/1197))
    * Fix black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235))
diff --git a/src/renderer/scss/component/_card.scss b/src/renderer/scss/component/_card.scss
index f06976225..b27fdc815 100644
--- a/src/renderer/scss/component/_card.scss
+++ b/src/renderer/scss/component/_card.scss
@@ -8,6 +8,10 @@
   flex-direction: column;
 }
 
+.card > h1 {
+  word-wrap: break-word;
+}
+
 .card--section {
   background-color: var(--card-bg);
   padding: $spacing-vertical;
-- 
2.45.3


From a2a12ef6cdcf37226c0096f823b8a6a3defb1a06 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Tue, 12 Jun 2018 09:22:53 -0400
Subject: [PATCH 8/9] add togglable QR code to wallet address component

---
 src/renderer/component/common/qr-code.jsx     |  9 +++++--
 src/renderer/component/walletAddress/view.jsx | 26 +++++++++++++++++++
 src/renderer/scss/_gui.scss                   |  3 +++
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/renderer/component/common/qr-code.jsx b/src/renderer/component/common/qr-code.jsx
index fb74c68d7..41b506bc5 100644
--- a/src/renderer/component/common/qr-code.jsx
+++ b/src/renderer/component/common/qr-code.jsx
@@ -6,22 +6,27 @@ import classnames from 'classnames';
 type Props = {
   value: string,
   paddingRight?: boolean,
+  paddingTop?: boolean,
+  size?: number,
 };
 
 class QRCode extends React.Component<Props> {
   static defaultProps = {
     paddingRight: false,
+    paddingTop: false,
+    size: 128,
   };
 
   render() {
-    const { value, paddingRight } = this.props;
+    const { value, paddingRight, paddingTop, size } = this.props;
     return (
       <div
         className={classnames('qr-code', {
           'qr-code--right-padding': paddingRight,
+          'qr-code--top-padding': paddingTop,
         })}
       >
-        <QRCodeElement value={value} />
+        <QRCodeElement value={value} size={size} />
       </div>
     );
   }
diff --git a/src/renderer/component/walletAddress/view.jsx b/src/renderer/component/walletAddress/view.jsx
index 81f7cec4f..208416a2a 100644
--- a/src/renderer/component/walletAddress/view.jsx
+++ b/src/renderer/component/walletAddress/view.jsx
@@ -2,6 +2,7 @@
 import React from 'react';
 import Button from 'component/button';
 import Address from 'component/address';
+import QRCode from 'component/common/qr-code';
 import * as icons from 'constants/icons';
 
 type Props = {
@@ -12,6 +13,20 @@ type Props = {
 };
 
 class WalletAddress extends React.PureComponent<Props> {
+  constructor(props: Props) {
+    super(props);
+
+    this.state = {
+      showQR: false,
+    };
+  }
+
+  toggleQR() {
+    this.setState({
+      showQR: !this.state.showQR,
+    });
+  }
+
   componentWillMount() {
     const { checkAddressIsMine, receiveAddress, getNewAddress } = this.props;
     if (!receiveAddress) {
@@ -23,6 +38,7 @@ class WalletAddress extends React.PureComponent<Props> {
 
   render() {
     const { receiveAddress, getNewAddress, gettingNewAddress } = this.props;
+    const { showQR } = this.state;
 
     return (
       <section className="card card--section">
@@ -43,7 +59,17 @@ class WalletAddress extends React.PureComponent<Props> {
             onClick={getNewAddress}
             disabled={gettingNewAddress}
           />
+          <Button
+            button="link"
+            label={showQR ? __('Hide QR code') : __('Show QR code')}
+            onClick={this.toggleQR.bind(this)}
+          />
         </div>
+
+        <div className="card__content">
+          {showQR && <QRCode value={receiveAddress} paddingTop size={256} />}
+        </div>
+
         <div className="card__content">
           <div className="help">
             <p>
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 <daovist@gmail.com>
Date: Wed, 13 Jun 2018 11:43:04 -0400
Subject: [PATCH 9/9] 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<Props> {
   static defaultProps = {
     paddingRight: false,
     paddingTop: false,
-    size: 128,
   };
 
   render() {
-    const { value, paddingRight, paddingTop, size } = this.props;
+    const { value, paddingRight, paddingTop } = this.props;
     return (
       <div
         className={classnames('qr-code', {
@@ -26,7 +24,7 @@ class QRCode extends React.Component<Props> {
           'qr-code--top-padding': paddingTop,
         })}
       >
-        <QRCodeElement value={value} size={size} />
+        <QRCodeElement value={value} />
       </div>
     );
   }
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<Props> {
         </div>
 
         <div className="card__content">
-          {showQR && <QRCode value={receiveAddress} paddingTop size={256} />}
+          {showQR && <QRCode value={receiveAddress} paddingTop />}
         </div>
 
         <div className="card__content">
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