diff --git a/CHANGELOG.md b/CHANGELOG.md index d39386c35..4ae782121 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ Web UI version numbers should always match the corresponding version of LBRY App * ### Fixed - * + * Version upgrade check on help page * ### Deprecated diff --git a/ui/js/lbry.js b/ui/js/lbry.js index db9a1ae2a..b9e70d359 100644 --- a/ui/js/lbry.js +++ b/ui/js/lbry.js @@ -100,7 +100,6 @@ lbry.connect = function() { let tryNum = 0 function checkDaemonStartedFailed() { - console.log('status error try num ' + tryNum) if (tryNum <= 100) { // Move # of tries into constant or config option setTimeout(() => { tryNum++ @@ -114,7 +113,6 @@ lbry.connect = function() { // Check every half second to see if the daemon is accepting connections function checkDaemonStarted() { - console.log('check daemon started try ' + tryNum) lbry.call('status', {}, resolve, checkDaemonStartedFailed, checkDaemonStartedFailed) } diff --git a/ui/js/page/help/view.jsx b/ui/js/page/help/view.jsx index 3f67c2d70..2303446d3 100644 --- a/ui/js/page/help/view.jsx +++ b/ui/js/page/help/view.jsx @@ -4,7 +4,6 @@ import lbry from 'lbry.js'; import Link from 'component/link'; import SubHeader from 'component/subHeader' import {BusyMessage} from 'component/common' -import {version as uiVersion} from 'json!../../../package.json'; class HelpPage extends React.Component { constructor(props) { @@ -13,13 +12,16 @@ class HelpPage extends React.Component { this.state = { versionInfo: null, lbryId: null, + uiVersion: null, + upgradeAvailable: null }; } componentWillMount() { - lbry.getAppVersionInfo().then((info) => { + lbry.getAppVersionInfo().then(({remoteVersion, upgradeAvailable}) => { this.setState({ - appVersionInfo: info, + uiVersion: remoteVersion, + upgradeAvailable: upgradeAvailable }); }); lbry.call('version', {}, (info) => { @@ -43,7 +45,6 @@ class HelpPage extends React.Component { if (this.state.versionInfo) { ver = this.state.versionInfo; - console.log(ver) if (ver.os_system == 'Darwin') { osName = (parseInt(ver.os_release.match(/^\d+/)) < 16 ? 'Mac OS X' : 'Mac OS'); @@ -96,11 +97,11 @@ class HelpPage extends React.Component {

About

- {this.state.appVersionInfo ? - (ver.lbrynet_update_available || ver.lbryum_update_available ? -

A newer version of LBRY is available.

- :

Your copy of LBRY is up to date.

) : null} - { ver ? + { this.state.upgradeAvailable === null ? '' : + ( this.state.upgradeAvailable ? +

A newer version of LBRY is available.

+ :

Your copy of LBRY is up to date.

)} + { this.state.uiVersion && ver ? @@ -113,7 +114,7 @@ class HelpPage extends React.Component { - +
interface{uiVersion}{this.state.uiVersion}
Platform