Merge branch 'master' into ui-2

js/src/api/transport/error.js

@@ -21,6 +21,7 @@ export const ERROR_CODES = {
   NO_WORK: -32001,
   NO_AUTHOR: -32002,
   NO_NEW_WORK: -32003,
+  NO_WORK_REQUIRED: -32004,
   NOT_ENOUGH_DATA: -32006,
   UNKNOWN_ERROR: -32009,
   TRANSACTION_ERROR: -32010,
@@ -38,7 +39,7 @@ export const ERROR_CODES = {
   COMPILATION_ERROR: -32050,
   ENCRYPTION_ERROR: -32055,
   FETCH_ERROR: -32060,
-  INVALID_PARAMS: -32602
+  INVALID_PARAMS: -32602,
 };
 
 export default class TransportError extends ExtendableError {

js/src/shared/redux/providers/status.js

@@ -214,6 +214,9 @@ export default class Status {
         const status = { netPeers, syncing, health };
 
         health.overall = this._overallStatus(health);
+        health.peers = health.peers || {};
+        health.sync = health.sync || {};
+        health.time = health.time || {};
 
         if (!isEqual(status, this._status)) {
           this._store.dispatch(statusCollection(status));

js/src/ui/StatusIndicator/statusIndicator.css

@@ -23,6 +23,7 @@
   margin: .2em;
   width: 1em;
   height: 1em;
+  white-space: nowrap;
 }
 
 .radial {