[DDW-635] Shutting down Screen top Priority

CHANGELOG.md

@@ -24,6 +24,7 @@ Changelog
 
 ### Fixes
 
+- Fixed shutting down screen top priority ([PR 1428](https://github.com/input-output-hk/daedalus/pull/1428))
 - Added fine adjustments to the Stake Pools screen. ([PR 1420](https://github.com/input-output-hk/daedalus/pull/1420))
 - Fixed the Block consolidation status screen not fully shown in minimized mode when the Japanese language is selected ([PR 1416](https://github.com/input-output-hk/daedalus/pull/1416))
 - Fixed "marked" dependency vulnerability warning ([PR 1414](https://github.com/input-output-hk/daedalus/pull/1414)

source/renderer/app/containers/Root.js

@@ -21,7 +21,7 @@ export default class Root extends Component<Props> {
       app,
       staking,
     } = stores;
-    const { isActiveDialog } = app;
+    const { isActiveDialog, _closeActiveDialog } = app;
     const { isStakingPage } = staking;
     const { isProfilePage, isSettingsPage } = profile;
     const { isAdaRedemptionPage } = adaRedemption;
@@ -47,7 +47,7 @@ export default class Root extends Component<Props> {
 
     // Just render any page that doesn't require wallets to be loaded or node to be connected
     if (
-      (isPageThatDoesntNeedWallets && !isNodeInStoppingSequence) ||
+      (isPageThatDoesntNeedWallets && !isNodeInStoppingSequence && isSynced) ||
       (isProfilePage && (isNotEnoughDiskSpace || !isNodeInStoppingSequence))
     ) {
       return React.Children.only(children);
@@ -57,8 +57,11 @@ export default class Root extends Component<Props> {
       !isSynced ||
       !hasLoadedWallets ||
       !isSystemTimeCorrect ||
-      isNotEnoughDiskSpace
+      isNotEnoughDiskSpace ||
+      (isNodeInStoppingSequence &&
+        !isActiveDialog(DIALOGS.DAEDALUS_DIAGNOSTICS))
     ) {
+      _closeActiveDialog();
       return <LoadingPage stores={stores} actions={actions} />;
     }