diff --git a/src/shared/containers/SubmissionPage.jsx b/src/shared/containers/SubmissionPage.jsx index bc017f3e83..13fd542fa0 100644 --- a/src/shared/containers/SubmissionPage.jsx +++ b/src/shared/containers/SubmissionPage.jsx @@ -37,7 +37,7 @@ class SubmissionsPageContainer extends React.Component { // check if challenge belongs to any groups // and the communitiesList is not up-to-date // then will load the communitiesList - if (!_.isEmpty(groups) && !communitiesList.loadingUuid + if (!_.isEmpty(groups) && !_.isEmpty(communitiesList.loadingUuid) && (Date.now() - communitiesList.timestamp > USER_GROUP_MAXAGE)) { getCommunitiesList(auth); } diff --git a/src/shared/containers/challenge-detail/index.jsx b/src/shared/containers/challenge-detail/index.jsx index 32fbc5fc79..1770d9c896 100644 --- a/src/shared/containers/challenge-detail/index.jsx +++ b/src/shared/containers/challenge-detail/index.jsx @@ -161,7 +161,7 @@ class ChallengeDetailPageContainer extends React.Component { loadChallengeDetails(auth, challengeId); } - if (!communitiesList.loadingUuid + if (!_.isEmpty(communitiesList.loadingUuid) && (Date.now() - communitiesList.timestamp > USER_GROUP_MAXAGE)) { getCommunitiesList(auth); } diff --git a/src/shared/containers/challenge-listing/Listing/index.jsx b/src/shared/containers/challenge-listing/Listing/index.jsx index 5019b91fa0..974ee2dae5 100644 --- a/src/shared/containers/challenge-listing/Listing/index.jsx +++ b/src/shared/containers/challenge-listing/Listing/index.jsx @@ -57,7 +57,7 @@ export class ListingContainer extends React.Component { selectBucket(queryBucket); } - if (!communitiesList.loadingUuid + if (!_.isEmpty(communitiesList.loadingUuid) && (Date.now() - communitiesList.timestamp > USER_GROUP_MAXAGE)) { getCommunitiesList(auth); }