From 7e1cb97c7e6997e813c412262c2811d209220153 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jaco@parity.io>
Date: Wed, 20 Sep 2017 09:04:39 +0200
Subject: [PATCH] Make status always visible

---
 js/src/Application/application.css |  3 +++
 js/src/Application/application.js  | 15 ++++++++-------
 js/src/Dapp/dapp.css               |  1 +
 js/src/ParityBar/parityBar.js      |  9 ++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/js/src/Application/application.css b/js/src/Application/application.css
index ea4029714..24f05e67b 100644
--- a/js/src/Application/application.css
+++ b/js/src/Application/application.css
@@ -15,6 +15,9 @@
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+.application {
+}
+
 .container {
   display: flex;
   flex-direction: column;
diff --git a/js/src/Application/application.js b/js/src/Application/application.js
index 0a3d33814..5b9ae035b 100644
--- a/js/src/Application/application.js
+++ b/js/src/Application/application.js
@@ -60,6 +60,7 @@ class Application extends Component {
   upgradeStore = UpgradeStore.get(this.context.api);
 
   render () {
+    const { blockNumber } = this.props;
     const [root] = (window.location.hash || '').replace('#/', '').split('/');
     const isMinimized = root !== '';
     const { pinMatrixRequest } = this.hwstore;
@@ -76,7 +77,7 @@ class Application extends Component {
     }
 
     return (
-      <div>
+      <div className={ styles.application }>
         {
           isMinimized
             ? this.renderMinimized()
@@ -101,12 +102,17 @@ class Application extends Component {
         }
         <Requests />
         <ParityBar dapp={ isMinimized } />
+        {
+          blockNumber
+            ? <Status upgradeStore={ this.upgradeStore } />
+            : null
+        }
       </div>
     );
   }
 
   renderApp () {
-    const { blockNumber, children } = this.props;
+    const { children } = this.props;
 
     return (
       <div className={ styles.container }>
@@ -118,11 +124,6 @@ class Application extends Component {
         <Snackbar />
         <UpgradeParity upgradeStore={ this.upgradeStore } />
         <Errors />
-        {
-          blockNumber
-            ? <Status upgradeStore={ this.upgradeStore } />
-            : null
-        }
         <div className={ styles.content }>
           { children }
         </div>
diff --git a/js/src/Dapp/dapp.css b/js/src/Dapp/dapp.css
index 035a17a24..7b3eae4bd 100644
--- a/js/src/Dapp/dapp.css
+++ b/js/src/Dapp/dapp.css
@@ -14,6 +14,7 @@
 /* You should have received a copy of the GNU General Public License
 /* along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 .frame {
   background: white;
   border: 0;
diff --git a/js/src/ParityBar/parityBar.js b/js/src/ParityBar/parityBar.js
index 6fd423128..86264b91a 100644
--- a/js/src/ParityBar/parityBar.js
+++ b/js/src/ParityBar/parityBar.js
@@ -31,7 +31,6 @@ import ContainerTitle from '@parity/ui/Container/Title';
 import IdentityIcon from '@parity/ui/IdentityIcon';
 import GradientBg from '@parity/ui/GradientBg';
 import SelectionList from '@parity/ui/SectionList';
-import StatusIndicator from '@parity/ui/StatusIndicator';
 import { CancelIcon, FingerprintIcon } from '@parity/ui/Icons';
 
 import imagesEthcoreBlock from '@parity/shared/assets/images/parity-logo-white-no-text.svg';
@@ -43,7 +42,7 @@ import AccountStore from './accountStore';
 import styles from './parityBar.css';
 
 const LS_STORE_KEY = '_parity::parityBar';
-const DEFAULT_POSITION = { right: '1em', bottom: 0 };
+const DEFAULT_POSITION = { right: '1em', bottom: '2.5em' };
 const DISPLAY_ACCOUNTS = 'accounts';
 const DISPLAY_SIGNER = 'signer';
 
@@ -184,7 +183,7 @@ class ParityBar extends Component {
       if (position.top !== undefined) {
         parityBgStyle.top = 0;
       } else {
-        parityBgStyle.bottom = 0;
+        parityBgStyle.bottom = '2.5em';
       }
 
       // Set at left or right of the screen
@@ -228,10 +227,6 @@ class ParityBar extends Component {
 
     return (
       <GradientBg className={ styles.cornercolor }>
-        <StatusIndicator
-          id='paritybar.health'
-          tooltipPlacement='right'
-        />
         <Button
           className={ styles.iconButton }
           icon={