Merge branch 'main' into chore/build-arm-image

CodeForAfrica · Nov 21, 2024 · 13a2205 · 13a2205
2 parents c2a4dc6 + 0b81b89
commit 13a2205
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/apps/civicsignalblog/src/payload/components/allowedAppSelect/index.tsx b/apps/civicsignalblog/src/payload/components/allowedAppSelect/index.tsx
@@ -6,7 +6,7 @@ import applications from "#civicsignalblog/payload/lib/data/common/applications"
 
 function CustomSelectComponent({ path, label }) {
   const { user } = useAuth();
-  const { value, setValue } = useField<string>({ path });
+  const { value, setValue } = useField({ path });
   const [options, setOptions] = useState([]);
 
   useEffect(() => {
@@ -32,7 +32,7 @@ function CustomSelectComponent({ path, label }) {
         path={path}
         name={path}
         options={options}
-        value={value}
+        value={String(value ?? "")}
         onChange={(e) => setValue(e.value)}
       />
     </div>

diff --git a/apps/climatemappedafrica/server.ts b/apps/climatemappedafrica/server.ts
@@ -43,7 +43,7 @@ const start = async (): Promise<void> => {
               transportOptions: {
                 auth: {
                   user: process.env.SMTP_USER || "apikey",
-                  apiKey: smtpAuthPass,
+                  pass: smtpAuthPass,
                 },
                 host: process.env.SMTP_HOST || "smtp.sendgrid.net",
                 port: smtpPort,