diff --git a/CHANGELOG.md b/CHANGELOG.md index f4f53a29a..df125cf6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +20,7 @@ Web UI version numbers should always match the corresponding version of LBRY App ### Fixed * On load screen, always show Cancel link if a previous page is available * When user hits "Watch," don't check balance if download already started - * + * Restore UI version on Help page * ## [0.9.0rc9] - 2017-02-22 diff --git a/js/page/help.js b/js/page/help.js index 9a492113f..fafec293f 100644 --- a/js/page/help.js +++ b/js/page/help.js @@ -3,6 +3,7 @@ import React from 'react'; import lbry from '../lbry.js'; import {Link} from '../component/link.js'; +import {version as uiVersion} from 'json!../../package.json'; var HelpPage = React.createClass({ getInitialState: function() { @@ -27,7 +28,7 @@ var HelpPage = React.createClass({ document.title = "Help"; }, render: function() { - let ver, osName, platform, newVerLink, uiVersion; + let ver, osName, platform, newVerLink; if (this.state.versionInfo) { ver = this.state.versionInfo; @@ -43,12 +44,6 @@ var HelpPage = React.createClass({ platform = `Windows (${ver.platform})`; newVerLink = 'https://lbry.io/get/lbry.msi'; } - - if (ver.ui_version == 'user-specified') { - uiVersion = '(User specified)'; - } else { - uiVersion = ver.ui_version || '(Unknown)'; - } } else { ver = null; } diff --git a/package.json b/package.json index f24b2ebba..4eb2dcd14 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "eslint-plugin-import": "^2.2.0", "eslint-plugin-jsx-a11y": "^2.2.3", "eslint-plugin-react": "^6.7.1", + "json-loader": "^0.5.4", "node-sass": "^3.13.0", "webpack": "^1.13.3", "webpack-target-electron-renderer": "^0.4.0"