Merge branch 'dev' into psp-8868

bcgov · Jul 17, 2024 · 1a7ddde · 1a7ddde
2 parents 88c03e9 + 1377a11
commit 1a7ddde
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>5.4.0-84.49</Version>
-    <Version>5.4.0-84.49</Version>
+    <Version>5.4.0-84.52</Version>
+    <Version>5.4.0-84.52</Version>
     <AssemblyVersion>5.4.0.84</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>

diff --git a/source/frontend/package.json b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "5.4.0-84.49",
+  "version": "5.4.0-84.52",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",

diff --git a/source/frontend/src/features/leases/add/FeeDeterminationSubForm.tsx b/source/frontend/src/features/leases/add/FeeDeterminationSubForm.tsx
@@ -37,7 +37,7 @@ const FeeDeterminationSubForm: React.FunctionComponent<IFeeDeterminationSubFormP
       </SectionField>
 
       <SectionField
-        label="Sugested fee"
+        label="Suggested fee"
         tooltip="Licence Administration Fee (LAF) *: If the financial gain far outweighs the public benefit, Fair Market Value should be considered over Licence Administration Fee."
         labelWidth="2"
         contentWidth="8"

diff --git a/source/frontend/src/features/leases/add/__snapshots__/FeeDeterminationSubForm.test.tsx.snap b/source/frontend/src/features/leases/add/__snapshots__/FeeDeterminationSubForm.test.tsx.snap
@@ -161,7 +161,7 @@ exports[`LeaseFeeDeterminationSubForm component > renders as expected 1`] = `
           <label
             class="c2"
           >
-            Sugested fee:
+            Suggested fee:
             <span>
               <span
                 class="tooltip-icon"

diff --git a/...res/mapSideBar/acquisition/tabs/compensation/update/UpdateCompensationRequisitionForm.tsx b/...res/mapSideBar/acquisition/tabs/compensation/update/UpdateCompensationRequisitionForm.tsx
@@ -120,7 +120,7 @@ const UpdateCompensationRequisitionForm: React.FC<CompensationRequisitionFormPro
   }, [activitiesUpdated]);
 
   const handleSubmit = async (values: CompensationRequisitionFormModel) => {
-    if (values.status === 'final') {
+    if (initialValues.status !== 'final' && values.status === 'final') {
       setShowModal(true);
     } else {
       await onSave(values);