From c3d21984f92cb62b85c014f948f2a72e662d2b9d Mon Sep 17 00:00:00 2001
From: Sinn <Alex.Sinn@gov.bc.ca>
Date: Wed, 5 Mar 2025 14:31:20 -0800
Subject: [PATCH 1/6] fix for fee exemption error in updating and creating
 permits

---
 .../ReportDetailsForm-edit.spec.tsx.snap      | 188 +++++-------------
 .../BasicInformation.spec.tsx.snap            |   2 +-
 .../src/components/Forms/AddPermitForm.tsx    |   2 +-
 .../{EditPermitForm.js => EditPermitForm.tsx} |  60 +++---
 4 files changed, 78 insertions(+), 174 deletions(-)
 rename services/core-web/src/components/Forms/{EditPermitForm.js => EditPermitForm.tsx} (67%)

diff --git a/services/common/src/components/reports/__snapshots__/ReportDetailsForm-edit.spec.tsx.snap b/services/common/src/components/reports/__snapshots__/ReportDetailsForm-edit.spec.tsx.snap
index cdcfbc98f7..ad9fe836bc 100644
--- a/services/common/src/components/reports/__snapshots__/ReportDetailsForm-edit.spec.tsx.snap
+++ b/services/common/src/components/reports/__snapshots__/ReportDetailsForm-edit.spec.tsx.snap
@@ -433,14 +433,13 @@ exports[`ReportDetailsForm renders CRR edit mode properly 1`] = `
             >
               <label
                 class="ant-form-item-required"
-                for="VIEW_EDIT_REPORT_mine_report_permit_requirement_id"
+                for="VIEW_EDIT_REPORT_permit_condition_category_code"
                 title=""
               >
                 <div
                   style="width: 100%;"
                 >
-                  Report Code Requirement
-                  
+                  Permit Condition Category
                 </div>
               </label>
             </div>
@@ -456,7 +455,7 @@ exports[`ReportDetailsForm renders CRR edit mode properly 1`] = `
                   <div
                     aria-required="true"
                     class="ant-select ant-select-in-form-item ant-select-single ant-select-allow-clear ant-select-show-arrow ant-select-show-search"
-                    data-cy="mine_report_permit_requirement_id"
+                    data-cy="permit_condition_category_code"
                   >
                     <div
                       class="ant-select-selector"
@@ -465,24 +464,25 @@ exports[`ReportDetailsForm renders CRR edit mode properly 1`] = `
                         class="ant-select-selection-search"
                       >
                         <input
-                          aria-activedescendant="VIEW_EDIT_REPORT_mine_report_permit_requirement_id_list_0"
+                          aria-activedescendant="VIEW_EDIT_REPORT_permit_condition_category_code_list_0"
                           aria-autocomplete="list"
-                          aria-controls="VIEW_EDIT_REPORT_mine_report_permit_requirement_id_list"
+                          aria-controls="VIEW_EDIT_REPORT_permit_condition_category_code_list"
                           aria-haspopup="listbox"
-                          aria-owns="VIEW_EDIT_REPORT_mine_report_permit_requirement_id_list"
+                          aria-owns="VIEW_EDIT_REPORT_permit_condition_category_code_list"
                           aria-required="true"
                           autocomplete="off"
                           class="ant-select-selection-search-input"
-                          id="VIEW_EDIT_REPORT_mine_report_permit_requirement_id"
+                          id="VIEW_EDIT_REPORT_permit_condition_category_code"
                           role="combobox"
                           type="search"
                           value=""
                         />
                       </span>
                       <span
-                        class="ant-select-selection-placeholder"
+                        class="ant-select-selection-item"
+                        title="GEC"
                       >
-                        Enter code section number or report name
+                        GEC
                       </span>
                     </div>
                     <span
@@ -511,6 +511,33 @@ exports[`ReportDetailsForm renders CRR edit mode properly 1`] = `
                         </svg>
                       </span>
                     </span>
+                    <span
+                      aria-hidden="true"
+                      class="ant-select-clear"
+                      style="user-select: none;"
+                      unselectable="on"
+                    >
+                      <span
+                        aria-label="close-circle"
+                        class="anticon anticon-close-circle"
+                        role="img"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          data-icon="close-circle"
+                          fill="currentColor"
+                          fill-rule="evenodd"
+                          focusable="false"
+                          height="1em"
+                          viewBox="64 64 896 896"
+                          width="1em"
+                        >
+                          <path
+                            d="M512 64c247.4 0 448 200.6 448 448S759.4 960 512 960 64 759.4 64 512 264.6 64 512 64zm127.98 274.82h-.04l-.08.06L512 466.75 384.14 338.88c-.04-.05-.06-.06-.08-.06a.12.12 0 00-.07 0c-.03 0-.05.01-.09.05l-45.02 45.02a.2.2 0 00-.05.09.12.12 0 000 .07v.02a.27.27 0 00.06.06L466.75 512 338.88 639.86c-.05.04-.06.06-.06.08a.12.12 0 000 .07c0 .03.01.05.05.09l45.02 45.02a.2.2 0 00.09.05.12.12 0 00.07 0c.02 0 .04-.01.08-.05L512 557.25l127.86 127.87c.04.04.06.05.08.05a.12.12 0 00.07 0c.03 0 .05-.01.09-.05l45.02-45.02a.2.2 0 00.05-.09.12.12 0 000-.07v-.02a.27.27 0 00-.05-.06L557.25 512l127.87-127.86c.04-.04.05-.06.05-.08a.12.12 0 000-.07c0-.03-.01-.05-.05-.09l-45.02-45.02a.2.2 0 00-.09-.05.12.12 0 00-.07 0z"
+                          />
+                        </svg>
+                      </span>
+                    </span>
                   </div>
                 </div>
               </div>
