Added zgw functions

ConductionNL · Apr 15, 2024 · 0a6ee91 · 0a6ee91
1 parent 50e75ed
commit 0a6ee91
Show file tree

Hide file tree

Showing 25 changed files with 109 additions and 66 deletions.
diff --git a/.env b/.env
@@ -11,4 +11,4 @@ NEXT_PUBLIC_MATOMO_URL=https://stats.utrecht.nl/analytics/
 NEXT_PUBLIC_MATOMO_SITE_ID=5
 NEXT_PUBLIC_NL_DESIGN_THEME_CLASSNAME=leiden-theme
 NEXT_PUBLIC_ORGANISATION_NAME=Gemeente Leiden
-NEXT_PUBLIC_FAV_ICON=https://gemeente.leiden.nl/typo3conf/ext/leiden_template/Resources/Public/Images/favicon/favicon-96x96.png
+NEXT_PUBLIC_FAV_ICON="data:image/svg+xml,%3Csvg id='eVILmByvqh51' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 32 32' shape-rendering='geometricPrecision' text-rendering='geometricPrecision'%3E%3Cimage width='32' height='32' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACQ0lEQVRYheXWTagOYRTA8R8h6aYpFqIkTRgLsZFvUtihLFggIXZKKVlYcFcWykYp8pHCgiSKtRDlK8qUZiEkdNMkSdLN4nnU9HLdeee+L8qp6Tk9p3nOf+Z8PIf/RfI0GZ2nyfDW/RFddNiDeViKJVEfh09dAcjTZCwWVBzOrXN+Y4A8TRIsig6XYXaT8xoB5GlyHSvxU0zblaYHTOuEcwb4A3maHMc93MLzrCj7O+GsNgA2Y3vU+/I0uYPbEejhnwCoynisjg98wTZMwUIh85NuArTKaNzPivIcxOYyU6iIhdjQzrl1EukuNv3GvgVrs6I8lhXlJnyo67wOwLcI8AYHW415mixBL0bmaTKxHcd1AY4IyTcZ53Gx4nxq3LsgdL6jv+r1QwXYg8VC3K9gt1AFY3EV+/EIn7GuSbnWSZat6In6GazDWdzIivIk5GlyrWmvqPPLeir6cszCGBz4sZkVZdnEeV2AqpzACyEpTzWJeROAPpS4KXz1FewTGtSBOGhMbgozWA6cxGH0462QeFPwVciFB9gYbS+xvl2Awagv4TKeCp2uGuv+CLI4K8r5mNuNMlyFQ1Ffg8cV2ww8y4rydZ4mmzW8NQcLwS6h1jMh8y9VbA8xJk+TVxHsd+26MQCh1fa2bmZF+QUr8jQZPpR5YSCAPnyMax/ex/VdXN9UQIY0rPwSICvKSUM5tB3pyFz3rwHsxZO/BpAV5WnMEW7RC8JMMaAM6zRAq+RpMgE7sBPTs6L8NMgrXQMZ1YnLq+PyHZzbnYV38hWDAAAAAElFTkSuQmCC' preserveAspectRatio='xMidYMid meet'/%3E%3C/svg%3E%0A"
diff --git a/.env.development b/.env.development
@@ -1,4 +1,4 @@
 NEXT_PUBLIC_NL_DESIGN_THEME_CLASSNAME=leiden-theme
 NEXT_PUBLIC_ORGANISATION_NAME=Gemeente Leiden
 NEXT_PUBLIC_ORGANISATION_NAME_SHORT=Leiden
