diff --git a/src/containers/Wrapper/index.js b/src/containers/Wrapper/index.js index 318c4548465f1068213c1c7558a15984a49f5e15..148aa3c594eb66c633dd387ecf7ffb2e8ae7f39c 100644 --- a/src/containers/Wrapper/index.js +++ b/src/containers/Wrapper/index.js @@ -21,7 +21,10 @@ class Wrapper extends Component { constructor(props) { super(props); - this.state = { userLoaded: false }; + this.state = { + userLoaded: false, + allUsersLoaded: false, + }; } componentDidMount() { @@ -43,6 +46,12 @@ class Wrapper extends Component { if (nextProps.user.user_id && !this.props.user.user_id) { this.setState({ userLoaded: true }); } + if ( + Object.keys(nextProps.user.allUsers).length !== 0 && + Object.keys(this.props.user.allUsers).length === 0 + ) { + this.setState({ allUsersLoaded: true }); + } } componentWillUnmount() { @@ -68,7 +77,7 @@ class Wrapper extends Component { } render() { - if (!this.state.userLoaded) { + if (!this.state.userLoaded || !this.state.allUsersLoaded) { return ; } const content = React.cloneElement(this.props.children, {