From c335e7069bd30e9e02356aadca54d19137652d56 Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 21 Dec 2022 16:33:15 +0100
Subject: [PATCH 1/2] Consider timezone for start time also when end date is
 hidden

Closes #1239

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Event/EventFullDate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/components/Event/EventFullDate.vue b/js/src/components/Event/EventFullDate.vue
index 1958f579..55d2f875 100644
--- a/js/src/components/Event/EventFullDate.vue
+++ b/js/src/components/Event/EventFullDate.vue
@@ -33,7 +33,7 @@
     {{
       t("On {date} starting at {startTime}", {
         date: formatDate(beginsOn),
-        startTime: formatTime(beginsOn),
+        startTime: formatTime(beginsOn, timezoneToShow),
       })
     }}
   </p>

From 5929a85ec7f899ca3858e7ed6d407f7da5af76cd Mon Sep 17 00:00:00 2001
From: Thomas Citharel <tcit@tcit.fr>
Date: Wed, 21 Dec 2022 17:10:51 +0100
Subject: [PATCH 2/2] Fix loading group members in organizer picker

Closes #1216

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
---
 js/src/components/Event/OrganizerPickerWrapper.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/src/components/Event/OrganizerPickerWrapper.vue b/js/src/components/Event/OrganizerPickerWrapper.vue
index b2b4939f..ca42b027 100644
--- a/js/src/components/Event/OrganizerPickerWrapper.vue
+++ b/js/src/components/Event/OrganizerPickerWrapper.vue
@@ -76,7 +76,7 @@
                 v-model:actorFilter="actorFilter"
               />
             </div>
-            <div class="max-h-[400px] overflow-y-auto">
+            <div class="pl-2 max-h-[400px] overflow-y-auto">
               <div v-if="isSelectedActorAGroup">
                 <p>{{ $t("Add a contact") }}</p>
                 <o-input
@@ -166,6 +166,8 @@ import { useRoute } from "vue-router";
 import AccountCircle from "vue-material-design-icons/AccountCircle.vue";
 import debounce from "lodash/debounce";
 import { IUser } from "@/types/current-user.model";
+import { IMember } from "@/types/actor/member.model";
+import { Paginate } from "@/types/paginate";
 
 const MEMBER_ROLES = [
   MemberRole.CREATOR,
@@ -233,7 +235,7 @@ const isComponentModalActive = ref(false);
 const contactFilter = ref("");
 const membersPage = ref(1);
 
-const { result: membersResult } = useQuery(
+const { result: membersResult } = useQuery<{ group: Pick<IGroup, 'members'> }>(
   GROUP_MEMBERS,
   () => ({
     groupName: usernameWithDomain(selectedActor.value),
@@ -245,8 +247,8 @@ const { result: membersResult } = useQuery(
   () => ({ enabled: selectedActor.value?.type === ActorType.GROUP })
 );
 
-const members = computed(
-  () => membersResult.value?.members ?? { elements: [], total: 0 }
+const members = computed<Paginate<IMember>>(
+  () => selectedActor.value?.type === ActorType.GROUP ? membersResult.value?.group?.members ?? { elements: [], total: 0 } : { elements: [], total: 0 }
 );
 
 const actualContacts = computed({