-NEXT_PUBLIC_FAV_ICON=https://gemeente.leiden.nl/typo3conf/ext/leiden_template/Resources/Public/Images/favicon/favicon-96x96.png
+NEXT_PUBLIC_FAV_ICON="data:image/svg+xml,%3Csvg id='eVILmByvqh51' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 32 32' shape-rendering='geometricPrecision' text-rendering='geometricPrecision'%3E%3Cimage width='32' height='32' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACQ0lEQVRYheXWTagOYRTA8R8h6aYpFqIkTRgLsZFvUtihLFggIXZKKVlYcFcWykYp8pHCgiSKtRDlK8qUZiEkdNMkSdLN4nnU9HLdeee+L8qp6Tk9p3nOf+Z8PIf/RfI0GZ2nyfDW/RFddNiDeViKJVEfh09dAcjTZCwWVBzOrXN+Y4A8TRIsig6XYXaT8xoB5GlyHSvxU0zblaYHTOuEcwb4A3maHMc93MLzrCj7O+GsNgA2Y3vU+/I0uYPbEejhnwCoynisjg98wTZMwUIh85NuArTKaNzPivIcxOYyU6iIhdjQzrl1EukuNv3GvgVrs6I8lhXlJnyo67wOwLcI8AYHW415mixBL0bmaTKxHcd1AY4IyTcZ53Gx4nxq3LsgdL6jv+r1QwXYg8VC3K9gt1AFY3EV+/EIn7GuSbnWSZat6In6GazDWdzIivIk5GlyrWmvqPPLeir6cszCGBz4sZkVZdnEeV2AqpzACyEpTzWJeROAPpS4KXz1FewTGtSBOGhMbgozWA6cxGH0462QeFPwVciFB9gYbS+xvl2Awagv4TKeCp2uGuv+CLI4K8r5mNuNMlyFQ1Ffg8cV2ww8y4rydZ4mmzW8NQcLwS6h1jMh8y9VbA8xJk+TVxHsd+26MQCh1fa2bmZF+QUr8jQZPpR5YSCAPnyMax/ex/VdXN9UQIY0rPwSICvKSUM5tB3pyFz3rwHsxZO/BpAV5WnMEW7RC8JMMaAM6zRAq+RpMgE7sBPTs6L8NMgrXQMZ1YnLq+PyHZzbnYV38hWDAAAAAElFTkSuQmCC' preserveAspectRatio='xMidYMid meet'/%3E%3C/svg%3E%0A"
diff --git a/.env.production b/.env.production
@@ -1,4 +1,4 @@
 NEXT_PUBLIC_NL_DESIGN_THEME_CLASSNAME=leiden-theme
 NEXT_PUBLIC_ORGANISATION_NAME=Gemeente Leiden
 NEXT_PUBLIC_ORGANISATION_NAME_SHORT=Leiden
