Merge 746981f into 24dd220

Author: joshreisner

public/app.js

@@ -5,9 +5,10 @@ import { Link as RouterLink } from 'react-router-dom';
 
 import {
   formatDirectionsUrl,
+  formatFeedbackEmail,
   formatIcs,
-  formatString as i18n,
   formatUrl,
+  formatString as i18n,
   useSettings,
 } from '../helpers';
 import {
@@ -47,6 +48,28 @@ export default function Meeting({
     url: meeting.url ?? location.href,
   };
 
+  let feedback_emails = settings.feedback_emails;
+  if (Array.isArray(meeting.feedback_emails)) {
+    feedback_emails = meeting.feedback_emails;
+  }
+  if ('string' === typeof meeting.feedback_emails) {
+    feedback_emails = (meeting.feedback_emails as string)
+      .split(',')
+      .map(e => e.trim())
+      .filter(e => e);
+  }
+
+  let feedback_url;
+  if (!meeting.feedback_url && feedback_emails.length) {
+    feedback_url = formatFeedbackEmail({
+      feedback_emails,
+      name: meeting.name,
+      edit_url: meeting.edit_url,
+      settings,
+      strings,
+    });
+  }
+
   // format time string (duration? or appointment?)
   const formatTime = (start?: DateTime, end?: DateTime) => {
     if (!start) {
@@ -420,7 +443,7 @@ export default function Meeting({
                   {formatWeekdays(groupWeekdays, meeting.slug, state, setState)}
                 </div>
               )}
-            {(meeting.updated || meeting.feedback_url || meeting.entity) && (
+            {(meeting.updated || feedback_url || meeting.entity) && (
               <div>
                 {meeting.entity && (
                   <>
@@ -451,9 +474,9 @@ export default function Meeting({
                   </>
                 )}
 
-                {meeting.feedback_url && (
+                {feedback_url && (
                   <Button
-                    href={meeting.feedback_url}
+                    href={feedback_url}
                     icon="edit"
                     text={strings.feedback}
                   />

src/components/Meeting.tsx

@@ -3,11 +3,10 @@ import { DateTime, WeekdayNumbers } from 'luxon';
 import { flattenAndSortIndexes } from './flatten-and-sort-indexes';
 import { formatAddress } from './format-address';
 import { formatConferenceProvider } from './format-conference-provider';
-import { formatFeedbackEmail } from './format-feedback-email';
 import { formatSlug } from './format-slug';
 import { states } from './states';
 
-import type { JSONData, JSONDataFlat, State, Meeting, Index } from '../types';
+import type { Index, JSONData, JSONDataFlat, Meeting, State } from '../types';
 
 // set up meeting data; this is only run once when the app loads
 export function loadMeetingData(
@@ -428,27 +427,6 @@ export function loadMeetingData(
       .join('\t')
       .toLowerCase();
 
-    let feedback_emails = settings.feedback_emails;
-    if (Array.isArray(meeting.feedback_emails)) {
-      feedback_emails = meeting.feedback_emails;
-    }
-    if ('string' === typeof meeting.feedback_emails) {
-      feedback_emails = meeting.feedback_emails
-        .split(',')
-        .map(e => e.trim())
-        .filter(e => e);
-    }
-
-    if (!feedback_url && feedback_emails.length) {
-      feedback_url = formatFeedbackEmail({
-        feedback_emails,
-        name,
-        edit_url,
-        settings,
-        strings,
-      });
-    }
-
     meetings[slug] = {
       address,
       approximate,