diff --git a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js index 7110dc3485..dfb38eb48b 100644 --- a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js +++ b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js @@ -135,11 +135,9 @@ class SectionHeaderContent extends React.Component { } componentDidUpdate() { - const { isLoaded, tReady, setIsLoadedSectionHeader } = this.props; + const { tReady, setIsLoadedSectionHeader } = this.props; - const isLoadedSetting = isLoaded && tReady; - - if (isLoadedSetting) setIsLoadedSectionHeader(isLoadedSetting); + if (tReady) setIsLoadedSectionHeader(true); const arrayOfParams = this.getArrayOfParams(); @@ -218,7 +216,7 @@ class SectionHeaderContent extends React.Component { render() { const { t, - tReady, + isLoadedSectionHeader, addUsers, isHeaderIndeterminate, isHeaderChecked, @@ -248,8 +246,6 @@ class SectionHeaderContent extends React.Component { }, ]; - const showLoader = !tReady; - return ( {isHeaderVisible ? ( @@ -262,7 +258,7 @@ class SectionHeaderContent extends React.Component { headerMenu={headerMenu} /> - ) : showLoader ? ( + ) : !isLoadedSectionHeader ? ( ) : ( @@ -311,7 +307,7 @@ export default inject(({ auth, setup, common }) => { selection, } = setup.selectionStore; const { admins, selectorIsOpen } = setup.security.accessRight; - const { isLoaded, setIsLoadedSectionHeader } = common; + const { isLoadedSectionHeader, setIsLoadedSectionHeader } = common; return { addUsers, removeAdmins, @@ -327,7 +323,7 @@ export default inject(({ auth, setup, common }) => { toggleSelector, selectorIsOpen, selection, - isLoaded, + isLoadedSectionHeader, setIsLoadedSectionHeader, }; })(