[DDW-635] Shutting down Screen top Priority (#1428)

* [DDW-635] Shutting down Screen top Priority * [DDW-635] Shutting down Screen top Priority * [DDW-635] Shutting down Screen top Priority * [DDW-635] Shutting down Screen top Priority * [DDW-635] Shutting down Screen top Priority * [DDW-635] Shutting down Screen top Priority * [DDW-635] Shutting down Screen top Priority * [DDW-635] Shutting down Screen top Priority * [DDW-635] Shutting down Screen top Priority - fixes * [DDW-635] Shutting down Screen top Priority - fixes * [DDW-635] Shutting down Screen top Priority - fixes * [DDW-635] Shutting down Screen top Priority - fixes * [DDW-635] Shutting down Screen top Priority - fixes * [DDW-635] Shutting down Screen top Priority - fixes * [DDW-635] Minor cleanup
input-output-hk · Jul 10, 2019 · 301d05a · 301d05a
1 parent fb74963
commit 301d05a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,6 +33,7 @@ Changelog
 
 ### Fixes
 
+- Fixed shutting down screen top priority ([PR 1428](https://github.com/input-output-hk/daedalus/pull/1428))
 - Fixed screen flashes during Daedalus loading ([PR 1444](https://github.com/input-output-hk/daedalus/pull/1444))
 - Removes files pushed without running Prettier ([PR 1445](https://github.com/input-output-hk/daedalus/pull/1445))
 - Improved Stake pool tooltip positioning ([PR 1429](https://github.com/input-output-hk/daedalus/pull/1429))

diff --git a/source/renderer/app/containers/Root.js b/source/renderer/app/containers/Root.js
@@ -2,7 +2,7 @@
 import React, { Component } from 'react';
 import { inject, observer } from 'mobx-react';
 import WalletAddPage from './wallet/WalletAddPage';
-import Loading from './loading/Loading';
+import LoadingPage from './loading/LoadingPage';
 import { DIALOGS } from '../../../common/ipc/constants';
 import type { InjectedContainerProps } from '../types/injectedPropsType';
 
@@ -59,7 +59,7 @@ export default class Root extends Component<Props> {
       !isSystemTimeCorrect ||
       isNotEnoughDiskSpace
     ) {
-      return <Loading stores={stores} actions={actions} />;
+      return <LoadingPage stores={stores} actions={actions} />;
     }
 
     if (!wallets.hasAnyWallets) {

diff --git a/...enderer/app/containers/loading/Loading.js → ...rer/app/containers/loading/LoadingPage.js b/...enderer/app/containers/loading/Loading.js → ...rer/app/containers/loading/LoadingPage.js
@@ -10,7 +10,7 @@ import type { InjectedProps } from '../../types/injectedPropsType';
 
 @inject('stores', 'actions')
 @observer
-export default class Loading extends Component<InjectedProps> {
+export default class LoadingPage extends Component<InjectedProps> {
   static defaultProps = { stores: null, actions: null };
 
   get activeOverlay() {

diff --git a/source/renderer/app/stores/NetworkStatusStore.js b/source/renderer/app/stores/NetworkStatusStore.js
@@ -286,6 +286,7 @@ export default class NetworkStatusStore extends Store {
           this.tlsConfig = null;
         });
         this._setDisconnected(wasConnected);
+        this.stores.app._closeActiveDialog();
         break;
       default:
         this._setDisconnected(wasConnected);