Merge branch 'main' into prod/festapp

vkh-cr · Nov 16, 2024 · ac3f737 · ac3f737
2 parents cd0aa7d + b1fe72c
commit ac3f737
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/lib/components/timeline/ScheduleTimeline.dart b/lib/components/timeline/ScheduleTimeline.dart
@@ -56,7 +56,7 @@ class _ScheduleTimelineState extends State<ScheduleTimeline> {
       children.add(
         Center(
           child: Padding(
-            padding: const EdgeInsets.symmetric(vertical: 38.0),
+            padding: const EdgeInsets.symmetric(vertical: 28.0),
             child: TextButton.icon(
               onPressed: () {
                 widget.onAddNewEvent?.call(context, widget.eventGroups);

diff --git a/lib/pages/EventEditPage.dart b/lib/pages/EventEditPage.dart
@@ -123,7 +123,7 @@ class _EventEditPageState extends State<EventEditPage> {
           ..maxParticipants = maxParticipants == 0 ? null : maxParticipants
           ..splitForMenWomen = splitForMenWomen!
           ..isGroupEvent = isGroupEvent!
-          ..place = places!.firstWhereOrNull((p)=>p.id! == placeId!)
+          ..place = places!.firstWhereOrNull((p)=>p.id == placeId)
           ..type = type
           ..description = content
           ..parentEventIds = showInsideEvent != null && showInsideEvent!.isNotEmpty

diff --git a/supabase/functions/send-sign-in-code/index.ts b/supabase/functions/send-sign-in-code/index.ts
@@ -78,6 +78,16 @@ Deno.serve(async (req) => {
 
     const organizationId = occasionData.organization;
 
+    const orgData = await supabaseAdmin
+        .from("organizations")
+        .select("data")
+        .eq("id", organizationId)
+        .single();
+
+    const orgConfig = orgData.data.data;
+    const appName = orgConfig.APP_NAME || "DefaultAppName";
+    const defaultUrl = orgConfig.DEFAULT_URL || "http://default.url";
+
     // Fetch email template based on the organization
     const template = await supabase
       .from("email_templates")
@@ -104,7 +114,7 @@ Deno.serve(async (req) => {
       subject: template.data.subject,
       content: template.data.html,
       subs,
-      from: `Festapp <${_DEFAULT_EMAIL}>`,
+      from: `${appName} | Festapp <${_DEFAULT_EMAIL}>`,
     });
 
   await supabaseAdmin