Pull in dapp-status

js-old/src/views/Application/TabBar/Tab/tab.js

@@ -18,15 +18,10 @@ import { Tab as MUITab } from 'material-ui/Tabs';
 import React, { Component, PropTypes } from 'react';
 import { FormattedMessage } from 'react-intl';
 
-import { Badge } from '~/ui';
-
 import styles from '../tabBar.css';
 
-const SIGNER_ID = 'signer';
-
 export default class Tab extends Component {
   static propTypes = {
-    pendings: PropTypes.number,
     view: PropTypes.object.isRequired
   };
 
@@ -37,9 +32,7 @@ export default class Tab extends Component {
       <MUITab
         icon={ view.icon }
         label={
-          view.id === SIGNER_ID
-            ? this.renderSignerLabel()
-            : this.renderLabel(view.id)
+          this.renderLabel(view.id)
         }
       />
     );
@@ -55,21 +48,4 @@ export default class Tab extends Component {
       </div>
     );
   }
-
-  renderSignerLabel () {
-    const { pendings } = this.props;
-    let bubble;
-
-    if (pendings) {
-      bubble = (
-        <Badge
-          color='red'
-          className={ styles.labelBubble }
-          value={ pendings }
-        />
-      );
-    }
-
-    return this.renderLabel(SIGNER_ID, bubble);
-  }
 }

js-old/src/views/Application/TabBar/tabBar.js

@@ -20,8 +20,6 @@ import { Link } from 'react-router';
 import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
 import { isEqual } from 'lodash';
 
-import { StatusIndicator } from '~/ui';
-
 import Tab from './Tab';
 import styles from './tabBar.css';
 
@@ -31,8 +29,6 @@ class TabBar extends Component {
   };
 
   static propTypes = {
-    pending: PropTypes.array,
-    health: PropTypes.object.isRequired,
     views: PropTypes.array.isRequired
   };
 
@@ -41,29 +37,12 @@ class TabBar extends Component {
   };
 
   render () {
-    const { health } = this.props;
-
     return (
       <Toolbar className={ styles.toolbar }>
         <ToolbarGroup className={ styles.first }>
           <div />
         </ToolbarGroup>
         <div className={ styles.tabs }>
-          <Link
-            activeClassName={ styles.tabactive }
-            className={ `${styles.tabLink} ${styles.indicatorTab}` }
-            key='status'
-            to='/status'
-          >
-            <div className={ styles.indicator }>
-              <StatusIndicator
-                type='signal'
-                id='topbar.health'
-                status={ health.overall.status }
-                title={ health.overall.message }
-              />
-            </div>
-          </Link>
           { this.renderTabItems() }
         </div>
         <ToolbarGroup className={ styles.last }>
@@ -74,7 +53,7 @@ class TabBar extends Component {
   }
 
   renderTabItems () {
-    const { views, pending } = this.props;
+    const { views } = this.props;
 
     return views.map((view, index) => {
       return (
@@ -85,7 +64,6 @@ class TabBar extends Component {
           to={ view.route }
         >
           <Tab
-            pendings={ pending.length }
             view={ view }
           />
         </Link>
@@ -109,7 +87,6 @@ function mapStateToProps (initState) {
   return (state) => {
     const { availability = 'unknown' } = state.nodeStatus.nodeKind || {};
     const { views } = state.settings;
-    const { health } = state.nodeStatus;
 
     const viewIds = Object
       .keys(views)
@@ -123,7 +100,7 @@ function mapStateToProps (initState) {
       });
 
     if (isEqual(viewIds, filteredViewIds)) {
-      return { views: filteredViews, health };
+      return { views: filteredViews };
     }
 
     filteredViewIds = viewIds;
@@ -132,7 +109,7 @@ function mapStateToProps (initState) {
       id
     }));
 
-    return { views: filteredViews, health };
+    return { views: filteredViews };
   };
 }
 

js/package.json

@@ -53,6 +53,7 @@
     "@parity/dapp-localtx": "paritytech/dapp-localtx",
     "@parity/dapp-registry": "paritytech/dapp-registry",
     "@parity/dapp-signaturereg": "paritytech/dapp-signaturereg",
+    "@parity/dapp-status": "js-dist-paritytech/dapp-status",
     "@parity/dapp-tokendeploy": "paritytech/dapp-tokendeploy",
     "@parity/dapp-tokenreg": "paritytech/dapp-tokenreg",
     "babel-cli": "6.26.0",
@@ -145,7 +146,7 @@
     "@parity/plugin-signer-default": "paritytech/plugin-signer-default",
     "@parity/plugin-signer-hardware": "paritytech/plugin-signer-hardware",
     "@parity/plugin-signer-qr": "paritytech/plugin-signer-qr",
-    "@parity/shared": "2.2.18",
+    "@parity/shared": "2.2.20",
     "@parity/ui": "3.0.22",
     "keythereum": "1.0.2",
     "lodash.flatten": "4.4.0",