feat: [#216] [Join NGO] Receive join request answer: Org update tile …

…is not displayed on Home page (#320)
code4romania · Jul 22, 2024 · 71feee8 · 71feee8
1 parent 03da622
commit 71feee8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/backend/src/usecases/dashboard/get-volunteer-monthly-news.usecase.ts b/backend/src/usecases/dashboard/get-volunteer-monthly-news.usecase.ts
@@ -53,12 +53,12 @@ export class GetVolunteerMonthlyNewsStatisticsUsecase
         await this.actionsArchiveFacade.countDocumentStatusUpdatesBetweenDates(
           volunteerIds,
         );
-      // get number of organization access requests
-      statisticsResponse.numberOfOrganizationUpdates =
-        await this.actionsArchiveFacade.countActivityRequestsUpdatesBetweenDates(
-          user.id,
-        );
     }
+    // get number of organization access requests
+    statisticsResponse.numberOfOrganizationUpdates =
+      await this.actionsArchiveFacade.countActivityRequestsUpdatesBetweenDates(
+        user.id,
+      );
 
     return statisticsResponse;
   }

diff --git a/mobile/src/components/Statistics.tsx b/mobile/src/components/Statistics.tsx
@@ -69,6 +69,7 @@ const Statistics = ({ navigation }: { navigation: any }) => {
             backgroundColor="color-primary-50"
             onPress={onEventsCardPress}
           />
+
           {userProfile?.activeOrganization && (
             <>
               <StatisticsCard
@@ -89,17 +90,18 @@ const Statistics = ({ navigation }: { navigation: any }) => {
                 backgroundColor="color-primary-50"
                 onPress={onDocumentsCardPress}
               />
-              <StatisticsCard
-                icon="users"
-                title={`${t('statistics.organizations.title', {
-                  number: statistics?.numberOfOrganizationUpdates,
-                })}`}
-                subtitle={t('statistics.organizations.description')}
-                backgroundColor="color-primary-50"
-                onPress={onOrganizationsCardPress}
-              />
             </>
           )}
+
+          <StatisticsCard
+            icon="users"
+            title={`${t('statistics.organizations.title', {
+              number: statistics?.numberOfOrganizationUpdates,
+            })}`}
+            subtitle={t('statistics.organizations.description')}
+            backgroundColor="color-primary-50"
+            onPress={onOrganizationsCardPress}
+          />
         </HorizontalCarousel>
       )}
     </SectionWrapper>

diff --git a/mobile/src/screens/News.tsx b/mobile/src/screens/News.tsx
@@ -187,7 +187,10 @@ const News = ({ navigation, route }: any) => {
       const activeOrganization = userProfile?.myOrganizations.find(
         (org) => org.id === item.organizationId,
       );
-      setActiveOrganization(activeOrganization as IOrganizationVolunteer);
+
+      if (activeOrganization) {
+        setActiveOrganization(activeOrganization as IOrganizationVolunteer);
+      }
       switchOrganization({ organizationId: item.organizationId as string });
 
       if (type === NewsType.LOGGED_HOURS) {