From 4f6481d4c45e52aeadae22c3747fe19d82d4811c Mon Sep 17 00:00:00 2001 From: hackrush Date: Sat, 22 Jul 2017 19:29:54 +0530 Subject: [PATCH 1/2] (quickfix) Check for daemon version equal or higher. --- ui/js/actions/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/actions/app.js b/ui/js/actions/app.js index d5014d9ad..96f8fd6d5 100644 --- a/ui/js/actions/app.js +++ b/ui/js/actions/app.js @@ -224,7 +224,7 @@ export function doCheckDaemonVersion() { return function(dispatch, getState) { lbry.version().then(({ lbrynet_version }) => { dispatch({ - type: config.lbrynetDaemonVersion == lbrynet_version + type: lbrynet_version.localeCompare(config.lbrynetDaemonVersion) >= 0 ? types.DAEMON_VERSION_MATCH : types.DAEMON_VERSION_MISMATCH, }); -- 2.45.3 From b336c4b1c78b25b153417073bd92d80b476d7a85 Mon Sep 17 00:00:00 2001 From: hackrush Date: Sat, 22 Jul 2017 20:26:11 +0530 Subject: [PATCH 2/2] (quickfix) Now displays two buttons in IncompatibleDaemonModal. Not everytime is it required to open up a webpage, so it is made optional. --- ui/js/actions/app.js | 8 +++++++- ui/js/component/modalIncompatibleDaemon/index.jsx | 5 +++-- ui/js/component/modalIncompatibleDaemon/view.jsx | 10 ++++++---- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/ui/js/actions/app.js b/ui/js/actions/app.js index 96f8fd6d5..2776f3bb9 100644 --- a/ui/js/actions/app.js +++ b/ui/js/actions/app.js @@ -280,7 +280,13 @@ export function doClearCache() { }; } -export function doQuitAndLaunchDaemonHelp() { +export function doQuit() { + return function(dispatch, getState) { + remote.app.quit(); + }; +} + +export function doLaunchDaemonHelp() { return function(dispatch, getState) { shell.openExternal("https://lbry.io/faq/incompatible-protocol-version"); remote.app.quit(); diff --git a/ui/js/component/modalIncompatibleDaemon/index.jsx b/ui/js/component/modalIncompatibleDaemon/index.jsx index 27ddecd8d..29670469d 100644 --- a/ui/js/component/modalIncompatibleDaemon/index.jsx +++ b/ui/js/component/modalIncompatibleDaemon/index.jsx @@ -1,13 +1,14 @@ import React from "react"; import { connect } from "react-redux"; import { doQuit, doSkipWrongDaemonNotice } from "actions/app"; -import { doQuitAndLaunchDaemonHelp } from "actions/app"; +import { doLaunchDaemonHelp } from "actions/app"; import ModalIncompatibleDaemon from "./view"; const select = state => ({}); const perform = dispatch => ({ - quitAndLaunchDaemonHelp: () => dispatch(doQuitAndLaunchDaemonHelp()), + quit: () => dispatch(doQuit()), + launchDaemonHelp: () => dispatch(doLaunchDaemonHelp()), }); export default connect(select, perform)(ModalIncompatibleDaemon); diff --git a/ui/js/component/modalIncompatibleDaemon/view.jsx b/ui/js/component/modalIncompatibleDaemon/view.jsx index 851a2ec88..135299850 100644 --- a/ui/js/component/modalIncompatibleDaemon/view.jsx +++ b/ui/js/component/modalIncompatibleDaemon/view.jsx @@ -3,15 +3,17 @@ import { Modal } from "component/modal"; class ModalIncompatibleDaemon extends React.PureComponent { render() { - const { quitAndLaunchDaemonHelp } = this.props; + const { quit, launchDaemonHelp } = this.props; return ( {__( "This browser is running with an incompatible version of the LBRY protocol and your install must be repaired." -- 2.45.3