LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Check if daemon version is greater than or equal to recommended, and modal edit. #378

Closed
hackrush01 wants to merge 2 commits from daemon_version_greater into master
pull from: daemon_version_greater
merge into: LBRYCommunity:master
Conversation 9 Commits 2 Files changed 3 +16 -7
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit b336c4b1c7 - Show all commits

8
ui/js/actions/app.js
View file

@ -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) { return function(dispatch, getState) {
shell.openExternal("https://lbry.io/faq/incompatible-protocol-version"); shell.openExternal("https://lbry.io/faq/incompatible-protocol-version");
remote.app.quit(); remote.app.quit();

5
ui/js/component/modalIncompatibleDaemon/index.jsx
View file

@ -1,13 +1,14 @@
import React from "react"; import React from "react";
import { connect } from "react-redux"; import { connect } from "react-redux";
import { doQuit, doSkipWrongDaemonNotice } from "actions/app"; import { doQuit, doSkipWrongDaemonNotice } from "actions/app";
import { doQuitAndLaunchDaemonHelp } from "actions/app"; import { doLaunchDaemonHelp } from "actions/app";
import ModalIncompatibleDaemon from "./view"; import ModalIncompatibleDaemon from "./view";
const select = state => ({}); const select = state => ({});
const perform = dispatch => ({ const perform = dispatch => ({
quitAndLaunchDaemonHelp: () => dispatch(doQuitAndLaunchDaemonHelp()), quit: () => dispatch(doQuit()),
launchDaemonHelp: () => dispatch(doLaunchDaemonHelp()),
}); });
export default connect(select, perform)(ModalIncompatibleDaemon); export default connect(select, perform)(ModalIncompatibleDaemon);

10
ui/js/component/modalIncompatibleDaemon/view.jsx
View file

@ -3,15 +3,17 @@ import { Modal } from "component/modal";
class ModalIncompatibleDaemon extends React.PureComponent { class ModalIncompatibleDaemon extends React.PureComponent {
render() { render() {
const { quitAndLaunchDaemonHelp } = this.props; const { quit, launchDaemonHelp } = this.props;
return ( return (
<Modal <Modal
isOpen={true} isOpen={true}
contentLabel={__("Incompatible daemon running")} contentLabel={__("Incompatible daemon running")}
type="alert" type="confirm"
confirmButtonLabel={__("Quit and Learn More")} confirmButtonLabel={__("Quit")}
onConfirmed={quitAndLaunchDaemonHelp} onConfirmed={quit}
abortButtonLabel={__("Learn More")}
onAborted={launchDaemonHelp}
> >
{__( {__(
"This browser is running with an incompatible version of the LBRY protocol and your install must be repaired." "This browser is running with an incompatible version of the LBRY protocol and your install must be repaired."