@@ -519,7 +546,7 @@ exports[`ReportDetailsForm renders CRR edit mode properly 1`] = `
               >
                 <div
                   class="ant-form-item-explain ant-form-item-explain-connected"
-                  id="VIEW_EDIT_REPORT_mine_report_permit_requirement_id_help"
+                  id="VIEW_EDIT_REPORT_permit_condition_category_code_help"
                   role="alert"
                 >
                   <div
@@ -3446,14 +3473,13 @@ exports[`ReportDetailsForm renders verified PRR edit mode properly 1`] = `
             >
               <label
                 class="ant-form-item-required"
-                for="VIEW_EDIT_REPORT_mine_report_permit_requirement_id"
+                for="VIEW_EDIT_REPORT_permit_condition_category_code"
                 title=""
               >
                 <div
                   style="width: 100%;"
                 >
-                  Report Code Requirement
-                  
+                  Permit Condition Category
                 </div>
               </label>
             </div>
@@ -3469,7 +3495,7 @@ exports[`ReportDetailsForm renders verified PRR edit mode properly 1`] = `
                   <div
                     aria-required="true"
                     class="ant-select ant-select-in-form-item ant-select-single ant-select-allow-clear ant-select-show-arrow ant-select-show-search"
-                    data-cy="mine_report_permit_requirement_id"
+                    data-cy="permit_condition_category_code"
                   >
                     <div
                       class="ant-select-selector"
@@ -3478,15 +3504,15 @@ exports[`ReportDetailsForm renders verified PRR edit mode properly 1`] = `
                         class="ant-select-selection-search"
                       >
                         <input
-                          aria-activedescendant="VIEW_EDIT_REPORT_mine_report_permit_requirement_id_list_0"
+                          aria-activedescendant="VIEW_EDIT_REPORT_permit_condition_category_code_list_0"
                           aria-autocomplete="list"
-                          aria-controls="VIEW_EDIT_REPORT_mine_report_permit_requirement_id_list"
+                          aria-controls="VIEW_EDIT_REPORT_permit_condition_category_code_list"
                           aria-haspopup="listbox"
-                          aria-owns="VIEW_EDIT_REPORT_mine_report_permit_requirement_id_list"
+                          aria-owns="VIEW_EDIT_REPORT_permit_condition_category_code_list"
                           aria-required="true"
                           autocomplete="off"
                           class="ant-select-selection-search-input"
-                          id="VIEW_EDIT_REPORT_mine_report_permit_requirement_id"
+                          id="VIEW_EDIT_REPORT_permit_condition_category_code"
                           role="combobox"
                           type="search"
                           value=""
@@ -3494,9 +3520,9 @@ exports[`ReportDetailsForm renders verified PRR edit mode properly 1`] = `
                       </span>
                       <span
                         class="ant-select-selection-item"
-                        title="Test Approved Report"
+                        title="GEC"
                       >
-                        Test Approved Report
+                        GEC
                       </span>
                     </div>
                     <span
@@ -3560,7 +3586,7 @@ exports[`ReportDetailsForm renders verified PRR edit mode properly 1`] = `
               >
                 <div
                   class="ant-form-item-explain ant-form-item-explain-connected"
-                  id="VIEW_EDIT_REPORT_mine_report_permit_requirement_id_help"
+                  id="VIEW_EDIT_REPORT_permit_condition_category_code_help"
                   role="alert"
                 >
                   <div
