From 18ee5b18dc3a8639987e67721c757ad8a0c5de22 Mon Sep 17 00:00:00 2001
From: Sayaka Ono <sayaka.ono.81@gmail.com>
Date: Mon, 29 Jul 2024 10:12:43 -0700
Subject: [PATCH 1/7] LF-4351 Set OTHER_PURPOSE_ID in useEffect

---
 .../ProductCard/index.tsx                        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/index.tsx b/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/index.tsx
index 9475b3bd73..d49b83ec01 100644
--- a/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/index.tsx
+++ b/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/index.tsx
@@ -13,7 +13,7 @@
  *  GNU General Public License for more details, see <https://www.gnu.org/licenses/>.
  */
 
-import { ReactNode, useRef } from 'react';
+import { ReactNode, useEffect, useRef } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { GroupBase, SelectInstance } from 'react-select';
@@ -101,6 +101,7 @@ const SoilAmendmentProductCard = ({
     register,
     watch,
     setValue,
+    getValues,
     formState: { errors },
   } = useFormContext();
 
@@ -120,6 +121,12 @@ const SoilAmendmentProductCard = ({
     selectRef?.current?.clearValue();
   };
 
+  useEffect(() => {
+    if (otherPurposeId && !getValues(OTHER_PURPOSE_ID)) {
+      setValue(OTHER_PURPOSE_ID, otherPurposeId);
+    }
+  }, [otherPurposeId]);
+
   return (
     <div className={styles.productCard}>
       {!isReadOnly && onRemove && (
@@ -185,12 +192,7 @@ const SoilAmendmentProductCard = ({
           />
         )}
       />
-      <input
-        type="hidden"
-        value={otherPurposeId}
-        defaultValue={otherPurposeId}
-        {...register(OTHER_PURPOSE_ID)}
-      />
+      <input type="hidden" {...register(OTHER_PURPOSE_ID)} />
 
       {purposes?.includes(otherPurposeId) && (
         <>

From 4d47fe12a0919c928c5410fc47066f23c7cef4f4 Mon Sep 17 00:00:00 2001
From: Sayaka Ono <sayaka.ono.81@gmail.com>
Date: Mon, 29 Jul 2024 10:17:25 -0700
Subject: [PATCH 2/7] LF-4351 Remove out-dated comment

---
 .../Task/AddSoilAmendmentProducts/ProductCard/index.tsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/index.tsx b/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/index.tsx
index d49b83ec01..00fd3ed2f0 100644
--- a/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/index.tsx
+++ b/packages/webapp/src/components/Task/AddSoilAmendmentProducts/ProductCard/index.tsx
@@ -188,7 +188,7 @@ const SoilAmendmentProductCard = ({
               const newPurposes = e.map(({ value }) => value);
               setValue(PURPOSES, newPurposes, { shouldValidate: true });
             }}
-            style={{ paddingBottom: '12px' }} // TODO: remove after adding <QuantityApplicationRate />
+            style={{ paddingBottom: '12px' }}
           />
         )}
       />

From 35967d6ab1d6738c5fd9f674e031d91aff8c1d56 Mon Sep 17 00:00:00 2001
From: Duncan-Brain <dbrain@litefarm.org>
Date: Mon, 29 Jul 2024 10:05:51 -0400
Subject: [PATCH 3/7] LF-4353 - update surveystack iframe url

---
 .../CertificationSurvey/RegisteredCertifierQuestions/index.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx b/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
index e0df0f8841..e00712a07e 100644
--- a/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
+++ b/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
@@ -6,6 +6,7 @@ import { useTranslation } from 'react-i18next';
 import { Info, Main, Semibold } from '../../Typography';
 import { colors } from '../../../assets/theme';
 import { ReactComponent as PostSurveySplash } from '../../../assets/images/certification/CompleteSurveySplash.svg';
+const surveyGroupId = import.meta.env.VITE_SURVEY_GROUP_ID;
 
 const RegisteredCertifierQuestionsSurvey = ({
   certiferAcronym,
@@ -49,7 +50,7 @@ const PreSurveyBody = ({ surveyId }) => {
   return (
     <iframe
       title="temp iframe title"
-      src={`https://app.surveystack.io/surveys/${surveyId}?minimal_ui=true`}
+      src={`https://app.surveystack.io/groups/${surveyGroupId}/surveys/${surveyId}/submissions/new?minimal_ui=true`}
       className={styles.surveyFrame}
       allow="geolocation"
     />

From 94c2c92a2777fefdc4a675326b10401c1a0b3645 Mon Sep 17 00:00:00 2001
From: Duncan-Brain <dbrain@litefarm.org>
Date: Mon, 29 Jul 2024 15:40:15 -0400
Subject: [PATCH 4/7] LF-4353 - test staging link for surveystack

---
 .../CertificationSurvey/RegisteredCertifierQuestions/index.jsx  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx b/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
index e00712a07e..c137912f49 100644
--- a/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
+++ b/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
@@ -50,7 +50,7 @@ const PreSurveyBody = ({ surveyId }) => {
   return (
     <iframe
       title="temp iframe title"
-      src={`https://app.surveystack.io/groups/${surveyGroupId}/surveys/${surveyId}/submissions/new?minimal_ui=true`}
+      src={`https://staging.surveystack.io/groups/${surveyGroupId}/surveys/${surveyId}/submissions/new?minimal_ui=true`}
       className={styles.surveyFrame}
       allow="geolocation"
     />

From 81fd64ddc9f766bf3eae67354de9e7edcceb01bc Mon Sep 17 00:00:00 2001
From: Duncan-Brain <dbrain@litefarm.org>
Date: Wed, 31 Jul 2024 15:27:01 -0400
Subject: [PATCH 5/7] LF-4353 - add staging to api links also

---
 packages/api/src/jobs/certification/pdf.js           | 2 +-
 packages/api/src/jobs/certification/survey_record.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/api/src/jobs/certification/pdf.js b/packages/api/src/jobs/certification/pdf.js
index a2e52eb2f2..2eb8f093c5 100644
--- a/packages/api/src/jobs/certification/pdf.js
+++ b/packages/api/src/jobs/certification/pdf.js
@@ -1,7 +1,7 @@
 import puppeteer from 'puppeteer';
 import fs from 'fs';
 import rp from 'request-promise';
-const surveyStackURL = 'https://app.surveystack.io/api/';
+const surveyStackURL = 'https://staging.surveystack.io/api/';
 
 export default (nextQueue, emailQueue) => async (job) => {
   console.log('STEP 3 > PDF');
diff --git a/packages/api/src/jobs/certification/survey_record.js b/packages/api/src/jobs/certification/survey_record.js
index 429bcfe545..60fe2cb403 100644
--- a/packages/api/src/jobs/certification/survey_record.js
+++ b/packages/api/src/jobs/certification/survey_record.js
@@ -1,6 +1,6 @@
 import XlsxPopulate from 'xlsx-populate';
 import rp from 'request-promise';
-const surveyStackURL = 'https://app.surveystack.io/api/';
+const surveyStackURL = 'https://staging.surveystack.io/api/';
 
 export default async (emailQueue, submission, exportId, organicCertifierSurvey, certifier) => {
   if (!submission) {

From ac0975f8237f8f3adabf65d872f8efd14c109052 Mon Sep 17 00:00:00 2001
From: Duncan-Brain <dbrain@litefarm.org>
Date: Wed, 31 Jul 2024 15:32:04 -0400
Subject: [PATCH 6/7] LF-4353 - update links to new surveystack production
 endpoitns away from staging

---
 packages/api/src/jobs/certification/pdf.js                      | 2 +-
 packages/api/src/jobs/certification/survey_record.js            | 2 +-
 .../CertificationSurvey/RegisteredCertifierQuestions/index.jsx  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/api/src/jobs/certification/pdf.js b/packages/api/src/jobs/certification/pdf.js
index 2eb8f093c5..a2e52eb2f2 100644
--- a/packages/api/src/jobs/certification/pdf.js
+++ b/packages/api/src/jobs/certification/pdf.js
@@ -1,7 +1,7 @@
 import puppeteer from 'puppeteer';
 import fs from 'fs';
 import rp from 'request-promise';
-const surveyStackURL = 'https://staging.surveystack.io/api/';
+const surveyStackURL = 'https://app.surveystack.io/api/';
 
 export default (nextQueue, emailQueue) => async (job) => {
   console.log('STEP 3 > PDF');
diff --git a/packages/api/src/jobs/certification/survey_record.js b/packages/api/src/jobs/certification/survey_record.js
index 60fe2cb403..429bcfe545 100644
--- a/packages/api/src/jobs/certification/survey_record.js
+++ b/packages/api/src/jobs/certification/survey_record.js
@@ -1,6 +1,6 @@
 import XlsxPopulate from 'xlsx-populate';
 import rp from 'request-promise';
-const surveyStackURL = 'https://staging.surveystack.io/api/';
+const surveyStackURL = 'https://app.surveystack.io/api/';
 
 export default async (emailQueue, submission, exportId, organicCertifierSurvey, certifier) => {
   if (!submission) {
diff --git a/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx b/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
index c137912f49..e00712a07e 100644
--- a/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
+++ b/packages/webapp/src/components/CertificationSurvey/RegisteredCertifierQuestions/index.jsx
@@ -50,7 +50,7 @@ const PreSurveyBody = ({ surveyId }) => {
   return (
     <iframe
       title="temp iframe title"
-      src={`https://staging.surveystack.io/groups/${surveyGroupId}/surveys/${surveyId}/submissions/new?minimal_ui=true`}
+      src={`https://app.surveystack.io/groups/${surveyGroupId}/surveys/${surveyId}/submissions/new?minimal_ui=true`}
       className={styles.surveyFrame}
       allow="geolocation"
     />

From 52cedf4013ce3aa5f64c97a17a0ac2f60c7e532a Mon Sep 17 00:00:00 2001
From: Sayaka Ono <sayaka.ono.81@gmail.com>
Date: Thu, 1 Aug 2024 13:35:38 -0700
Subject: [PATCH 7/7] Update version number

---
 packages/api/package-lock.json | 4 ++--
 packages/api/package.json      | 2 +-
 packages/api/src/server.js     | 2 +-
 packages/webapp/package.json   | 2 +-
 packages/webapp/src/main.jsx   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/api/package-lock.json b/packages/api/package-lock.json
index bc738ac4d8..5f5e19b688 100644
--- a/packages/api/package-lock.json
+++ b/packages/api/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "litefarm-api",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "litefarm-api",
-      "version": "3.6.5",
+      "version": "3.6.6",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.456.0",
         "@googlemaps/google-maps-services-js": "^3.3.14",
diff --git a/packages/api/package.json b/packages/api/package.json
index ba9e257d99..f05456cf06 100644
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-api",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "description": "LiteFarm API server",
   "main": "./api/src/server.js",
   "type": "module",
diff --git a/packages/api/src/server.js b/packages/api/src/server.js
index 57f01afba2..8a4c739503 100644
--- a/packages/api/src/server.js
+++ b/packages/api/src/server.js
@@ -39,7 +39,7 @@ if (process.env.SENTRY_DSN && environment !== 'development') {
       // Automatically instrument Node.js libraries and frameworks
       ...Sentry.autoDiscoverNodePerformanceMonitoringIntegrations(),
     ],
-    release: '3.6.5',
+    release: '3.6.6',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production
diff --git a/packages/webapp/package.json b/packages/webapp/package.json
index a074d3fc7a..1c6f1d12d9 100644
--- a/packages/webapp/package.json
+++ b/packages/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "litefarm-webapp",
-  "version": "3.6.5",
+  "version": "3.6.6",
   "description": "LiteFarm Web application",
   "type": "module",
   "scripts": {
diff --git a/packages/webapp/src/main.jsx b/packages/webapp/src/main.jsx
index 309cfcbb8a..2188946514 100644
--- a/packages/webapp/src/main.jsx
+++ b/packages/webapp/src/main.jsx
@@ -87,7 +87,7 @@ if (import.meta.env.VITE_SENTRY_DSN) {
   Sentry.init({
     dsn: import.meta.env.VITE_SENTRY_DSN,
     integrations: [new Integrations.BrowserTracing()],
-    release: '3.6.5',
+    release: '3.6.6',
     // Set tracesSampleRate to 1.0 to capture 100%
     // of transactions for performance monitoring.
     // We recommend adjusting this value in production