merge development

2018-05-22 09:25:02 -07:00
parent d460c0e8b9 ab9cfd293b
commit 4a0c8d72b0
59 changed files with 418 additions and 124 deletions
--- a/packages/website/ts/components/relayer_index/relayer_index.tsx
+++ b/packages/website/ts/components/relayer_index/relayer_index.tsx
@@ -60,8 +60,8 @@ export class RelayerIndex extends React.Component<RelayerIndexProps, RelayerInde
        this._isUnmounted = true;
    }
    public render(): React.ReactNode {
-        const readyToRender = _.isUndefined(this.state.error) && !_.isUndefined(this.state.relayerInfos);
-        if (!readyToRender) {
+        const isReadyToRender = _.isUndefined(this.state.error) && !_.isUndefined(this.state.relayerInfos);
+        if (!isReadyToRender) {
            return (
                // TODO: consolidate this loading component with the one in portal
                <div className="center">