@@ -3572,120 +3598,6 @@ exports[`ReportDetailsForm renders verified PRR edit mode properly 1`] = `
           </div>
         </div>
       </div>
-      <div
-        class="ant-col ant-col-24"
-        style="padding: 4px 8px 4px 8px;"
-      >
-        <div
-          class="report-summary-box"
-        >
-          <div>
-            <h4
-              class="ant-typography primary-colour"
-            >
-              You are 
-              submitting
-              :
-            </h4>
-            <h5
-              class="ant-typography"
-            >
-              Test Approved Report
-            </h5>
-            <h5
-              class="ant-typography"
-            >
-              Condition:
-            </h5>
-            <div
-              class="ant-typography"
-            >
-              Health and Safety - 1
-            </div>
-            <div
-              class="ant-row"
-            >
-              <div
-                class="ant-col ant-col-12"
-              >
-                <h5
-                  class="ant-typography"
-                >
-                  Frequency:
-                </h5>
-                <div
-                  class="ant-typography"
-                >
-                  Annually
-                </div>
-                <h5
-                  class="ant-typography"
-                >
-                  Due Date:
-                </h5>
-                <div
-                  class="ant-typography"
-                >
-                  Jan 01 2024
-                </div>
-              </div>
-              <div
-                class="ant-col ant-col-12"
-              >
-                <h5
-                  class="ant-typography"
-                >
-                  Regulatory Authority:
-                </h5>
-                <div
-                  class="ant-typography"
-                />
-                <h5
-                  class="ant-typography"
-                >
-                  Ministry Recipient:
-                </h5>
-                <div
-                  class="ant-typography"
-                >
-                  Major Mines Office 
-                </div>
-              </div>
-            </div>
-            <a
-              class="ant-btn ant-btn-default"
-              href="test"
-              rel="noopener noreferrer"
-              target="_blank"
-            >
-              <span>
-                View Permit Condition 
-              </span>
-              <span
-                aria-label="export"
-                class="anticon anticon-export"
-                role="img"
-              >
-                <svg
-                  aria-hidden="true"
-                  class=""
-                  data-icon="export"
-                  fill="currentColor"
-                  fill-rule="evenodd"
-                  focusable="false"
-                  height="1em"
-                  viewBox="64 64 896 896"
-                  width="1em"
-                >
-                  <path
-                    d="M880 912H144c-17.7 0-32-14.3-32-32V144c0-17.7 14.3-32 32-32h360c4.4 0 8 3.6 8 8v56c0 4.4-3.6 8-8 8H184v656h656V520c0-4.4 3.6-8 8-8h56c4.4 0 8 3.6 8 8v360c0 17.7-14.3 32-32 32zM770.87 199.13l-52.2-52.2a8.01 8.01 0 014.7-13.6l179.4-21c5.1-.6 9.5 3.7 8.9 8.9l-21 179.4c-.8 6.6-8.9 9.4-13.6 4.7l-52.4-52.4-256.2 256.2a8.03 8.03 0 01-11.3 0l-42.4-42.4a8.03 8.03 0 010-11.3l256.1-256.3z"
-                  />
-                </svg>
-              </span>
-            </a>
-          </div>
-        </div>
-      </div>
       <div
         class="ant-col ant-col-24"
         style="padding: 4px 8px 4px 8px;"
@@ -3918,8 +3830,8 @@ exports[`ReportDetailsForm renders verified PRR edit mode properly 1`] = `
                         placeholder="Select date"
                         readonly=""
                         size="12"
-                        title="2024-01-01"
-                        value="2024-01-01"
+                        title="2024-02-07"
+                        value="2024-02-07"
                       />
                       <span
                         class="ant-picker-suffix"
