diff --git a/js/src/api/transport/ws/ws.js b/js/src/api/transport/ws/ws.js
index ecab2a5a2..119f4ba76 100644
--- a/js/src/api/transport/ws/ws.js
+++ b/js/src/api/transport/ws/ws.js
@@ -93,21 +93,30 @@ export default class Ws extends JsonRpcBase {
}
_onMessage = (event) => {
- const result = JSON.parse(event.data);
- const { method, params, json, resolve, reject } = this._messages[result.id];
-
- Logging.send(method, params, { json, result });
-
- if (result.error) {
- this.error(event.data);
-
- reject(new Error(`${result.error.code}: ${result.error.message}`));
- delete this._messages[result.id];
- return;
+ // Event sent by Signer Broadcaster
+ if (event.data === 'new_message') {
+ return false;
}
- resolve(result.result);
- delete this._messages[result.id];
+ try {
+ const result = JSON.parse(event.data);
+ const { method, params, json, resolve, reject } = this._messages[result.id];
+
+ Logging.send(method, params, { json, result });
+
+ if (result.error) {
+ this.error(event.data);
+
+ reject(new Error(`${result.error.code}: ${result.error.message}`));
+ delete this._messages[result.id];
+ return;
+ }
+
+ resolve(result.result);
+ delete this._messages[result.id];
+ } catch (e) {
+ console.error('ws::_onMessage', event.data, e);
+ }
}
_send = (id) => {
diff --git a/js/src/dapps/gavcoin/Loading/loading.js b/js/src/dapps/gavcoin/Loading/loading.js
index 9e00cc8f1..78aaa8828 100644
--- a/js/src/dapps/gavcoin/Loading/loading.js
+++ b/js/src/dapps/gavcoin/Loading/loading.js
@@ -24,7 +24,7 @@ export default class Loading extends Component {
render () {
return (
-
+
);
}
diff --git a/js/src/dapps/registry/Application/application.js b/js/src/dapps/registry/Application/application.js
index 3d3d8d582..d0c4bd2f7 100644
--- a/js/src/dapps/registry/Application/application.js
+++ b/js/src/dapps/registry/Application/application.js
@@ -79,7 +79,7 @@ export default class Application extends Component {
) : (
-
+
) }
);
diff --git a/js/src/dapps/tokenreg/Loading/loading.js b/js/src/dapps/tokenreg/Loading/loading.js
index 3b7619323..bdcc98df6 100644
--- a/js/src/dapps/tokenreg/Loading/loading.js
+++ b/js/src/dapps/tokenreg/Loading/loading.js
@@ -25,9 +25,11 @@ export default class Loading extends Component {
};
render () {
+ const size = (this.props.size || 2) * 60;
+
return (
-
+
);
}
diff --git a/js/src/ui/Container/container.css b/js/src/ui/Container/container.css
index ad625aa7c..7305a4aba 100644
--- a/js/src/ui/Container/container.css
+++ b/js/src/ui/Container/container.css
@@ -15,15 +15,17 @@
/* along with Parity. If not, see .
*/
.container {
+ flex: 1;
padding: 0em;
+ background: rgba(0, 0, 0, 0.8) !important;
}
.compact,
.padded {
- background: rgba(0, 0, 0, 0.8) !important;
border-radius: 0 !important;
position: relative;
overflow: auto;
+ background-color: transparent !important;
}
.compact {
diff --git a/js/src/views/ParityBar/parityBar.css b/js/src/views/ParityBar/parityBar.css
index 0c6de9f5d..b9b94c1d2 100644
--- a/js/src/views/ParityBar/parityBar.css
+++ b/js/src/views/ParityBar/parityBar.css
@@ -43,7 +43,7 @@
.expanded {
right: 16px;
width: 964px;
- height: 288px;
+ height: 300px;
border-radius: 4px 4px 0 0;
overflow-y: auto;
display: flex;
@@ -53,6 +53,7 @@
.expanded .content {
flex: 1;
overflow: auto;
+ display: flex;
}
.corner {
diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
index d7717c7fb..9326f57e6 100644
--- a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
+++ b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
@@ -80,7 +80,7 @@ export default class TransactionFinished extends Component {
if (!chain || !fromBalance || !toBalance) {
return (
-
+
);
}
diff --git a/js/src/views/Signer/components/TransactionPending/TransactionPending.js b/js/src/views/Signer/components/TransactionPending/TransactionPending.js
index 9f77e6cc1..3ca078b83 100644
--- a/js/src/views/Signer/components/TransactionPending/TransactionPending.js
+++ b/js/src/views/Signer/components/TransactionPending/TransactionPending.js
@@ -81,7 +81,7 @@ export default class TransactionPending extends Component {
if (!this.state.chain) {
return (
-
+
);
}