From 88b4a73fca0f494a1f1660706a7b5f5a51658bc4 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Thu, 14 Jun 2018 12:08:13 -0400 Subject: [PATCH] fix: upgrade modal flow --- package.json | 2 +- src/renderer/modal/modalUpgrade/index.js | 6 +++--- src/renderer/redux/actions/app.js | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e319e36bd..aa7065cc7 100644 --- a/package.json +++ b/package.json @@ -126,7 +126,7 @@ "yarn": "^1.3" }, "lbrySettings": { - "lbrynetDaemonVersion": "0.20.0rc14", + "lbrynetDaemonVersion": "0.20.0", "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-daemon-vDAEMONVER-OSNAME.zip", "lbrynetDaemonDir": "static/daemon", "lbrynetDaemonFileName": "lbrynet-daemon" diff --git a/src/renderer/modal/modalUpgrade/index.js b/src/renderer/modal/modalUpgrade/index.js index 031927b96..8ac49e49c 100644 --- a/src/renderer/modal/modalUpgrade/index.js +++ b/src/renderer/modal/modalUpgrade/index.js @@ -1,9 +1,9 @@ -import React from 'react'; import { connect } from 'react-redux'; -import { doDownloadUpgrade, doSkipUpgrade, doHideNotification } from 'redux/actions/app'; +import { doHideNotification } from 'lbry-redux'; +import { doDownloadUpgrade, doSkipUpgrade } from 'redux/actions/app'; import ModalUpgrade from './view'; -const select = state => ({}); +const select = () => ({}); const perform = dispatch => ({ downloadUpgrade: () => dispatch(doDownloadUpgrade()), diff --git a/src/renderer/redux/actions/app.js b/src/renderer/redux/actions/app.js index 313ce7914..e2e433b02 100644 --- a/src/renderer/redux/actions/app.js +++ b/src/renderer/redux/actions/app.js @@ -10,6 +10,7 @@ import { doNotify, selectNotification, MODALS, + doHideNotification, } from 'lbry-redux'; import Native from 'native'; import { doFetchRewardedContent } from 'redux/actions/content'; @@ -89,6 +90,7 @@ export function doDownloadUpgrade() { dispatch({ type: ACTIONS.UPGRADE_DOWNLOAD_STARTED, }); + dispatch(doHideNotification()); dispatch( doNotify({ id: MODALS.DOWNLOADING,