From 8ffe129c350bfec2706ce4d437d4a031771305db Mon Sep 17 00:00:00 2001
From: Sayaka Ono <sayaka.ono.81@gmail.com>
Date: Thu, 16 Jul 2026 13:04:08 -0700
Subject: [PATCH 1/2] LF-5390 Add type button to non-primary buttons in
 FormNavigationButtons

---
 .../components/Form/FormNavigationButtons/index.tsx    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/webapp/src/components/Form/FormNavigationButtons/index.tsx b/packages/webapp/src/components/Form/FormNavigationButtons/index.tsx
index 6ec56de92c..3b3a00c6e7 100644
--- a/packages/webapp/src/components/Form/FormNavigationButtons/index.tsx
+++ b/packages/webapp/src/components/Form/FormNavigationButtons/index.tsx
@@ -53,11 +53,19 @@ const FormNavigationButtons = ({
     <div className={clsx(styles.container)}>
       {contextualContent && <div className={styles.contextualContent}>{contextualContent}</div>}
       <div className={styles.buttonContainer}>
-        <Button color="secondary-cta" onClick={onCancel} className={styles.button} sm fullLength>
+        <Button
+          type="button"
+          color="secondary-cta"
+          onClick={onCancel}
+          className={styles.button}
+          sm
+          fullLength
+        >
           {cancelButtonContent || t('common:CANCEL')}
         </Button>
         {onPrevious && (
           <Button
+            type="button"
             color="secondary"
             disabled={isFirstStep}
             onClick={onPrevious}

From 4deb72400c97fe2883c15a61e78e5e982bc0471c Mon Sep 17 00:00:00 2001
From: Sayaka Ono <sayaka.ono.81@gmail.com>
Date: Thu, 16 Jul 2026 13:36:22 -0700
Subject: [PATCH 2/2] LF-5390 Fix certifier key colliding across system types

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
---
 .../src/containers/Certifications/utils.ts    | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/webapp/src/containers/Certifications/utils.ts b/packages/webapp/src/containers/Certifications/utils.ts
index 42bd1f1aaa..bdbe484fb2 100644
--- a/packages/webapp/src/containers/Certifications/utils.ts
+++ b/packages/webapp/src/containers/Certifications/utils.ts
@@ -48,23 +48,30 @@ const buildCertifiersMap = (certifiers: SupportedCertifier[]) =>
     return map;
   }, {});
 
-// Unified certifier identity key: used for dedup grouping, the certifier Select's
-// value (ReportingPeriod), and parsed back into certifier_id/other_certifier for
-// the export request body (Survey). indexOf/slice (not split) so a free-text
-// other_certifier value containing ':' still parses correctly.
+// Unified certifier identity key (dedup grouping, Select value, parsed back for export).
+// System type is included so the same certifier/name under a different system type
+// isn't treated as the same identity. Free-text parts are encodeURIComponent-escaped
+// so a stray ':' inside them can't be confused with our own separators.
 export function getCertifierKey({
   certifier_id,
   other_certifier,
+  system_type_id,
+  requested_system_type,
 }: {
   certifier_id?: number | null;
   other_certifier?: string | null;
+  system_type_id?: number | null;
+  requested_system_type?: string | null;
 }): string {
-  return certifier_id ? `ID:${certifier_id}` : `OTHER:${other_certifier}`;
+  const systemType = encodeURIComponent(system_type_id || requested_system_type || '');
+  return certifier_id
+    ? `ID:${certifier_id}:${systemType}`
+    : `OTHER:${encodeURIComponent(other_certifier ?? '')}:${systemType}`;
 }
 
 export function parseCertifierKey(key: string): { type: string; value: string } {
-  const separatorIndex = key.indexOf(':');
-  return { type: key.slice(0, separatorIndex), value: key.slice(separatorIndex + 1) };
+  const [type, encodedValue] = key.split(':');
+  return { type, value: decodeURIComponent(encodedValue) };
 }
 
 export const getCertifierOptions = (