Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fixes signer and MUI errors throwing #2876

Merged
merged 1 commit into from
Oct 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions js/src/api/transport/ws/ws.js
Original file line number Diff line number Diff line change
Expand Up @@ -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];
// Event sent by Signer Broadcaster
if (event.data === 'new_message') {
return false;
}

try {
const result = JSON.parse(event.data);
const { method, params, json, resolve, reject } = this._messages[result.id];

Logging.send(method, params, { json, result });
Logging.send(method, params, { json, result });

if (result.error) {
this.error(event.data);
if (result.error) {
this.error(event.data);

reject(new Error(`${result.error.code}: ${result.error.message}`));
reject(new Error(`${result.error.code}: ${result.error.message}`));
delete this._messages[result.id];
return;
}

resolve(result.result);
delete this._messages[result.id];
return;
} catch (e) {
console.error('ws::_onMessage', event.data, e);
}

resolve(result.result);
delete this._messages[result.id];
}

_send = (id) => {
Expand Down
2 changes: 1 addition & 1 deletion js/src/dapps/gavcoin/Loading/loading.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default class Loading extends Component {
render () {
return (
<div className={ styles.loading }>
<CircularProgress size={ 2 } />
<CircularProgress size={ 120 } thickness={ 7 } />
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion js/src/dapps/registry/Application/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default class Application extends Component {
</p>
</div>
) : (
<CircularProgress size={ 1 } />
<CircularProgress size={ 60 } />
) }
</div>
);
Expand Down
4 changes: 3 additions & 1 deletion js/src/dapps/tokenreg/Loading/loading.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ export default class Loading extends Component {
};

render () {
const size = (this.props.size || 2) * 60;

return (
<div className={ styles.loading }>
<CircularProgress size={ this.props.size || 2 } />
<CircularProgress size={ size } />
</div>
);
}
Expand Down
4 changes: 3 additions & 1 deletion js/src/ui/Container/container.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@
/* along with Parity. If not, see <http://www.gnu.org/licenses/>.
*/
.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 {
Expand Down
3 changes: 2 additions & 1 deletion js/src/views/ParityBar/parityBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
.expanded {
right: 16px;
width: 964px;
height: 288px;
height: 300px;
border-radius: 4px 4px 0 0;
overflow-y: auto;
display: flex;
Expand All @@ -53,6 +53,7 @@
.expanded .content {
flex: 1;
overflow: auto;
display: flex;
}

.corner {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ export default class TransactionFinished extends Component {
if (!chain || !fromBalance || !toBalance) {
return (
<div className={ `${styles.container} ${className}` }>
<CircularProgress size={ 1 } />
<CircularProgress size={ 60 } />
</div>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default class TransactionPending extends Component {
if (!this.state.chain) {
return (
<div className={ `${styles.container} ${className}` }>
<CircularProgress size={ 1 } />
<CircularProgress size={ 60 } />
</div>
);
}
Expand Down