fix common member amount on feed page

daostack · Sep 27, 2023 · d282b6a · d282b6a
1 parent 5fb53fa
commit d282b6a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 25 deletions.
diff --git a/src/pages/commonFeed/CommonFeedPage.tsx b/src/pages/commonFeed/CommonFeedPage.tsx
@@ -41,7 +41,6 @@ const renderContentWrapper: RenderCommonFeedContentWrapper = ({
     headerContent={
       <HeaderContent
         common={commonData.common}
-        commonMembersAmount={commonData.commonMembersAmount}
         commonMember={commonMember}
         governance={commonData.governance}
       />

diff --git a/src/pages/commonFeed/components/HeaderContent/HeaderContent.tsx b/src/pages/commonFeed/components/HeaderContent/HeaderContent.tsx
@@ -19,14 +19,12 @@ import styles from "./HeaderContent.module.scss";
 interface HeaderContentProps {
   className?: string;
   common: Common;
-  commonMembersAmount: number;
   commonMember: (CommonMember & CirclesPermissions) | null;
   governance: Governance;
 }
 
 const HeaderContent: FC<HeaderContentProps> = (props) => {
-  const { className, common, commonMembersAmount, commonMember, governance } =
-    props;
+  const { className, common, commonMember, governance } = props;
   const { getCommonPageAboutTabPath } = useRoutesContext();
   const isMobileVersion = useIsTabletView();
   const commonFollow = useCommonFollow(common.id, commonMember);
@@ -61,7 +59,7 @@ const HeaderContent: FC<HeaderContentProps> = (props) => {
               {showFollowIcon && <StarIcon stroke="currentColor" />}
             </div>
             <p className={styles.commonMembersAmount}>
-              {commonMembersAmount} member{getPluralEnding(commonMembersAmount)}
+              {common.memberCount} member{getPluralEnding(common.memberCount)}
             </p>
           </div>
         </NavLink>

diff --git a/src/pages/commonFeed/hooks/useCommonData/index.ts b/src/pages/commonFeed/hooks/useCommonData/index.ts
@@ -43,18 +43,16 @@ export const useCommonData = (userId?: string): Return => {
 
       (async () => {
         try {
-          const [common, governance, commonMembersAmount, sharedFeedItem] =
-            await Promise.all([
-              CommonService.getCommonById(commonId),
-              GovernanceService.getGovernanceByCommonId(commonId),
-              CommonService.getCommonMembersAmount(commonId),
-              sharedFeedItemId
-                ? CommonFeedService.getCommonFeedItemById(
-                    commonId,
-                    sharedFeedItemId,
-                  )
-                : null,
-            ]);
+          const [common, governance, sharedFeedItem] = await Promise.all([
+            CommonService.getCommonById(commonId),
+            GovernanceService.getGovernanceByCommonId(commonId),
+            sharedFeedItemId
+              ? CommonFeedService.getCommonFeedItemById(
+                  commonId,
+                  sharedFeedItemId,
+                )
+              : null,
+          ]);
 
           if (!common) {
             throw new Error(`Couldn't find common by id = ${commonId}`);
@@ -87,7 +85,6 @@ export const useCommonData = (userId?: string): Return => {
               governance,
               parentCommons,
               subCommons,
-              commonMembersAmount,
               sharedFeedItem,
               rootCommon,
               rootCommonGovernance,

diff --git a/src/pages/commonFeed/hooks/useCommonData/types.ts b/src/pages/commonFeed/hooks/useCommonData/types.ts
@@ -6,7 +6,6 @@ export interface Data {
   governance: Governance;
   parentCommons: Common[];
   subCommons: Common[];
-  commonMembersAmount: number;
   sharedFeedItem: CommonFeed | null;
   rootCommon?: Common | null;
   rootCommonGovernance: Governance | null;

diff --git a/src/services/Common.ts b/src/services/Common.ts
@@ -345,12 +345,6 @@ class CommonService {
     });
   };
 
-  public getCommonMembersAmount = async (commonId: string): Promise<number> => {
-    const snapshot = await commonMembersSubCollection(commonId).get();
-
-    return snapshot.size;
-  };
-
   public leaveCircle = async (
     commonId: string,
     circleId: string,