diff --git a/.flowconfig b/.flowconfig index 1eaa4969e..664b2d8de 100644 --- a/.flowconfig +++ b/.flowconfig @@ -20,6 +20,5 @@ module.name_mapper='^lbry\(.*\)$' -> '/src/renderer/lbry\1' module.name_mapper='^rewards\(.*\)$' -> '/src/renderer/rewards\1' module.name_mapper='^modal\(.*\)$' -> '/src/renderer/modal\1' module.name_mapper='^app\(.*\)$' -> '/src/renderer/app\1' -module.name_mapper='^native\(.*\)$' -> '/src/renderer/native\1' [strict] diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ae61c477..61461cbf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,6 @@ 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)) @@ -28,7 +27,6 @@ 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/component/common/qr-code.jsx b/src/renderer/component/common/qr-code.jsx index fb74c68d7..daf08d9c3 100644 --- a/src/renderer/component/common/qr-code.jsx +++ b/src/renderer/component/common/qr-code.jsx @@ -6,19 +6,22 @@ import classnames from 'classnames'; type Props = { value: string, paddingRight?: boolean, + paddingTop?: boolean, }; class QRCode extends React.Component { static defaultProps = { paddingRight: false, + paddingTop: false, }; render() { - const { value, paddingRight } = this.props; + const { value, paddingRight, paddingTop } = this.props; return (
diff --git a/src/renderer/component/walletAddress/view.jsx b/src/renderer/component/walletAddress/view.jsx index 81f7cec4f..1cfc6dd39 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 { + 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 { render() { const { receiveAddress, getNewAddress, gettingNewAddress } = this.props; + const { showQR } = this.state; return (
@@ -43,7 +59,17 @@ class WalletAddress extends React.PureComponent { onClick={getNewAddress} disabled={gettingNewAddress} /> +
+ +
+ {showQR && } +
+

diff --git a/src/renderer/page/help/index.js b/src/renderer/page/help/index.js index cfabb784b..6a59becb9 100644 --- a/src/renderer/page/help/index.js +++ b/src/renderer/page/help/index.js @@ -1,14 +1,12 @@ 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 => ({ @@ -16,7 +14,4 @@ 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 cc8dd13fc..eb8da4aae 100644 --- a/src/renderer/page/help/view.jsx +++ b/src/renderer/page/help/view.jsx @@ -1,44 +1,15 @@ // @TODO: Customize advice based on OS -// @flow -import * as React from 'react'; -import { shell } from 'electron'; +import React from 'react'; 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 DeamonSettings = { - data_dir: string | any, -}; - -type Props = { - deamonSettings: DeamonSettings, - accessToken: string, - fetchAccessToken: () => void, - doAuth: () => void, - user: any, -}; - -type VersionInfo = { - os_system: string, - os_release: string, - platform: string, - lbrynet_version: string, - lbryum_version: string, -}; - -type State = { - versionInfo: VersionInfo | any, - lbryId: String | any, - uiVersion: ?string, - upgradeAvailable: ?boolean, - accessTokenHidden: ?boolean, -}; - -class HelpPage extends React.PureComponent { - constructor(props: Props) { +class HelpPage extends React.PureComponent { + constructor(props) { super(props); this.state = { @@ -49,12 +20,11 @@ class HelpPage extends React.PureComponent { accessTokenHidden: true, }; - (this: any).showAccessToken = this.showAccessToken.bind(this); - (this: any).openLogFile = this.openLogFile.bind(this); + this.showAccessToken = this.showAccessToken.bind(this); } componentDidMount() { - Native.getAppVersionInfo().then(({ localVersion, upgradeAvailable }) => { + Native.getAppVersionInfo().then(({ remoteVersion, localVersion, upgradeAvailable }) => { this.setState({ uiVersion: localVersion, upgradeAvailable, @@ -80,24 +50,13 @@ 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; let platform; let newVerLink; - const { accessToken, doAuth, user, deamonSettings } = this.props; - const { data_dir: dataDirectory } = deamonSettings; + const { accessToken, doAuth, user } = this.props; if (this.state.versionInfo) { ver = this.state.versionInfo; @@ -149,34 +108,12 @@ 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?')}

+