-NEXT_PUBLIC_FAV_ICON=https://gemeente.leiden.nl/typo3conf/ext/leiden_template/Resources/Public/Images/favicon/favicon-96x96.png
+NEXT_PUBLIC_FAV_ICON="data:image/svg+xml,%3Csvg id='eVILmByvqh51' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' viewBox='0 0 32 32' shape-rendering='geometricPrecision' text-rendering='geometricPrecision'%3E%3Cimage width='32' height='32' xlink:href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAACXBIWXMAAA7EAAAOxAGVKw4bAAACQ0lEQVRYheXWTagOYRTA8R8h6aYpFqIkTRgLsZFvUtihLFggIXZKKVlYcFcWykYp8pHCgiSKtRDlK8qUZiEkdNMkSdLN4nnU9HLdeee+L8qp6Tk9p3nOf+Z8PIf/RfI0GZ2nyfDW/RFddNiDeViKJVEfh09dAcjTZCwWVBzOrXN+Y4A8TRIsig6XYXaT8xoB5GlyHSvxU0zblaYHTOuEcwb4A3maHMc93MLzrCj7O+GsNgA2Y3vU+/I0uYPbEejhnwCoynisjg98wTZMwUIh85NuArTKaNzPivIcxOYyU6iIhdjQzrl1EukuNv3GvgVrs6I8lhXlJnyo67wOwLcI8AYHW415mixBL0bmaTKxHcd1AY4IyTcZ53Gx4nxq3LsgdL6jv+r1QwXYg8VC3K9gt1AFY3EV+/EIn7GuSbnWSZat6In6GazDWdzIivIk5GlyrWmvqPPLeir6cszCGBz4sZkVZdnEeV2AqpzACyEpTzWJeROAPpS4KXz1FewTGtSBOGhMbgozWA6cxGH0462QeFPwVciFB9gYbS+xvl2Awagv4TKeCp2uGuv+CLI4K8r5mNuNMlyFQ1Ffg8cV2ww8y4rydZ4mmzW8NQcLwS6h1jMh8y9VbA8xJk+TVxHsd+26MQCh1fa2bmZF+QUr8jQZPpR5YSCAPnyMax/ex/VdXN9UQIY0rPwSICvKSUM5tB3pyFz3rwHsxZO/BpAV5WnMEW7RC8JMMaAM6zRAq+RpMgE7sBPTs6L8NMgrXQMZ1YnLq+PyHZzbnYV38hWDAAAAAElFTkSuQmCC' preserveAspectRatio='xMidYMid meet'/%3E%3C/svg%3E%0A"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "watch:test": "NODE_OPTIONS=--experimental-vm-modules jest --watch src/"
   },
   "dependencies": {
-    "@conduction/theme": "1.1.23",
+    "@conduction/theme": "1.1.32",
     "@gemeente-denhaag/design-tokens-components": "0.2.3-alpha.316",
     "@gemeente-denhaag/process-steps": "0.1.0-alpha.145",
     "@utrecht/assets": "1.0.0-alpha.147",

diff --git a/pages/email-data-summary.tsx b/pages/email-data-summary.tsx
@@ -161,7 +161,7 @@ export default function HuwelijksplannerStep0() {
     <Email>
       <Document>
         <Head>
-          <title>{`Melding Voorgenomen Huwelijk - ${t("common:website-name")}`}</title>
+          <title>{`Melding Voorgenomen Huwelijk - ${process.env.NEXT_PUBLIC_ORGANISATION_NAME}`}</title>
         </Head>
         <Page>
           <PageContent>

diff --git a/pages/email-reservation-success.tsx b/pages/email-reservation-success.tsx
@@ -29,7 +29,7 @@ export default function HuwelijksplannerStep0() {
     <Email>
       <Document>
         <Head>
-          <title>{`Melding Voorgenomen Huwelijk - ${t("common:website-name")}`}</title>
+          <title>{`Melding Voorgenomen Huwelijk - ${process.env.NEXT_PUBLIC_ORGANISATION_NAME}`}</title>
         </Head>
         <Page>
           <PageContent>

diff --git a/pages/extra/index.tsx b/pages/extra/index.tsx
@@ -86,7 +86,7 @@ export default function MultistepForm1() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("huwelijksplanner-step-5:title")} - ${t("common:website-name")}`}</title>
+          <title>{`${t("huwelijksplanner-step-5:title")} -  ${process.env.NEXT_PUBLIC_ORGANISATION_NAME}`}</title>
         </Head>
         <Page>
           <PageHeader>

diff --git a/pages/huwelijksplanner-cancel.tsx b/pages/huwelijksplanner-cancel.tsx
@@ -40,7 +40,7 @@ export default function MultistepForm1() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("huwelijksplanner-cancel:title")} - ${t("common:website-name")}`}</title>
+          <title>{`${t("huwelijksplanner-cancel:title")} - ${process.env.NEXT_PUBLIC_ORGANISATION_NAME}`}</title>
         </Head>
         <Page>
           <PageHeader>

diff --git a/pages/huwelijksplanner-cancelled.tsx b/pages/huwelijksplanner-cancelled.tsx
@@ -62,7 +62,7 @@ export default function MultistepForm1() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("huwelijksplanner-cancelled:title")} - ${t("common:website-name")}`}</title>
+          <title>{`${t("huwelijksplanner-cancelled:title")} - ${process.env.NEXT_PUBLIC_ORGANISATION_NAME}`}</title>
         </Head>
         <Page>
           <PageHeader>

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -37,7 +37,7 @@ export default function HuwelijksplannerStep0() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("huwelijksplanner-step-0:title")} - ${t("common:website-name")}`}</title>
+          <title>{`${t("huwelijksplanner-step-0:title")} - ${process.env.NEXT_PUBLIC_ORGANISATION_NAME}`}</title>
         </Head>
         <SkipLink href="#main">{t("common:skip-link-main")}</SkipLink>
         <Page>

