Merge pull request #9626 from darkwing/loading-screen-update

Make loading screen more concise
feature/default_network_editable
David Walsh 4 years ago committed by GitHub
commit 6e7a8428d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      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
? <span>{loadingMessage}</span>
: null
return isValidElement(loadingMessage) ? loadingMessage : <span>{loadingMessage}</span>
}
render () {
return (
<div className="loading-overlay">
{this.props.header && this.props.header}
{this.props.header}
<div className="loading-overlay__container">
{this.props.showLoadingSpinner && <Spinner color="#F7C06C" className="loading-overlay__spinner" />}
{this.renderMessage()}

Loading…
Cancel
Save