diff --git a/services/common/src/components/tailings/__snapshots__/BasicInformation.spec.tsx.snap b/services/common/src/components/tailings/__snapshots__/BasicInformation.spec.tsx.snap
index 9a7ae76570..ed0a5a0483 100644
--- a/services/common/src/components/tailings/__snapshots__/BasicInformation.spec.tsx.snap
+++ b/services/common/src/components/tailings/__snapshots__/BasicInformation.spec.tsx.snap
@@ -49,7 +49,7 @@ exports[`Tailings BasicInformation renders properly 1`] = `
               <div
                 class="ant-alert-description"
               >
-                Last Updated by test@bceid  on Apr 5, 2019 9:05 PM
+                Last Updated by test@bceid  on Apr 5, 2019 2:05 PM
               </div>
             </div>
             <div
diff --git a/services/core-web/src/components/Forms/AddPermitForm.tsx b/services/core-web/src/components/Forms/AddPermitForm.tsx
index efaf2193b3..4ec5022f28 100644
--- a/services/core-web/src/components/Forms/AddPermitForm.tsx
+++ b/services/core-web/src/components/Forms/AddPermitForm.tsx
@@ -131,7 +131,7 @@ export const AddPermitForm: FC<AddPermitFormProps> = (props) => {
       dispatch(change(formName, "exemption_fee_status_code", statusCode));
     }
 
-  }, [permit_status_code, permit_type, mine_tenure_type_code]);
+  }, [permit_status_code, permit_type, mine_tenure_type_code, mine_disturbance_code]);
 
   const isCoalOrMineral =
     mine_tenure_type_code === "COL" ||
diff --git a/services/core-web/src/components/Forms/EditPermitForm.js b/services/core-web/src/components/Forms/EditPermitForm.tsx
similarity index 67%
rename from services/core-web/src/components/Forms/EditPermitForm.js
rename to services/core-web/src/components/Forms/EditPermitForm.tsx
index 13e7caa921..f65569f74c 100644
--- a/services/core-web/src/components/Forms/EditPermitForm.js
+++ b/services/core-web/src/components/Forms/EditPermitForm.tsx
@@ -1,7 +1,5 @@
-import React, { useEffect } from "react";
-import { connect, useDispatch, useSelector } from "react-redux";
-import { compose } from "redux";
-import PropTypes from "prop-types";
+import React, { useEffect, FC } from "react";
+import { useDispatch, useSelector } from "react-redux";
 import { getFormValues, Field, change } from "@mds/common/components/forms/form";
 import { Col, Row } from "antd";
 import { currency, required, maxLength } from "@mds/common/redux/utils/Validate";
@@ -15,40 +13,43 @@ import RenderSelect from "@mds/common/components/forms/RenderSelect";
 import RenderField from "@mds/common/components/forms/RenderField";
 import RenderAutoSizeField from "@mds/common/components/forms/RenderAutoSizeField";
 
-import CustomPropTypes from "@/customPropTypes";
 import FormWrapper from "@mds/common/components/forms/FormWrapper";
 import RenderSubmitButton from "@mds/common/components/forms/RenderSubmitButton";
 import RenderCancelButton from "@mds/common/components/forms/RenderCancelButton";
+import { IPermit } from "@mds/common/interfaces";
 
-const propTypes = {
-  onSubmit: PropTypes.func.isRequired,
-  closeModal: PropTypes.func.isRequired,
-  permitStatusOptions: PropTypes.arrayOf(CustomPropTypes.dropdownListItem).isRequired,
-  title: PropTypes.string.isRequired,
-  initialValues: CustomPropTypes.permit.isRequired,
-  exemptionFeeStatusDropDownOptions: PropTypes.objectOf(CustomPropTypes.options).isRequired,
-};
+interface EditPermitFormProps {
+  onSubmit: (values) => void | Promise<void>;
+  title: string;
+  initialValues: Partial<IPermit>;
+}
 
-export const EditPermitForm = (props) => {
+export const EditPermitForm: FC<EditPermitFormProps> = ({
+  onSubmit,
+  title,
+  initialValues
+}) => {
   const dispatch = useDispatch();
+  const permitStatusOptions = useSelector(getDropdownPermitStatusOptions);
+  const exemptionFeeStatusDropDownOptions = useSelector(getExemptionFeeStatusDropDownOptions);
   const formValues = useSelector(getFormValues(FORM.EDIT_PERMIT)) ?? {};
 
   useEffect(() => {
-    const isExploration = props.initialValues.permit_no.charAt(1) === "X";
+    const isExploration = initialValues.permit_no.charAt(1) === "X";
     const feeStatus = determineExemptionFeeStatus(
       formValues?.permit_status_code,
-      props.initialValues.permit_prefix,
-      props.initialValues.site_properties?.mine_tenure_type_code,
+      initialValues.permit_prefix,
+      initialValues.site_properties?.mine_tenure_type_code,
       isExploration,
-      props.initialValues.site_properties?.mine_disturbance_code
+      initialValues.site_properties?.mine_disturbance_code
     );
-    dispatch(change("exemption_fee_status_code", feeStatus));
+    dispatch(change(FORM.EDIT_PERMIT, "exemption_fee_status_code", feeStatus));
   }, [formValues?.permit_status_code]);
 
   return (
-    <FormWrapper onSubmit={props.onSubmit}
+    <FormWrapper onSubmit={onSubmit}
       isModal
-      initialValues={props.initialValues}
+      initialValues={initialValues}
       name={FORM.EDIT_PERMIT}
       reduxFormConfig={{
         touchOnBlur: false,
@@ -63,7 +64,7 @@ export const EditPermitForm = (props) => {
             label="Permit status"
             placeholder="Select a permit status"
             component={RenderSelect}
-            data={props.permitStatusOptions}
+            data={permitStatusOptions}
             required
             validate={[required]}
           />
@@ -91,7 +92,7 @@ export const EditPermitForm = (props) => {
             showOptional={false}
             component={RenderSelect}
             disabled
-            data={props.exemptionFeeStatusDropDownOptions}
+            data={exemptionFeeStatusDropDownOptions}
           />
         </Col>
       </Row>
@@ -108,19 +109,10 @@ export const EditPermitForm = (props) => {
       </Row>
       <div className="right center-mobile">
         <RenderCancelButton />
-        <RenderSubmitButton buttonText={props.title} />
+        <RenderSubmitButton buttonText={title} />
       </div>
     </FormWrapper>
   );
 };
 
-EditPermitForm.propTypes = propTypes;
-
-const mapStateToProps = (state) => ({
-  permitStatusOptions: getDropdownPermitStatusOptions(state),
-  exemptionFeeStatusDropDownOptions: getExemptionFeeStatusDropDownOptions(state),
-});
-
-export default compose(
-  connect(mapStateToProps)
-)(EditPermitForm);
+export default EditPermitForm;

From 411681baa6d33ed811184b5bf654e8fbcf387f69 Mon Sep 17 00:00:00 2001
From: Sinn <Alex.Sinn@gov.bc.ca>
Date: Wed, 5 Mar 2025 14:51:11 -0800
Subject: [PATCH 2/6] adjusting snap file

---
 .../tailings/__snapshots__/BasicInformation.spec.tsx.snap       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/common/src/components/tailings/__snapshots__/BasicInformation.spec.tsx.snap b/services/common/src/components/tailings/__snapshots__/BasicInformation.spec.tsx.snap
index ed0a5a0483..9a7ae76570 100644
--- a/services/common/src/components/tailings/__snapshots__/BasicInformation.spec.tsx.snap
+++ b/services/common/src/components/tailings/__snapshots__/BasicInformation.spec.tsx.snap
@@ -49,7 +49,7 @@ exports[`Tailings BasicInformation renders properly 1`] = `
               <div
                 class="ant-alert-description"
               >