diff --git a/pages/persoonsgegevens/[person].tsx b/pages/persoonsgegevens/[person].tsx
@@ -99,6 +99,16 @@ export default function MultistepForm1() {
   };
 
   useEffect(() => {
+    // console.log(loadingType)
+    // console.log(loadingCeremonie)
+    // console.log(loadingMoment)
+    // console.log(loadingAmbtenaar)
+    // console.log(loadingLocatie)
+    // console.log(loadingKosten)
+    // console.log(loadingPartner)
+    // console.log(!huwelijkId)
+    // console.log(loading)
+
     if (
       loadingType === true &&
       loadingCeremonie === true &&
@@ -357,9 +367,9 @@ export default function MultistepForm1() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-4:title")} - ${t(
-            "common:website-name"
-          )}`}</title>
+          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-4:title")} - ${
+            process.env.NEXT_PUBLIC_ORGANISATION_NAME
+          }`}</title>
         </Head>
         <SkipLink href="#main">{t("common:skip-link-main")}</SkipLink>
         <Page>

diff --git a/pages/persoonsgegevens/succes.tsx b/pages/persoonsgegevens/succes.tsx
@@ -42,9 +42,9 @@ export default function MultistepForm1() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-5:title")} - ${t(
-            "common:website-name"
-          )}`}</title>
+          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-5:title")} - ${
+            process.env.NEXT_PUBLIC_ORGANISATION_NAME
+          }`}</title>
         </Head>
         <SkipLink href="#main">{t("common:skip-link-main")}</SkipLink>
         <Page>

diff --git a/pages/sitemap.tsx b/pages/sitemap.tsx
@@ -29,7 +29,7 @@ export default function HuwelijksplannerStep0() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("huwelijksplanner-step-0:title")} - ${t("common:website-name")}`}</title>
+          <title>{`${t("huwelijksplanner-step-0:title")} - ${process.env.NEXT_PUBLIC_ORGANISATION_NAME}`}</title>
         </Head>
         <Page>
           <PageHeader>

diff --git a/pages/trouw-opties/[slug].tsx b/pages/trouw-opties/[slug].tsx
@@ -114,9 +114,9 @@ const PlanningFormPage: NextPage = () => {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("common:step-n", { n: 2 })}: ${t("huwelijksplanner-step-2:title")} - ${t(
-            "common:website-name"
-          )}`}</title>
+          <title>{`${t("common:step-n", { n: 2 })}: ${t("huwelijksplanner-step-2:title")} - ${
+            process.env.NEXT_PUBLIC_ORGANISATION_NAME
+          }`}</title>
         </Head>
         <SkipLink href="#main">{t("common:skip-link-main")}</SkipLink>
         <Page>

