From c806d10f1ef84198df80d53fdd8705ab2f97f7fc Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean.yesmunt@gmail.com>
Date: Thu, 10 May 2018 19:06:41 -0400
Subject: [PATCH] fix incompatible daemon modal

---
 .../modal/modalIncompatibleDaemon/view.jsx      | 14 ++++++++++++--
 src/renderer/redux/actions/app.js               | 17 +++++++++++++----
 src/renderer/redux/reducers/app.js              |  2 --
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/renderer/modal/modalIncompatibleDaemon/view.jsx b/src/renderer/modal/modalIncompatibleDaemon/view.jsx
index 7b056bcbe..e5a2b6309 100644
--- a/src/renderer/modal/modalIncompatibleDaemon/view.jsx
+++ b/src/renderer/modal/modalIncompatibleDaemon/view.jsx
@@ -1,8 +1,14 @@
+// @flow
 import React from 'react';
 import { Modal } from 'modal/modal';
 import Button from 'component/button';
 
-class ModalIncompatibleDaemon extends React.PureComponent {
+type Props = {
+  quit: () => void,
+  quitAnyDaemon: () => void,
+};
+
+class ModalIncompatibleDaemon extends React.PureComponent<Props> {
   render() {
     const { quit, quitAnyDaemon } = this.props;
 
@@ -19,7 +25,11 @@ class ModalIncompatibleDaemon extends React.PureComponent {
         {__(
           'This browser is running with an incompatible version of the LBRY protocol and your install must be repaired. '
         )}
-        <Button label={__('Learn more')} href="https://lbry.io/faq/incompatible-protocol-version" />
+        <Button
+          button="link"
+          label={__('Learn more')}
+          href="https://lbry.io/faq/incompatible-protocol-version"
+        />
       </Modal>
     );
   }
diff --git a/src/renderer/redux/actions/app.js b/src/renderer/redux/actions/app.js
index 3d6167639..313ce7914 100644
--- a/src/renderer/redux/actions/app.js
+++ b/src/renderer/redux/actions/app.js
@@ -251,12 +251,21 @@ export function doCheckUpgradeSubscribe() {
 export function doCheckDaemonVersion() {
   return dispatch => {
     Lbry.version().then(({ lbrynet_version: lbrynetVersion }) => {
+      if (config.lbrynetDaemonVersion === lbrynetVersion) {
+        dispatch({
+          type: ACTIONS.DAEMON_VERSION_MATCH,
+        });
+        return;
+      }
+
       dispatch({
-        type:
-          config.lbrynetDaemonVersion === lbrynetVersion
-            ? ACTIONS.DAEMON_VERSION_MATCH
-            : ACTIONS.DAEMON_VERSION_MISMATCH,
+        type: ACTIONS.DAEMON_VERSION_MISMATCH,
       });
+      dispatch(
+        doNotify({
+          id: MODALS.INCOMPATIBLE_DAEMON,
+        })
+      );
     });
   };
 }
diff --git a/src/renderer/redux/reducers/app.js b/src/renderer/redux/reducers/app.js
index 2cdedcc7c..3417d55d2 100644
--- a/src/renderer/redux/reducers/app.js
+++ b/src/renderer/redux/reducers/app.js
@@ -1,7 +1,6 @@
 // @flow
 
 import * as ACTIONS from 'constants/action_types';
-import { MODALS } from 'lbry-redux';
 
 import { remote } from 'electron';
 
@@ -74,7 +73,6 @@ reducers[ACTIONS.DAEMON_VERSION_MATCH] = state =>
 reducers[ACTIONS.DAEMON_VERSION_MISMATCH] = state =>
   Object.assign({}, state, {
     daemonVersionMatched: false,
-    modal: MODALS.INCOMPATIBLE_DAEMON,
   });
 
 reducers[ACTIONS.UPGRADE_CANCELLED] = state =>