diff --git a/ui/app/components/ui/loading-screen/loading-screen.component.js b/ui/app/components/ui/loading-screen/loading-screen.component.js index e7f754acc..457f2dcbd 100644 --- a/ui/app/components/ui/loading-screen/loading-screen.component.js +++ b/ui/app/components/ui/loading-screen/loading-screen.component.js @@ -16,18 +16,18 @@ class LoadingScreen extends Component { renderMessage () { const { loadingMessage } = this.props - if (isValidElement(loadingMessage)) { - return loadingMessage + + if (!loadingMessage) { + return null } - return loadingMessage - ? {loadingMessage} - : null + + return isValidElement(loadingMessage) ? loadingMessage : {loadingMessage} } render () { return (
- {this.props.header && this.props.header} + {this.props.header}
{this.props.showLoadingSpinner && } {this.renderMessage()}