From 8301a7212a987c191f06329e3f4f6a7ca47a61fb Mon Sep 17 00:00:00 2001
From: Joana Maia <joana@crowd.dev>
Date: Wed, 10 May 2023 11:36:01 +0100
Subject: [PATCH] Fix activity types display in dashboard

---
 .../activity/dashboard-activity-types.vue           | 13 +++++--------
 .../src/modules/dashboard/pages/dashboard-page.vue  |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/frontend/src/modules/dashboard/components/activity/dashboard-activity-types.vue b/frontend/src/modules/dashboard/components/activity/dashboard-activity-types.vue
index 125fb6ac20..9e1155914e 100644
--- a/frontend/src/modules/dashboard/components/activity/dashboard-activity-types.vue
+++ b/frontend/src/modules/dashboard/components/activity/dashboard-activity-types.vue
@@ -63,10 +63,9 @@
               <p v-if="typeNames?.[plat]?.[type]?.display" class="text-xs leading-5 activity-type">
                 {{ typeNames?.[plat]?.[type]?.display?.short }}
               </p>
-              <app-i18n
-                v-else-if="getPlatformDetails(plat)"
-                :code="`entities.activity.${plat}.${type}`"
-              />
+              <div v-else class="text-xs leading-5 activity-type">
+                Conducted an activity
+              </div>
             </div>
             <p class="text-2xs text-gray-400">
               {{ pluralize('activity', total, true) }} ・
@@ -112,6 +111,7 @@ import { useActivityTypeStore } from '@/modules/activity/store/type';
 import { storeToRefs } from 'pinia';
 import { computed, watch } from 'vue';
 import pluralize from 'pluralize';
+import merge from 'lodash/merge';
 
 const { period, platform } = mapGetters('dashboard');
 const { currentTenant } = mapGetters('auth');
@@ -120,10 +120,7 @@ const activityTypeStore = useActivityTypeStore();
 const { types } = storeToRefs(activityTypeStore);
 const { setTypes } = activityTypeStore;
 
-const typeNames = computed(() => ({
-  ...types.value.default,
-  ...types.value.custom,
-}));
+const typeNames = computed(() => (merge(types.value.default, types.value.custom)));
 
 watch(
   () => currentTenant,
diff --git a/frontend/src/modules/dashboard/pages/dashboard-page.vue b/frontend/src/modules/dashboard/pages/dashboard-page.vue
index e9b312e6da..cf573bdeb9 100644
--- a/frontend/src/modules/dashboard/pages/dashboard-page.vue
+++ b/frontend/src/modules/dashboard/pages/dashboard-page.vue
@@ -18,7 +18,7 @@
               class="leading-8 font-semibold transition-all duration-100"
               :class="scrolled ? 'text-base' : 'text-xl'"
             >
-              {{ currentTenant.name }} team overview
+              {{ currentTenant?.name }} team overview
             </h4>
           </div>