-                Last Updated by test@bceid  on Apr 5, 2019 2:05 PM
+                Last Updated by test@bceid  on Apr 5, 2019 9:05 PM
               </div>
             </div>
             <div

From 85a40655ae0681d3cee7ba445f08b6e7d85baba6 Mon Sep 17 00:00:00 2001
From: Sinn <Alex.Sinn@gov.bc.ca>
Date: Wed, 5 Mar 2025 15:52:54 -0800
Subject: [PATCH 3/6] adding test for EditPermitForm component

---
 .../components/Forms/EditPermitForm.spec.js   |  23 +
 .../__snapshots__/EditPermitForm.spec.js.snap | 424 ++++++++++++++++++
 2 files changed, 447 insertions(+)
 create mode 100644 services/core-web/src/tests/components/Forms/EditPermitForm.spec.js
 create mode 100644 services/core-web/src/tests/components/Forms/__snapshots__/EditPermitForm.spec.js.snap

diff --git a/services/core-web/src/tests/components/Forms/EditPermitForm.spec.js b/services/core-web/src/tests/components/Forms/EditPermitForm.spec.js
new file mode 100644
index 0000000000..b67fff8fac
--- /dev/null
+++ b/services/core-web/src/tests/components/Forms/EditPermitForm.spec.js
@@ -0,0 +1,23 @@
+import React from "react";
+import { render } from "@testing-library/react";
+import { EditPermitForm } from "@/components/Forms/EditPermitForm";
+import { ReduxWrapper } from "@mds/common/tests/utils/ReduxWrapper";
+import * as MOCK from "@mds/common/tests/mocks/dataMocks";
+
+describe("EditPermitForm", () => {
+    it("renders properly", () => {
+        const { container } = render(
+            <ReduxWrapper>
+                <EditPermitForm
+                    onSubmit={jest.fn()}
+                    getDropdownPermitStatusOptions={jest.fn()}
+                    title={"mockTitle"}
+                    permitStatusOptions={[]}
+                    exemptionFeeStatusDropDownOptions={[]}
+                    initialValues={MOCK.PERMITS[0]}
+                />
+            </ReduxWrapper>
+        );
+        expect(container).toMatchSnapshot();
+    });
+});
\ No newline at end of file
diff --git a/services/core-web/src/tests/components/Forms/__snapshots__/EditPermitForm.spec.js.snap b/services/core-web/src/tests/components/Forms/__snapshots__/EditPermitForm.spec.js.snap
new file mode 100644
index 0000000000..5aaabd2a40
--- /dev/null
+++ b/services/core-web/src/tests/components/Forms/__snapshots__/EditPermitForm.spec.js.snap
@@ -0,0 +1,424 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EditPermitForm renders properly 1`] = `
+<div>
+  <form
+    class="ant-form ant-form-vertical common-form common-form-EDIT_PERMIT form-edit"
+    id="EDIT_PERMIT"
+  >
+    <div
+      class="ant-row"
+      style="margin-left: -8px; margin-right: -8px;"
+    >
+      <div
+        class="ant-col ant-col-24"
+        style="padding-left: 8px; padding-right: 8px;"
+      >
+        <div
+          class="ant-form-item ant-form-item-with-help"
+        >
+          <div
+            class="ant-row ant-form-item-row"
+          >
+            <div
+              class="ant-col ant-form-item-label"
+            >
+              <label
+                class="ant-form-item-required"
+                for="EDIT_PERMIT_permit_status_code"
+                title=""
+              >
+                <div
+                  style="width: 100%;"
+                >
+                  Permit status
+                </div>
+              </label>
+            </div>
+            <div
+              class="ant-col ant-form-item-control"
+            >
+              <div
+                class="ant-form-item-control-input"
+              >
+                <div
+                  class="ant-form-item-control-input-content"
+                >
+                  <div
+                    aria-required="true"
+                    class="ant-select ant-select-in-form-item ant-select-single ant-select-allow-clear ant-select-show-arrow ant-select-show-search"
+                    data-cy="permit_status_code"
+                  >
+                    <div
+                      class="ant-select-selector"
+                    >
+                      <span
+                        class="ant-select-selection-search"
+                      >
+                        <input
+                          aria-activedescendant="permit_status_code_list_0"
+                          aria-autocomplete="list"
+                          aria-controls="permit_status_code_list"
+                          aria-haspopup="listbox"
+                          aria-owns="permit_status_code_list"
+                          aria-required="true"
+                          autocomplete="off"
+                          class="ant-select-selection-search-input"
+                          id="permit_status_code"
+                          role="combobox"
+                          type="search"
+                          value=""
+                        />
+                      </span>
+                      <span
+                        class="ant-select-selection-item"
+                        title="O"
+                      >
+                        O
+                      </span>
+                    </div>
+                    <span
+                      aria-hidden="true"
+                      class="ant-select-arrow"
+                      style="user-select: none;"
+                      unselectable="on"
+                    >
+                      <span
+                        aria-label="down"
+                        class="anticon anticon-down ant-select-suffix"
+                        role="img"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          data-icon="down"
+                          fill="currentColor"
+                          focusable="false"
+                          height="1em"
+                          viewBox="64 64 896 896"
+                          width="1em"
+                        >
+                          <path
+                            d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
+                          />
+                        </svg>
+                      </span>
+                    </span>
+                    <span
+                      aria-hidden="true"
+                      class="ant-select-clear"
+                      style="user-select: none;"
+                      unselectable="on"
+                    >
+                      <span
+                        aria-label="close-circle"
+                        class="anticon anticon-close-circle"
+                        role="img"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          data-icon="close-circle"
+                          fill="currentColor"
+                          fill-rule="evenodd"
+                          focusable="false"
+                          height="1em"
+                          viewBox="64 64 896 896"
+                          width="1em"
+                        >
+                          <path
+                            d="M512 64c247.4 0 448 200.6 448 448S759.4 960 512 960 64 759.4 64 512 264.6 64 512 64zm127.98 274.82h-.04l-.08.06L512 466.75 384.14 338.88c-.04-.05-.06-.06-.08-.06a.12.12 0 00-.07 0c-.03 0-.05.01-.09.05l-45.02 45.02a.2.2 0 00-.05.09.12.12 0 000 .07v.02a.27.27 0 00.06.06L466.75 512 338.88 639.86c-.05.04-.06.06-.06.08a.12.12 0 000 .07c0 .03.01.05.05.09l45.02 45.02a.2.2 0 00.09.05.12.12 0 00.07 0c.02 0 .04-.01.08-.05L512 557.25l127.86 127.87c.04.04.06.05.08.05a.12.12 0 00.07 0c.03 0 .05-.01.09-.05l45.02-45.02a.2.2 0 00.05-.09.12.12 0 000-.07v-.02a.27.27 0 00-.05-.06L557.25 512l127.87-127.86c.04-.04.05-.06.05-.08a.12.12 0 000-.07c0-.03-.01-.05-.05-.09l-45.02-45.02a.2.2 0 00-.09-.05.12.12 0 00-.07 0z"
+                          />
+                        </svg>
+                      </span>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div
+                style="display: flex; flex-wrap: nowrap;"
+              >
+                <div
+                  class="ant-form-item-explain ant-form-item-explain-connected"
+                  id="EDIT_PERMIT_permit_status_code_help"
+                  role="alert"
+                >
+                  <div
+                    class=""
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="ant-form-item ant-form-item-with-help"
+        >
+          <div
+            class="ant-row ant-form-item-row"
+          >
+            <div
+              class="ant-col ant-form-item-label"
+            >
+              <label
+                class=""
+                for="EDIT_PERMIT_remaining_static_liability"
+                title=""
+              >
+                <div>
+                  Remaining outstanding liability amount (if any)
+                   
+                  <span
+                    class="form-item-optional"
+                  >
+                     (optional)
+                  </span>
+                </div>
+              </label>
+            </div>
+            <div
+              class="ant-col ant-form-item-control"
+            >
+              <div
+                class="ant-form-item-control-input"
+              >
+                <div
+                  class="ant-form-item-control-input-content"
+                >
+                  <input
+                    aria-label="remaining_static_liability"
+                    class="ant-input"
+                    id="remaining_static_liability"
+                    name="remaining_static_liability"
+                    placeholder="$0.00"
+                    type="text"
+                    value="$0.00"
+                  />
+                </div>
+              </div>
+              <div
+                style="display: flex; flex-wrap: nowrap;"
+              >
+                <div
+                  class="ant-form-item-explain ant-form-item-explain-connected"
+                  id="EDIT_PERMIT_remaining_static_liability_help"
+                  role="alert"
+                >
+                  <div
+                    class=""
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="ant-row"
+      style="margin-left: -8px; margin-right: -8px;"
+    >
+      <div
+        class="ant-col ant-col-24"
+        style="padding-left: 8px; padding-right: 8px;"
+      >
+        <div
+          class="ant-form-item ant-form-item-with-help"
+        >
+          <div
+            class="ant-row ant-form-item-row"
+          >
+            <div
+              class="ant-col ant-form-item-label"
+            >
+              <label
+                class=""
+                for="EDIT_PERMIT_exemption_fee_status_code"
+                title=""
+              >
+                <div>
+                  Inspection Fee Status
+                   
+                </div>
+              </label>
+            </div>
+            <div
+              class="ant-col ant-form-item-control"
+            >
+              <div
+                class="ant-form-item-control-input"
+              >
+                <div
+                  class="ant-form-item-control-input-content"
+                >
+                  <div
+                    class="ant-select ant-select-in-form-item ant-select-single ant-select-allow-clear ant-select-show-arrow ant-select-disabled ant-select-show-search"
+                    data-cy="exemption_fee_status_code"
+                  >
+                    <div
+                      class="ant-select-selector"
+                    >
+                      <span
+                        class="ant-select-selection-search"
+                      >
+                        <input
+                          aria-activedescendant="exemption_fee_status_code_list_0"
+                          aria-autocomplete="list"
+                          aria-controls="exemption_fee_status_code_list"
+                          aria-expanded="false"
+                          aria-haspopup="listbox"
+                          aria-owns="exemption_fee_status_code_list"
+                          autocomplete="off"
+                          class="ant-select-selection-search-input"
+                          disabled=""
+                          id="exemption_fee_status_code"
+                          role="combobox"
+                          type="search"
+                          value=""
+                        />
+                      </span>
+                      <span
+                        class="ant-select-selection-item"
+                        title="MIM"
+                      >
+                        MIM
+                      </span>
+                    </div>
+                    <span
+                      aria-hidden="true"
+                      class="ant-select-arrow"
+                      style="user-select: none;"
+                      unselectable="on"
+                    >
+                      <span
+                        aria-label="down"
+                        class="anticon anticon-down ant-select-suffix"
+                        role="img"
+                      >
+                        <svg
+                          aria-hidden="true"
+                          data-icon="down"
+                          fill="currentColor"
+                          focusable="false"
+                          height="1em"
+                          viewBox="64 64 896 896"
+                          width="1em"
+                        >
+                          <path
+                            d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"
+                          />
+                        </svg>
+                      </span>
+                    </span>
+                  </div>
+                </div>
+              </div>
+              <div
+                style="display: flex; flex-wrap: nowrap;"
+              >
+                <div
+                  class="ant-form-item-explain ant-form-item-explain-connected"
+                  id="EDIT_PERMIT_exemption_fee_status_code_help"
+                  role="alert"
+                >
+                  <div
+                    class=""
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="ant-row"
+      style="margin-left: -8px; margin-right: -8px;"
+    >
+      <div
+        class="ant-col ant-col-24"
+        style="padding-left: 8px; padding-right: 8px;"
+      >
+        <div
+          class="ant-form-item ant-form-item-with-help"
+        >
+          <div
+            class="ant-row ant-form-item-row"
+          >
+            <div
+              class="ant-col ant-form-item-label"
+            >
+              <label
+                class=""
+                for="EDIT_PERMIT_exemption_fee_status_note"
+                title=""
+              >
+                <div>
+                  Fee Exemption Note
+                   
+                  <span
+                    class="form-item-optional"
+                  >
+                     (optional)
+                  </span>
+                </div>
+              </label>
+            </div>
+            <div
+              class="ant-col ant-form-item-control"
+            >
+              <div
+                class="ant-form-item-control-input"
+              >
+                <div
+                  class="ant-form-item-control-input-content"
+                >
+                  <textarea
+                    class="ant-input"
+                    id="exemption_fee_status_note"
+                    name="exemption_fee_status_note"
+                    style="height: 0px; resize: none; min-height: -12px;"
+                  />
+                </div>
+              </div>
+              <div
+                style="display: flex; flex-wrap: nowrap;"
+              >
+                <div
+                  class="ant-form-item-explain ant-form-item-explain-connected"
+                  id="EDIT_PERMIT_exemption_fee_status_note_help"
+                  role="alert"
+                >
+                  <div
+                    class=""
+                  />
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div
+      class="right center-mobile"
+    >
+      <button
+        aria-label="Cancel"
+        class="ant-btn ant-btn-default core-btn core-btn-default  form-btn"
+        type="button"
+      >
+        <span>
+          Cancel
+        </span>
+      </button>
+      <button
+        aria-label="Submit"
+        class="ant-btn ant-btn-primary  form-btn"
+        type="submit"
+      >
+        <span>
+          mockTitle
+        </span>
+      </button>
+    </div>
+  </form>
+</div>
+`;

From f2ca7656db7f444af9f13a6d1ccc560220d8581b Mon Sep 17 00:00:00 2001
From: Sinn <Alex.Sinn@gov.bc.ca>
Date: Wed, 12 Mar 2025 11:25:55 -0700
Subject: [PATCH 4/6] adjusting NoD decision doc upload conditions

---
 .../modalContent/NoticeOfDepartureModal.tsx   | 29 ++++++++++++++++---
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx b/services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx
index 7efb656b24..62b4f2d4db 100644
--- a/services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx
+++ b/services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 import { Button, Col, Popconfirm, Row, Form } from "antd";
-import { connect } from "react-redux";
+import { connect, useSelector } from "react-redux";
 import { bindActionCreators, compose } from "redux";
 import {
   EMPTY_FIELD,
@@ -18,12 +18,13 @@ import {
   updateNoticeOfDeparture,
 } from "@mds/common/redux/actionCreators/noticeOfDepartureActionCreator";
 import { getNoticeOfDeparture } from "@mds/common/redux/selectors/noticeOfDepartureSelectors";
-import { Field, FieldArray, change } from "@mds/common/components/forms/form";
+import { Field, FieldArray, change, getFormValues } from "@mds/common/components/forms/form";
 import {
   email,
   maxLength,
   phoneNumber,
   required,
+  requiredList,
 } from "@mds/common/redux/utils/Validate";
 import { getUserAccessData } from "@mds/common/redux/selectors/authenticationSelectors";
 import CoreTable from "@mds/common/components/common/CoreTable";
@@ -51,7 +52,6 @@ interface RenderContactsProps {
 
 export const renderContacts: React.FC<RenderContactsProps> = (props, disabled = false) => {
   const { fields } = props;
-
   return (
     <div className="margin-large--bottom">
       {fields.length > 0 && (
@@ -131,7 +131,9 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
   const [documentArray, setDocumentArray] = useState([]);
   const [uploadedFiles, setUploadedFiles] = useState([]);
   const [uploading, setUploading] = useState(false);
+  const [currentStatus, setCurrentStatus] = useState("");
   const formName = FORM.NOTICE_OF_DEPARTURE_FORM;
+  const formValues = useSelector(getFormValues(formName));
 
   const { noticeOfDeparture, mine, change } = props;
   const { nod_guid } = noticeOfDeparture;
@@ -149,6 +151,15 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
     (doc) => doc.document_type === NOTICE_OF_DEPARTURE_DOCUMENT_TYPE.DECISION
   );
 
+  const isDecisionDocRequired = (status) => {
+    const requiredDocStatuses = [
+      NOTICE_OF_DEPARTURE_STATUS_VALUES.determined_non_substantial,
+      NOTICE_OF_DEPARTURE_STATUS_VALUES.determined_substantial,
+    ];
+
+    return requiredDocStatuses.includes(status) && decision.length === 0 && documentArray.length == 0;
+  }
+
   const handleAddDocuments = (noticeOfDepartureGuid) => {
     documentArray.forEach((document) =>
       props.addDocumentToNoticeOfDeparture(
@@ -209,8 +220,16 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
         };
       })
     );
+
+    setCurrentStatus(props?.initialValues?.nod_status);
   }, []);
 
+  useEffect(() => {
+    if (formValues?.nod_status !== currentStatus) {
+      setCurrentStatus(formValues?.nod_status);
+    }
+  }, [formValues?.nod_status]);
+
   const handleDeleteANoticeOfDepartureDocument = async (document) => {
     await removeFileFromDocumentManager(document);
 
@@ -335,6 +354,8 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
                 addFileStart={() => setUploading(true)}
                 onAbort={() => setUploading(false)}
                 onProcessFiles={() => setUploading(false)}
+                validate={isDecisionDocRequired(currentStatus) ? [requiredList] : []}
+                required={isDecisionDocRequired(currentStatus)}
                 uploadUrl={NOTICE_OF_DEPARTURE_DOCUMENTS(mine.mine_guid)}
                 acceptedFileTypesMap={{ ...DOCUMENT, ...EXCEL }}
                 onFileLoad={(documentName, document_manager_guid) => {
@@ -383,7 +404,7 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
           ) : (
             <>
               <RenderCancelButton />
-              <RenderSubmitButton disabled={documentArray.length == 0 || uploading} buttonText="Update" disableOnClean={false} />
+              <RenderSubmitButton disabled={isDecisionDocRequired(currentStatus) || uploading} buttonText="Update" disableOnClean={false} />
             </>
           )}
         </div>

From 47081f022e16d3c1753c486a8813ce3c72c441ea Mon Sep 17 00:00:00 2001
From: Sinn <Alex.Sinn@gov.bc.ca>
Date: Wed, 12 Mar 2025 11:48:10 -0700
Subject: [PATCH 5/6] ran yarn install locally

---
 yarn.lock | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index f72d3a9d05..b9da12a137 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4676,17 +4676,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:1.7.2":
-  version: 1.7.2
-  resolution: "axios@npm:1.7.2"
-  dependencies:
-    follow-redirects: ^1.15.6
-    form-data: ^4.0.0
-    proxy-from-env: ^1.1.0
-  checksum: e457e2b0ab748504621f6fa6609074ac08c824bf0881592209dfa15098ece7e88495300e02cd22ba50b3468fd712fe687e629dcb03d6a3f6a51989727405aedf
-  languageName: node
-  linkType: hard
-
 "axios@npm:1.8.2":
   version: 1.8.2
   resolution: "axios@npm:1.8.2"

From 3ff7a0a36d1099a4422f34ec4d82d93ee0d761f6 Mon Sep 17 00:00:00 2001
From: Sinn <Alex.Sinn@gov.bc.ca>
Date: Wed, 12 Mar 2025 15:33:58 -0700
Subject: [PATCH 6/6] addressing pr comment

---
 .../components/modalContent/NoticeOfDepartureModal.tsx | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx b/services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx
index 62b4f2d4db..bb7f1021b6 100644
--- a/services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx
+++ b/services/core-web/src/components/modalContent/NoticeOfDepartureModal.tsx
@@ -131,9 +131,9 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
   const [documentArray, setDocumentArray] = useState([]);
   const [uploadedFiles, setUploadedFiles] = useState([]);
   const [uploading, setUploading] = useState(false);
-  const [currentStatus, setCurrentStatus] = useState("");
   const formName = FORM.NOTICE_OF_DEPARTURE_FORM;
   const formValues = useSelector(getFormValues(formName));
+  const currentStatus = formValues?.nod_status
 
   const { noticeOfDeparture, mine, change } = props;
   const { nod_guid } = noticeOfDeparture;
@@ -220,16 +220,8 @@ const NoticeOfDepartureModal: React.FC<NoticeOfDepartureModalProps> = (props) =>
         };
       })
     );
-
-    setCurrentStatus(props?.initialValues?.nod_status);
   }, []);
 
-  useEffect(() => {
-    if (formValues?.nod_status !== currentStatus) {
-      setCurrentStatus(formValues?.nod_status);
-    }
-  }, [formValues?.nod_status]);
-
   const handleDeleteANoticeOfDepartureDocument = async (document) => {
     await removeFileFromDocumentManager(document);