diff --git a/frontend/app/Router.js b/frontend/app/Router.js index 4885aa27f..f66e0fda6 100644 --- a/frontend/app/Router.js +++ b/frontend/app/Router.js @@ -55,14 +55,14 @@ const ONBOARDING_PATH = routes.onboarding(); const jwt = state.get('jwt'); const changePassword = state.getIn([ 'user', 'account', 'changePassword' ]); const userInfoLoading = state.getIn([ 'user', 'fetchUserInfoRequest', 'loading' ]); - const fetchingTenants = state.get('user', 'fetchTenantsRequest', 'loading'); + // const fetchingTenants = state.get('user', 'fetchTenantsRequest', 'loading'); return { jwt, siteId, changePassword, sites: state.getIn([ 'user', 'client', 'sites' ]), isLoggedIn: jwt !== null && !changePassword, - loading: siteId === null || userInfoLoading || fetchingTenants, + loading: siteId === null || userInfoLoading, email: state.getIn([ 'user', 'account', 'email' ]), account: state.getIn([ 'user', 'account' ]), organisation: state.getIn([ 'user', 'client', 'name' ]), diff --git a/frontend/app/components/Errors/Error/DistributionBar.js b/frontend/app/components/Errors/Error/DistributionBar.js index 8e3c168b2..413d38ecb 100644 --- a/frontend/app/components/Errors/Error/DistributionBar.js +++ b/frontend/app/components/Errors/Error/DistributionBar.js @@ -1,5 +1,5 @@ import cn from 'classnames'; -import { Popup } from 'UI'; +import { Popup, TextEllipsis } from 'UI'; import { Styles } from '../../Dashboard/Widgets/common'; import cls from './distributionBar.css'; import { colorScale } from 'App/utils'; @@ -15,11 +15,15 @@ function DistributionBar({ className, title, partitions }) { return (