From 68da3ce2c1441121b124934fe72af2483a019dd2 Mon Sep 17 00:00:00 2001
From: Kurt Hutten <k.hutten@protonmail.ch>
Date: Sun, 25 Jul 2021 20:16:55 +1000
Subject: [PATCH] Fix subscriber name When signing up to newsletter

Resolves #420
---
 .../LoginModal/{LoginModal.js => LoginModal.tsx}     |  6 +++---
 app/web/src/helpers/{subscribe.js => subscribe.ts}   | 12 ++++++++++--
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename app/web/src/components/LoginModal/{LoginModal.js => LoginModal.tsx} (97%)
 rename app/web/src/helpers/{subscribe.js => subscribe.ts} (69%)

diff --git a/app/web/src/components/LoginModal/LoginModal.js b/app/web/src/components/LoginModal/LoginModal.tsx
similarity index 97%
rename from app/web/src/components/LoginModal/LoginModal.js
rename to app/web/src/components/LoginModal/LoginModal.tsx
index 9c9ee67..e3fe2cd 100644
--- a/app/web/src/components/LoginModal/LoginModal.js
+++ b/app/web/src/components/LoginModal/LoginModal.tsx
@@ -2,8 +2,8 @@ import { useState } from 'react'
 import Dialog from '@material-ui/core/Dialog'
 import Tab from '@material-ui/core/Tab'
 import Tabs from '@material-ui/core/Tabs'
-import InputTextForm from 'src/components/InputTextForm'
-import OutBound from 'src/components/OutBound'
+import InputTextForm from 'src/components/InputTextForm/InputTextForm'
+import OutBound from 'src/components/OutBound/OutBound'
 import { Form, Submit } from '@redwoodjs/forms'
 import { useAuth } from '@redwoodjs/auth'
 import { toast } from '@redwoodjs/web/toast'
@@ -25,7 +25,7 @@ const LoginModal = ({ open, onClose, shouldStartWithSignup = false }) => {
     try {
       setError('')
       if (checkBox) {
-        subscribe({ email, addMessage: (msg) => toast.error(msg) })
+        subscribe({ email, addMessage: (msg) => toast.error(msg), name })
       }
       await signUp({
         email,
diff --git a/app/web/src/helpers/subscribe.js b/app/web/src/helpers/subscribe.ts
similarity index 69%
rename from app/web/src/helpers/subscribe.js
rename to app/web/src/helpers/subscribe.ts
index 4e52c82..e387cf4 100644
--- a/app/web/src/helpers/subscribe.js
+++ b/app/web/src/helpers/subscribe.ts
@@ -1,9 +1,17 @@
-export const subscribe = ({ email, addMessage }) => {
+export const subscribe = ({
+  email,
+  addMessage,
+  name,
+}: {
+  email: string
+  addMessage: Function
+  name: string
+}) => {
   // subscribe to mailchimp newsletter
   const path = window.location.hostname + window.location.pathname
   try {
     fetch(
-      `https://kurthutten.us10.list-manage.com/subscribe/post-json?u=cbd8888e924bdd99d06c14fa5&amp;id=6a765a8b3d&EMAIL=${email}&FNAME=Kurt&PATHNAME=${path}&c=__jp0`
+      `https://kurthutten.us10.list-manage.com/subscribe/post-json?u=cbd8888e924bdd99d06c14fa5&amp;id=6a765a8b3d&EMAIL=${email}&FNAME=${name}&PATHNAME=${path}&c=__jp0`
     )
   } catch (e) {
     setTimeout(() => {