Merge branch 'main' into entity-fields

code4recovery · Oct 3, 2024 · fd30026 · fd30026
2 parents 0845743 + 70f8db2
commit fd30026
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 3 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/public/tests/flags.html b/public/tests/flags.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta name="description" content="React JS recovery meeting finder demo" />
+    <link rel="icon" type="image/png" href="/logo.png" />
+    <title>Meetings</title>
+  </head>
+  <body>
+    <div
+      id="tsml-ui"
+      data-src="https://sheets.code4recovery.org/storage/12Ga8uwMG4WJ8pZ_SEU7vNETp_aQZ-2yNVsYDFqIwHyE.json"
+      data-mapbox="pk.eyJ1Ijoiam9zaHJlaXNuZXIiLCJhIjoiY2tvYXA0YnZxMGRldDJxbzdta25uNGphdiJ9.eay-UKgIT99ALmdw08xBPw"
+      data-timezone="America/Los_Angeles"
+    ></div>
+    <script>
+      var tsml_react_config = { 'flags': ['M', 'W', 'O', 'C'] };
+    </script>
+    <script src="/app.js" async></script>
+  </body>
+</html>
diff --git a/src/components/Meeting.tsx b/src/components/Meeting.tsx
@@ -175,7 +175,7 @@ export default function Meeting({
       });
     if (meeting[`contact_${i}_phone` as keyof typeof Meeting])
       contactButtons.push({
-        href: `tel:${meeting[`contact_${i}_phone` as keyof typeof Meeting]}`,
+        href: `sms:${meeting[`contact_${i}_phone` as keyof typeof Meeting]}`,
         icon: 'text',
         text: i18n(strings.contact_text, {
           contact: meeting[`contact_${i}_name` as keyof typeof Meeting],

diff --git a/test/__tests__/Meeting.spec.tsx b/test/__tests__/Meeting.spec.tsx
@@ -47,6 +47,11 @@ describe('<Meeting />', () => {
     conference_phone_notes: 'Test',
     conference_provider: 'Zoom',
     updated: '2/17/22',
+    contact_1_name: 'Contact 1',
+    contact_1_email: '[email protected]',
+    contact_1_phone: '+18005551212',
+    contact_2_email: '[email protected]',
+    contact_2_phone: '+18005551212',
   };
 
   const mockState: State = {
@@ -140,6 +145,31 @@ describe('<Meeting />', () => {
     expect(container).toBeTruthy();
   });
 
+  it('renders with contact 1 but no contact 2', () => {
+    const { getByText, queryByText } = render(
+      <MemoryRouter>
+        <Meeting
+          state={mockState}
+          setState={jest.fn()}
+          mapbox="pk.123456"
+          feedback_emails={['[email protected]']}
+        />
+      </MemoryRouter>
+    );
+    const contact1text = getByText(`Text ${mockMeeting.contact_1_name}`);
+    expect(contact1text).toHaveAttribute(
+      'href',
+      `sms:${mockMeeting.contact_1_phone}`
+    );
+    const contact1email = getByText(`Email ${mockMeeting.contact_1_name}`);
+    expect(contact1email).toHaveAttribute(
+      'href',
+      `mailto:${mockMeeting.contact_1_email}`
+    );
+    const contact2text = queryByText(`Text ${mockMeeting.contact_2_name}`);
+    expect(contact2text).toBeNull();
+  });
+
   it('renders when inactive', () => {
     const { container } = render(
       <MemoryRouter>