diff --git a/pages/trouw-opties/index.tsx b/pages/trouw-opties/index.tsx
@@ -58,9 +58,9 @@ export default function MultistepForm1() {
       <Document>
         <Surface>
           <Head>
-            <title>{`${t("common:step-n", { n: 1 })}: ${t("huwelijksplanner-step-1:title")} - ${t(
-              "common:website-name"
-            )}`}</title>
+            <title>{`${t("common:step-n", { n: 1 })}: ${t("huwelijksplanner-step-1:title")} - ${
+              process.env.NEXT_PUBLIC_ORGANISATION_NAME
+            }`}</title>
           </Head>
           <SkipLink href="#main">{t("common:skip-link-main")}</SkipLink>
           <Page>

diff --git a/pages/voorgenomen-huwelijk/checken.tsx b/pages/voorgenomen-huwelijk/checken.tsx
@@ -22,6 +22,8 @@ import {
 import { PageFooterTemplate } from "../../src/components/huwelijksplanner/PageFooterTemplate";
 import { PageHeaderTemplate } from "../../src/components/huwelijksplanner/PageHeaderTemplate";
 import { exampleState } from "../../src/data/huwelijksplanner-state";
+import { useContext } from "react";
+import { MarriageOptionsContext } from "../../src/context/MarriageOptionsContext";
 
 export const getServerSideProps = async ({ locale }: { locale: string }) => ({
   props: {
@@ -31,14 +33,16 @@ export const getServerSideProps = async ({ locale }: { locale: string }) => ({
 
 export default function MultistepForm1() {
   const { t } = useTranslation(["common", "huwelijksplanner-step-5", "form"]);
+  const [marriageOptions] = useContext(MarriageOptionsContext);
+
   const data = { ...exampleState };
   const { locale = "nl" } = useRouter();
 
   return (
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("huwelijksplanner-step-5:title")} - ${t("common:website-name")}`}</title>
+          <title>{`${t("huwelijksplanner-step-5:title")} - ${process.env.NEXT_PUBLIC_ORGANISATION_NAME}`}</title>
         </Head>
         <Page>
           <PageHeader>
@@ -54,7 +58,9 @@ export default function MultistepForm1() {
                   <Paragraph lead>{t("common:step-n-of-m", { n: 3, m: 5 })} — Meld je voorgenomen huwelijk</Paragraph>
                 </HeadingGroup>
                 {/*TODO: Banner / card */}
-                {data["reservation"] ? <ReservationCard reservation={data["reservation"]} locale={locale} /> : ""}
+                {marriageOptions.reservation && (
+                  <ReservationCard reservation={marriageOptions.reservation} locale={locale} />
+                )}{" "}
                 <section>
                   <Heading2>Gelukt</Heading2>
                   <Paragraph>De gemeente heeft de volgende punten gecontroleerd:</Paragraph>

diff --git a/pages/voorgenomen-huwelijk/getuigen/index.tsx b/pages/voorgenomen-huwelijk/getuigen/index.tsx
@@ -3,7 +3,7 @@ import Head from "next/head";
 import { useRouter } from "next/router";
 import { useTranslation } from "next-i18next";
 import { serverSideTranslations } from "next-i18next/serverSideTranslations";
-import { useContext, useId, useState } from "react";
+import { useContext, useEffect, useId, useState } from "react";
 import { FormProvider, useForm, useFormContext } from "react-hook-form";
 import {
   Button,
@@ -51,6 +51,8 @@ type WitnessFormData = {
 export default function MultistepForm1() {
   const { t } = useTranslation(["common", "huwelijksplanner-step-getuigen", "form"]);
   const [marriageOptions] = useContext(MarriageOptionsContext);
+  console.log(marriageOptions);
+
   const { locale = "nl", push } = useRouter();
   const formMethods = useForm<WitnessFormData>();
   const [loading, setLoading] = useState(false);
@@ -73,6 +75,8 @@ export default function MultistepForm1() {
       return;
     }
 
+    console.log(marriageOptions.id);
+
     let hasError = false;
 
     formData.witnesses.forEach((witness, index) => {
@@ -88,16 +92,36 @@ export default function MultistepForm1() {
 
     if (hasError) return;
 
-    setLoading(true);
-    HuwelijkService.huwelijkPatchItem({
-      id: marriageOptions.id as string,
-      requestBody: {
-        getuigen: mapWitnesses(formData.witnesses),
-      },
-    }).then(() => {
-      push("/voorgenomen-huwelijk/getuigen/succes");
-      setLoading(false);
-    });
+    console.log(formData);
+
+    console.log(mapWitnesses(formData.witnesses));
+
+    console.log();
+
+    if (marriageOptions.id) {
+      HuwelijkService.huwelijkGet(marriageOptions.id.toString()).then((response: any) => {
+        // Getuigen
+        HuwelijkService.huwelijkPostEigenschap(
+          response.id ?? "",
+          "7e950e1d-04ab-482e-a066-299711d4b4ed",
+          JSON.stringify(mapWitnesses(formData.witnesses ?? [])) ?? ""
+        ).then(() => {
+          push("/voorgenomen-huwelijk/getuigen/succes");
+          setLoading(false);
+        });
+      });
+    }
+
+    // setLoading(true);
+    // HuwelijkService.huwelijkPatchItem({
+    //   id: marriageOptions.id as string,
+    //   requestBody: {
+    //     getuigen: mapWitnesses(formData.witnesses),
+    //   },
+    // }).then(() => {
+    //   push("/voorgenomen-huwelijk/getuigen/succes");
+    //   setLoading(false);
+    // });
   };
 
   const formHeaderId = useId();
@@ -106,9 +130,9 @@ export default function MultistepForm1() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-getuigen:title")} - ${t(
-            "common:website-name"
-          )}`}</title>
+          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-getuigen:title")} - ${
+            process.env.NEXT_PUBLIC_ORGANISATION_NAME
+          }`}</title>
         </Head>
         <SkipLink href="#main">{t("common:skip-link-main")}</SkipLink>
         <Page>
@@ -143,7 +167,7 @@ export default function MultistepForm1() {
                     <WitnessFieldset index={4} />
                     <ButtonGroup>
                       <Button
-                        disabled={loading || !hasWitnesses}
+                        // disabled={loading || !hasWitnesses}
                         appearance="primary-action-button"
                         type="submit"
                         value={"invite"}

diff --git a/pages/voorgenomen-huwelijk/getuigen/succes.tsx b/pages/voorgenomen-huwelijk/getuigen/succes.tsx
@@ -38,16 +38,17 @@ export const getServerSideProps = async ({ locale }: { locale: string }) => ({
 export default function MultistepForm1() {
   const { t } = useTranslation(["common", "huwelijksplanner-step-getuigen-success", "form"]);
   const [marriageOptions] = useContext(MarriageOptionsContext);
+  const partner = JSON.parse(marriageOptions.partners[0]?.toString());
   const { locale = "nl" } = useRouter();
-  const { voornaam } = marriageOptions.partners[0]?.contact;
+  const contact = partner?.naam;
 
   return (
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-getuigen-success:title")} - ${t(
-            "common:website-name"
-          )}`}</title>
+          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-getuigen-success:title")} - ${
+            process.env.NEXT_PUBLIC_ORGANISATION_NAME
+          }`}</title>
         </Head>
         <SkipLink href="#main">{t("common:skip-link-main")}</SkipLink>
         <Page>
@@ -68,14 +69,15 @@ export default function MultistepForm1() {
               <section>
                 <Heading2>Gelukt!</Heading2>
                 <Paragraph>
-                  {voornaam ? <DataNoTranslate>{voornaam}</DataNoTranslate> : <>Je partner</>} heeft met DigID ingelogd.
-                  Nu kunnen jullie verder met het plannen van het huwelijk. Er volgen nog een paar stappen:
+                  {contact.voornamen ? <DataNoTranslate>{contact.voornamen}</DataNoTranslate> : <>Je partner</>} heeft
+                  met DigID ingelogd. Nu kunnen jullie verder met het plannen van het huwelijk. Er volgen nog een paar
+                  stappen:
                 </Paragraph>
                 <OrderedList>
                   <OrderedListItem>
                     De {process.env.NEXT_PUBLIC_ORGANISATION_NAME} checkt een aantal dingen, bijvoorbeeld of{" "}
-                    {voornaam ? <DataNoTranslate>{voornaam}</DataNoTranslate> : <>je partner</>} geen broer of zus van
-                    je is
+                    {contact.voornamen ? <DataNoTranslate>{contact.voornamen}</DataNoTranslate> : <>je partner</>} geen
+                    broer of zus van je is
                   </OrderedListItem>
                   <OrderedListItem>
                     Je kunt alvast extra’s aanschaffen om je huwelijk nog leuker te maken. Dat kan natuurlijk ook later.

diff --git a/pages/voorgenomen-huwelijk/index.tsx b/pages/voorgenomen-huwelijk/index.tsx
@@ -49,9 +49,9 @@ export default function MultistepForm1() {
     <Surface>
       <Document>
         <Head>
-          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-3:eenvoudig-trouwen")} - ${t(
-            "common:website-name"
-          )}`}</title>
+          <title>{`${t("common:step-n", { n: 3 })}: ${t("huwelijksplanner-step-3:eenvoudig-trouwen")} - ${
+            process.env.NEXT_PUBLIC_ORGANISATION_NAME
+          }`}</title>
         </Head>
         <SkipLink href="#main">{t("common:skip-link-main")}</SkipLink>
         <Page>