From e0a524ae27b29f0fd9adde06d6d5118958423425 Mon Sep 17 00:00:00 2001
From: Oskar Kocjan <oskarkocjan@Oskar-Kocjan.local>
Date: Fri, 2 Sep 2022 11:12:03 +0200
Subject: [PATCH 1/2] change places between before/after confirmed date filter

---
 .../ui/src/components/FiltersDialog/index.tsx | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/verification/curator-service/ui/src/components/FiltersDialog/index.tsx b/verification/curator-service/ui/src/components/FiltersDialog/index.tsx
index 72dde6760..32e35c335 100644
--- a/verification/curator-service/ui/src/components/FiltersDialog/index.tsx
+++ b/verification/curator-service/ui/src/components/FiltersDialog/index.tsx
@@ -497,13 +497,14 @@ export default function FiltersDialog({
                                 formik.touched.variant && formik.errors.variant
                             }
                         />
+
                         <TextField
                             autoFocus={
-                                activeFilterInput === 'dateconfirmedbefore'
+                                activeFilterInput === 'dateconfirmedafter'
                             }
-                            id="dateconfirmedbefore"
-                            label="Date confirmed before"
-                            name="dateconfirmedbefore"
+                            id="dateconfirmedafter"
+                            label="Date confirmed after"
+                            name="dateconfirmedafter"
                             type="date"
                             variant="outlined"
                             // This makes sure that only 4 digits can be entered as a year
@@ -512,24 +513,24 @@ export default function FiltersDialog({
                             }}
                             size={inputSize}
                             InputLabelProps={{ shrink: true }}
-                            value={formik.values.dateconfirmedbefore || ''}
+                            value={formik.values.dateconfirmedafter || ''}
                             onChange={formik.handleChange}
                             error={
-                                formik.touched.dateconfirmedbefore &&
-                                Boolean(formik.errors.dateconfirmedbefore)
+                                formik.touched.dateconfirmedafter &&
+                                Boolean(formik.errors.dateconfirmedafter)
                             }
                             helperText={
-                                formik.touched.dateconfirmedbefore &&
-                                formik.errors.dateconfirmedbefore
+                                formik.touched.dateconfirmedafter &&
+                                formik.errors.dateconfirmedafter
                             }
                         />
                         <TextField
                             autoFocus={
-                                activeFilterInput === 'dateconfirmedafter'
+                                activeFilterInput === 'dateconfirmedbefore'
                             }
-                            id="dateconfirmedafter"
-                            label="Date confirmed after"
-                            name="dateconfirmedafter"
+                            id="dateconfirmedbefore"
+                            label="Date confirmed before"
+                            name="dateconfirmedbefore"
                             type="date"
                             variant="outlined"
                             // This makes sure that only 4 digits can be entered as a year
@@ -538,15 +539,15 @@ export default function FiltersDialog({
                             }}
                             size={inputSize}
                             InputLabelProps={{ shrink: true }}
-                            value={formik.values.dateconfirmedafter || ''}
+                            value={formik.values.dateconfirmedbefore || ''}
                             onChange={formik.handleChange}
                             error={
-                                formik.touched.dateconfirmedafter &&
-                                Boolean(formik.errors.dateconfirmedafter)
+                                formik.touched.dateconfirmedbefore &&
+                                Boolean(formik.errors.dateconfirmedbefore)
                             }
                             helperText={
-                                formik.touched.dateconfirmedafter &&
-                                formik.errors.dateconfirmedafter
+                                formik.touched.dateconfirmedbefore &&
+                                formik.errors.dateconfirmedbefore
                             }
                         />
                     </div>

From 9e5aa95e2b865e42b0b787220454a9c8ef49fb3b Mon Sep 17 00:00:00 2001
From: Oskar Kocjan <oskarkocjan@Oskar-Kocjan.local>
Date: Fri, 2 Sep 2022 14:21:03 +0200
Subject: [PATCH 2/2] added secret keys for recaptcha for local development

---
 .../curator-service/api/src/util/validate-recaptcha-token.ts  | 4 +++-
 .../ui/src/components/landing-page/SignInForm.tsx             | 3 ++-
 .../ui/src/components/landing-page/SignUpForm.tsx             | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/verification/curator-service/api/src/util/validate-recaptcha-token.ts b/verification/curator-service/api/src/util/validate-recaptcha-token.ts
index 29f81996c..459f0e1ce 100644
--- a/verification/curator-service/api/src/util/validate-recaptcha-token.ts
+++ b/verification/curator-service/api/src/util/validate-recaptcha-token.ts
@@ -6,7 +6,9 @@ export const validateRecaptchaToken = async (
 ): Promise<boolean> => {
     const env = validateEnv();
     const response = await axios.post(
-        `https://www.google.com/recaptcha/api/siteverify?secret=${env.RECAPTCHA_SECRET_KEY}&response=${token}`,
+        `https://www.google.com/recaptcha/api/siteverify?secret=${
+            env.RECAPTCHA_SECRET_KEY || process.env.RECAPTCHA_SECRET_KEY
+        }&response=${token}`,
     );
 
     return response.data.success;
diff --git a/verification/curator-service/ui/src/components/landing-page/SignInForm.tsx b/verification/curator-service/ui/src/components/landing-page/SignInForm.tsx
index e673c8ccf..ab597d153 100644
--- a/verification/curator-service/ui/src/components/landing-page/SignInForm.tsx
+++ b/verification/curator-service/ui/src/components/landing-page/SignInForm.tsx
@@ -73,7 +73,8 @@ interface SignInFormProps {
 
 const RECAPTCHA_SITE_KEY = window.Cypress
     ? '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
-    : (process.env.RECAPTCHA_SITE_KEY as string);
+    : ((process.env.RECAPTCHA_SITE_KEY ||
+          process.env.REACT_APP_RECAPTCHA_SITE_KEY) as string);
 
 export default function SignInForm({
     disabled,
diff --git a/verification/curator-service/ui/src/components/landing-page/SignUpForm.tsx b/verification/curator-service/ui/src/components/landing-page/SignUpForm.tsx
index 3b964e8ec..304be3926 100644
--- a/verification/curator-service/ui/src/components/landing-page/SignUpForm.tsx
+++ b/verification/curator-service/ui/src/components/landing-page/SignUpForm.tsx
@@ -94,7 +94,8 @@ interface SignUpFormProps {
 
 const RECAPTCHA_SITE_KEY = window.Cypress
     ? '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI'
-    : (process.env.RECAPTCHA_SITE_KEY as string);
+    : ((process.env.RECAPTCHA_SITE_KEY ||
+          process.env.REACT_APP_RECAPTCHA_SITE_KEY) as string);
 
 export default function SignUpForm({
     disabled,