From a17cd85756d6b292ec92eb42b7007404e62c5638 Mon Sep 17 00:00:00 2001
From: devinleighsmith <devinleighsmith@gmail.com>
Date: Wed, 21 Jan 2026 17:55:11 -0800
Subject: [PATCH 01/13] psp-11168 ensure that enriched region/district is added
 to property search results. Correct display of search results menu options.

---
 source/backend/api/Pims.Api.csproj            |  8 ++--
 source/frontend/package-lock.json             |  2 +-
 source/frontend/package.json                  |  2 +-
 .../src/components/common/Section/Section.tsx |  7 ++-
 .../components/common/mapFSM/useMapSearch.tsx | 20 ++++----
 .../Control/Search/SearchContainer.tsx        |  1 +
 .../leaflet/Control/Search/SearchView.tsx     | 47 +++++++++----------
 .../activity/detail/InvoiceView.tsx           |  2 +-
 8 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/source/backend/api/Pims.Api.csproj b/source/backend/api/Pims.Api.csproj
index b661349ed1..e9202779c5 100644
--- 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.15.0-115.51</Version>
-    <AssemblyVersion>5.15.0.115</AssemblyVersion>
+    <Version>5.15.1-115.51</Version>
+    <AssemblyVersion>5.15.1.115</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>{16BC0468-78F6-4C91-87DA-7403C919E646}</ProjectGuid>
     <TargetFramework>net8.0</TargetFramework>
@@ -58,7 +58,7 @@
     <PackageReference Include="prometheus-net.AspNetCore.HealthChecks" Version="8.2.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
     <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.9.0" />
-    
+
     <!-- Transitive dependency overrides for security vulnerabilities -->
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
@@ -101,4 +101,4 @@
     <Folder Include="Areas\Keycloak\Mapping\User\" />
     <Folder Include="Helpers\Swagger\" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/source/frontend/package-lock.json b/source/frontend/package-lock.json
index 71e839f7ba..08938a4fd5 100644
--- a/source/frontend/package-lock.json
+++ b/source/frontend/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "5.15.0-115.0",
+  "version": "5.15.1-115.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/source/frontend/package.json b/source/frontend/package.json
index 89dc6b42de..b77a71caec 100644
--- a/source/frontend/package.json
+++ b/source/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "5.15.0-115.51",
+  "version": "5.15.1-115.51",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",
diff --git a/source/frontend/src/components/common/Section/Section.tsx b/source/frontend/src/components/common/Section/Section.tsx
index e3d18bc535..78cb8c9580 100644
--- a/source/frontend/src/components/common/Section/Section.tsx
+++ b/source/frontend/src/components/common/Section/Section.tsx
@@ -13,6 +13,7 @@ interface SectionProps {
   isCollapsable?: boolean;
   initiallyExpanded?: boolean;
   noPadding?: boolean;
+  hideOverflow?: boolean;
 }
 
 export const Section: React.FC<
@@ -28,6 +29,7 @@ export const Section: React.FC<
   initiallyExpanded,
   noPadding,
   className,
+  hideOverflow,
   ...rest
 }) => {
   const [isCollapsed, setIsCollapsed] = useState<boolean>(!(initiallyExpanded === true));
@@ -40,7 +42,10 @@ export const Section: React.FC<
       {exists(header) && (
         <StyledSectionHeader isStyledHeader={isStyledHeader}>
           <Row className="no-gutters">
-            <Col className="align-content-end" style={{ overflow: 'hidden' }}>
+            <Col
+              className="align-content-end"
+              style={{ overflow: hideOverflow === true ? 'hidden' : '' }}
+            >
               {header}
             </Col>
             {isCollapsable && (
diff --git a/source/frontend/src/components/common/mapFSM/useMapSearch.tsx b/source/frontend/src/components/common/mapFSM/useMapSearch.tsx
index aa9f613c99..b5e1eb5fb3 100644
--- a/source/frontend/src/components/common/mapFSM/useMapSearch.tsx
+++ b/source/frontend/src/components/common/mapFSM/useMapSearch.tsx
@@ -274,7 +274,7 @@ export const useMapSearch = () => {
           findPropertyIdsByProjectTask,
         ]);
 
-        const validFeatures = properties.features?.filter(
+        const validFeatures = properties?.features?.filter(
           feature =>
             !!feature?.geometry && projectPropertyIds.includes(feature.properties.PROPERTY_ID),
         );
@@ -355,10 +355,10 @@ export const useMapSearch = () => {
             highwayPlanFeatures: emptyHighwayFeatures,
           };
 
-          if (validFeatures.length === 0) {
+          if (validFeatures?.length === 0) {
             toast.info('No search results found');
           } else {
-            toast.info(`${validFeatures.length} properties found`);
+            toast.info(`${validFeatures?.length} properties found`);
           }
         }
       } catch (error) {
@@ -469,12 +469,12 @@ export const useMapSearch = () => {
           features: [...(pinPmbcData?.features || []), ...(pidPmbcData?.features || [])],
           bbox: pinPmbcData?.bbox || pidPmbcData?.bbox,
         };
-        const validPimsFeatures = pidPinInventoryData.features.filter(feature => exists(feature));
+        const validPimsFeatures = pidPinInventoryData?.features?.filter(feature => exists(feature));
 
         //filter out any pmbc features that do not have geometry, or are part of the pims feature result set.
-        const validPmbcFeatures = attributedFeatures.features.filter(feature => exists(feature));
+        const validPmbcFeatures = attributedFeatures?.features?.filter(feature => exists(feature));
         result = {
-          pimsFeatures: validPimsFeatures.length
+          pimsFeatures: validPimsFeatures?.length
             ? {
                 type: pidPinInventoryData.type,
                 bbox: pidPinInventoryData.bbox,
@@ -482,7 +482,7 @@ export const useMapSearch = () => {
               }
             : emptyPimsFeatureCollection,
           pimsLiteFeatures: emptyPimsLiteFeatureCollection,
-          fullyAttributedFeatures: validPmbcFeatures
+          fullyAttributedFeatures: validPmbcFeatures?.length
             ? {
                 type: attributedFeatures.type,
                 bbox: attributedFeatures.bbox,
@@ -493,10 +493,10 @@ export const useMapSearch = () => {
           highwayPlanFeatures: emptyHighwayFeatures,
         };
 
-        if (validPmbcFeatures.length === 0 && validPimsFeatures.length === 0) {
+        if (validPmbcFeatures?.length === 0 && validPimsFeatures?.length === 0) {
           toast.info('No search results found');
         } else {
-          toast.info(`${validPmbcFeatures.length + validPimsFeatures.length} properties found`);
+          toast.info(`${validPmbcFeatures?.length + validPimsFeatures?.length} properties found`);
         }
       } catch (error) {
         toast.error((error as Error).message, { autoClose: 7000 });
@@ -550,7 +550,7 @@ export const useMapSearch = () => {
           pimsLiteFeatures: {
             type: pidPinInventoryData.type,
             bbox: pidPinInventoryData.bbox,
-            features: validFeatures.map(vf => ({
+            features: validFeatures?.map(vf => ({
               type: vf.type,
               geometry: vf.geometry ?? vf?.properties?.LOCATION,
               id: vf.id,
diff --git a/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx b/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
index 126ca97726..9e5e6ab5f6 100644
--- a/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
@@ -169,6 +169,7 @@ export const SearchContainer: React.FC<ISearchContainerProps> = ({ View }) => {
       propertyFilter={mapSearchCriteria ?? defaultPropertyFilter}
       onFilterChange={handleMapFilterChange}
       searchResult={mapFeatureData}
+      selectedFeatureDatasets={selectedFeatureDatasets}
       canAddToOpenFile={isEditPropertiesMode}
       onCreateResearchFile={onCreateResearchFile}
       onCreateAcquisitionFile={onCreateAcquisitionFile}
diff --git a/source/frontend/src/components/maps/leaflet/Control/Search/SearchView.tsx b/source/frontend/src/components/maps/leaflet/Control/Search/SearchView.tsx
index c9d30e8fc5..d0773141a9 100644
--- a/source/frontend/src/components/maps/leaflet/Control/Search/SearchView.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/Search/SearchView.tsx
@@ -10,6 +10,7 @@ import LeaseIcon from '@/assets/images/lease-icon.svg?react';
 import ManagementIcon from '@/assets/images/management-icon.svg?react';
 import ResearchIcon from '@/assets/images/research-icon.svg?react';
 import { MapFeatureData } from '@/components/common/mapFSM/models';
+import { SelectedFeatureDataset } from '@/components/common/mapFSM/useLocationFeatureLoader';
 import MoreOptionsMenu, { MenuOption } from '@/components/common/MoreOptionsMenu';
 import { Section } from '@/components/common/Section/Section';
 import { SimpleSectionHeader } from '@/components/common/SimpleSectionHeader';
@@ -23,7 +24,6 @@ import { ParcelDataset } from '@/features/properties/parcelList/models';
 import { ParcelListContainer } from '@/features/properties/parcelList/ParcelListContainer';
 import { ParcelListView } from '@/features/properties/parcelList/ParcelListView';
 import useKeycloakWrapper from '@/hooks/useKeycloakWrapper';
-import { PMBC_FullyAttributed_Feature_Properties } from '@/models/layers/parcelMapBC';
 import { PIMS_Property_View } from '@/models/layers/pimsPropertyView';
 import { exists } from '@/utils';
 import { isStrataCommonProperty } from '@/utils/propertyUtils';
@@ -34,6 +34,7 @@ export interface ISearchViewProps {
   onFilterChange: (filter: IPropertyFilter) => void;
   propertyFilter: IPropertyFilter;
   searchResult: MapFeatureData;
+  selectedFeatureDatasets?: SelectedFeatureDataset[];
   canAddToOpenFile?: boolean;
   onCreateResearchFile: () => void;
   onCreateAcquisitionFile: () => void;
@@ -54,31 +55,29 @@ interface PropertyProjection<T> {
 export const SearchView: React.FC<ISearchViewProps> = props => {
   const keycloak = useKeycloakWrapper();
 
-  const groupedFeatures = chain(props.searchResult?.fullyAttributedFeatures.features)
-    .groupBy(feature => feature?.properties?.PLAN_NUMBER)
-    .map(
-      planGroup =>
-        planGroup
-          ?.map<PropertyProjection<PMBC_FullyAttributed_Feature_Properties>>(x => ({
-            pid: x.properties.PID_FORMATTED,
-            pin: exists(x.properties.PIN) ? String(x.properties.PIN) : null,
-            isStrataLot: isStrataCommonProperty(x),
-            feature: x,
-            plan: x.properties.PLAN_NUMBER,
-          }))
-          .sort((a, b) => {
-            if (a.isStrataLot === b.isStrataLot) return 0;
-            if (a.isStrataLot) return -1;
-            if (b.isStrataLot) return 1;
-            return 0;
-          }) ?? [],
-    );
+  const propertyProjections = useMemo(() => {
+    const fallbackFeatures = props.searchResult?.fullyAttributedFeatures?.features ?? [];
+
+    const baseParcels = props.selectedFeatureDatasets?.length
+      ? props.selectedFeatureDatasets.map(dataset =>
+          ParcelDataset.fromSelectedFeatureDataset(dataset),
+        )
+      : fallbackFeatures.map(feature => ParcelDataset.fromFullyAttributedFeature(feature));
 
-  const propertyProjections =
-    groupedFeatures
+    return chain(baseParcels)
+      .groupBy(parcel => parcel.pmbcFeature?.properties?.PLAN_NUMBER)
+      .map(group =>
+        group.toSorted((a, b) => {
+          const aIsStrata = a.pmbcFeature ? isStrataCommonProperty(a.pmbcFeature) : false;
+          const bIsStrata = b.pmbcFeature ? isStrataCommonProperty(b.pmbcFeature) : false;
+
+          if (aIsStrata === bIsStrata) return 0;
+          return aIsStrata ? -1 : 1;
+        }),
+      )
       .value()
-      .flatMap(x => x)
-      .map(x => ParcelDataset.fromFullyAttributedFeature(x.feature)) ?? [];
+      .flat();
+  }, [props.searchResult, props.selectedFeatureDatasets]);
 
   const pimsGroupedFeatures = chain(props.searchResult?.pimsFeatures.features)
     .groupBy(feature => feature?.properties?.SURVEY_PLAN_NUMBER)
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/InvoiceView.tsx b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/InvoiceView.tsx
index fc725b5770..afcc5dcce1 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/InvoiceView.tsx
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/detail/InvoiceView.tsx
@@ -28,7 +28,7 @@ export const InvoiceView: React.FunctionComponent<React.PropsWithChildren<IInvoi
   };
 
   return (
-    <Section header={getInvoiceHeader()} isCollapsable initiallyExpanded={false}>
+    <Section header={getInvoiceHeader()} isCollapsable initiallyExpanded={false} hideOverflow>
       <SectionField label="Invoice number" labelWidth={{ xs: 4 }} contentWidth={{ xs: 8 }}>
         {activityInvoice.invoiceNum}
       </SectionField>

From 35524d55cc71b72c726f4b428df3594dc7c855e3 Mon Sep 17 00:00:00 2001
From: devinleighsmith <devinleighsmith@gmail.com>
Date: Wed, 21 Jan 2026 18:02:52 -0800
Subject: [PATCH 02/13] update snapshots.

---
 .../FilterContentForm.test.tsx.snap            |  5 -----
 .../__snapshots__/LayersMenu.test.tsx.snap     |  2 --
 .../SearchContainer.test.tsx.snap              |  2 --
 .../MapSelectorContainer.test.tsx.snap         |  1 -
 ...ropertySearchSelectorFormView.test.tsx.snap |  1 -
 .../CreateOrganizationForm.test.tsx.snap       |  6 ------
 .../CreatePersonForm.test.tsx.snap             |  6 ------
 .../CreateContactContainer.test.tsx.snap       |  6 ------
 .../UpdateOrganizationForm.test.tsx.snap       |  7 -------
 .../UpdatePersonForm.test.tsx.snap             |  6 ------
 .../UpdateContactContainer.test.tsx.snap       |  6 ------
 .../DocumentDetailContainer.test.tsx.snap      |  1 -
 .../DocumentDetailForm.test.tsx.snap           |  1 -
 .../DocumentDetailView.test.tsx.snap           |  1 -
 .../DocumentListView.test.tsx.snap             |  1 -
 .../AddLeaseContainer.test.tsx.snap            |  6 ------
 .../AdministrationSubForm.test.tsx.snap        |  1 -
 .../FeeDeterminationSubForm.test.tsx.snap      |  1 -
 .../LeaseDetailSubForm.test.tsx.snap           |  1 -
 .../DepositsContainer.test.tsx.snap            |  3 ---
 .../__snapshots__/DepositNotes.test.tsx.snap   |  1 -
 .../DepositsReceivedContainer.test.tsx.snap    |  1 -
 .../DepositsReturnedContainer.test.tsx.snap    |  1 -
 .../DetailAdministration.test.tsx.snap         |  2 --
 .../DetailFeeDetermination.test.tsx.snap       |  2 --
 .../LeaseDetailsView.test.tsx.snap             |  1 -
 .../__snapshots__/LeaseTeamView.test.tsx.snap  |  1 -
 .../PropertiesInformation.test.tsx.snap        |  1 -
 .../UpdateLeaseForm.test.tsx.snap              |  5 -----
 .../__snapshots__/DocumentsPage.test.tsx.snap  |  1 -
 .../__snapshots__/Insurance.test.tsx.snap      |  4 ----
 .../EditInsuranceContainer.test.tsx.snap       |  2 --
 .../PeriodPaymentsContainer.test.tsx.snap      |  4 ----
 .../__snapshots__/PaymentsView.test.tsx.snap   |  2 --
 .../PaymentPeriodsView.test.tsx.snap           |  2 --
 .../AddLeaseStakeholderForm.test.tsx.snap      |  1 -
 .../ViewStakeholderForm.test.tsx.snap          |  6 ------
 .../LeasePropertySelector.test.tsx.snap        |  2 --
 .../AcquisitionView.test.tsx.snap              |  7 -------
 .../AcquisitionPropertiesSubForm.test.tsx.snap |  1 -
 .../AddAcquisitionContainer.test.tsx.snap      | 18 ------------------
 .../AddAcquisitionForm.test.tsx.snap           | 18 ------------------
 .../AcquisitionFileTabs.test.tsx.snap          |  7 -------
 ...pdateAcquisitionAgreementForm.test.tsx.snap |  1 -
 .../__snapshots__/AgreementView.test.tsx.snap  |  3 ---
 ...ExpropriationEventHistoryView.test.tsx.snap |  1 -
 .../AcquisitionSummaryView.test.tsx.snap       |  7 -------
 .../UpdateAcquisitionForm.test.tsx.snap        |  7 -------
 .../StakeHolderView.test.tsx.snap              |  2 --
 .../UpdateStakeHolderForm.test.tsx.snap        |  2 --
 .../SubFileListView.test.tsx.snap              |  1 -
 ...ensationRequisitionDetailView.test.tsx.snap |  5 -----
 .../CompensationListView.test.tsx.snap         |  2 --
 ...teCompensationRequisitionForm.test.tsx.snap |  5 -----
 .../AddConsolidationView.test.tsx.snap         |  2 --
 .../DispositionView.test.tsx.snap              |  4 ----
 .../DispositionPropertiesSubForm.test.tsx.snap |  1 -
 .../DispositionFileTabs.test.tsx.snap          |  4 ----
 .../DispositionSummaryView.test.tsx.snap       |  4 ----
 .../UpdateDispositionForm.test.tsx.snap        |  4 ----
 .../OffersAndSaleView.test.tsx.snap            |  3 ---
 .../DispositionSaleForm.test.tsx.snap          |  1 -
 .../UpdateDispositionSaleView.test.tsx.snap    |  1 -
 .../ConsultationListView.test.tsx.snap         | 11 -----------
 .../ConsultationEditForm.test.tsx.snap         |  1 -
 .../__snapshots__/ManagementView.test.tsx.snap |  5 -----
 .../AddManagementContainerView.test.tsx.snap   |  6 ------
 .../ManagementPropertiesSubForm.test.tsx.snap  |  1 -
 .../ManagementFileTabs.test.tsx.snap           |  5 -----
 .../__snapshots__/ActivitiesTab.test.tsx.snap  |  2 --
 .../ManagementActivityEditForm.test.tsx.snap   |  3 ---
 .../ManagementSummaryView.test.tsx.snap        |  5 -----
 .../UpdateManagementForm.test.tsx.snap         |  4 ----
 .../__snapshots__/AddProjectForm.test.tsx.snap |  8 --------
 .../ProjectSummaryView.test.tsx.snap           |  4 ----
 .../LtsaPlanTabView.test.tsx.snap              |  3 ---
 .../PropertyAssociationTabView.test.tsx.snap   |  5 -----
 .../OperationSectionView.test.tsx.snap         |  4 ----
 .../__snapshots__/OperationView.test.tsx.snap  |  1 -
 ...pdatePropertyDetailsContainer.test.tsx.snap |  5 -----
 .../UpdatePropertyDetailsForm.test.tsx.snap    |  5 -----
 .../InvoiceTotalsForm.test.tsx.snap            |  1 -
 .../PropertyActivityEditForm.test.tsx.snap     |  2 --
 .../ManagementActivitiesListView.test.tsx.snap |  1 -
 .../PropertyContactListView.test.tsx.snap      |  1 -
 .../PropertyManagementDetailView.test.tsx.snap |  1 -
 .../PropertyContactEditForm.test.tsx.snap      |  1 -
 .../PropertyManagementUpdateForm.test.tsx.snap |  1 -
 .../PropertyResearchTabView.test.tsx.snap      |  2 --
 .../UpdatePropertyForm.test.tsx.snap           |  2 --
 .../TakesDetailView.test.tsx.snap              |  3 ---
 .../__snapshots__/TakeUpdateForm.test.tsx.snap |  3 ---
 .../ResearchContainer.test.tsx.snap            |  5 -----
 .../AddResearchContainer.test.tsx.snap         |  3 ---
 .../AddResearchForm.test.tsx.snap              |  3 ---
 .../ResearchProperties.test.tsx.snap           |  2 --
 .../ResearchTabsContainer.test.tsx.snap        |  5 -----
 .../ResearchSummaryView.test.tsx.snap          |  5 -----
 .../UpdateSummaryContainer.test.tsx.snap       |  6 ------
 .../UpdateSummaryForm.test.tsx.snap            |  6 ------
 ...ilePropertiesImprovementsView.test.tsx.snap |  1 -
 .../__snapshots__/ChecklistView.test.tsx.snap  |  6 ------
 .../UpdateChecklistForm.test.tsx.snap          |  6 ------
 .../UpdateProperties.test.tsx.snap             |  1 -
 .../AddSubdivisionView.test.tsx.snap           |  2 --
 .../NoteListContainer.test.tsx.snap            |  1 -
 106 files changed, 362 deletions(-)

diff --git a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap
index d125bc21c1..b9c29d7c74 100644
--- a/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap
+++ b/source/frontend/src/components/maps/leaflet/Control/AdvancedFilter/__snapshots__/FilterContentForm.test.tsx.snap
@@ -334,7 +334,6 @@ exports[`FilterContentForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Show Ownership
           </div>
@@ -620,7 +619,6 @@ exports[`FilterContentForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -733,7 +731,6 @@ exports[`FilterContentForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Tenure
           </div>
@@ -1124,7 +1121,6 @@ exports[`FilterContentForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Lease / Licence
           </div>
@@ -1752,7 +1748,6 @@ exports[`FilterContentForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Anomaly
           </div>
diff --git a/source/frontend/src/components/maps/leaflet/Control/LayersControl/__snapshots__/LayersMenu.test.tsx.snap b/source/frontend/src/components/maps/leaflet/Control/LayersControl/__snapshots__/LayersMenu.test.tsx.snap
index 74f6264587..e6e242a38f 100644
--- a/source/frontend/src/components/maps/leaflet/Control/LayersControl/__snapshots__/LayersMenu.test.tsx.snap
+++ b/source/frontend/src/components/maps/leaflet/Control/LayersControl/__snapshots__/LayersMenu.test.tsx.snap
@@ -158,7 +158,6 @@ exports[`LayersMenu View > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               PIMS
             </div>
@@ -392,7 +391,6 @@ exports[`LayersMenu View > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               External
             </div>
diff --git a/source/frontend/src/components/maps/leaflet/Control/Search/__snapshots__/SearchContainer.test.tsx.snap b/source/frontend/src/components/maps/leaflet/Control/Search/__snapshots__/SearchContainer.test.tsx.snap
index 2a4c5e7dbd..67131cdb22 100644
--- a/source/frontend/src/components/maps/leaflet/Control/Search/__snapshots__/SearchContainer.test.tsx.snap
+++ b/source/frontend/src/components/maps/leaflet/Control/Search/__snapshots__/SearchContainer.test.tsx.snap
@@ -511,7 +511,6 @@ exports[`SearchContainer component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c4 no-gutters row"
@@ -606,7 +605,6 @@ exports[`SearchContainer component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c4 no-gutters row"
diff --git a/source/frontend/src/components/propertySelector/__snapshots__/MapSelectorContainer.test.tsx.snap b/source/frontend/src/components/propertySelector/__snapshots__/MapSelectorContainer.test.tsx.snap
index d13750741d..7885b90d96 100644
--- a/source/frontend/src/components/propertySelector/__snapshots__/MapSelectorContainer.test.tsx.snap
+++ b/source/frontend/src/components/propertySelector/__snapshots__/MapSelectorContainer.test.tsx.snap
@@ -607,7 +607,6 @@ exports[`MapSelectorContainer component > renders as expected when provided no p
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Search for a property
               </div>
diff --git a/source/frontend/src/components/propertySelector/search/__snapshots__/PropertySearchSelectorFormView.test.tsx.snap b/source/frontend/src/components/propertySelector/search/__snapshots__/PropertySearchSelectorFormView.test.tsx.snap
index 2978853224..fcf6577ba3 100644
--- a/source/frontend/src/components/propertySelector/search/__snapshots__/PropertySearchSelectorFormView.test.tsx.snap
+++ b/source/frontend/src/components/propertySelector/search/__snapshots__/PropertySearchSelectorFormView.test.tsx.snap
@@ -268,7 +268,6 @@ exports[`PropertySearchSelectorFormView component > renders as expected when pro
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Search for a property
         </div>
diff --git a/source/frontend/src/features/contacts/contact/create/Organization/__snapshots__/CreateOrganizationForm.test.tsx.snap b/source/frontend/src/features/contacts/contact/create/Organization/__snapshots__/CreateOrganizationForm.test.tsx.snap
index a1a8f222d1..8a22d598b7 100644
--- a/source/frontend/src/features/contacts/contact/create/Organization/__snapshots__/CreateOrganizationForm.test.tsx.snap
+++ b/source/frontend/src/features/contacts/contact/create/Organization/__snapshots__/CreateOrganizationForm.test.tsx.snap
@@ -330,7 +330,6 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Contact Details
               </div>
@@ -439,7 +438,6 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="d-flex align-items-center"
@@ -742,7 +740,6 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Mailing Address
               </div>
@@ -1000,7 +997,6 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Property Address
               </div>
@@ -1258,7 +1254,6 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Billing Address
               </div>
@@ -1516,7 +1511,6 @@ exports[`CreateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Comments
               </div>
diff --git a/source/frontend/src/features/contacts/contact/create/Person/__snapshots__/CreatePersonForm.test.tsx.snap b/source/frontend/src/features/contacts/contact/create/Person/__snapshots__/CreatePersonForm.test.tsx.snap
index 9fe9fccb5e..8c3cdf5309 100644
--- a/source/frontend/src/features/contacts/contact/create/Person/__snapshots__/CreatePersonForm.test.tsx.snap
+++ b/source/frontend/src/features/contacts/contact/create/Person/__snapshots__/CreatePersonForm.test.tsx.snap
@@ -343,7 +343,6 @@ exports[`CreatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Contact Details
               </div>
@@ -552,7 +551,6 @@ exports[`CreatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="d-flex align-items-center"
@@ -855,7 +853,6 @@ exports[`CreatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="d-flex align-items-center"
@@ -1145,7 +1142,6 @@ exports[`CreatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Property Address
               </div>
@@ -1403,7 +1399,6 @@ exports[`CreatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Billing Address
               </div>
@@ -1661,7 +1656,6 @@ exports[`CreatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Comments
               </div>
diff --git a/source/frontend/src/features/contacts/contact/create/__snapshots__/CreateContactContainer.test.tsx.snap b/source/frontend/src/features/contacts/contact/create/__snapshots__/CreateContactContainer.test.tsx.snap
index 93599c94ea..a83c44414b 100644
--- a/source/frontend/src/features/contacts/contact/create/__snapshots__/CreateContactContainer.test.tsx.snap
+++ b/source/frontend/src/features/contacts/contact/create/__snapshots__/CreateContactContainer.test.tsx.snap
@@ -570,7 +570,6 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Contact Details
                   </div>
@@ -779,7 +778,6 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     <div
                       class="d-flex align-items-center"
@@ -1082,7 +1080,6 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     <div
                       class="d-flex align-items-center"
@@ -1372,7 +1369,6 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Property Address
                   </div>
@@ -1630,7 +1626,6 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Billing Address
                   </div>
@@ -1888,7 +1883,6 @@ exports[`CreateContactContainer component > should render as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Comments
                   </div>
diff --git a/source/frontend/src/features/contacts/contact/edit/Organization/__snapshots__/UpdateOrganizationForm.test.tsx.snap b/source/frontend/src/features/contacts/contact/edit/Organization/__snapshots__/UpdateOrganizationForm.test.tsx.snap
index f8488e757b..0bbcc2e2ee 100644
--- a/source/frontend/src/features/contacts/contact/edit/Organization/__snapshots__/UpdateOrganizationForm.test.tsx.snap
+++ b/source/frontend/src/features/contacts/contact/edit/Organization/__snapshots__/UpdateOrganizationForm.test.tsx.snap
@@ -387,7 +387,6 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Contact Details
               </div>
@@ -496,7 +495,6 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="d-flex align-items-center"
@@ -799,7 +797,6 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Individual Contacts
               </div>
@@ -859,7 +856,6 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Mailing Address
               </div>
@@ -1117,7 +1113,6 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Property Address
               </div>
@@ -1375,7 +1370,6 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Billing Address
               </div>
@@ -1633,7 +1627,6 @@ exports[`UpdateOrganizationForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Comments
               </div>
diff --git a/source/frontend/src/features/contacts/contact/edit/Person/__snapshots__/UpdatePersonForm.test.tsx.snap b/source/frontend/src/features/contacts/contact/edit/Person/__snapshots__/UpdatePersonForm.test.tsx.snap
index 24ccca45bd..d795900a07 100644
--- a/source/frontend/src/features/contacts/contact/edit/Person/__snapshots__/UpdatePersonForm.test.tsx.snap
+++ b/source/frontend/src/features/contacts/contact/edit/Person/__snapshots__/UpdatePersonForm.test.tsx.snap
@@ -416,7 +416,6 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Contact Details
               </div>
@@ -626,7 +625,6 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="d-flex align-items-center"
@@ -929,7 +927,6 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="d-flex align-items-center"
@@ -1218,7 +1215,6 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Property Address
               </div>
@@ -1476,7 +1472,6 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Billing Address
               </div>
@@ -1734,7 +1729,6 @@ exports[`UpdatePersonForm > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Comments
               </div>
diff --git a/source/frontend/src/features/contacts/contact/edit/__snapshots__/UpdateContactContainer.test.tsx.snap b/source/frontend/src/features/contacts/contact/edit/__snapshots__/UpdateContactContainer.test.tsx.snap
index c50c7265dc..cc35813bcb 100644
--- a/source/frontend/src/features/contacts/contact/edit/__snapshots__/UpdateContactContainer.test.tsx.snap
+++ b/source/frontend/src/features/contacts/contact/edit/__snapshots__/UpdateContactContainer.test.tsx.snap
@@ -585,7 +585,6 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Contact Details
                   </div>
@@ -792,7 +791,6 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     <div
                       class="d-flex align-items-center"
@@ -1095,7 +1093,6 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     <div
                       class="d-flex align-items-center"
@@ -1385,7 +1382,6 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Property Address
                   </div>
@@ -1643,7 +1639,6 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Billing Address
                   </div>
@@ -1901,7 +1896,6 @@ exports[`UpdateContactContainer > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Comments
                   </div>
diff --git a/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailContainer.test.tsx.snap b/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailContainer.test.tsx.snap
index 66368685e7..b02819e1c0 100644
--- a/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailContainer.test.tsx.snap
+++ b/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailContainer.test.tsx.snap
@@ -312,7 +312,6 @@ exports[`DocumentDetailContainer component > renders the underlying form 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Document Information
             <span
diff --git a/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailForm.test.tsx.snap b/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailForm.test.tsx.snap
index 2d3c8fd626..80de6076cb 100644
--- a/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailForm.test.tsx.snap
+++ b/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailForm.test.tsx.snap
@@ -284,7 +284,6 @@ exports[`DocumentDetailForm component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Document Information
               <span
diff --git a/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailView.test.tsx.snap b/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailView.test.tsx.snap
index ea50f8d5f4..4cd72342a9 100644
--- a/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailView.test.tsx.snap
+++ b/source/frontend/src/features/documents/documentDetail/__snapshots__/DocumentDetailView.test.tsx.snap
@@ -313,7 +313,6 @@ exports[`DocumentDetailView component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Document Information
               <span
diff --git a/source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap b/source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap
index 07d04211ae..18ece02f6d 100644
--- a/source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap
+++ b/source/frontend/src/features/documents/list/__snapshots__/DocumentListView.test.tsx.snap
@@ -387,7 +387,6 @@ exports[`Document List View > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="c2 no-gutters row"
diff --git a/source/frontend/src/features/leases/add/__snapshots__/AddLeaseContainer.test.tsx.snap b/source/frontend/src/features/leases/add/__snapshots__/AddLeaseContainer.test.tsx.snap
index ca88088494..7d8b7bbf13 100644
--- a/source/frontend/src/features/leases/add/__snapshots__/AddLeaseContainer.test.tsx.snap
+++ b/source/frontend/src/features/leases/add/__snapshots__/AddLeaseContainer.test.tsx.snap
@@ -635,7 +635,6 @@ exports[`AddLeaseContainer component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Original Agreement
                 </div>
@@ -1019,7 +1018,6 @@ exports[`AddLeaseContainer component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Properties to include in this file:
                 </div>
@@ -1149,7 +1147,6 @@ exports[`AddLeaseContainer component > renders as expected 1`] = `
                   >
                     <div
                       class="align-content-end col"
-                      style="overflow: hidden;"
                     >
                       <div
                         class="row"
@@ -1242,7 +1239,6 @@ exports[`AddLeaseContainer component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Administration
                 </div>
@@ -2278,7 +2274,6 @@ exports[`AddLeaseContainer component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Lease & Licence Team
                 </div>
@@ -2312,7 +2307,6 @@ exports[`AddLeaseContainer component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Fee Determination
                 </div>
diff --git a/source/frontend/src/features/leases/add/__snapshots__/AdministrationSubForm.test.tsx.snap b/source/frontend/src/features/leases/add/__snapshots__/AdministrationSubForm.test.tsx.snap
index 3c4019bc0f..37b730d1df 100644
--- a/source/frontend/src/features/leases/add/__snapshots__/AdministrationSubForm.test.tsx.snap
+++ b/source/frontend/src/features/leases/add/__snapshots__/AdministrationSubForm.test.tsx.snap
@@ -133,7 +133,6 @@ exports[`AdministrationSubForm component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Administration
         </div>
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
index 6c2921d335..b966d7238f 100644
--- a/source/frontend/src/features/leases/add/__snapshots__/FeeDeterminationSubForm.test.tsx.snap
+++ b/source/frontend/src/features/leases/add/__snapshots__/FeeDeterminationSubForm.test.tsx.snap
@@ -66,7 +66,6 @@ exports[`LeaseFeeDeterminationSubForm component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Fee Determination
         </div>
diff --git a/source/frontend/src/features/leases/add/__snapshots__/LeaseDetailSubForm.test.tsx.snap b/source/frontend/src/features/leases/add/__snapshots__/LeaseDetailSubForm.test.tsx.snap
index ca9d62bfd6..6e4de69fba 100644
--- a/source/frontend/src/features/leases/add/__snapshots__/LeaseDetailSubForm.test.tsx.snap
+++ b/source/frontend/src/features/leases/add/__snapshots__/LeaseDetailSubForm.test.tsx.snap
@@ -69,7 +69,6 @@ exports[`LeaseDetailSubForm component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Original Agreement
         </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/deposits/__snapshots__/DepositsContainer.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/deposits/__snapshots__/DepositsContainer.test.tsx.snap
index fa1c019140..cd9cf543a0 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/deposits/__snapshots__/DepositsContainer.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/deposits/__snapshots__/DepositsContainer.test.tsx.snap
@@ -32,7 +32,6 @@ exports[`DepositsContainer > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
@@ -198,7 +197,6 @@ exports[`DepositsContainer > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Deposits Returned
         </div>
@@ -370,7 +368,6 @@ exports[`DepositsContainer > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <span>
             Deposit Comments
diff --git a/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositNotes/__snapshots__/DepositNotes.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositNotes/__snapshots__/DepositNotes.test.tsx.snap
index bb52e2d9d0..2f30633b2f 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositNotes/__snapshots__/DepositNotes.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositNotes/__snapshots__/DepositNotes.test.tsx.snap
@@ -38,7 +38,6 @@ exports[`DepositNotes component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <span>
             Deposit Comments
diff --git a/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositsReceivedContainer/__snapshots__/DepositsReceivedContainer.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositsReceivedContainer/__snapshots__/DepositsReceivedContainer.test.tsx.snap
index f19cd0e54e..d54b8da4ec 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositsReceivedContainer/__snapshots__/DepositsReceivedContainer.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositsReceivedContainer/__snapshots__/DepositsReceivedContainer.test.tsx.snap
@@ -42,7 +42,6 @@ exports[`DepositsReceivedContainer component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
diff --git a/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositsReturnedContainer/__snapshots__/DepositsReturnedContainer.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositsReturnedContainer/__snapshots__/DepositsReturnedContainer.test.tsx.snap
index 2dc874739a..9690e4883a 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositsReturnedContainer/__snapshots__/DepositsReturnedContainer.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/deposits/components/DepositsReturnedContainer/__snapshots__/DepositsReturnedContainer.test.tsx.snap
@@ -32,7 +32,6 @@ exports[`DepositsReturnedContainer component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Deposits Returned
         </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/DetailAdministration.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/DetailAdministration.test.tsx.snap
index e6c646bca4..62bb2a59af 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/DetailAdministration.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/DetailAdministration.test.tsx.snap
@@ -49,7 +49,6 @@ exports[`DetailAdministration component > renders a complete lease as expected 1
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Administration
         </div>
@@ -365,7 +364,6 @@ exports[`DetailAdministration component > renders minimally as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Administration
         </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/DetailFeeDetermination.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/DetailFeeDetermination.test.tsx.snap
index 81782adb7e..1561b873fd 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/DetailFeeDetermination.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/DetailFeeDetermination.test.tsx.snap
@@ -54,7 +54,6 @@ exports[`DetailFeeDetermination component > renders a complete lease as expected
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Fee Determination
         </div>
@@ -279,7 +278,6 @@ exports[`DetailFeeDetermination component > renders minimally as expected 1`] =
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Fee Determination
         </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/LeaseDetailsView.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/LeaseDetailsView.test.tsx.snap
index 3f51cd6572..eb80abc190 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/LeaseDetailsView.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/LeaseDetailsView.test.tsx.snap
@@ -43,7 +43,6 @@ exports[`LeaseDetailView component > renders minimally as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Original Agreement
         </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/LeaseTeamView.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/LeaseTeamView.test.tsx.snap
index 570c8f7589..e2a0fb5717 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/LeaseTeamView.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/LeaseTeamView.test.tsx.snap
@@ -32,7 +32,6 @@ exports[`LeaseTeamView component > renders empty lease team 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Lease & Licence Team
         </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/PropertiesInformation.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/PropertiesInformation.test.tsx.snap
index 021b832be5..4b26f4568d 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/PropertiesInformation.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/PropertiesInformation.test.tsx.snap
@@ -69,7 +69,6 @@ exports[`LeasePropertiesInformation component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Property Information
         </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/UpdateLeaseForm.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/UpdateLeaseForm.test.tsx.snap
index b73a425d7e..feb540a211 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/UpdateLeaseForm.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/details/__snapshots__/UpdateLeaseForm.test.tsx.snap
@@ -375,7 +375,6 @@ exports[`UpdateLeaseForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Original Agreement
           </div>
@@ -759,7 +758,6 @@ exports[`UpdateLeaseForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Renewal Options
           </div>
@@ -792,7 +790,6 @@ exports[`UpdateLeaseForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Administration
           </div>
@@ -1821,7 +1818,6 @@ exports[`UpdateLeaseForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Lease & Licence Team
           </div>
@@ -1855,7 +1851,6 @@ exports[`UpdateLeaseForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Fee Determination
           </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/documents/__snapshots__/DocumentsPage.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/documents/__snapshots__/DocumentsPage.test.tsx.snap
index ee6186f227..bc606bc813 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/documents/__snapshots__/DocumentsPage.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/documents/__snapshots__/DocumentsPage.test.tsx.snap
@@ -313,7 +313,6 @@ exports[`Lease Documents Page > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="c2 no-gutters row"
diff --git a/source/frontend/src/features/leases/detail/LeasePages/insurance/details/__snapshots__/Insurance.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/insurance/details/__snapshots__/Insurance.test.tsx.snap
index 8118e136ce..40406148da 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/insurance/details/__snapshots__/Insurance.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/insurance/details/__snapshots__/Insurance.test.tsx.snap
@@ -73,7 +73,6 @@ exports[`Edit Lease Insurance > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Required Coverage
           </div>
@@ -154,7 +153,6 @@ exports[`Edit Lease Insurance > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Home Insurance
           </div>
@@ -382,7 +380,6 @@ exports[`Lease Insurance > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Required insurance
           </div>
@@ -414,7 +411,6 @@ exports[`Lease Insurance > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Home Insurance
             </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/insurance/edit/__snapshots__/EditInsuranceContainer.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/insurance/edit/__snapshots__/EditInsuranceContainer.test.tsx.snap
index 4160790973..c90c0c5d4c 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/insurance/edit/__snapshots__/EditInsuranceContainer.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/insurance/edit/__snapshots__/EditInsuranceContainer.test.tsx.snap
@@ -73,7 +73,6 @@ exports[`Edit Lease Insurance > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Required Coverage
           </div>
@@ -154,7 +153,6 @@ exports[`Edit Lease Insurance > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Home Insurance
           </div>
diff --git a/source/frontend/src/features/leases/detail/LeasePages/payment/__snapshots__/PeriodPaymentsContainer.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/payment/__snapshots__/PeriodPaymentsContainer.test.tsx.snap
index bbfef6628b..ee2335b790 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/payment/__snapshots__/PeriodPaymentsContainer.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/payment/__snapshots__/PeriodPaymentsContainer.test.tsx.snap
@@ -276,7 +276,6 @@ exports[`PaymentsView component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end c2 row"
@@ -608,7 +607,6 @@ exports[`PaymentsView component > renders with data as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end c2 row"
@@ -1038,7 +1036,6 @@ exports[`PeriodsPaymentsContainer component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
@@ -1929,7 +1926,6 @@ exports[`PeriodsPaymentsContainer component > renders with data as expected 1`]
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
diff --git a/source/frontend/src/features/leases/detail/LeasePages/payment/table/payments/__snapshots__/PaymentsView.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/payment/table/payments/__snapshots__/PaymentsView.test.tsx.snap
index 99ce3f1da6..771197cbe3 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/payment/table/payments/__snapshots__/PaymentsView.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/payment/table/payments/__snapshots__/PaymentsView.test.tsx.snap
@@ -276,7 +276,6 @@ exports[`PaymentsView component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end c2 row"
@@ -608,7 +607,6 @@ exports[`PaymentsView component > renders with data as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end c2 row"
diff --git a/source/frontend/src/features/leases/detail/LeasePages/payment/table/periods/__snapshots__/PaymentPeriodsView.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/payment/table/periods/__snapshots__/PaymentPeriodsView.test.tsx.snap
index af1380ffcd..a0f8b43616 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/payment/table/periods/__snapshots__/PaymentPeriodsView.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/payment/table/periods/__snapshots__/PaymentPeriodsView.test.tsx.snap
@@ -260,7 +260,6 @@ exports[`PeriodsForm component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
@@ -970,7 +969,6 @@ exports[`PeriodsForm component > renders with data as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
diff --git a/source/frontend/src/features/leases/detail/LeasePages/stakeholders/__snapshots__/AddLeaseStakeholderForm.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/stakeholders/__snapshots__/AddLeaseStakeholderForm.test.tsx.snap
index 86acbdc344..6883d82ae5 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/stakeholders/__snapshots__/AddLeaseStakeholderForm.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/stakeholders/__snapshots__/AddLeaseStakeholderForm.test.tsx.snap
@@ -288,7 +288,6 @@ exports[`AddLeaseTenantForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="no-gutters justify-content-between align-items-end row"
diff --git a/source/frontend/src/features/leases/detail/LeasePages/stakeholders/__snapshots__/ViewStakeholderForm.test.tsx.snap b/source/frontend/src/features/leases/detail/LeasePages/stakeholders/__snapshots__/ViewStakeholderForm.test.tsx.snap
index a29a84656c..b9bf90210a 100644
--- a/source/frontend/src/features/leases/detail/LeasePages/stakeholders/__snapshots__/ViewStakeholderForm.test.tsx.snap
+++ b/source/frontend/src/features/leases/detail/LeasePages/stakeholders/__snapshots__/ViewStakeholderForm.test.tsx.snap
@@ -288,7 +288,6 @@ exports[`AddLeaseTenantForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="no-gutters justify-content-between align-items-end row"
@@ -533,7 +532,6 @@ exports[`Tenant component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Assignee
         </div>
@@ -569,7 +567,6 @@ exports[`Tenant component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Property manager
         </div>
@@ -605,7 +602,6 @@ exports[`Tenant component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Representative
         </div>
@@ -641,7 +637,6 @@ exports[`Tenant component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Tenant
         </div>
@@ -677,7 +672,6 @@ exports[`Tenant component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Unknown
         </div>
diff --git a/source/frontend/src/features/leases/shared/propertyPicker/__snapshots__/LeasePropertySelector.test.tsx.snap b/source/frontend/src/features/leases/shared/propertyPicker/__snapshots__/LeasePropertySelector.test.tsx.snap
index 499bc696b9..b383371196 100644
--- a/source/frontend/src/features/leases/shared/propertyPicker/__snapshots__/LeasePropertySelector.test.tsx.snap
+++ b/source/frontend/src/features/leases/shared/propertyPicker/__snapshots__/LeasePropertySelector.test.tsx.snap
@@ -462,7 +462,6 @@ exports[`LeasePropertySelector component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Properties to include in this file:
         </div>
@@ -592,7 +591,6 @@ exports[`LeasePropertySelector component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               <div
                 class="row"
diff --git a/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
index a55e0c644b..5ea82ca6ee 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/__snapshots__/AcquisitionView.test.tsx.snap
@@ -1278,7 +1278,6 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Project
                             </div>
@@ -1352,7 +1351,6 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Progress Statuses
                             </div>
@@ -1535,7 +1533,6 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Schedule
                             </div>
@@ -1674,7 +1671,6 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Acquisition Details
                             </div>
@@ -1844,7 +1840,6 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Acquisition Team
                             </div>
@@ -1948,7 +1943,6 @@ exports[`AcquisitionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Owner Information
                             </div>
@@ -2422,7 +2416,6 @@ Canada
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Notice of Claim
                             </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AcquisitionPropertiesSubForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AcquisitionPropertiesSubForm.test.tsx.snap
index fdd710cba7..49fc4724da 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AcquisitionPropertiesSubForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AcquisitionPropertiesSubForm.test.tsx.snap
@@ -472,7 +472,6 @@ exports[`AcquisitionProperties component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Selected Properties
           </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AddAcquisitionContainer.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AddAcquisitionContainer.test.tsx.snap
index 35a1dd925a..630ebea53a 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AddAcquisitionContainer.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AddAcquisitionContainer.test.tsx.snap
@@ -722,7 +722,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Project
                   </div>
@@ -933,7 +932,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Progress Statuses
                   </div>
@@ -1389,7 +1387,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Schedule
                   </div>
@@ -1643,7 +1640,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Properties to include in this sub-file:
                   </div>
@@ -1671,7 +1667,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                       >
                         <div
                           class="align-content-end col"
-                          style="overflow: hidden;"
                         >
                           Selected Properties
                         </div>
@@ -1838,7 +1833,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Acquisition Details
                   </div>
@@ -2283,7 +2277,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Acquisition Team
                   </div>
@@ -2699,7 +2692,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Sub-Interest
                   </div>
@@ -2914,7 +2906,6 @@ exports[`AddAcquisitionContainer component > Sub-interest file > renders as expe
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Notice of Claim
                   </div>
@@ -3707,7 +3698,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Project
                   </div>
@@ -3910,7 +3900,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Progress Statuses
                   </div>
@@ -4366,7 +4355,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Schedule
                   </div>
@@ -4620,7 +4608,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Properties to include in this file:
                   </div>
@@ -4648,7 +4635,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                       >
                         <div
                           class="align-content-end col"
-                          style="overflow: hidden;"
                         >
                           Selected Properties
                         </div>
@@ -4815,7 +4801,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Acquisition Details
                   </div>
@@ -5142,7 +5127,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Acquisition Team
                   </div>
@@ -5176,7 +5160,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Owners
                   </div>
@@ -5391,7 +5374,6 @@ exports[`AddAcquisitionContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Notice of Claim
                   </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AddAcquisitionForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AddAcquisitionForm.test.tsx.snap
index cb8c368be7..084c26cf11 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AddAcquisitionForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/add/__snapshots__/AddAcquisitionForm.test.tsx.snap
@@ -398,7 +398,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -609,7 +608,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Progress Statuses
           </div>
@@ -1065,7 +1063,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Schedule
           </div>
@@ -1319,7 +1316,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Properties to include in this sub-file:
           </div>
@@ -1347,7 +1343,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Selected Properties
                 </div>
@@ -1514,7 +1509,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Details
           </div>
@@ -1952,7 +1946,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Team
           </div>
@@ -1986,7 +1979,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Sub-Interest
           </div>
@@ -2201,7 +2193,6 @@ exports[`AddAcquisitionForm component > Sub-interest files > renders as expected
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Notice of Claim
           </div>
@@ -2693,7 +2684,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -2896,7 +2886,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Progress Statuses
           </div>
@@ -3352,7 +3341,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Schedule
           </div>
@@ -3606,7 +3594,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Properties to include in this file:
           </div>
@@ -3634,7 +3621,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Selected Properties
                 </div>
@@ -3801,7 +3787,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Details
           </div>
@@ -4121,7 +4106,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Team
           </div>
@@ -4155,7 +4139,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Owners
           </div>
@@ -4370,7 +4353,6 @@ exports[`AddAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Notice of Claim
           </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap
index 7c9a7e7f4b..49b18de99e 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/__snapshots__/AcquisitionFileTabs.test.tsx.snap
@@ -198,7 +198,6 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Project
                 </div>
@@ -272,7 +271,6 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Progress Statuses
                 </div>
@@ -455,7 +453,6 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Schedule
                 </div>
@@ -594,7 +591,6 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Acquisition Details
                 </div>
@@ -764,7 +760,6 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Acquisition Team
                 </div>
@@ -868,7 +863,6 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Owner Information
                 </div>
@@ -1034,7 +1028,6 @@ exports[`AcquisitionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Notice of Claim
                 </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/common/__snapshots__/UpdateAcquisitionAgreementForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/common/__snapshots__/UpdateAcquisitionAgreementForm.test.tsx.snap
index 3028ebd518..5d1979a9db 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/common/__snapshots__/UpdateAcquisitionAgreementForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/common/__snapshots__/UpdateAcquisitionAgreementForm.test.tsx.snap
@@ -343,7 +343,6 @@ exports[`UpdateAcquisitionAgreementView component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Agreement Details
             </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/detail/__snapshots__/AgreementView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/detail/__snapshots__/AgreementView.test.tsx.snap
index a1495dc7da..fac45c14b9 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/detail/__snapshots__/AgreementView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/agreement/detail/__snapshots__/AgreementView.test.tsx.snap
@@ -328,7 +328,6 @@ exports[`AgreementView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="no-gutters justify-content-between align-items-end row"
@@ -359,7 +358,6 @@ exports[`AgreementView component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   <div
                     class="c4"
@@ -654,7 +652,6 @@ exports[`AgreementView component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   <div
                     class="c4"
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/expropriation/history/__snapshots__/ExpropriationEventHistoryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/expropriation/history/__snapshots__/ExpropriationEventHistoryView.test.tsx.snap
index 4bd867a261..e66007f66c 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/expropriation/history/__snapshots__/ExpropriationEventHistoryView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/expropriation/history/__snapshots__/ExpropriationEventHistoryView.test.tsx.snap
@@ -307,7 +307,6 @@ exports[`ExpropriationEventHistoryView > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="c2 no-gutters row"
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap
index 8f3a358b86..77c1157a9a 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/detail/__snapshots__/AcquisitionSummaryView.test.tsx.snap
@@ -81,7 +81,6 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -155,7 +154,6 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Progress Statuses
           </div>
@@ -338,7 +336,6 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Schedule
           </div>
@@ -477,7 +474,6 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Details
           </div>
@@ -647,7 +643,6 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Team
           </div>
@@ -751,7 +746,6 @@ exports[`AcquisitionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Owner Information
           </div>
@@ -1227,7 +1221,6 @@ Canada
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Notice of Claim
           </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/update/__snapshots__/UpdateAcquisitionForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/update/__snapshots__/UpdateAcquisitionForm.test.tsx.snap
index 0d4ec5f593..e6b7fec106 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/update/__snapshots__/UpdateAcquisitionForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/fileDetails/update/__snapshots__/UpdateAcquisitionForm.test.tsx.snap
@@ -581,7 +581,6 @@ exports[`UpdateAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -807,7 +806,6 @@ exports[`UpdateAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Progress Statuses
           </div>
@@ -1263,7 +1261,6 @@ exports[`UpdateAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Schedule
           </div>
@@ -1517,7 +1514,6 @@ exports[`UpdateAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Details
           </div>
@@ -1849,7 +1845,6 @@ exports[`UpdateAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Team
           </div>
@@ -2265,7 +2260,6 @@ exports[`UpdateAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Owners
           </div>
@@ -4081,7 +4075,6 @@ exports[`UpdateAcquisitionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Notice of Claim
           </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/stakeholders/detail/__snapshots__/StakeHolderView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/stakeholders/detail/__snapshots__/StakeHolderView.test.tsx.snap
index 845f054eea..b961b5c299 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/stakeholders/detail/__snapshots__/StakeHolderView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/stakeholders/detail/__snapshots__/StakeHolderView.test.tsx.snap
@@ -54,7 +54,6 @@ exports[`StakeHolderView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Interests
           </div>
@@ -359,7 +358,6 @@ exports[`StakeHolderView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Non-interest Payees
           </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/stakeholders/update/__snapshots__/UpdateStakeHolderForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/stakeholders/update/__snapshots__/UpdateStakeHolderForm.test.tsx.snap
index 4adf90ab98..03aaf0d5f0 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/stakeholders/update/__snapshots__/UpdateStakeHolderForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/stakeholders/update/__snapshots__/UpdateStakeHolderForm.test.tsx.snap
@@ -404,7 +404,6 @@ exports[`UpdateStakeHolderForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Interests
           </div>
@@ -1714,7 +1713,6 @@ exports[`UpdateStakeHolderForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Non-interest Payees
           </div>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/tabs/subFiles/__snapshots__/SubFileListView.test.tsx.snap b/source/frontend/src/features/mapSideBar/acquisition/tabs/subFiles/__snapshots__/SubFileListView.test.tsx.snap
index a35502fe54..a60b17cf25 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/tabs/subFiles/__snapshots__/SubFileListView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/acquisition/tabs/subFiles/__snapshots__/SubFileListView.test.tsx.snap
@@ -78,7 +78,6 @@ exports[`SubFileListView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c3 no-gutters row"
diff --git a/source/frontend/src/features/mapSideBar/compensation/detail/__snapshots__/CompensationRequisitionDetailView.test.tsx.snap b/source/frontend/src/features/mapSideBar/compensation/detail/__snapshots__/CompensationRequisitionDetailView.test.tsx.snap
index 751dee016c..c42ad10b3e 100644
--- a/source/frontend/src/features/mapSideBar/compensation/detail/__snapshots__/CompensationRequisitionDetailView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/compensation/detail/__snapshots__/CompensationRequisitionDetailView.test.tsx.snap
@@ -446,7 +446,6 @@ exports[`Compensation Detail View Component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c5"
@@ -609,7 +608,6 @@ exports[`Compensation Detail View Component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="d-flex align-items-center"
@@ -684,7 +682,6 @@ exports[`Compensation Detail View Component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Financial Coding
           </div>
@@ -868,7 +865,6 @@ exports[`Compensation Detail View Component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Payment
           </div>
@@ -986,7 +982,6 @@ exports[`Compensation Detail View Component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Financial Activities
           </div>
diff --git a/source/frontend/src/features/mapSideBar/compensation/list/__snapshots__/CompensationListView.test.tsx.snap b/source/frontend/src/features/mapSideBar/compensation/list/__snapshots__/CompensationListView.test.tsx.snap
index ae71e969f8..86e6214791 100644
--- a/source/frontend/src/features/mapSideBar/compensation/list/__snapshots__/CompensationListView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/compensation/list/__snapshots__/CompensationListView.test.tsx.snap
@@ -362,7 +362,6 @@ exports[`compensation list view > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
@@ -674,7 +673,6 @@ exports[`compensation list view > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Requisitions in this File (H120)
         </div>
diff --git a/source/frontend/src/features/mapSideBar/compensation/update/__snapshots__/UpdateCompensationRequisitionForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/compensation/update/__snapshots__/UpdateCompensationRequisitionForm.test.tsx.snap
index d3fdee7c12..8fd301b529 100644
--- a/source/frontend/src/features/mapSideBar/compensation/update/__snapshots__/UpdateCompensationRequisitionForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/compensation/update/__snapshots__/UpdateCompensationRequisitionForm.test.tsx.snap
@@ -350,7 +350,6 @@ exports[`Compensation Requisition UpdateForm component > renders as expected 1`]
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Requisition Details
             </div>
@@ -582,7 +581,6 @@ exports[`Compensation Requisition UpdateForm component > renders as expected 1`]
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               <div
                 class="d-flex align-items-center"
@@ -776,7 +774,6 @@ exports[`Compensation Requisition UpdateForm component > renders as expected 1`]
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Financial Coding
             </div>
@@ -1094,7 +1091,6 @@ exports[`Compensation Requisition UpdateForm component > renders as expected 1`]
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Payment
             </div>
@@ -1416,7 +1412,6 @@ exports[`Compensation Requisition UpdateForm component > renders as expected 1`]
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Activities
             </div>
diff --git a/source/frontend/src/features/mapSideBar/consolidation/__snapshots__/AddConsolidationView.test.tsx.snap b/source/frontend/src/features/mapSideBar/consolidation/__snapshots__/AddConsolidationView.test.tsx.snap
index 7babb534d5..76c925e1b0 100644
--- a/source/frontend/src/features/mapSideBar/consolidation/__snapshots__/AddConsolidationView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/consolidation/__snapshots__/AddConsolidationView.test.tsx.snap
@@ -657,7 +657,6 @@ exports[`Add Consolidation View > matches snapshot 1`] = `
                     >
                       <div
                         class="align-content-end col"
-                        style="overflow: hidden;"
                       >
                         Selected Parents
                       </div>
@@ -723,7 +722,6 @@ exports[`Add Consolidation View > matches snapshot 1`] = `
                     >
                       <div
                         class="align-content-end col"
-                        style="overflow: hidden;"
                       >
                         Selected Child
                       </div>
diff --git a/source/frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
index f6f01cee85..452e3b3716 100644
--- a/source/frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/__snapshots__/DispositionView.test.tsx.snap
@@ -1204,7 +1204,6 @@ exports[`DispositionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Project
                             </div>
@@ -1280,7 +1279,6 @@ exports[`DispositionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Schedule
                             </div>
@@ -1338,7 +1336,6 @@ exports[`DispositionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Disposition Details
                             </div>
@@ -1586,7 +1583,6 @@ exports[`DispositionView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Disposition Team
                             </div>
diff --git a/source/frontend/src/features/mapSideBar/disposition/form/__snapshots__/DispositionPropertiesSubForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/form/__snapshots__/DispositionPropertiesSubForm.test.tsx.snap
index 5988254898..a0345d6202 100644
--- a/source/frontend/src/features/mapSideBar/disposition/form/__snapshots__/DispositionPropertiesSubForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/form/__snapshots__/DispositionPropertiesSubForm.test.tsx.snap
@@ -472,7 +472,6 @@ exports[`DispositionPropertiesSubForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="row"
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap
index 158695a129..ff27256810 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/__snapshots__/DispositionFileTabs.test.tsx.snap
@@ -202,7 +202,6 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Project
                 </div>
@@ -278,7 +277,6 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Schedule
                 </div>
@@ -336,7 +334,6 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Disposition Details
                 </div>
@@ -584,7 +581,6 @@ exports[`DispositionFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Disposition Team
                 </div>
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap
index 906546b0d4..98aeaab2b7 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/__snapshots__/DispositionSummaryView.test.tsx.snap
@@ -90,7 +90,6 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -166,7 +165,6 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Schedule
           </div>
@@ -224,7 +222,6 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Disposition Details
           </div>
@@ -472,7 +469,6 @@ exports[`DispositionSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Disposition Team
           </div>
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/update/__snapshots__/UpdateDispositionForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/update/__snapshots__/UpdateDispositionForm.test.tsx.snap
index 770d57ec94..0b2282dd3f 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/update/__snapshots__/UpdateDispositionForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/fileDetails/detail/update/__snapshots__/UpdateDispositionForm.test.tsx.snap
@@ -436,7 +436,6 @@ exports[`UpdateDispositionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -640,7 +639,6 @@ exports[`UpdateDispositionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Schedule
           </div>
@@ -757,7 +755,6 @@ exports[`UpdateDispositionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Disposition Details
           </div>
@@ -1314,7 +1311,6 @@ exports[`UpdateDispositionForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Disposition Team
           </div>
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/__snapshots__/OffersAndSaleView.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/__snapshots__/OffersAndSaleView.test.tsx.snap
index b46ee667ce..388b3c2ee7 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/__snapshots__/OffersAndSaleView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/__snapshots__/OffersAndSaleView.test.tsx.snap
@@ -59,7 +59,6 @@ exports[`Disposition Offer Detail View component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="c2"
@@ -111,7 +110,6 @@ exports[`Disposition Offer Detail View component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
@@ -241,7 +239,6 @@ exports[`Disposition Offer Detail View component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="c2"
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/form/__snapshots__/DispositionSaleForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/form/__snapshots__/DispositionSaleForm.test.tsx.snap
index 2fadf1e629..ebfc0d3394 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/form/__snapshots__/DispositionSaleForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/form/__snapshots__/DispositionSaleForm.test.tsx.snap
@@ -323,7 +323,6 @@ exports[`DispositionSaleForm  component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Sales Details
         </div>
diff --git a/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/update/__snapshots__/UpdateDispositionSaleView.test.tsx.snap b/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/update/__snapshots__/UpdateDispositionSaleView.test.tsx.snap
index 5dff5750e5..26118a88a6 100644
--- a/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/update/__snapshots__/UpdateDispositionSaleView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/disposition/tabs/offersAndSale/dispositionSale/update/__snapshots__/UpdateDispositionSaleView.test.tsx.snap
@@ -366,7 +366,6 @@ exports[`Update Disposition Sale View > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Sales Details
             </div>
diff --git a/source/frontend/src/features/mapSideBar/lease/tabs/consultations/detail/__snapshots__/ConsultationListView.test.tsx.snap b/source/frontend/src/features/mapSideBar/lease/tabs/consultations/detail/__snapshots__/ConsultationListView.test.tsx.snap
index 2d572b736d..897dc2f8a5 100644
--- a/source/frontend/src/features/mapSideBar/lease/tabs/consultations/detail/__snapshots__/ConsultationListView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/lease/tabs/consultations/detail/__snapshots__/ConsultationListView.test.tsx.snap
@@ -412,7 +412,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="no-gutters justify-content-between align-items-end row"
@@ -468,7 +467,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="c7 row"
@@ -544,7 +542,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
                   >
                     <div
                       class="align-content-end col"
-                      style="overflow: hidden;"
                     >
                       <div>
                         <div
@@ -795,7 +792,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
                   >
                     <div
                       class="align-content-end col"
-                      style="overflow: hidden;"
                     >
                       <div>
                         <div
@@ -1045,7 +1041,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="c7 row"
@@ -1110,7 +1105,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="c7 row"
@@ -1175,7 +1169,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="c7 row"
@@ -1240,7 +1233,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="c7 row"
@@ -1305,7 +1297,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="c7 row"
@@ -1370,7 +1361,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="c7 row"
@@ -1435,7 +1425,6 @@ exports[`ConsultationListView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="c7 row"
diff --git a/source/frontend/src/features/mapSideBar/lease/tabs/consultations/edit/__snapshots__/ConsultationEditForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/lease/tabs/consultations/edit/__snapshots__/ConsultationEditForm.test.tsx.snap
index 0df0f4af1e..52054c6de4 100644
--- a/source/frontend/src/features/mapSideBar/lease/tabs/consultations/edit/__snapshots__/ConsultationEditForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/lease/tabs/consultations/edit/__snapshots__/ConsultationEditForm.test.tsx.snap
@@ -367,7 +367,6 @@ exports[`ConsultationEditForm component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Update Approval / Consultation
             </div>
diff --git a/source/frontend/src/features/mapSideBar/management/__snapshots__/ManagementView.test.tsx.snap b/source/frontend/src/features/mapSideBar/management/__snapshots__/ManagementView.test.tsx.snap
index 631be360da..b536cf5041 100644
--- a/source/frontend/src/features/mapSideBar/management/__snapshots__/ManagementView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/management/__snapshots__/ManagementView.test.tsx.snap
@@ -1281,7 +1281,6 @@ exports[`ManagementView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Project
                             </div>
@@ -1358,7 +1357,6 @@ exports[`ManagementView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Management Details
                             </div>
@@ -1488,7 +1486,6 @@ exports[`ManagementView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               <div
                                 class="no-gutters justify-content-between align-items-end row"
@@ -1625,7 +1622,6 @@ exports[`ManagementView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Management Team
                             </div>
@@ -1731,7 +1727,6 @@ exports[`ManagementView component > renders as expected 1`] = `
                           >
                             <div
                               class="align-content-end col"
-                              style="overflow: hidden;"
                             >
                               Notice of Claim
                             </div>
diff --git a/source/frontend/src/features/mapSideBar/management/add/__snapshots__/AddManagementContainerView.test.tsx.snap b/source/frontend/src/features/mapSideBar/management/add/__snapshots__/AddManagementContainerView.test.tsx.snap
index 81ccb0005b..e8614a7e9b 100644
--- a/source/frontend/src/features/mapSideBar/management/add/__snapshots__/AddManagementContainerView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/management/add/__snapshots__/AddManagementContainerView.test.tsx.snap
@@ -640,7 +640,6 @@ exports[`Add Management Container View > matches snapshot 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Project
                   </div>
@@ -843,7 +842,6 @@ exports[`Add Management Container View > matches snapshot 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Properties to include in this file:
                   </div>
@@ -871,7 +869,6 @@ exports[`Add Management Container View > matches snapshot 1`] = `
                       >
                         <div
                           class="align-content-end col"
-                          style="overflow: hidden;"
                         >
                           Selected Properties
                         </div>
@@ -1046,7 +1043,6 @@ exports[`Add Management Container View > matches snapshot 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Management Details
                   </div>
@@ -1261,7 +1257,6 @@ exports[`Add Management Container View > matches snapshot 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Management Team
                   </div>
@@ -1294,7 +1289,6 @@ exports[`Add Management Container View > matches snapshot 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Notice of Claim
                   </div>
diff --git a/source/frontend/src/features/mapSideBar/management/form/__snapshots__/ManagementPropertiesSubForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/management/form/__snapshots__/ManagementPropertiesSubForm.test.tsx.snap
index e871f75963..9dbd45bfef 100644
--- a/source/frontend/src/features/mapSideBar/management/form/__snapshots__/ManagementPropertiesSubForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/management/form/__snapshots__/ManagementPropertiesSubForm.test.tsx.snap
@@ -472,7 +472,6 @@ exports[`ManagementPropertiesSubForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Selected Properties
           </div>
diff --git a/source/frontend/src/features/mapSideBar/management/tabs/__snapshots__/ManagementFileTabs.test.tsx.snap b/source/frontend/src/features/mapSideBar/management/tabs/__snapshots__/ManagementFileTabs.test.tsx.snap
index 1657b96975..4a64fd52c9 100644
--- a/source/frontend/src/features/mapSideBar/management/tabs/__snapshots__/ManagementFileTabs.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/management/tabs/__snapshots__/ManagementFileTabs.test.tsx.snap
@@ -209,7 +209,6 @@ exports[`ManagementFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Project
                 </div>
@@ -286,7 +285,6 @@ exports[`ManagementFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Management Details
                 </div>
@@ -416,7 +414,6 @@ exports[`ManagementFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   <div
                     class="no-gutters justify-content-between align-items-end row"
@@ -553,7 +550,6 @@ exports[`ManagementFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Management Team
                 </div>
@@ -659,7 +655,6 @@ exports[`ManagementFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Notice of Claim
                 </div>
diff --git a/source/frontend/src/features/mapSideBar/management/tabs/activities/__snapshots__/ActivitiesTab.test.tsx.snap b/source/frontend/src/features/mapSideBar/management/tabs/activities/__snapshots__/ActivitiesTab.test.tsx.snap
index d0c518be99..fb48e0b0f0 100644
--- a/source/frontend/src/features/mapSideBar/management/tabs/activities/__snapshots__/ActivitiesTab.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/management/tabs/activities/__snapshots__/ActivitiesTab.test.tsx.snap
@@ -91,7 +91,6 @@ exports[`ManagementSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c3 no-gutters row"
@@ -360,7 +359,6 @@ exports[`ManagementSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="d-flex"
diff --git a/source/frontend/src/features/mapSideBar/management/tabs/activities/edit/__snapshots__/ManagementActivityEditForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/management/tabs/activities/edit/__snapshots__/ManagementActivityEditForm.test.tsx.snap
index 26894beb08..b637dcc673 100644
--- a/source/frontend/src/features/mapSideBar/management/tabs/activities/edit/__snapshots__/ManagementActivityEditForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/management/tabs/activities/edit/__snapshots__/ManagementActivityEditForm.test.tsx.snap
@@ -488,7 +488,6 @@ exports[`ManagementActivityEditForm component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Select File Properties
                 </div>
@@ -618,7 +617,6 @@ exports[`ManagementActivityEditForm component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Activity Details
                 </div>
@@ -1417,7 +1415,6 @@ exports[`ManagementActivityEditForm component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   <div
                     class="c17 no-gutters row"
diff --git a/source/frontend/src/features/mapSideBar/management/tabs/fileDetails/detail/__snapshots__/ManagementSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/management/tabs/fileDetails/detail/__snapshots__/ManagementSummaryView.test.tsx.snap
index ca88a600fa..9712ee6c23 100644
--- a/source/frontend/src/features/mapSideBar/management/tabs/fileDetails/detail/__snapshots__/ManagementSummaryView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/management/tabs/fileDetails/detail/__snapshots__/ManagementSummaryView.test.tsx.snap
@@ -146,7 +146,6 @@ exports[`ManagementSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -223,7 +222,6 @@ exports[`ManagementSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Management Details
           </div>
@@ -353,7 +351,6 @@ exports[`ManagementSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="no-gutters justify-content-between align-items-end row"
@@ -722,7 +719,6 @@ exports[`ManagementSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Management Team
           </div>
@@ -828,7 +824,6 @@ exports[`ManagementSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Notice of Claim
           </div>
diff --git a/source/frontend/src/features/mapSideBar/management/update/__snapshots__/UpdateManagementForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/management/update/__snapshots__/UpdateManagementForm.test.tsx.snap
index 8b194b28d7..2f523f8e57 100644
--- a/source/frontend/src/features/mapSideBar/management/update/__snapshots__/UpdateManagementForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/management/update/__snapshots__/UpdateManagementForm.test.tsx.snap
@@ -463,7 +463,6 @@ exports[`UpdateManagementForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -667,7 +666,6 @@ exports[`UpdateManagementForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Management Details
           </div>
@@ -943,7 +941,6 @@ exports[`UpdateManagementForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Management Team
           </div>
@@ -1302,7 +1299,6 @@ exports[`UpdateManagementForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Notice of Claim
           </div>
diff --git a/source/frontend/src/features/mapSideBar/project/add/__snapshots__/AddProjectForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/project/add/__snapshots__/AddProjectForm.test.tsx.snap
index 9036f0d85b..fa26377ce4 100644
--- a/source/frontend/src/features/mapSideBar/project/add/__snapshots__/AddProjectForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/project/add/__snapshots__/AddProjectForm.test.tsx.snap
@@ -272,7 +272,6 @@ exports[`AddProjectForm component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Project Details
             </div>
@@ -501,7 +500,6 @@ exports[`AddProjectForm component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Associated Codes
             </div>
@@ -682,7 +680,6 @@ exports[`AddProjectForm component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Associated products
             </div>
@@ -716,7 +713,6 @@ exports[`AddProjectForm component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Project Management Team
             </div>
@@ -1127,7 +1123,6 @@ exports[`AddProjectForm component > renders as expected with existing data 1`] =
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Project Details
             </div>
@@ -1358,7 +1353,6 @@ exports[`AddProjectForm component > renders as expected with existing data 1`] =
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Associated Codes
             </div>
@@ -1539,7 +1533,6 @@ exports[`AddProjectForm component > renders as expected with existing data 1`] =
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Associated products
             </div>
@@ -2194,7 +2187,6 @@ exports[`AddProjectForm component > renders as expected with existing data 1`] =
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Project Management Team
             </div>
diff --git a/source/frontend/src/features/mapSideBar/project/tabs/projectDetails/detail/__snapshots__/ProjectSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/project/tabs/projectDetails/detail/__snapshots__/ProjectSummaryView.test.tsx.snap
index 11369dc419..e0f827f7b7 100644
--- a/source/frontend/src/features/mapSideBar/project/tabs/projectDetails/detail/__snapshots__/ProjectSummaryView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/project/tabs/projectDetails/detail/__snapshots__/ProjectSummaryView.test.tsx.snap
@@ -73,7 +73,6 @@ exports[`ProjectSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project Details
           </div>
@@ -138,7 +137,6 @@ exports[`ProjectSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Associated Codes
           </div>
@@ -236,7 +234,6 @@ exports[`ProjectSummaryView component > matches snapshot 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Associated Products
             </div>
@@ -446,7 +443,6 @@ exports[`ProjectSummaryView component > matches snapshot 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project Management Team
           </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/ltsa/__snapshots__/LtsaPlanTabView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/ltsa/__snapshots__/LtsaPlanTabView.test.tsx.snap
index 009eafffda..31fb19c021 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/ltsa/__snapshots__/LtsaPlanTabView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/ltsa/__snapshots__/LtsaPlanTabView.test.tsx.snap
@@ -108,7 +108,6 @@ exports[`LtsaPlanTabView component > renders as expected when provided valid lts
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Strata Plan Common Property Details
           </div>
@@ -190,7 +189,6 @@ exports[`LtsaPlanTabView component > renders as expected when provided valid lts
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Legal Notations on Strata Common Property
           </div>
@@ -307,7 +305,6 @@ GOVERNMENT ACT, SEE EP96596
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Charges on Strata Common Property
           </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/__snapshots__/PropertyAssociationTabView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/__snapshots__/PropertyAssociationTabView.test.tsx.snap
index 954e7ab95b..070fe5bdd0 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/__snapshots__/PropertyAssociationTabView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyAssociations/__snapshots__/PropertyAssociationTabView.test.tsx.snap
@@ -106,7 +106,6 @@ exports[`PropertyAssociationTabView component > renders as expected when provide
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c3"
@@ -330,7 +329,6 @@ exports[`PropertyAssociationTabView component > renders as expected when provide
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c3"
@@ -554,7 +552,6 @@ exports[`PropertyAssociationTabView component > renders as expected when provide
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c3"
@@ -776,7 +773,6 @@ exports[`PropertyAssociationTabView component > renders as expected when provide
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c3"
@@ -881,7 +877,6 @@ exports[`PropertyAssociationTabView component > renders as expected when provide
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c3"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/detail/__snapshots__/OperationSectionView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/detail/__snapshots__/OperationSectionView.test.tsx.snap
index 7f9784f2f3..0118f6ba58 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/detail/__snapshots__/OperationSectionView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/detail/__snapshots__/OperationSectionView.test.tsx.snap
@@ -62,7 +62,6 @@ exports[`Operation section view > matches snapshot 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Subdivision History
         </div>
@@ -82,7 +81,6 @@ exports[`Operation section view > matches snapshot 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               <div
                 class="row"
@@ -486,7 +484,6 @@ exports[`Operation section view > matches snapshot 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Consolidation History
         </div>
@@ -506,7 +503,6 @@ exports[`Operation section view > matches snapshot 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               <div
                 class="row"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/detail/propertyOperation/__snapshots__/OperationView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/detail/propertyOperation/__snapshots__/OperationView.test.tsx.snap
index 05305c5708..10b441cebd 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/detail/propertyOperation/__snapshots__/OperationView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/detail/propertyOperation/__snapshots__/OperationView.test.tsx.snap
@@ -47,7 +47,6 @@ exports[`Subdivision detail view > matches snapshot 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="row"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/__snapshots__/UpdatePropertyDetailsContainer.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/__snapshots__/UpdatePropertyDetailsContainer.test.tsx.snap
index 047d509835..9d7ec9cc51 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/__snapshots__/UpdatePropertyDetailsContainer.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/__snapshots__/UpdatePropertyDetailsContainer.test.tsx.snap
@@ -426,7 +426,6 @@ exports[`UpdatePropertyDetailsContainer component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Property Address
             </div>
@@ -1188,7 +1187,6 @@ exports[`UpdatePropertyDetailsContainer component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Property Attributes
             </div>
@@ -1827,7 +1825,6 @@ exports[`UpdatePropertyDetailsContainer component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Tenure
             </div>
@@ -2365,7 +2362,6 @@ exports[`UpdatePropertyDetailsContainer component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Measurements
             </div>
@@ -2712,7 +2708,6 @@ exports[`UpdatePropertyDetailsContainer component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Surplus Declaration
             </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/__snapshots__/UpdatePropertyDetailsForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/__snapshots__/UpdatePropertyDetailsForm.test.tsx.snap
index b727d79763..ced4c20b44 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/__snapshots__/UpdatePropertyDetailsForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetails/update/__snapshots__/UpdatePropertyDetailsForm.test.tsx.snap
@@ -406,7 +406,6 @@ exports[`UpdatePropertyDetailsForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Property Address
           </div>
@@ -1168,7 +1167,6 @@ exports[`UpdatePropertyDetailsForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Property Attributes
           </div>
@@ -1807,7 +1805,6 @@ exports[`UpdatePropertyDetailsForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Tenure
           </div>
@@ -2335,7 +2332,6 @@ exports[`UpdatePropertyDetailsForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Measurements
           </div>
@@ -2682,7 +2678,6 @@ exports[`UpdatePropertyDetailsForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Surplus Declaration
           </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/edit/__snapshots__/InvoiceTotalsForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/edit/__snapshots__/InvoiceTotalsForm.test.tsx.snap
index 662e6451dc..d897084e67 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/edit/__snapshots__/InvoiceTotalsForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/edit/__snapshots__/InvoiceTotalsForm.test.tsx.snap
@@ -283,7 +283,6 @@ exports[`EditPropertyActivity - InvoiceTotalsForm > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="c2 no-gutters row"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/edit/__snapshots__/PropertyActivityEditForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/edit/__snapshots__/PropertyActivityEditForm.test.tsx.snap
index 553e70abb3..142dc63ba4 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/edit/__snapshots__/PropertyActivityEditForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/edit/__snapshots__/PropertyActivityEditForm.test.tsx.snap
@@ -471,7 +471,6 @@ exports[`PropertyActivityEditForm component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Activity Details
                 </div>
@@ -1255,7 +1254,6 @@ exports[`PropertyActivityEditForm component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   <div
                     class="c16 no-gutters row"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/list/__snapshots__/ManagementActivitiesListView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/list/__snapshots__/ManagementActivitiesListView.test.tsx.snap
index a659ac98d6..01883615b8 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/list/__snapshots__/ManagementActivitiesListView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/activity/list/__snapshots__/ManagementActivitiesListView.test.tsx.snap
@@ -378,7 +378,6 @@ exports[`Activities list view > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/__snapshots__/PropertyContactListView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/__snapshots__/PropertyContactListView.test.tsx.snap
index 3c1030f730..e3cc242007 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/__snapshots__/PropertyContactListView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/__snapshots__/PropertyContactListView.test.tsx.snap
@@ -368,7 +368,6 @@ exports[`PropertyContactListView component > renders as expected when provided v
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/summary/__snapshots__/PropertyManagementDetailView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/summary/__snapshots__/PropertyManagementDetailView.test.tsx.snap
index 1f047039a5..d36cec6625 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/summary/__snapshots__/PropertyManagementDetailView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/detail/summary/__snapshots__/PropertyManagementDetailView.test.tsx.snap
@@ -54,7 +54,6 @@ exports[`PropertyManagementDetailView component > renders as expected when provi
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="row"
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/update/__snapshots__/PropertyContactEditForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/update/__snapshots__/PropertyContactEditForm.test.tsx.snap
index 23e076442a..6ae68debd2 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/update/__snapshots__/PropertyContactEditForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/update/__snapshots__/PropertyContactEditForm.test.tsx.snap
@@ -71,7 +71,6 @@ exports[`PropertyContactEditForm component > renders as expected when provided v
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Contact Details
             </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/update/summary/__snapshots__/PropertyManagementUpdateForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/update/summary/__snapshots__/PropertyManagementUpdateForm.test.tsx.snap
index f0ea2e4428..17dbdeb8e7 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/update/summary/__snapshots__/PropertyManagementUpdateForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyDetailsManagement/update/summary/__snapshots__/PropertyManagementUpdateForm.test.tsx.snap
@@ -295,7 +295,6 @@ exports[`PropertyManagementUpdateForm component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Summary
             </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyResearch/detail/__snapshots__/PropertyResearchTabView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyResearch/detail/__snapshots__/PropertyResearchTabView.test.tsx.snap
index 8bc9a59f73..a1b1852263 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyResearch/detail/__snapshots__/PropertyResearchTabView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyResearch/detail/__snapshots__/PropertyResearchTabView.test.tsx.snap
@@ -337,7 +337,6 @@ exports[`PropertyResearchTabView component > renders as expected when provided v
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Property of Interest
           </div>
@@ -449,7 +448,6 @@ exports[`PropertyResearchTabView component > renders as expected when provided v
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Research Summary
           </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyResearch/update/__snapshots__/UpdatePropertyForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyResearch/update/__snapshots__/UpdatePropertyForm.test.tsx.snap
index e512a91168..b064964c0e 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyResearch/update/__snapshots__/UpdatePropertyForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyResearch/update/__snapshots__/UpdatePropertyForm.test.tsx.snap
@@ -61,7 +61,6 @@ exports[`UpdatePropertyForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Property of Interest
           </div>
@@ -435,7 +434,6 @@ exports[`UpdatePropertyForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Research Summary
           </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/takes/detail/__snapshots__/TakesDetailView.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/takes/detail/__snapshots__/TakesDetailView.test.tsx.snap
index de4bcdcdcd..e44a09515e 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/takes/detail/__snapshots__/TakesDetailView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/takes/detail/__snapshots__/TakesDetailView.test.tsx.snap
@@ -225,7 +225,6 @@ exports[`TakesDetailView component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 <div
                   class="row"
@@ -390,7 +389,6 @@ exports[`TakesDetailView component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Area
                   </div>
@@ -1159,7 +1157,6 @@ exports[`TakesDetailView component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Surplus
                   </div>
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/takes/update/__snapshots__/TakeUpdateForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/takes/update/__snapshots__/TakeUpdateForm.test.tsx.snap
index 3b3cad020b..8bc27f3880 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/takes/update/__snapshots__/TakeUpdateForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/takes/update/__snapshots__/TakeUpdateForm.test.tsx.snap
@@ -169,7 +169,6 @@ exports[`TakeUpdateForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Update Take
           </div>
@@ -461,7 +460,6 @@ exports[`TakeUpdateForm component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Area
               </div>
@@ -1861,7 +1859,6 @@ exports[`TakeUpdateForm component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Surplus
               </div>
diff --git a/source/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap
index 276f6fc917..10a9173cbc 100644
--- a/source/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/research/__snapshots__/ResearchContainer.test.tsx.snap
@@ -1159,7 +1159,6 @@ exports[`ResearchContainer component > renders as expected 1`] = `
                             >
                               <div
                                 class="align-content-end col"
-                                style="overflow: hidden;"
                               >
                                 Project
                               </div>
@@ -1202,7 +1201,6 @@ exports[`ResearchContainer component > renders as expected 1`] = `
                             >
                               <div
                                 class="align-content-end col"
-                                style="overflow: hidden;"
                               >
                                 Roads
                               </div>
@@ -1262,7 +1260,6 @@ exports[`ResearchContainer component > renders as expected 1`] = `
                             >
                               <div
                                 class="align-content-end col"
-                                style="overflow: hidden;"
                               >
                                 Research Request
                               </div>
@@ -1401,7 +1398,6 @@ exports[`ResearchContainer component > renders as expected 1`] = `
                             >
                               <div
                                 class="align-content-end col"
-                                style="overflow: hidden;"
                               >
                                 Result
                               </div>
@@ -1484,7 +1480,6 @@ exports[`ResearchContainer component > renders as expected 1`] = `
                             >
                               <div
                                 class="align-content-end col"
-                                style="overflow: hidden;"
                               >
                                 Expropriation
                               </div>
diff --git a/source/frontend/src/features/mapSideBar/research/add/__snapshots__/AddResearchContainer.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/add/__snapshots__/AddResearchContainer.test.tsx.snap
index b142c8d1a4..39bb9cb3bc 100644
--- a/source/frontend/src/features/mapSideBar/research/add/__snapshots__/AddResearchContainer.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/research/add/__snapshots__/AddResearchContainer.test.tsx.snap
@@ -737,7 +737,6 @@ exports[`AddResearchContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Project
                   </div>
@@ -770,7 +769,6 @@ exports[`AddResearchContainer component > renders as expected 1`] = `
                 >
                   <div
                     class="align-content-end col"
-                    style="overflow: hidden;"
                   >
                     Properties to include in this file:
                   </div>
@@ -895,7 +893,6 @@ exports[`AddResearchContainer component > renders as expected 1`] = `
                     >
                       <div
                         class="align-content-end col"
-                        style="overflow: hidden;"
                       >
                         Selected Properties
                       </div>
diff --git a/source/frontend/src/features/mapSideBar/research/add/__snapshots__/AddResearchForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/add/__snapshots__/AddResearchForm.test.tsx.snap
index 13db4fd462..99c7431c69 100644
--- a/source/frontend/src/features/mapSideBar/research/add/__snapshots__/AddResearchForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/research/add/__snapshots__/AddResearchForm.test.tsx.snap
@@ -481,7 +481,6 @@ exports[`AddResearchForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -514,7 +513,6 @@ exports[`AddResearchForm component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Properties to include in this file:
           </div>
@@ -639,7 +637,6 @@ exports[`AddResearchForm component > renders as expected 1`] = `
             >
               <div
                 class="align-content-end col"
-                style="overflow: hidden;"
               >
                 Selected Properties
               </div>
diff --git a/source/frontend/src/features/mapSideBar/research/add/__snapshots__/ResearchProperties.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/add/__snapshots__/ResearchProperties.test.tsx.snap
index 20cf649a48..91770b1be7 100644
--- a/source/frontend/src/features/mapSideBar/research/add/__snapshots__/ResearchProperties.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/research/add/__snapshots__/ResearchProperties.test.tsx.snap
@@ -453,7 +453,6 @@ exports[`ResearchProperties component > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           Properties to include in this file:
         </div>
@@ -578,7 +577,6 @@ exports[`ResearchProperties component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Selected Properties
             </div>
diff --git a/source/frontend/src/features/mapSideBar/research/tabs/__snapshots__/ResearchTabsContainer.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/tabs/__snapshots__/ResearchTabsContainer.test.tsx.snap
index efb138122a..f128f9d965 100644
--- a/source/frontend/src/features/mapSideBar/research/tabs/__snapshots__/ResearchTabsContainer.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/research/tabs/__snapshots__/ResearchTabsContainer.test.tsx.snap
@@ -168,7 +168,6 @@ exports[`ResearchFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Project
                 </div>
@@ -210,7 +209,6 @@ exports[`ResearchFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Roads
                 </div>
@@ -268,7 +266,6 @@ exports[`ResearchFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Research Request
                 </div>
@@ -401,7 +398,6 @@ exports[`ResearchFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Result
                 </div>
@@ -482,7 +478,6 @@ exports[`ResearchFileTabs component > matches snapshot 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   Expropriation
                 </div>
diff --git a/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/details/__snapshots__/ResearchSummaryView.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/details/__snapshots__/ResearchSummaryView.test.tsx.snap
index 1fb307f6c5..521c6792f1 100644
--- a/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/details/__snapshots__/ResearchSummaryView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/details/__snapshots__/ResearchSummaryView.test.tsx.snap
@@ -75,7 +75,6 @@ exports[`ResearchSummaryView component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Project
             </div>
@@ -118,7 +117,6 @@ exports[`ResearchSummaryView component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Roads
             </div>
@@ -178,7 +176,6 @@ exports[`ResearchSummaryView component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Research Request
             </div>
@@ -317,7 +314,6 @@ exports[`ResearchSummaryView component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Result
             </div>
@@ -400,7 +396,6 @@ exports[`ResearchSummaryView component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Expropriation
             </div>
diff --git a/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/update/__snapshots__/UpdateSummaryContainer.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/update/__snapshots__/UpdateSummaryContainer.test.tsx.snap
index 91f8d8002a..6c7c3de597 100644
--- a/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/update/__snapshots__/UpdateSummaryContainer.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/update/__snapshots__/UpdateSummaryContainer.test.tsx.snap
@@ -496,7 +496,6 @@ exports[`Research File Update Container > Renders the underlying form 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Research File Information
             </div>
@@ -720,7 +719,6 @@ exports[`Research File Update Container > Renders the underlying form 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Project
             </div>
@@ -868,7 +866,6 @@ exports[`Research File Update Container > Renders the underlying form 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Roads
             </div>
@@ -948,7 +945,6 @@ exports[`Research File Update Container > Renders the underlying form 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Research Request
             </div>
@@ -1320,7 +1316,6 @@ exports[`Research File Update Container > Renders the underlying form 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Result
             </div>
@@ -1419,7 +1414,6 @@ exports[`Research File Update Container > Renders the underlying form 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Expropriation
             </div>
diff --git a/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/update/__snapshots__/UpdateSummaryForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/update/__snapshots__/UpdateSummaryForm.test.tsx.snap
index 65d24be2f5..8164c7b233 100644
--- a/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/update/__snapshots__/UpdateSummaryForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/research/tabs/fileDetails/update/__snapshots__/UpdateSummaryForm.test.tsx.snap
@@ -449,7 +449,6 @@ exports[`UpdateResearchForm component > renders as expected when provided no res
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Research File Information
           </div>
@@ -673,7 +672,6 @@ exports[`UpdateResearchForm component > renders as expected when provided no res
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Project
           </div>
@@ -706,7 +704,6 @@ exports[`UpdateResearchForm component > renders as expected when provided no res
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Roads
           </div>
@@ -786,7 +783,6 @@ exports[`UpdateResearchForm component > renders as expected when provided no res
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Research Request
           </div>
@@ -1158,7 +1154,6 @@ exports[`UpdateResearchForm component > renders as expected when provided no res
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Result
           </div>
@@ -1257,7 +1252,6 @@ exports[`UpdateResearchForm component > renders as expected when provided no res
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Expropriation
           </div>
diff --git a/source/frontend/src/features/mapSideBar/shared/improvements/FilePropertiesImprovements/__snapshots__/FilePropertiesImprovementsView.test.tsx.snap b/source/frontend/src/features/mapSideBar/shared/improvements/FilePropertiesImprovements/__snapshots__/FilePropertiesImprovementsView.test.tsx.snap
index e5829e4de7..ccaa408825 100644
--- a/source/frontend/src/features/mapSideBar/shared/improvements/FilePropertiesImprovements/__snapshots__/FilePropertiesImprovementsView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/shared/improvements/FilePropertiesImprovements/__snapshots__/FilePropertiesImprovementsView.test.tsx.snap
@@ -216,7 +216,6 @@ exports[`File properties improvements list view > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             <div
               class="c9"
diff --git a/source/frontend/src/features/mapSideBar/shared/tabs/checklist/detail/__snapshots__/ChecklistView.test.tsx.snap b/source/frontend/src/features/mapSideBar/shared/tabs/checklist/detail/__snapshots__/ChecklistView.test.tsx.snap
index 2c24ad653e..ec7bfb3074 100644
--- a/source/frontend/src/features/mapSideBar/shared/tabs/checklist/detail/__snapshots__/ChecklistView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/shared/tabs/checklist/detail/__snapshots__/ChecklistView.test.tsx.snap
@@ -122,7 +122,6 @@ exports[`ChecklistView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             File Initiation
           </div>
@@ -560,7 +559,6 @@ exports[`ChecklistView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Active File Management
           </div>
@@ -1765,7 +1763,6 @@ exports[`ChecklistView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Crown Land
           </div>
@@ -1811,7 +1808,6 @@ exports[`ChecklistView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Section 3 - Agreement
           </div>
@@ -2385,7 +2381,6 @@ exports[`ChecklistView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Section 6 - Expropriation
           </div>
@@ -2934,7 +2929,6 @@ exports[`ChecklistView component > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Completion
           </div>
diff --git a/source/frontend/src/features/mapSideBar/shared/tabs/checklist/update/__snapshots__/UpdateChecklistForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/shared/tabs/checklist/update/__snapshots__/UpdateChecklistForm.test.tsx.snap
index 8cd8381895..4d27a3bda8 100644
--- a/source/frontend/src/features/mapSideBar/shared/tabs/checklist/update/__snapshots__/UpdateChecklistForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/shared/tabs/checklist/update/__snapshots__/UpdateChecklistForm.test.tsx.snap
@@ -76,7 +76,6 @@ exports[`UpdateChecklist form > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             File Initiation
           </div>
@@ -360,7 +359,6 @@ exports[`UpdateChecklist form > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Active File Management
           </div>
@@ -1212,7 +1210,6 @@ exports[`UpdateChecklist form > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Crown Land
           </div>
@@ -1233,7 +1230,6 @@ exports[`UpdateChecklist form > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Section 3 - Agreement
           </div>
@@ -1635,7 +1631,6 @@ exports[`UpdateChecklist form > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Section 6 - Expropriation
           </div>
@@ -2033,7 +2028,6 @@ exports[`UpdateChecklist form > renders as expected 1`] = `
         >
           <div
             class="align-content-end col"
-            style="overflow: hidden;"
           >
             Acquisition Completion
           </div>
diff --git a/source/frontend/src/features/mapSideBar/shared/update/properties/__snapshots__/UpdateProperties.test.tsx.snap b/source/frontend/src/features/mapSideBar/shared/update/properties/__snapshots__/UpdateProperties.test.tsx.snap
index b60f152645..540616d810 100644
--- a/source/frontend/src/features/mapSideBar/shared/update/properties/__snapshots__/UpdateProperties.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/shared/update/properties/__snapshots__/UpdateProperties.test.tsx.snap
@@ -752,7 +752,6 @@ exports[`UpdateProperties component > renders as expected 1`] = `
               >
                 <div
                   class="align-content-end col"
-                  style="overflow: hidden;"
                 >
                   <div
                     class="row"
diff --git a/source/frontend/src/features/mapSideBar/subdivision/__snapshots__/AddSubdivisionView.test.tsx.snap b/source/frontend/src/features/mapSideBar/subdivision/__snapshots__/AddSubdivisionView.test.tsx.snap
index 8a6ec7b7a9..f73806b8a7 100644
--- a/source/frontend/src/features/mapSideBar/subdivision/__snapshots__/AddSubdivisionView.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/subdivision/__snapshots__/AddSubdivisionView.test.tsx.snap
@@ -649,7 +649,6 @@ exports[`Add Subdivision View > matches snapshot 1`] = `
                     >
                       <div
                         class="align-content-end col"
-                        style="overflow: hidden;"
                       >
                         Selected Parent
                       </div>
@@ -715,7 +714,6 @@ exports[`Add Subdivision View > matches snapshot 1`] = `
                     >
                       <div
                         class="align-content-end col"
-                        style="overflow: hidden;"
                       >
                         <div
                           class="row"
diff --git a/source/frontend/src/features/notes/list/__snapshots__/NoteListContainer.test.tsx.snap b/source/frontend/src/features/notes/list/__snapshots__/NoteListContainer.test.tsx.snap
index a61f97377e..1b2c63b856 100644
--- a/source/frontend/src/features/notes/list/__snapshots__/NoteListContainer.test.tsx.snap
+++ b/source/frontend/src/features/notes/list/__snapshots__/NoteListContainer.test.tsx.snap
@@ -298,7 +298,6 @@ exports[`Note List Container > renders as expected 1`] = `
       >
         <div
           class="align-content-end col"
-          style="overflow: hidden;"
         >
           <div
             class="no-gutters justify-content-between align-items-end row"

From a546fd79d139363f32e2dcf5cdd73cc05c39f491 Mon Sep 17 00:00:00 2001
From: devinleighsmith <devinleighsmith@gmail.com>
Date: Wed, 21 Jan 2026 18:03:16 -0800
Subject: [PATCH 03/13] only show the parcel map outage warning once.

---
 .../src/hooks/useRefreshSiteminder.ts         | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/source/frontend/src/hooks/useRefreshSiteminder.ts b/source/frontend/src/hooks/useRefreshSiteminder.ts
index 99ae736075..08d26df218 100644
--- a/source/frontend/src/hooks/useRefreshSiteminder.ts
+++ b/source/frontend/src/hooks/useRefreshSiteminder.ts
@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { useCallback } from 'react';
+import { useCallback, useRef } from 'react';
 
 import { useTenant } from '@/tenants';
 
@@ -8,6 +8,7 @@ import { useModalContext } from './useModalContext';
 export const useRefreshSiteminder = () => {
   const { parcelMapFullyAttributed } = useTenant();
   const { setModalContent, setDisplayModal } = useModalContext();
+  const hasShownModalRef = useRef(false); // only display this warning once.
 
   const refresh = useCallback(async () => {
     try {
@@ -29,14 +30,17 @@ export const useRefreshSiteminder = () => {
         throw new Error('Session expired');
       }
     } catch {
-      setModalContent({
-        title: 'Session Expired',
-        message:
-          'Your SITEMINDER session has expired. Please save any in-progress work and log out of the PIMS application.',
-        okButtonText: 'OK',
-        variant: 'warning',
-      });
-      setDisplayModal(true);
+      if (!hasShownModalRef.current) {
+        hasShownModalRef.current = true;
+        setModalContent({
+          title: 'Session Expired',
+          message:
+            'Your SITEMINDER session has expired. Please save any in-progress work and log out of the PIMS application.',
+          okButtonText: 'OK',
+          variant: 'warning',
+        });
+        setDisplayModal(true);
+      }
       console.error('Unable to refresh Siteminder cookie');
     }
   }, [parcelMapFullyAttributed, setModalContent, setDisplayModal]);

From c6a8b2d7d8c43aa448384fd415b832eca8f1a480 Mon Sep 17 00:00:00 2001
From: Arturo Reyes Lopez <arturo_reyes_lopez@hotmail.com>
Date: Mon, 5 Jan 2026 14:06:30 -0700
Subject: [PATCH 04/13] Implement modal when user exits to avoid losing changes

---
 .../components/common/ConfirmNavigation.tsx   |  5 +-
 .../access-request/AccessRequestContainer.tsx | 38 ++++++++++++--
 .../access-request/AccessRequestForm.test.tsx |  5 ++
 .../access-request/AccessRequestForm.tsx      |  8 ++-
 .../AccessRequestPage.test.tsx.snap           | 10 ++++
 .../admin/edit-user/EditUserContainer.tsx     | 40 ++++++++++++++-
 .../admin/edit-user/EditUserForm.test.tsx     |  5 ++
 .../features/admin/edit-user/EditUserForm.tsx |  9 +++-
 .../UpdateFinancialCodeContainer.test.tsx     |  7 +++
 .../update/UpdateFinancialCodeContainer.tsx   | 17 ++++++-
 .../update/UpdateFinancialCodeForm.tsx        |  2 +
 .../LeaseUpdatePropertySelector.tsx           |  4 +-
 .../acquisition/AcquisitionContainer.test.tsx |  7 +++
 .../acquisition/AcquisitionContainer.tsx      | 47 +++++++++++-------
 .../disposition/DispositionContainer.test.tsx |  7 +++
 .../disposition/DispositionContainer.tsx      |  7 +++
 .../mapSideBar/lease/LeaseContainer.test.tsx  |  7 +++
 .../mapSideBar/lease/LeaseContainer.tsx       | 49 +++++++++++--------
 .../features/mapSideBar/lease/LeaseView.tsx   |  2 +-
 .../management/ManagementContainer.test.tsx   |  7 +++
 .../management/ManagementContainer.tsx        |  7 +++
 .../project/ProjectContainerView.test.tsx     |  7 +++
 .../project/ProjectContainerView.tsx          | 10 ++++
 .../property/MotiInventoryContainer.test.tsx  |  7 +++
 .../property/MotiInventoryContainer.tsx       |  9 +++-
 .../research/ResearchContainer.test.tsx       |  7 +++
 .../mapSideBar/research/ResearchContainer.tsx | 43 +++++++++-------
 27 files changed, 302 insertions(+), 71 deletions(-)

diff --git a/source/frontend/src/components/common/ConfirmNavigation.tsx b/source/frontend/src/components/common/ConfirmNavigation.tsx
index ea845ceeab..a8a859f0f5 100644
--- a/source/frontend/src/components/common/ConfirmNavigation.tsx
+++ b/source/frontend/src/components/common/ConfirmNavigation.tsx
@@ -34,8 +34,11 @@ const ConfirmNavigation = ({ when, navigate, shouldBlockNavigation }: Props) =>
     if (confirmedNavigation && lastLocation) {
       // Navigate to the previous blocked location with your navigate function
       navigate(lastLocation.pathname);
+      // Reset state after navigation so future navigation can be blocked again
+      setConfirmedNavigation(false);
+      setLastLocation(null);
     }
-  }, [confirmedNavigation, lastLocation, navigate]);
+  }, [confirmedNavigation, lastLocation, navigate, setConfirmedNavigation, setLastLocation]);
 
   return <Prompt when={when} message={handleBlockedNavigation} />;
 };
diff --git a/source/frontend/src/features/admin/access-request/AccessRequestContainer.tsx b/source/frontend/src/features/admin/access-request/AccessRequestContainer.tsx
index d4ae9eec26..a98f49f5f0 100644
--- a/source/frontend/src/features/admin/access-request/AccessRequestContainer.tsx
+++ b/source/frontend/src/features/admin/access-request/AccessRequestContainer.tsx
@@ -1,4 +1,5 @@
-import { useEffect } from 'react';
+import { FormikProps } from 'formik';
+import { useEffect, useRef } from 'react';
 import { Alert } from 'react-bootstrap';
 
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
@@ -6,6 +7,7 @@ import { AccessRequestStatus } from '@/constants/accessStatus';
 import { EmailContactMethods } from '@/constants/contactMethodType';
 import { useAccessRequests } from '@/hooks/pims-api/useAccessRequests';
 import useKeycloakWrapper, { IUserInfo } from '@/hooks/useKeycloakWrapper';
+import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
 import { ApiGen_Concepts_AccessRequest } from '@/models/api/generated/ApiGen_Concepts_AccessRequest';
 import { getEmptyBaseAudit } from '@/models/defaultInitializers';
 import { firstOrNull, isValidId } from '@/utils';
@@ -42,6 +44,8 @@ export const AccessRequestContainer: React.FunctionComponent<
   } = useAccessRequests();
   const keycloak = useKeycloakWrapper();
   const userInfo = keycloak?.obj?.userInfo as IUserInfo;
+  const formikRef = useRef<FormikProps<FormAccessRequest>>(null);
+  const { setModalContent, setDisplayModal } = useModalContext();
 
   useEffect(() => {
     if (!isValidId(accessRequestId)) {
@@ -77,6 +81,29 @@ export const AccessRequestContainer: React.FunctionComponent<
       keycloak.businessIdentifierValue ?? userInfo.idir_username ?? '';
     initialValues.keycloakUserGuid = userInfo.subject;
   }
+
+  const handleCancelConfirm = () => {
+    formikRef.current?.resetForm();
+  };
+
+  const handleCancelClick = (onCancelConfirm?: () => void) => {
+    if (formikRef.current?.dirty) {
+      setModalContent({
+        ...getCancelModalProps(),
+        handleOk: () => {
+          handleCancelConfirm();
+          setDisplayModal(false);
+          onCancelConfirm && onCancelConfirm();
+        },
+        handleCancel: () => setDisplayModal(false),
+      });
+      setDisplayModal(true);
+    } else {
+      handleCancelConfirm();
+      onCancelConfirm && onCancelConfirm();
+    }
+  };
+
   return (
     <>
       <LoadingBackdrop parentScreen show={loading || addLoading || byIdLoading} />
@@ -84,13 +111,18 @@ export const AccessRequestContainer: React.FunctionComponent<
         <Alert variant="success">Your access request has been submitted</Alert>
       )}
       <AccessRequestFormComponent
+        formikRef={formikRef}
         initialValues={initialValues}
         addAccessRequest={async (accessRequest: ApiGen_Concepts_AccessRequest) => {
           const response = await addAccessRequest(accessRequest);
-          onSave && onSave();
           return response;
         }}
-        onCancel={onSave}
+        onCancel={() =>
+          handleCancelClick(() => {
+            onSave && onSave();
+          })
+        }
+        onSuccess={onSave}
       />
     </>
   );
diff --git a/source/frontend/src/features/admin/access-request/AccessRequestForm.test.tsx b/source/frontend/src/features/admin/access-request/AccessRequestForm.test.tsx
index 2973213083..36efd0d180 100644
--- a/source/frontend/src/features/admin/access-request/AccessRequestForm.test.tsx
+++ b/source/frontend/src/features/admin/access-request/AccessRequestForm.test.tsx
@@ -1,3 +1,6 @@
+import { FormikProps } from 'formik';
+import { createRef } from 'react';
+
 import { getMockAccessRequest } from '@/mocks/accessRequest.mock';
 import { mockLookups } from '@/mocks/lookups.mock';
 import { ApiGen_Concepts_AccessRequest } from '@/models/api/generated/ApiGen_Concepts_AccessRequest';
@@ -21,8 +24,10 @@ const onCancel = vi.fn();
 describe('AccessRequestForm component', () => {
   // render component under test
   const setup = (renderOptions: RenderOptions & { initialValues: FormAccessRequest }) => {
+    const formikRef = createRef<FormikProps<FormAccessRequest>>();
     const utils = render(
       <AccessRequestForm
+        formikRef={formikRef}
         initialValues={renderOptions.initialValues}
         addAccessRequest={addAccessRequest}
         onCancel={onCancel}
diff --git a/source/frontend/src/features/admin/access-request/AccessRequestForm.tsx b/source/frontend/src/features/admin/access-request/AccessRequestForm.tsx
index 6552944ac0..c0421f99c8 100644
--- a/source/frontend/src/features/admin/access-request/AccessRequestForm.tsx
+++ b/source/frontend/src/features/admin/access-request/AccessRequestForm.tsx
@@ -1,4 +1,4 @@
-import { Formik } from 'formik';
+import { Formik, FormikProps } from 'formik';
 import { ButtonToolbar, Col, Row } from 'react-bootstrap';
 import { FaInfoCircle } from 'react-icons/fa';
 import styled from 'styled-components';
@@ -19,16 +19,18 @@ import { FormAccessRequest as AccessRequestFormModel, userTypeCodeValues } from
 import RolesToolTip from './RolesToolTip';
 
 interface IAccessRequestFormProps {
+  formikRef: React.RefObject<FormikProps<AccessRequestFormModel>>;
   initialValues: AccessRequestFormModel;
   addAccessRequest: (
     accessRequest: ApiGen_Concepts_AccessRequest,
   ) => Promise<ApiGen_Concepts_AccessRequest | undefined>;
   onCancel?: () => void;
+  onSuccess?: () => void;
 }
 
 export const AccessRequestForm: React.FunctionComponent<
   React.PropsWithChildren<IAccessRequestFormProps>
-> = ({ initialValues, addAccessRequest, onCancel }) => {
+> = ({ formikRef, initialValues, addAccessRequest, onCancel, onSuccess }) => {
   const { getPublicByType, getOptionsByType } = useLookupCodeHelpers();
   const roles = getPublicByType(API.ROLE_TYPES);
   const selectRegions = getOptionsByType(API.REGION_TYPES).filter(
@@ -38,6 +40,7 @@ export const AccessRequestForm: React.FunctionComponent<
 
   return (
     <Formik<AccessRequestFormModel>
+      innerRef={formikRef}
       enableReinitialize={true}
       initialValues={initialValues}
       validationSchema={AccessRequestSchema}
@@ -46,6 +49,7 @@ export const AccessRequestForm: React.FunctionComponent<
           await addAccessRequest(values.toApi());
         } finally {
           setSubmitting(false);
+          onSuccess && onSuccess();
         }
       }}
     >
diff --git a/source/frontend/src/features/admin/access-request/__snapshots__/AccessRequestPage.test.tsx.snap b/source/frontend/src/features/admin/access-request/__snapshots__/AccessRequestPage.test.tsx.snap
index 490fd27efc..a3974dc3b7 100644
--- a/source/frontend/src/features/admin/access-request/__snapshots__/AccessRequestPage.test.tsx.snap
+++ b/source/frontend/src/features/admin/access-request/__snapshots__/AccessRequestPage.test.tsx.snap
@@ -734,6 +734,16 @@ exports[`AccessRequestPage > renders correctly 1`] = `
               class="cancelSave btn-toolbar"
               role="toolbar"
             >
+              <button
+                class="c7 Button mr-2 btn btn-primary"
+                type="button"
+              >
+                <div
+                  class="Button__value"
+                >
+                  Cancel
+                </div>
+              </button>
               <button
                 class="c7 Button btn btn-primary"
                 type="submit"
diff --git a/source/frontend/src/features/admin/edit-user/EditUserContainer.tsx b/source/frontend/src/features/admin/edit-user/EditUserContainer.tsx
index 47084b78df..a63947d1bc 100644
--- a/source/frontend/src/features/admin/edit-user/EditUserContainer.tsx
+++ b/source/frontend/src/features/admin/edit-user/EditUserContainer.tsx
@@ -1,8 +1,10 @@
-import { FunctionComponent, useEffect, useState } from 'react';
+import { FormikProps } from 'formik';
+import { FunctionComponent, useEffect, useRef, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
 import { UserTypes } from '@/constants/index';
+import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
 import useIsMounted from '@/hooks/util/useIsMounted';
 import { ApiGen_Concepts_User } from '@/models/api/generated/ApiGen_Concepts_User';
 import { toTypeCode } from '@/utils/formUtils';
@@ -19,6 +21,8 @@ const EditUserContainer: FunctionComponent<IEditUserContainerProps> = ({ userId
   const history = useHistory();
   const [user, setUser] = useState<ApiGen_Concepts_User>();
   const isMounted = useIsMounted();
+  const formikRef = useRef<FormikProps<FormUser>>(null);
+  const { setModalContent, setDisplayModal } = useModalContext();
   const {
     updateUser: { execute: updateUserDetail },
     fetchUserDetail: { execute: getUserDetail, loading },
@@ -40,6 +44,35 @@ const EditUserContainer: FunctionComponent<IEditUserContainerProps> = ({ userId
     history.goBack();
   };
 
+  const handleCancelConfirm = () => {
+    if (formikRef !== undefined) {
+      formikRef.current?.resetForm();
+    }
+  };
+
+  const handleCancelClick = (onCancelConfirm?: () => void) => {
+    if (formikRef !== undefined) {
+      if (formikRef.current?.dirty) {
+        setModalContent({
+          ...getCancelModalProps(),
+          handleOk: () => {
+            handleCancelConfirm();
+            setDisplayModal(false);
+            onCancelConfirm && onCancelConfirm();
+          },
+          handleCancel: () => setDisplayModal(false),
+        });
+        setDisplayModal(true);
+      } else {
+        handleCancelConfirm();
+        onCancelConfirm && onCancelConfirm();
+      }
+    } else {
+      handleCancelConfirm();
+      onCancelConfirm && onCancelConfirm();
+    }
+  };
+
   const initialValues: FormUser = {
     businessIdentifierValue: '',
     firstName: '',
@@ -61,14 +94,17 @@ const EditUserContainer: FunctionComponent<IEditUserContainerProps> = ({ userId
       <LoadingBackdrop parentScreen show={loading} />
 
       <EditUserForm
+        formikRef={formikRef}
         updateUserDetail={async (updateUser: ApiGen_Concepts_User) => {
           const response = await updateUserDetail(updateUser);
           if (isMounted()) {
             setUser(response);
+            setDisplayModal(false);
           }
         }}
         formUser={formUser}
-        onCancel={goBack}
+        onCancel={() => handleCancelClick(goBack)}
+        onSuccess={goBack}
       />
     </>
   );
diff --git a/source/frontend/src/features/admin/edit-user/EditUserForm.test.tsx b/source/frontend/src/features/admin/edit-user/EditUserForm.test.tsx
index dbb1560912..6d0c9c7423 100644
--- a/source/frontend/src/features/admin/edit-user/EditUserForm.test.tsx
+++ b/source/frontend/src/features/admin/edit-user/EditUserForm.test.tsx
@@ -1,3 +1,6 @@
+import { FormikProps } from 'formik';
+import { createRef } from 'react';
+
 import { mockLookups } from '@/mocks/lookups.mock';
 import { getUserMock } from '@/mocks/user.mock';
 import { lookupCodesSlice } from '@/store/slices/lookupCodes';
@@ -20,8 +23,10 @@ const onCancel = vi.fn();
 describe('EditUserForm component', () => {
   // render component under test
   const setup = (renderOptions: RenderOptions & { initialValues: FormUser }) => {
+    const formikRef = createRef<FormikProps<FormUser>>();
     const utils = render(
       <EditUserForm
+        formikRef={formikRef}
         formUser={renderOptions.initialValues}
         updateUserDetail={onSubmit}
         onCancel={onCancel}
diff --git a/source/frontend/src/features/admin/edit-user/EditUserForm.tsx b/source/frontend/src/features/admin/edit-user/EditUserForm.tsx
index 460635c94b..0a4221eba5 100644
--- a/source/frontend/src/features/admin/edit-user/EditUserForm.tsx
+++ b/source/frontend/src/features/admin/edit-user/EditUserForm.tsx
@@ -1,4 +1,4 @@
-import { Formik } from 'formik';
+import { Formik, FormikProps } from 'formik';
 import { ButtonToolbar, Row } from 'react-bootstrap';
 import { FaInfoCircle } from 'react-icons/fa';
 import styled from 'styled-components';
@@ -19,15 +19,19 @@ import RolesToolTip from '../access-request/RolesToolTip';
 import { FormUser, userTypeCodeValues } from '../users/models';
 
 interface IEditUserFormProps {
+  formikRef: React.RefObject<FormikProps<FormUser>>;
   updateUserDetail: (user: ApiGen_Concepts_User) => void;
   formUser: FormUser;
   onCancel: () => void;
+  onSuccess?: () => void;
 }
 
 const EditUserForm: React.FunctionComponent<React.PropsWithChildren<IEditUserFormProps>> = ({
+  formikRef,
   updateUserDetail,
   formUser,
   onCancel,
+  onSuccess,
 }) => {
   const { getPublicByType, getByType } = useLookupCodeHelpers();
   const roles = getByType(API.ROLE_TYPES);
@@ -36,13 +40,14 @@ const EditUserForm: React.FunctionComponent<React.PropsWithChildren<IEditUserFor
   );
   return (
     <Formik<FormUser>
+      innerRef={formikRef}
       enableReinitialize
       initialValues={formUser}
       validationSchema={UserUpdateSchema}
       onSubmit={async (values, { setSubmitting }) => {
         await updateUserDetail(values.toApi());
         setSubmitting(false);
-        onCancel();
+        onSuccess && onSuccess();
       }}
     >
       {formikProps => (
diff --git a/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.test.tsx b/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.test.tsx
index ae059b1b38..3c92930c00 100644
--- a/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.test.tsx
+++ b/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.test.tsx
@@ -32,6 +32,13 @@ vi.mock('@/hooks/repositories/useFinancialCodeRepository', () => ({
   },
 }));
 
+// Mock ConfirmNavigation to avoid Prompt issues in jsdom
+vi.mock('@/components/common/ConfirmNavigation', () => {
+  return {
+    default: () => null,
+  };
+});
+
 const history = createMemoryHistory();
 
 let viewProps: IUpdateFinancialCodeFormProps | undefined;
diff --git a/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.tsx b/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.tsx
index 2be6e821bb..fe91b6db5c 100644
--- a/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.tsx
+++ b/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.tsx
@@ -1,10 +1,12 @@
 import { AxiosError } from 'axios';
-import React, { useEffect, useState } from 'react';
+import { FormikProps } from 'formik';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { Alert, Col, Row } from 'react-bootstrap';
 import { useHistory } from 'react-router-dom';
 import { toast } from 'react-toastify';
 import styled from 'styled-components';
 
+import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
 import { H1 } from '@/components/common/styles';
 import { useFinancialCodeRepository } from '@/hooks/repositories/useFinancialCodeRepository';
@@ -12,6 +14,7 @@ import { IApiError } from '@/interfaces/IApiError';
 import { ApiGen_Concepts_FinancialCode } from '@/models/api/generated/ApiGen_Concepts_FinancialCode';
 import { ApiGen_Concepts_FinancialCodeTypes } from '@/models/api/generated/ApiGen_Concepts_FinancialCodeTypes';
 
+import { FinancialCodeForm } from '../models';
 import { UpdateFinancialCodeYupSchema } from './UpdateFinancialCodeYupSchema';
 
 export interface IUpdateFinancialCodeFormProps {
@@ -23,6 +26,7 @@ export interface IUpdateFinancialCodeFormProps {
   onCancel: () => void;
   onSuccess: (financialCode: ApiGen_Concepts_FinancialCode) => Promise<void>;
   onError: (e: AxiosError<IApiError>) => void;
+  formikRef?: React.RefObject<FormikProps<FinancialCodeForm>>;
 }
 
 export interface IUpdateFinancialCodeContainerProps {
@@ -38,6 +42,7 @@ export const UpdateFinancialCodeContainer: React.FC<IUpdateFinancialCodeContaine
 }) => {
   const [duplicateError, setDuplicateError] = useState(false);
   const history = useHistory();
+  const formikRef = useRef<FormikProps<FinancialCodeForm>>(null);
   const {
     getFinancialCode: {
       execute: getFinancialCode,
@@ -80,6 +85,11 @@ export const UpdateFinancialCodeContainer: React.FC<IUpdateFinancialCodeContaine
     }
   };
 
+  const shouldBlockNavigation = useCallback(
+    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
+    [],
+  );
+
   if (loadingFinancialCode) {
     return <LoadingBackdrop show={true} parentScreen={true}></LoadingBackdrop>;
   }
@@ -107,6 +117,11 @@ export const UpdateFinancialCodeContainer: React.FC<IUpdateFinancialCodeContaine
             onCancel={onCancel}
             onSuccess={onUpdateSuccess}
             onError={onUpdateError}
+            formikRef={formikRef}
+          />
+          <ConfirmNavigation
+            navigate={history.push}
+            shouldBlockNavigation={shouldBlockNavigation}
           />
         </Col>
       </Row>
diff --git a/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeForm.tsx b/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeForm.tsx
index d6707541d2..a09edeaa5d 100644
--- a/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeForm.tsx
+++ b/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeForm.tsx
@@ -23,6 +23,7 @@ export const UpdateFinancialCodeForm: React.FC<IUpdateFinancialCodeFormProps> =
   onCancel,
   onSuccess,
   onError,
+  formikRef,
 }) => {
   // show confirmation message if user has made changes
   const { setModalContent, setDisplayModal } = useModalContext();
@@ -47,6 +48,7 @@ export const UpdateFinancialCodeForm: React.FC<IUpdateFinancialCodeFormProps> =
 
   return (
     <Formik<FinancialCodeForm>
+      innerRef={formikRef}
       enableReinitialize
       initialValues={
         financialCode ? FinancialCodeForm.fromApi(financialCode) : new FinancialCodeForm()
diff --git a/source/frontend/src/features/leases/shared/propertyPicker/LeaseUpdatePropertySelector.tsx b/source/frontend/src/features/leases/shared/propertyPicker/LeaseUpdatePropertySelector.tsx
index c0b065bf00..6f8e26a750 100644
--- a/source/frontend/src/features/leases/shared/propertyPicker/LeaseUpdatePropertySelector.tsx
+++ b/source/frontend/src/features/leases/shared/propertyPicker/LeaseUpdatePropertySelector.tsx
@@ -50,11 +50,12 @@ import SelectedPropertyHeaderRow from './selectedPropertyList/SelectedPropertyHe
 import SelectedPropertyRow from './selectedPropertyList/SelectedPropertyRow';
 interface LeaseUpdatePropertySelectorProp {
   lease: ApiGen_Concepts_Lease;
+  formikRef: React.RefObject<FormikProps<LeaseFormModel>>;
 }
 
 export const LeaseUpdatePropertySelector: React.FunctionComponent<
   LeaseUpdatePropertySelectorProp
-> = ({ lease }) => {
+> = ({ lease, formikRef }) => {
   const pathSolver = usePathGenerator();
   const [showSaveConfirmModal, setShowSaveConfirmModal] = useState<boolean>(false);
   const [isValid, setIsValid] = useState<boolean>(true);
@@ -63,7 +64,6 @@ export const LeaseUpdatePropertySelector: React.FunctionComponent<
   const { setModalContent, setDisplayModal } = useContext(ModalContext);
   const { resetFilePropertyLocations } = useContext(SideBarContext);
 
-  const formikRef = useRef<FormikProps<LeaseFormModel>>();
   const arrayHelpersRef = useRef<FieldArrayRenderProps | null>(null);
 
   const {
diff --git a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.test.tsx b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.test.tsx
index ec2c4fb678..0f04eaf899 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.test.tsx
+++ b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.test.tsx
@@ -40,6 +40,13 @@ vi.mocked(useDocumentGenerationRepository).mockImplementation(
 
 const onClose = vi.fn();
 
+// Mock ConfirmNavigation to avoid Prompt issues in jsdom
+vi.mock('@/components/common/ConfirmNavigation', () => {
+  return {
+    default: () => null,
+  };
+});
+
 // Need to mock this library for unit tests
 vi.mock('react-visibility-sensor', () => {
   return {
diff --git a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
index b9b431f85f..176080b2a6 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
@@ -11,6 +11,7 @@ import React, {
 } from 'react';
 import { matchPath, useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 
+import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
 import { useMapStateMachine } from '@/components/common/mapFSM/MapStateMachineContext';
 import { InventoryTabNames } from '@/features/mapSideBar/property/InventoryTabs';
@@ -353,6 +354,11 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
     );
   };
 
+  const shouldBlockNavigation = useCallback(
+    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
+    [],
+  );
+
   // UI components
   if (
     loadingAcquisitionFile ||
@@ -364,25 +370,28 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
   }
 
   return (
-    <View
-      isEditing={isEditing}
-      setIsEditing={setIsEditing}
-      containerState={containerState}
-      setContainerState={setContainerState}
-      onClose={close}
-      onCancel={handleCancelClick}
-      onSave={handleSaveClick}
-      onSelectFileSummary={onSelectFileSummary}
-      onSelectProperty={onSelectProperty}
-      onEditProperties={onEditProperties}
-      onUpdateProperties={onUpdateProperties}
-      onSuccess={onSuccess}
-      confirmBeforeAdd={confirmBeforeAdd}
-      canRemove={canRemove}
-      formikRef={formikRef}
-      isFormValid={isValid}
-      error={error}
-    />
+    <>
+      <View
+        isEditing={isEditing}
+        setIsEditing={setIsEditing}
+        containerState={containerState}
+        setContainerState={setContainerState}
+        onClose={close}
+        onCancel={handleCancelClick}
+        onSave={handleSaveClick}
+        onSelectFileSummary={onSelectFileSummary}
+        onSelectProperty={onSelectProperty}
+        onEditProperties={onEditProperties}
+        onUpdateProperties={onUpdateProperties}
+        onSuccess={onSuccess}
+        confirmBeforeAdd={confirmBeforeAdd}
+        canRemove={canRemove}
+        formikRef={formikRef}
+        isFormValid={isValid}
+        error={error}
+      />
+      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+    </>
   );
 };
 
diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.test.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.test.tsx
index 600e7ba8ff..ddec1549fd 100644
--- a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.test.tsx
+++ b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.test.tsx
@@ -34,6 +34,13 @@ const mockDispositionFileApi = mockDispositionFileResponse();
 
 const onClose = vi.fn();
 
+// Mock ConfirmNavigation to avoid Prompt issues in jsdom
+vi.mock('@/components/common/ConfirmNavigation', () => {
+  return {
+    default: () => null,
+  };
+});
+
 // Need to mock this library for unit tests
 vi.mock('react-visibility-sensor', () => {
   return {
diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
index 3b0242df7c..3f8d63070e 100644
--- a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
@@ -3,6 +3,7 @@ import { FormikProps } from 'formik';
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { matchPath, useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 
+import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
 import { useMapStateMachine } from '@/components/common/mapFSM/MapStateMachineContext';
 import { useDispositionProvider } from '@/hooks/repositories/useDispositionProvider';
@@ -322,6 +323,11 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
     [dispositionFileId, getPropertyAssociations],
   );
 
+  const shouldBlockNavigation = useCallback(
+    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
+    [],
+  );
+
   // UI components
   const loading =
     loadingDispositionFile ||
@@ -359,6 +365,7 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
         }
         isEditing={isEditing}
       ></View>
+      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
     </>
   );
 };
diff --git a/source/frontend/src/features/mapSideBar/lease/LeaseContainer.test.tsx b/source/frontend/src/features/mapSideBar/lease/LeaseContainer.test.tsx
index a17113b51c..76c8a02528 100644
--- a/source/frontend/src/features/mapSideBar/lease/LeaseContainer.test.tsx
+++ b/source/frontend/src/features/mapSideBar/lease/LeaseContainer.test.tsx
@@ -37,6 +37,13 @@ vi.mocked(useLeaseRepository, { partial: true }).mockReturnValue({
 vi.mock('@/features/leases/hooks/useLeaseDetail');
 let useLeaseDetailMock: ReturnType<typeof useLeaseDetail>;
 
+// Mock ConfirmNavigation to avoid Prompt issues in jsdom
+vi.mock('@/components/common/ConfirmNavigation', () => {
+  return {
+    default: () => null,
+  };
+});
+
 const history = createMemoryHistory();
 const onClose = vi.fn();
 
diff --git a/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx b/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
index c280846588..a5a6b058f0 100644
--- a/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
@@ -11,6 +11,7 @@ import React, {
 import { useHistory } from 'react-router-dom';
 import * as Yup from 'yup';
 
+import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
 import { useMapStateMachine } from '@/components/common/mapFSM/MapStateMachineContext';
 import { LocationBoundaryDataset } from '@/components/common/mapFSM/models';
@@ -249,6 +250,7 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
       isEditing: false,
       activeEditForm: undefined,
     });
+    setIsPropertyEditing(false);
   };
 
   const handleSaveClick = async () => {
@@ -276,6 +278,7 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
             if (typeof onCancelConfirm === 'function') {
               onCancelConfirm();
             }
+            // onCancelConfirm && onCancelConfirm();
           },
           handleCancel: () => setDisplayModal(false),
         });
@@ -286,8 +289,6 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
     } else {
       handleCancelConfirm();
     }
-
-    setIsPropertyEditing(false);
   };
 
   const fetchLastUpdatedBy = useCallback(async () => {
@@ -393,30 +394,38 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
     refresh();
   };
 
+  const shouldBlockNavigation = useCallback(
+    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
+    [],
+  );
+
   // UI components
   if (loading || getLastUpdatedByLoading) {
     return <LoadingBackdrop show={true} parentScreen={true}></LoadingBackdrop>;
   }
 
   return (
-    <View
-      setIsEditing={setIsPropertyEditing}
-      onClose={close}
-      onSave={handleSaveClick}
-      onCancel={handleCancelClick}
-      onSelectFileSummary={onSelectFileSummary}
-      onSelectProperty={onSelectProperty}
-      onEditProperties={onEditProperties}
-      onPropertyUpdateSuccess={onPropertyUpdate}
-      onChildSuccess={onChildSuccess}
-      refreshLease={refresh}
-      setLease={setLease}
-      formikRef={formikRef}
-      containerState={containerState}
-      setContainerState={setContainerState}
-      isFormValid={isValid}
-      lease={lease}
-    ></View>
+    <>
+      <View
+        setIsEditing={setIsPropertyEditing}
+        onClose={close}
+        onSave={handleSaveClick}
+        onCancel={handleCancelClick}
+        onSelectFileSummary={onSelectFileSummary}
+        onSelectProperty={onSelectProperty}
+        onEditProperties={onEditProperties}
+        onPropertyUpdateSuccess={onPropertyUpdate}
+        onChildSuccess={onChildSuccess}
+        refreshLease={refresh}
+        setLease={setLease}
+        formikRef={formikRef}
+        containerState={containerState}
+        setContainerState={setContainerState}
+        isFormValid={isValid}
+        lease={lease}
+      ></View>
+      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+    </>
   );
 };
 
diff --git a/source/frontend/src/features/mapSideBar/lease/LeaseView.tsx b/source/frontend/src/features/mapSideBar/lease/LeaseView.tsx
index cf833f74a9..e513c6b9fe 100644
--- a/source/frontend/src/features/mapSideBar/lease/LeaseView.tsx
+++ b/source/frontend/src/features/mapSideBar/lease/LeaseView.tsx
@@ -74,7 +74,7 @@ export const LeaseView: React.FunctionComponent<ILeaseViewProps> = ({
   return (
     <Switch>
       <Route path={`${stripTrailingSlash(currentRoute.path)}/property/selector`}>
-        {exists(lease) && <LeaseUpdatePropertySelector lease={lease} />}
+        {exists(lease) && <LeaseUpdatePropertySelector lease={lease} formikRef={formikRef} />}
       </Route>
       <Route>
         <MapSideBarLayout
diff --git a/source/frontend/src/features/mapSideBar/management/ManagementContainer.test.tsx b/source/frontend/src/features/mapSideBar/management/ManagementContainer.test.tsx
index 11431e93ef..0cbfd33e8d 100644
--- a/source/frontend/src/features/mapSideBar/management/ManagementContainer.test.tsx
+++ b/source/frontend/src/features/mapSideBar/management/ManagementContainer.test.tsx
@@ -38,6 +38,13 @@ const mockManagementFileApi = mockManagementFileResponse();
 
 const onClose = vi.fn();
 
+// Mock ConfirmNavigation to avoid Prompt issues in jsdom
+vi.mock('@/components/common/ConfirmNavigation', () => {
+  return {
+    default: () => null,
+  };
+});
+
 // Need to mock this library for unit tests
 vi.mock('react-visibility-sensor', () => {
   return {
diff --git a/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx b/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
index 355650d1ad..f32b1ea7de 100644
--- a/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
@@ -3,6 +3,7 @@ import { FormikProps } from 'formik';
 import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { matchPath, useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 
+import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
 import { useMapStateMachine } from '@/components/common/mapFSM/MapStateMachineContext';
 import { useManagementFileRepository } from '@/hooks/repositories/useManagementFileRepository';
@@ -302,6 +303,11 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
     [managementFileId, getPropertyAssociations],
   );
 
+  const shouldBlockNavigation = useCallback(
+    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
+    [],
+  );
+
   // UI components
   const loading =
     loadingManagementFile ||
@@ -337,6 +343,7 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
         }
         isEditing={isEditing}
       ></View>
+      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
     </>
   );
 };
diff --git a/source/frontend/src/features/mapSideBar/project/ProjectContainerView.test.tsx b/source/frontend/src/features/mapSideBar/project/ProjectContainerView.test.tsx
index 81cbc9a03b..787a1376b4 100644
--- a/source/frontend/src/features/mapSideBar/project/ProjectContainerView.test.tsx
+++ b/source/frontend/src/features/mapSideBar/project/ProjectContainerView.test.tsx
@@ -23,6 +23,13 @@ const mockProps: IProjectContainerViewProps = {
   displayRequiredFieldsError: false,
 };
 
+// Mock ConfirmNavigation to avoid Prompt issues in jsdom
+vi.mock('@/components/common/ConfirmNavigation', () => {
+  return {
+    default: () => null,
+  };
+});
+
 vi.mock('react-visibility-sensor', () => {
   return {
     default: vi.fn().mockImplementation(({ children }) => {
diff --git a/source/frontend/src/features/mapSideBar/project/ProjectContainerView.tsx b/source/frontend/src/features/mapSideBar/project/ProjectContainerView.tsx
index 9a82a69459..2c73083d24 100644
--- a/source/frontend/src/features/mapSideBar/project/ProjectContainerView.tsx
+++ b/source/frontend/src/features/mapSideBar/project/ProjectContainerView.tsx
@@ -1,7 +1,9 @@
 import { FormikProps } from 'formik';
 import { useCallback, useRef } from 'react';
 import { FaBriefcase } from 'react-icons/fa';
+import { useHistory } from 'react-router-dom';
 
+import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import GenericModal from '@/components/common/GenericModal';
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
 import MapSideBarLayout from '@/features/mapSideBar/layout/MapSideBarLayout';
@@ -28,6 +30,8 @@ const ProjectContainerView: React.FC<IProjectContainerViewProps> = ({
 }) => {
   const close = useCallback(() => onClose && onClose(), [onClose]);
 
+  const history = useHistory();
+
   const handleSaveClick = () => {
     if (formikRef !== undefined) {
       setIsValid(formikRef.current?.isValid ?? false);
@@ -63,6 +67,11 @@ const ProjectContainerView: React.FC<IProjectContainerViewProps> = ({
     }
   };
 
+  const shouldBlockNavigation = useCallback(
+    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
+    [],
+  );
+
   if (loadingProject) {
     return <LoadingBackdrop show={true} parentScreen={true}></LoadingBackdrop>;
   }
@@ -111,6 +120,7 @@ const ProjectContainerView: React.FC<IProjectContainerViewProps> = ({
           cancelButtonText="No"
           show
         />
+        <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
       </StyledFormWrapper>
     </MapSideBarLayout>
   );
diff --git a/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.test.tsx b/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.test.tsx
index 1e258daf8e..f76e19c389 100644
--- a/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.test.tsx
+++ b/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.test.tsx
@@ -53,6 +53,13 @@ vi.mock('@/hooks/repositories/usePropertyImprovementRepository', () => ({
   },
 }));
 
+// Mock ConfirmNavigation to avoid Prompt issues in jsdom
+vi.mock('@/components/common/ConfirmNavigation', () => {
+  return {
+    default: () => null,
+  };
+});
+
 describe('MotiInventoryContainer component', () => {
   // render component under test
   const setup = (renderOptions: RenderOptions & IMotiInventoryContainerProps) => {
diff --git a/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx b/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
index ada9717a9e..86a6358220 100644
--- a/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
@@ -2,11 +2,12 @@ import { point } from '@turf/turf';
 import { FormikProps } from 'formik';
 import { Geometry } from 'geojson';
 import { LatLngLiteral } from 'leaflet';
-import React, { useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { generatePath, useHistory, useRouteMatch } from 'react-router-dom';
 import styled from 'styled-components';
 
 import LotSvg from '@/assets/images/icon-lot.svg?react';
+import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import { useMapStateMachine } from '@/components/common/mapFSM/MapStateMachineContext';
 import { PROPERTY_TYPES, useComposedProperties } from '@/hooks/repositories/useComposedProperties';
 import { useQuery } from '@/hooks/use-query';
@@ -118,6 +119,11 @@ export const MotiInventoryContainer: React.FunctionComponent<
     push(path, { search: query.toString() });
   };
 
+  const shouldBlockNavigation = useCallback(
+    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
+    [],
+  );
+
   return (
     <MapSideBarLayout
       title="Property Information"
@@ -146,6 +152,7 @@ export const MotiInventoryContainer: React.FunctionComponent<
         onSuccess={onSuccess}
         ref={formikRef}
       />
+      <ConfirmNavigation navigate={push} shouldBlockNavigation={shouldBlockNavigation} />
     </MapSideBarLayout>
   );
 };
diff --git a/source/frontend/src/features/mapSideBar/research/ResearchContainer.test.tsx b/source/frontend/src/features/mapSideBar/research/ResearchContainer.test.tsx
index a387277856..51a498bc71 100644
--- a/source/frontend/src/features/mapSideBar/research/ResearchContainer.test.tsx
+++ b/source/frontend/src/features/mapSideBar/research/ResearchContainer.test.tsx
@@ -48,6 +48,13 @@ vi.mock('react-visibility-sensor', () => {
 
 const onClose = vi.fn();
 
+// Mock ConfirmNavigation to avoid Prompt issues in jsdom
+vi.mock('@/components/common/ConfirmNavigation', () => {
+  return {
+    default: () => null,
+  };
+});
+
 describe('ResearchContainer component', () => {
   // render component under test
   const setup = (
diff --git a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
index 9c36f4c9d4..b3c822aa0f 100644
--- a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
@@ -3,6 +3,7 @@ import { FormikProps } from 'formik';
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { matchPath, useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 
+import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import LoadingBackdrop from '@/components/common/LoadingBackdrop';
 import { useMapStateMachine } from '@/components/common/mapFSM/MapStateMachineContext';
 import { usePropertyAssociations } from '@/hooks/repositories/usePropertyAssociations';
@@ -280,6 +281,11 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
     );
   };
 
+  const shouldBlockNavigation = useCallback(
+    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
+    [],
+  );
+
   // UI components
   if (
     loadingResearchFile ||
@@ -291,23 +297,26 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
   }
 
   return (
-    <View
-      researchFile={researchFile as unknown as ApiGen_Concepts_ResearchFile}
-      formikRef={formikRef}
-      isEditing={isEditing}
-      setEditMode={setIsEditing}
-      onClose={onClose}
-      onSave={handleSaveClick}
-      onCancel={handleCancelClick}
-      onSelectFileSummary={onSelectFileSummary}
-      onSelectProperty={onSelectProperty}
-      onEditProperties={onEditProperties}
-      onUpdateProperties={onUpdateProperties}
-      confirmBeforeAdd={confirmBeforeAdd}
-      canRemove={canRemove}
-      onSuccess={onSuccess}
-      isFormValid={isValid}
-    />
+    <>
+      <View
+        researchFile={researchFile as unknown as ApiGen_Concepts_ResearchFile}
+        formikRef={formikRef}
+        isEditing={isEditing}
+        setEditMode={setIsEditing}
+        onClose={onClose}
+        onSave={handleSaveClick}
+        onCancel={handleCancelClick}
+        onSelectFileSummary={onSelectFileSummary}
+        onSelectProperty={onSelectProperty}
+        onEditProperties={onEditProperties}
+        onUpdateProperties={onUpdateProperties}
+        confirmBeforeAdd={confirmBeforeAdd}
+        canRemove={canRemove}
+        onSuccess={onSuccess}
+        isFormValid={isValid}
+      />
+      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+    </>
   );
 };
 

From 992baef856fdb2f5cd97feef97c7e83c0fa4537a Mon Sep 17 00:00:00 2001
From: Arturo Reyes Lopez <arturo_reyes_lopez@hotmail.com>
Date: Wed, 7 Jan 2026 12:39:08 -0700
Subject: [PATCH 05/13] Create hook to avoid duplicated code

---
 .../acquisition/AcquisitionContainer.tsx      |  84 +++++---------
 .../disposition/DispositionContainer.tsx      |  75 +++++-------
 .../mapSideBar/lease/LeaseContainer.tsx       | 107 +++++++-----------
 .../management/ManagementContainer.tsx        |  77 +++++--------
 .../property/MotiInventoryContainer.tsx       |  53 +++------
 .../mapSideBar/research/ResearchContainer.tsx |  61 ++++------
 source/frontend/src/hooks/useFormikCancel.ts  |  52 +++++++++
 7 files changed, 209 insertions(+), 300 deletions(-)
 create mode 100644 source/frontend/src/hooks/useFormikCancel.ts

diff --git a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
index 176080b2a6..575c9f6b7e 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
@@ -1,14 +1,5 @@
 import { AxiosError } from 'axios';
-import { FormikProps } from 'formik/dist/types';
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-} from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, useReducer, useState } from 'react';
 import { matchPath, useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 
 import ConfirmNavigation from '@/components/common/ConfirmNavigation';
@@ -20,7 +11,8 @@ import { useProjectProvider } from '@/hooks/repositories/useProjectProvider';
 import { usePropertyAssociations } from '@/hooks/repositories/usePropertyAssociations';
 import { useQuery } from '@/hooks/use-query';
 import useApiUserOverride from '@/hooks/useApiUserOverride';
-import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
+import { useFormikCancel } from '@/hooks/useFormikCancel';
+import { useModalContext } from '@/hooks/useModalContext';
 import { IApiError } from '@/interfaces/IApiError';
 import { ApiGen_CodeTypes_FileTypes } from '@/models/api/generated/ApiGen_CodeTypes_FileTypes';
 import { ApiGen_Concepts_AcquisitionFile } from '@/models/api/generated/ApiGen_Concepts_AcquisitionFile';
@@ -91,26 +83,29 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
     getProject: { execute: getProjectFunction },
   } = useProjectProvider();
 
-  const { setModalContent, setDisplayModal } = useModalContext();
   const { execute: getPropertyAssociations } = usePropertyAssociations();
 
   const mapMachine = useMapStateMachine();
 
-  const formikRef = useRef<FormikProps<any>>(null);
+  const { formikRef, handleCancelClick } = useFormikCancel<any>();
+  const { setModalContent, setDisplayModal } = useModalContext();
   const location = useLocation();
   const history = useHistory();
   const match = useRouteMatch();
   const query = useQuery();
   const isEditing = query.get('edit') === 'true';
 
-  const setIsEditing = (value: boolean) => {
-    if (value) {
-      query.set('edit', value.toString());
-    } else {
-      query.delete('edit');
-    }
-    history.push({ search: query.toString() });
-  };
+  const setIsEditing = useCallback(
+    (value: boolean) => {
+      if (value) {
+        query.set('edit', value.toString());
+      } else {
+        query.delete('edit');
+      }
+      history.push({ search: query.toString() });
+    },
+    [query, history],
+  );
 
   const isPropertySelector = useMemo(
     () =>
@@ -229,9 +224,10 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
 
     if (isEditing) {
       if (formikRef?.current?.dirty) {
-        handleCancelClick(() =>
-          pathGenerator.showFilePropertyId('acquisition', acquisitionFile.id, filePropertyId),
-        );
+        handleCancelClick(() => {
+          setIsEditing(false);
+          pathGenerator.showFilePropertyId('acquisition', acquisitionFile.id, filePropertyId);
+        });
         return;
       }
     }
@@ -259,33 +255,9 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
     }
   };
 
-  const handleCancelClick = (onCancelConfirm?: () => void) => {
-    if (formikRef !== undefined) {
-      if (formikRef.current?.dirty) {
-        setModalContent({
-          ...getCancelModalProps(),
-          handleOk: () => {
-            handleCancelConfirm();
-            setDisplayModal(false);
-            onCancelConfirm && onCancelConfirm();
-          },
-          handleCancel: () => setDisplayModal(false),
-        });
-        setDisplayModal(true);
-      } else {
-        handleCancelConfirm();
-      }
-    } else {
-      handleCancelConfirm();
-    }
-  };
-
-  const handleCancelConfirm = () => {
-    if (formikRef !== undefined) {
-      formikRef.current?.resetForm();
-    }
-    setIsEditing(false);
-  };
+  const handleCancel = useCallback(() => {
+    handleCancelClick(() => setIsEditing(false));
+  }, [handleCancelClick, setIsEditing]);
 
   const onSuccess = () => {
     fetchAcquisitionFile();
@@ -354,10 +326,10 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
     );
   };
 
-  const shouldBlockNavigation = useCallback(
-    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
-    [],
-  );
+  const shouldBlockNavigation = useCallback(() => {
+    const current = formikRef.current;
+    return !!current && current.dirty && !current.isSubmitting;
+  }, [formikRef]);
 
   // UI components
   if (
@@ -377,7 +349,7 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
         containerState={containerState}
         setContainerState={setContainerState}
         onClose={close}
-        onCancel={handleCancelClick}
+        onCancel={handleCancel}
         onSave={handleSaveClick}
         onSelectFileSummary={onSelectFileSummary}
         onSelectProperty={onSelectProperty}
diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
index 3f8d63070e..5490e2f6ba 100644
--- a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
@@ -1,6 +1,5 @@
 import { AxiosError } from 'axios';
-import { FormikProps } from 'formik';
-import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { matchPath, useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 
 import ConfirmNavigation from '@/components/common/ConfirmNavigation';
@@ -10,7 +9,8 @@ import { useDispositionProvider } from '@/hooks/repositories/useDispositionProvi
 import { usePropertyAssociations } from '@/hooks/repositories/usePropertyAssociations';
 import { useQuery } from '@/hooks/use-query';
 import useApiUserOverride from '@/hooks/useApiUserOverride';
-import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
+import { useFormikCancel } from '@/hooks/useFormikCancel';
+import { useModalContext } from '@/hooks/useModalContext';
 import { IApiError } from '@/interfaces/IApiError';
 import { ApiGen_CodeTypes_FileTypes } from '@/models/api/generated/ApiGen_CodeTypes_FileTypes';
 import { ApiGen_Concepts_DispositionFile } from '@/models/api/generated/ApiGen_Concepts_DispositionFile';
@@ -65,21 +65,24 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
 
   const mapMachine = useMapStateMachine();
 
-  const formikRef = useRef<FormikProps<any>>(null);
+  const { formikRef, handleCancelClick } = useFormikCancel<any>();
   const location = useLocation();
   const history = useHistory();
   const match = useRouteMatch();
   const query = useQuery();
   const isEditing = query.get('edit') === 'true';
 
-  const setIsEditing = (value: boolean) => {
-    if (value) {
-      query.set('edit', value.toString());
-    } else {
-      query.delete('edit');
-    }
-    history.push({ search: query.toString() });
-  };
+  const setIsEditing = useCallback(
+    (value: boolean) => {
+      if (value) {
+        query.set('edit', value.toString());
+      } else {
+        query.delete('edit');
+      }
+      history.push({ search: query.toString() });
+    },
+    [query, history],
+  );
 
   const isPropertySelector = useMemo(
     () =>
@@ -162,7 +165,10 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
 
     if (isEditing) {
       if (formikRef?.current?.dirty) {
-        handleCancelClick(() => pathGenerator.showFile('disposition', dispositionFile.id));
+        handleCancelClick(() => {
+          setIsEditing(false);
+          pathGenerator.showFile('disposition', dispositionFile.id);
+        });
         return;
       }
     }
@@ -176,9 +182,10 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
 
     if (isEditing) {
       if (formikRef?.current?.dirty) {
-        handleCancelClick(() =>
-          pathGenerator.showFilePropertyId('disposition', dispositionFile.id, filePropertyId),
-        );
+        handleCancelClick(() => {
+          setIsEditing(false);
+          pathGenerator.showFilePropertyId('disposition', dispositionFile.id, filePropertyId);
+        });
         return;
       }
     }
@@ -206,34 +213,6 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
     }
   };
 
-  const handleCancelClick = (onCancelConfirm?: () => void) => {
-    if (formikRef !== undefined) {
-      if (formikRef.current?.dirty) {
-        setModalContent({
-          ...getCancelModalProps(),
-          handleOk: () => {
-            handleCancelConfirm();
-            setDisplayModal(false);
-            onCancelConfirm && onCancelConfirm();
-          },
-          handleCancel: () => setDisplayModal(false),
-        });
-        setDisplayModal(true);
-      } else {
-        handleCancelConfirm();
-      }
-    } else {
-      handleCancelConfirm();
-    }
-  };
-
-  const handleCancelConfirm = () => {
-    if (formikRef !== undefined) {
-      formikRef.current?.resetForm();
-    }
-    setIsEditing(false);
-  };
-
   const onSuccess = (refreshProperties?: boolean, refreshFile?: boolean) => {
     setIsEditing(false);
     fetchLastUpdatedBy();
@@ -325,9 +304,13 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
 
   const shouldBlockNavigation = useCallback(
     () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
-    [],
+    [formikRef],
   );
 
+  const handleCancel = useCallback(() => {
+    handleCancelClick(() => setIsEditing(false));
+  }, [handleCancelClick, setIsEditing]);
+
   // UI components
   const loading =
     loadingDispositionFile ||
@@ -342,7 +325,7 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
       <View
         setIsEditing={setIsEditing}
         onClose={close}
-        onCancel={handleCancelClick}
+        onCancel={handleCancel}
         onSave={handleSaveClick}
         onSelectFileSummary={onSelectFileSummary}
         onSelectProperty={onSelectProperty}
diff --git a/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx b/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
index a5a6b058f0..286f2d1781 100644
--- a/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
@@ -1,13 +1,5 @@
 import { FormikProps } from 'formik';
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-} from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, useReducer, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import * as Yup from 'yup';
 
@@ -32,7 +24,7 @@ import Surplus from '@/features/leases/detail/LeasePages/surplus/Surplus';
 import { isLeaseFile, LeaseFormModel } from '@/features/leases/models';
 import { useLeaseRepository } from '@/hooks/repositories/useLeaseRepository';
 import { useQuery } from '@/hooks/use-query';
-import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
+import { useFormikCancel } from '@/hooks/useFormikCancel';
 import { ApiGen_Concepts_Lease } from '@/models/api/generated/ApiGen_Concepts_Lease';
 import { exists, filePropertyToLocationBoundaryDataset } from '@/utils';
 
@@ -198,7 +190,7 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
     initialState,
   );
 
-  const formikRef = useRef<FormikProps<LeaseFormModel>>(null);
+  const { formikRef, handleCancelClick } = useFormikCancel<LeaseFormModel>();
 
   const close = useCallback(() => onClose && onClose(), [onClose]);
   const { setLease, getCompleteLease, refresh, loading } = useLeaseDetail(leaseId);
@@ -214,7 +206,6 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
   const query = useQuery();
   const history = useHistory();
   const [isValid, setIsValid] = useState<boolean>(true);
-  const { setModalContent, setDisplayModal } = useModalContext();
 
   const pathSolver = usePathGenerator();
 
@@ -241,17 +232,7 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
     setStaleLastUpdatedBy(true);
   }, [setStaleLastUpdatedBy]);
 
-  const handleCancelConfirm = () => {
-    if (formikRef !== undefined) {
-      formikRef.current?.resetForm();
-    }
-    setIsValid(true);
-    setContainerState({
-      isEditing: false,
-      activeEditForm: undefined,
-    });
-    setIsPropertyEditing(false);
-  };
+  // cancellation handled via useFormikCancel; additional state resets occur in onCancelConfirm callback
 
   const handleSaveClick = async () => {
     await formikRef?.current?.validateForm();
@@ -267,29 +248,29 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
     }
   };
 
-  const handleCancelClick = (onCancelConfirm?: () => void) => {
-    if (formikRef !== undefined) {
-      if (formikRef.current?.dirty) {
-        setModalContent({
-          ...getCancelModalProps(),
-          handleOk: () => {
-            handleCancelConfirm();
-            setDisplayModal(false);
-            if (typeof onCancelConfirm === 'function') {
-              onCancelConfirm();
-            }
-            // onCancelConfirm && onCancelConfirm();
-          },
-          handleCancel: () => setDisplayModal(false),
-        });
-        setDisplayModal(true);
+  const setIsPropertyEditing = useCallback(
+    (value: boolean) => {
+      if (value) {
+        query.set('edit', value.toString());
       } else {
-        handleCancelConfirm();
+        query.delete('edit');
       }
-    } else {
-      handleCancelConfirm();
-    }
-  };
+
+      setContainerState({
+        isEditing: value,
+      });
+      history.push({ search: query.toString() });
+    },
+    [history, query],
+  );
+
+  const handleCancel = useCallback(() => {
+    handleCancelClick(() => {
+      setIsValid(true);
+      setContainerState({ isEditing: false, activeEditForm: undefined });
+      setIsPropertyEditing(false);
+    });
+  }, [handleCancelClick, setIsPropertyEditing]);
 
   const fetchLastUpdatedBy = useCallback(async () => {
     if (leaseId) {
@@ -339,7 +320,10 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
 
     if (containerState.isEditing) {
       if (formikRef?.current?.dirty) {
-        handleCancelClick(() => pathSolver.showFile('lease', lease?.id ?? 0));
+        handleCancelClick(() => {
+          setIsPropertyEditing(false);
+          pathSolver.showFile('lease', lease?.id ?? 0);
+        });
       }
     }
     pathSolver.showFile('lease', lease?.id ?? 0);
@@ -352,9 +336,10 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
 
     if (containerState.isEditing) {
       if (formikRef?.current?.dirty) {
-        handleCancelClick(() =>
-          pathSolver.showFilePropertyId('lease', lease?.id ?? 0, filePropertyId),
-        );
+        handleCancelClick(() => {
+          setIsPropertyEditing(false);
+          pathSolver.showFilePropertyId('lease', lease?.id ?? 0, filePropertyId);
+        });
         return;
       }
     }
@@ -369,22 +354,6 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
     }
   };
 
-  const setIsPropertyEditing = useCallback(
-    (value: boolean) => {
-      if (value) {
-        query.set('edit', value.toString());
-      } else {
-        query.delete('edit');
-      }
-
-      setContainerState({
-        isEditing: value,
-      });
-      history.push({ search: query.toString() });
-    },
-    [history, query],
-  );
-
   useEffect(() => {
     setIsPropertyEditing(query.get('edit') === 'true');
   }, [query, setIsPropertyEditing]);
@@ -394,10 +363,10 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
     refresh();
   };
 
-  const shouldBlockNavigation = useCallback(
-    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
-    [],
-  );
+  const shouldBlockNavigation = useCallback(() => {
+    const current = formikRef.current;
+    return !!current && current.dirty && !current.isSubmitting;
+  }, [formikRef]);
 
   // UI components
   if (loading || getLastUpdatedByLoading) {
@@ -410,7 +379,7 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
         setIsEditing={setIsPropertyEditing}
         onClose={close}
         onSave={handleSaveClick}
-        onCancel={handleCancelClick}
+        onCancel={handleCancel}
         onSelectFileSummary={onSelectFileSummary}
         onSelectProperty={onSelectProperty}
         onEditProperties={onEditProperties}
diff --git a/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx b/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
index f32b1ea7de..cf864902a4 100644
--- a/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
@@ -1,6 +1,5 @@
 import { AxiosError } from 'axios';
-import { FormikProps } from 'formik';
-import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { matchPath, useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 
 import ConfirmNavigation from '@/components/common/ConfirmNavigation';
@@ -10,7 +9,8 @@ import { useManagementFileRepository } from '@/hooks/repositories/useManagementF
 import { usePropertyAssociations } from '@/hooks/repositories/usePropertyAssociations';
 import { useQuery } from '@/hooks/use-query';
 import useApiUserOverride from '@/hooks/useApiUserOverride';
-import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
+import { useFormikCancel } from '@/hooks/useFormikCancel';
+import { useModalContext } from '@/hooks/useModalContext';
 import { IApiError } from '@/interfaces/IApiError';
 import { ApiGen_CodeTypes_FileTypes } from '@/models/api/generated/ApiGen_CodeTypes_FileTypes';
 import { ApiGen_Concepts_File } from '@/models/api/generated/ApiGen_Concepts_File';
@@ -61,7 +61,7 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
 
   const mapMachine = useMapStateMachine();
 
-  const formikRef = useRef<FormikProps<any>>(null);
+  const { formikRef, handleCancelClick } = useFormikCancel<any>();
   const location = useLocation();
   const history = useHistory();
   const match = useRouteMatch();
@@ -156,33 +156,19 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
 
     if (isEditing) {
       if (formikRef?.current?.dirty) {
-        handleCancelClick(() => pathGenerator.showFile('management', managementFile.id));
+        handleCancelClick(() => {
+          setIsEditing(false);
+          pathGenerator.showFile('management', managementFile.id);
+        });
         return;
       }
     }
     pathGenerator.showFile('management', managementFile.id);
   };
 
-  const onSelectProperty = (filePropertyId: number) => {
-    if (!exists(managementFile)) {
-      return;
-    }
-
-    if (isEditing) {
-      if (formikRef?.current?.dirty) {
-        handleCancelClick(() =>
-          pathGenerator.showFilePropertyId('management', managementFile.id, filePropertyId),
-        );
-        return;
-      }
-    }
-    // The index needs to be offset to match the menu index
-    pathGenerator.showFilePropertyId('management', managementFile.id, filePropertyId);
-  };
-
   const onEditProperties = () => {
     if (exists(managementFile)) {
-      pathGenerator.editProperties('management', managementFile.id);
+      pathGenerator.editProperties('management', managementFileId);
     }
   };
 
@@ -200,33 +186,26 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
     }
   };
 
-  const handleCancelClick = (onCancelConfirm?: () => void) => {
-    if (formikRef !== undefined) {
-      if (formikRef.current?.dirty) {
-        setModalContent({
-          ...getCancelModalProps(),
-          handleOk: () => {
-            handleCancelConfirm();
-            setDisplayModal(false);
-            onCancelConfirm && onCancelConfirm();
-          },
-          handleCancel: () => setDisplayModal(false),
-        });
-        setDisplayModal(true);
-      } else {
-        handleCancelConfirm();
-      }
-    } else {
-      handleCancelConfirm();
-    }
+  const handleCancel = () => {
+    handleCancelClick(() => setIsEditing(false));
   };
 
-  const handleCancelConfirm = () => {
-    if (formikRef !== undefined) {
-      formikRef.current?.resetForm();
+  const onSelectProperty = (filePropertyId: number) => {
+    if (!exists(managementFile)) {
+      return;
     }
-    setIsEditing(false);
-    stripEditFromPath();
+
+    if (isEditing) {
+      if (formikRef?.current?.dirty) {
+        handleCancelClick(() => {
+          setIsEditing(false);
+          pathGenerator.showFilePropertyId('management', managementFile.id, filePropertyId);
+        });
+        return;
+      }
+    }
+    // The index needs to be offset to match the menu index
+    pathGenerator.showFilePropertyId('management', managementFile.id, filePropertyId);
   };
 
   const onSuccess = (refreshProperties?: boolean, refreshFile?: boolean) => {
@@ -305,7 +284,7 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
 
   const shouldBlockNavigation = useCallback(
     () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
-    [],
+    [formikRef],
   );
 
   // UI components
@@ -321,7 +300,7 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
       <View
         setIsEditing={setIsEditing}
         onClose={close}
-        onCancel={handleCancelClick}
+        onCancel={handleCancel}
         onSave={handleSaveClick}
         onSelectFileSummary={onSelectFileSummary}
         onSelectProperty={onSelectProperty}
diff --git a/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx b/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
index 86a6358220..ad35aeb5a0 100644
--- a/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
@@ -1,8 +1,7 @@
 import { point } from '@turf/turf';
-import { FormikProps } from 'formik';
 import { Geometry } from 'geojson';
 import { LatLngLiteral } from 'leaflet';
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { generatePath, useHistory, useRouteMatch } from 'react-router-dom';
 import styled from 'styled-components';
 
@@ -11,7 +10,7 @@ import ConfirmNavigation from '@/components/common/ConfirmNavigation';
 import { useMapStateMachine } from '@/components/common/mapFSM/MapStateMachineContext';
 import { PROPERTY_TYPES, useComposedProperties } from '@/hooks/repositories/useComposedProperties';
 import { useQuery } from '@/hooks/use-query';
-import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
+import { useFormikCancel } from '@/hooks/useFormikCancel';
 import { exists, firstOrNull, pinParser } from '@/utils';
 
 import MapSideBarLayout from '../layout/MapSideBarLayout';
@@ -40,11 +39,10 @@ export const MotiInventoryContainer: React.FunctionComponent<
   const isEditing = query.get('edit') === 'true';
   const [isValid, setIsValid] = useState<boolean>(true);
 
-  const { setModalContent, setDisplayModal } = useModalContext();
   const mapMachine = useMapStateMachine();
   const selectedFeatureData = mapMachine.mapLocationFeatureDataset;
 
-  const formikRef = useRef<FormikProps<any>>(null);
+  const { formikRef, handleCancelClick } = useFormikCancel<any>();
   let boundary: Geometry = null;
   if (exists(props.id)) {
     boundary = firstOrNull(selectedFeatureData?.pimsFeatures)?.geometry;
@@ -81,34 +79,7 @@ export const MotiInventoryContainer: React.FunctionComponent<
     }
   };
 
-  const handleCancelClick = () => {
-    if (formikRef !== undefined) {
-      if (formikRef.current?.dirty) {
-        setModalContent({
-          ...getCancelModalProps(),
-          handleOk: () => {
-            handleCancelConfirm();
-            setDisplayModal(false);
-          },
-          handleCancel: () => setDisplayModal(false),
-        });
-        setDisplayModal(true);
-      } else {
-        handleCancelConfirm();
-      }
-    } else {
-      handleCancelConfirm();
-    }
-  };
-
-  const handleCancelConfirm = () => {
-    if (formikRef !== undefined) {
-      formikRef.current?.resetForm();
-    }
-    stripEditFromPath();
-  };
-
-  const stripEditFromPath = () => {
+  const stripEditFromPath = useCallback(() => {
     if (!tabMatch) {
       return;
     }
@@ -117,12 +88,16 @@ export const MotiInventoryContainer: React.FunctionComponent<
       tab: tabMatch?.params.tab,
     });
     push(path, { search: query.toString() });
-  };
+  }, [tabMatch, push, query]);
 
-  const shouldBlockNavigation = useCallback(
-    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
-    [],
-  );
+  const handleCancel = useCallback(() => {
+    handleCancelClick(() => stripEditFromPath());
+  }, [handleCancelClick, stripEditFromPath]);
+
+  const shouldBlockNavigation = useCallback(() => {
+    const current = formikRef.current;
+    return !!current && current.dirty && !current.isSubmitting;
+  }, [formikRef]);
 
   return (
     <MapSideBarLayout
@@ -138,7 +113,7 @@ export const MotiInventoryContainer: React.FunctionComponent<
           <SidebarFooter
             isOkDisabled={formikRef?.current?.isSubmitting}
             onSave={handleSaveClick}
-            onCancel={handleCancelClick}
+            onCancel={handleCancel}
             displayRequiredFieldError={!isValid}
           />
         )
diff --git a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
index b3c822aa0f..2d1c266fb8 100644
--- a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
@@ -1,6 +1,5 @@
 import { AxiosError } from 'axios';
-import { FormikProps } from 'formik';
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { matchPath, useHistory, useLocation, useRouteMatch } from 'react-router-dom';
 
 import ConfirmNavigation from '@/components/common/ConfirmNavigation';
@@ -10,7 +9,8 @@ import { usePropertyAssociations } from '@/hooks/repositories/usePropertyAssocia
 import { useResearchRepository } from '@/hooks/repositories/useResearchRepository';
 import { useQuery } from '@/hooks/use-query';
 import useApiUserOverride from '@/hooks/useApiUserOverride';
-import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
+import { useFormikCancel } from '@/hooks/useFormikCancel';
+import { useModalContext } from '@/hooks/useModalContext';
 import { IApiError } from '@/interfaces/IApiError';
 import { ApiGen_CodeTypes_FileTypes } from '@/models/api/generated/ApiGen_CodeTypes_FileTypes';
 import { ApiGen_Concepts_File } from '@/models/api/generated/ApiGen_Concepts_File';
@@ -62,8 +62,7 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
 
   const [isValid, setIsValid] = useState<boolean>(true);
   const { setModalContent, setDisplayModal } = useModalContext();
-
-  const formikRef = useRef<FormikProps<any>>(null);
+  const { formikRef, handleCancelClick } = useFormikCancel<any>();
   const location = useLocation();
   const history = useHistory();
   const match = useRouteMatch();
@@ -158,7 +157,10 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
 
     if (isEditing) {
       if (formikRef?.current?.dirty) {
-        handleCancelClick(() => pathGenerator.showFile('research', researchFile.id));
+        handleCancelClick(() => {
+          setIsEditing(false);
+          pathGenerator.showFile('research', researchFile.id);
+        });
         return;
       }
     }
@@ -172,9 +174,10 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
 
     if (isEditing) {
       if (formikRef?.current?.dirty) {
-        handleCancelClick(() =>
-          pathGenerator.showFilePropertyId('research', researchFile.id, filePropertyId),
-        );
+        handleCancelClick(() => {
+          setIsEditing(false);
+          pathGenerator.showFilePropertyId('research', researchFile.id, filePropertyId);
+        });
         return;
       }
     }
@@ -202,33 +205,9 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
     }
   };
 
-  const handleCancelClick = (onCancelConfirm?: () => void) => {
-    if (formikRef !== undefined) {
-      if (formikRef.current?.dirty) {
-        setModalContent({
-          ...getCancelModalProps(),
-          handleOk: () => {
-            handleCancelConfirm();
-            setDisplayModal(false);
-            onCancelConfirm && onCancelConfirm();
-          },
-          handleCancel: () => setDisplayModal(false),
-        });
-        setDisplayModal(true);
-      } else {
-        handleCancelConfirm();
-      }
-    } else {
-      handleCancelConfirm();
-    }
-  };
-
-  const handleCancelConfirm = () => {
-    if (formikRef !== undefined) {
-      formikRef.current?.resetForm();
-    }
-    setIsEditing(false);
-  };
+  const handleCancel = useCallback(() => {
+    handleCancelClick(() => setIsEditing(false));
+  }, [handleCancelClick, setIsEditing]);
 
   //TODO: add this if we need this check for the research file.
   const canRemove = async () => true;
@@ -281,10 +260,10 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
     );
   };
 
-  const shouldBlockNavigation = useCallback(
-    () => formikRef.current?.dirty && !formikRef.current?.isSubmitting,
-    [],
-  );
+  const shouldBlockNavigation = useCallback(() => {
+    const current = formikRef.current;
+    return !!current && current.dirty && !current.isSubmitting;
+  }, [formikRef]);
 
   // UI components
   if (
@@ -305,7 +284,7 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
         setEditMode={setIsEditing}
         onClose={onClose}
         onSave={handleSaveClick}
-        onCancel={handleCancelClick}
+        onCancel={handleCancel}
         onSelectFileSummary={onSelectFileSummary}
         onSelectProperty={onSelectProperty}
         onEditProperties={onEditProperties}
diff --git a/source/frontend/src/hooks/useFormikCancel.ts b/source/frontend/src/hooks/useFormikCancel.ts
new file mode 100644
index 0000000000..cfa51c044a
--- /dev/null
+++ b/source/frontend/src/hooks/useFormikCancel.ts
@@ -0,0 +1,52 @@
+import { FormikProps } from 'formik';
+import { useRef } from 'react';
+
+import { getCancelModalProps, useModalContext } from '@/hooks/useModalContext';
+
+/**
+ * Custom hook to handle form cancellation with confirmation modal.
+ * Manages the formikRef, modal state, and cancel logic for forms with unsaved changes.
+ *
+ * @template T - The form model type
+ * @returns Object with formikRef, handleCancelClick, and handleCancelConfirm
+ */
+export const useFormikCancel = <T>() => {
+  const formikRef = useRef<FormikProps<T>>(null);
+  const { setModalContent, setDisplayModal } = useModalContext();
+
+  const handleCancelConfirm = () => {
+    if (formikRef !== undefined) {
+      formikRef.current?.resetForm();
+    }
+  };
+
+  const handleCancelClick = (onCancelConfirm?: () => void) => {
+    if (formikRef !== undefined) {
+      if (formikRef.current?.dirty) {
+        setModalContent({
+          ...getCancelModalProps(),
+          handleOk: () => {
+            handleCancelConfirm();
+            onCancelConfirm && onCancelConfirm();
+            // Close modal AFTER all callbacks complete
+            setDisplayModal(false);
+          },
+          handleCancel: () => setDisplayModal(false),
+        });
+        setDisplayModal(true);
+      } else {
+        handleCancelConfirm();
+        onCancelConfirm && onCancelConfirm();
+      }
+    } else {
+      handleCancelConfirm();
+      onCancelConfirm && onCancelConfirm();
+    }
+  };
+
+  return {
+    formikRef,
+    handleCancelClick,
+    handleCancelConfirm,
+  };
+};

From 5123027046bd60531c3a28bfd4f5593a55eea236 Mon Sep 17 00:00:00 2001
From: Arturo Reyes Lopez <arturo_reyes_lopez@hotmail.com>
Date: Sat, 10 Jan 2026 13:18:30 -0700
Subject: [PATCH 06/13] Update properties after change

---
 .../mapSideBar/shared/update/properties/UpdateProperties.tsx     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx b/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx
index 9b9e535b6b..9be66d1bcf 100644
--- a/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx
+++ b/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx
@@ -246,6 +246,7 @@ export const UpdateProperties: React.FunctionComponent<IUpdatePropertiesProps> =
           <Formik<FileForm>
             innerRef={formikRef}
             initialValues={formFile}
+            enableReinitialize={true}
             validationSchema={UpdatePropertiesYupSchema}
             onSubmit={async (values: FileForm) => {
               const file: ApiGen_Concepts_File = values.toApi();

From 36bd26b47ba3835fafef868196defd5e97492c5b Mon Sep 17 00:00:00 2001
From: Arturo Reyes Lopez <arturo_reyes_lopez@hotmail.com>
Date: Tue, 13 Jan 2026 19:29:21 -0700
Subject: [PATCH 07/13] Waiting for fetching changes and formik to update dirty
 state

---
 .../mapSideBar/disposition/DispositionContainer.tsx |  8 ++++----
 .../mapSideBar/disposition/DispositionView.tsx      |  2 +-
 .../mapSideBar/management/ManagementContainer.tsx   |  8 ++++----
 .../mapSideBar/management/ManagementView.tsx        |  2 +-
 .../shared/update/properties/UpdateProperties.tsx   | 13 +++++++++----
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
index 5490e2f6ba..4895168fec 100644
--- a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
@@ -213,11 +213,11 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
     }
   };
 
-  const onSuccess = (refreshProperties?: boolean, refreshFile?: boolean) => {
+  const onSuccess = async (refreshProperties?: boolean, refreshFile?: boolean) => {
     setIsEditing(false);
     fetchLastUpdatedBy();
     if (refreshFile) {
-      fetchDispositionFile();
+      await fetchDispositionFile();
     }
     if (refreshProperties) {
       mapMachine.refreshMapProperties();
@@ -259,9 +259,9 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
             },
             userOverrideCodes,
           )
-          .then(response => {
+          .then(async response => {
+            await onSuccess(true, true);
             history.push(`${stripTrailingSlash(match.url)}`);
-            onSuccess(true, true);
             return response;
           });
       },
diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionView.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionView.tsx
index daf1135beb..de47a48a0a 100644
--- a/source/frontend/src/features/mapSideBar/disposition/DispositionView.tsx
+++ b/source/frontend/src/features/mapSideBar/disposition/DispositionView.tsx
@@ -43,7 +43,7 @@ export interface IDispositionViewProps {
   onSelectFileSummary: () => void;
   onSelectProperty: (propertyId: number) => void;
   onEditProperties: () => void;
-  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => void;
+  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => Promise<void>;
   onUpdateProperties: (file: ApiGen_Concepts_File) => Promise<ApiGen_Concepts_File | undefined>;
   confirmBeforeAdd: (propertyForm: PropertyForm) => Promise<boolean>;
   canRemove: (propertyId: number) => Promise<boolean>;
diff --git a/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx b/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
index cf864902a4..e5148e4bcf 100644
--- a/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
@@ -208,12 +208,12 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
     pathGenerator.showFilePropertyId('management', managementFile.id, filePropertyId);
   };
 
-  const onSuccess = (refreshProperties?: boolean, refreshFile?: boolean) => {
+  const onSuccess = async (refreshProperties?: boolean, refreshFile?: boolean) => {
     setIsEditing(false);
     stripEditFromPath();
     fetchLastUpdatedBy();
     if (refreshFile) {
-      fetchManagementFile();
+      await fetchManagementFile();
     }
     if (refreshProperties) {
       mapMachine.refreshMapProperties();
@@ -239,9 +239,9 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
             },
             userOverrideCodes,
           )
-          .then(response => {
+          .then(async response => {
+            await onSuccess(true, true);
             history.push(`${stripTrailingSlash(match.url)}`);
-            onSuccess(true, true);
             return response;
           });
       },
diff --git a/source/frontend/src/features/mapSideBar/management/ManagementView.tsx b/source/frontend/src/features/mapSideBar/management/ManagementView.tsx
index bc9263717b..72810e587a 100644
--- a/source/frontend/src/features/mapSideBar/management/ManagementView.tsx
+++ b/source/frontend/src/features/mapSideBar/management/ManagementView.tsx
@@ -43,7 +43,7 @@ export interface IManagementViewProps {
   onSelectFileSummary: () => void;
   onSelectProperty: (propertyId: number) => void;
   onEditProperties: () => void;
-  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => void;
+  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => Promise<void>;
   onUpdateProperties: (file: ApiGen_Concepts_File) => Promise<ApiGen_Concepts_File | undefined>;
   confirmBeforeAdd: (propertyForm: PropertyForm) => Promise<boolean>;
   canRemove: (propertyId: number) => Promise<boolean>;
diff --git a/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx b/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx
index 9be66d1bcf..31415206d8 100644
--- a/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx
+++ b/source/frontend/src/features/mapSideBar/shared/update/properties/UpdateProperties.tsx
@@ -39,7 +39,7 @@ import { UpdatePropertiesYupSchema } from './UpdatePropertiesYupSchema';
 export interface IUpdatePropertiesProps {
   file: ApiGen_Concepts_File;
   setIsShowingPropertySelector: (isShowing: boolean) => void;
-  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => void;
+  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => Promise<void>;
   updateFileProperties: (
     file: ApiGen_Concepts_File,
     userOverrideCodes: UserOverrideCode[],
@@ -161,9 +161,14 @@ export const UpdateProperties: React.FunctionComponent<IUpdatePropertiesProps> =
   const handleCancelConfirm = () => {
     if (formikRef !== undefined) {
       formikRef.current?.resetForm();
+      setTimeout(() => {
+        resetFilePropertyLocations();
+        props.setIsShowingPropertySelector(false);
+      }, 0); // Wait for Formik to update dirty state
+    } else {
+      resetFilePropertyLocations();
+      props.setIsShowingPropertySelector(false);
     }
-    resetFilePropertyLocations();
-    props.setIsShowingPropertySelector(false);
   };
 
   const saveFile = async (file: ApiGen_Concepts_File) => {
@@ -180,7 +185,7 @@ export const UpdateProperties: React.FunctionComponent<IUpdatePropertiesProps> =
         }
         formikRef.current?.resetForm();
         props.setIsShowingPropertySelector(false);
-        props.onSuccess(true);
+        await props.onSuccess(true);
       }
     } catch (e) {
       if (axios.isAxiosError(e) && (e as AxiosError).code === '409') {

From 913987f57998fb2e304ad0bbd30dbd7f89374038 Mon Sep 17 00:00:00 2001
From: Arturo Reyes Lopez <arturo_reyes_lopez@hotmail.com>
Date: Tue, 13 Jan 2026 19:59:27 -0700
Subject: [PATCH 08/13] Changes in onSuccess async

---
 .../mapSideBar/acquisition/AcquisitionContainer.tsx         | 6 +++---
 .../src/features/mapSideBar/acquisition/AcquisitionView.tsx | 6 +++---
 .../src/features/mapSideBar/research/ResearchContainer.tsx  | 2 +-
 .../src/features/mapSideBar/research/ResearchView.tsx       | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
index 575c9f6b7e..06ad6b41a7 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
@@ -259,9 +259,9 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
     handleCancelClick(() => setIsEditing(false));
   }, [handleCancelClick, setIsEditing]);
 
-  const onSuccess = () => {
-    fetchAcquisitionFile();
-    fetchLastUpdatedBy();
+  const onSuccess = async (): Promise<void> => {
+    await fetchAcquisitionFile();
+    await fetchLastUpdatedBy();
     mapMachine.refreshMapProperties();
     setIsEditing(false);
   };
diff --git a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionView.tsx b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionView.tsx
index 8a5c9cb257..c391bf6327 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionView.tsx
+++ b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionView.tsx
@@ -47,7 +47,7 @@ export interface IAcquisitionViewProps {
   onSelectFileSummary: () => void;
   onSelectProperty: (propertyId: number) => void;
   onEditProperties: () => void;
-  onSuccess: () => void;
+  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => Promise<void>;
   onUpdateProperties: (file: ApiGen_Concepts_File) => Promise<ApiGen_Concepts_File | undefined>;
   confirmBeforeAdd: (propertyForm: PropertyForm) => Promise<boolean>;
   canRemove: (propertyId: number) => Promise<boolean>;
@@ -103,9 +103,9 @@ export const AcquisitionView: React.FunctionComponent<IAcquisitionViewProps> = (
     ? getEditTitle(fileMatch, propertySelectorMatch, propertiesMatch)
     : 'Acquisition File';
 
-  const closePropertySelector = () => {
+  const closePropertySelector = async () => {
     setIsEditing(false);
-    onSuccess();
+    await onSuccess();
     history.push(`${match.url}`);
   };
 
diff --git a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
index 2d1c266fb8..24669f92c3 100644
--- a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
@@ -123,7 +123,7 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
     [push, query],
   );
 
-  const onSuccess = useCallback(() => {
+  const onSuccess = useCallback(async (): Promise<void> => {
     setStaleFile(true);
     setStaleLastUpdatedBy(true);
     mapMachine.refreshMapProperties();
diff --git a/source/frontend/src/features/mapSideBar/research/ResearchView.tsx b/source/frontend/src/features/mapSideBar/research/ResearchView.tsx
index 01a8e94be5..7e8bde1d69 100644
--- a/source/frontend/src/features/mapSideBar/research/ResearchView.tsx
+++ b/source/frontend/src/features/mapSideBar/research/ResearchView.tsx
@@ -45,7 +45,7 @@ export interface IResearchViewProps {
   onUpdateProperties: (file: ApiGen_Concepts_File) => Promise<ApiGen_Concepts_File | undefined>;
   confirmBeforeAdd: (propertyForm: PropertyForm) => Promise<boolean>;
   canRemove: (propertyId: number) => Promise<boolean>;
-  onSuccess: () => void;
+  onSuccess: (updateProperties?: boolean, updateFile?: boolean) => Promise<void>;
 }
 
 const ResearchView: React.FunctionComponent<IResearchViewProps> = ({
@@ -71,8 +71,9 @@ const ResearchView: React.FunctionComponent<IResearchViewProps> = ({
   const { hasClaim } = useKeycloakWrapper();
   const { lastUpdatedBy } = useContext(SideBarContext);
 
-  const closePropertySelector = () => {
+  const closePropertySelector = async () => {
     setEditMode(false);
+    await onSuccess();
     history.push(`${match.url}`);
   };
 

From 773bc7b8243fb434d79ea7360ecfa01caa942183 Mon Sep 17 00:00:00 2001
From: Arturo Reyes Lopez <arturo_reyes_lopez@hotmail.com>
Date: Wed, 14 Jan 2026 19:36:10 -0700
Subject: [PATCH 09/13] ConfirmNavigation fix for updating properties

---
 .../src/components/common/ConfirmNavigation.tsx      | 12 +++++++++---
 .../update/UpdateFinancialCodeContainer.tsx          |  1 +
 .../mapSideBar/acquisition/AcquisitionContainer.tsx  |  6 +++++-
 .../mapSideBar/disposition/DispositionContainer.tsx  |  6 +++++-
 .../src/features/mapSideBar/lease/LeaseContainer.tsx |  6 +++++-
 .../mapSideBar/management/ManagementContainer.tsx    |  6 +++++-
 .../mapSideBar/project/ProjectContainerView.tsx      |  6 +++++-
 .../mapSideBar/property/MotiInventoryContainer.tsx   |  6 +++++-
 .../mapSideBar/research/ResearchContainer.tsx        |  6 +++++-
 9 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/source/frontend/src/components/common/ConfirmNavigation.tsx b/source/frontend/src/components/common/ConfirmNavigation.tsx
index a8a859f0f5..9a507cd1ca 100644
--- a/source/frontend/src/components/common/ConfirmNavigation.tsx
+++ b/source/frontend/src/components/common/ConfirmNavigation.tsx
@@ -8,9 +8,10 @@ interface Props {
   when?: boolean | undefined;
   navigate: (path: string) => void;
   shouldBlockNavigation: (location: Location) => boolean;
+  showModal?: boolean;
 }
 
-const ConfirmNavigation = ({ when, navigate, shouldBlockNavigation }: Props) => {
+const ConfirmNavigation = ({ when, navigate, shouldBlockNavigation, showModal = true }: Props) => {
   const { setDisplayModal, setModalContent } = useModalContext();
   const [lastLocation, setLastLocation] = useState<Location | null>(null);
   const [confirmedNavigation, setConfirmedNavigation] = useState(false);
@@ -22,8 +23,13 @@ const ConfirmNavigation = ({ when, navigate, shouldBlockNavigation }: Props) =>
 
   const handleBlockedNavigation = (nextLocation: Location): boolean => {
     if (!confirmedNavigation && shouldBlockNavigation(nextLocation)) {
-      setModalContent({ ...getCancelModalProps(), handleOk: () => handleConfirmNavigationClick() });
-      setDisplayModal(true);
+      if (showModal) {
+        setModalContent({
+          ...getCancelModalProps(),
+          handleOk: () => handleConfirmNavigationClick(),
+        });
+        setDisplayModal(true);
+      }
       setLastLocation(nextLocation);
       return false;
     }
diff --git a/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.tsx b/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.tsx
index fe91b6db5c..ce7c736afe 100644
--- a/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.tsx
+++ b/source/frontend/src/features/admin/financial-codes/update/UpdateFinancialCodeContainer.tsx
@@ -122,6 +122,7 @@ export const UpdateFinancialCodeContainer: React.FC<IUpdateFinancialCodeContaine
           <ConfirmNavigation
             navigate={history.push}
             shouldBlockNavigation={shouldBlockNavigation}
+            showModal={true}
           />
         </Col>
       </Row>
diff --git a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
index 06ad6b41a7..1e91a05d48 100644
--- a/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/acquisition/AcquisitionContainer.tsx
@@ -362,7 +362,11 @@ export const AcquisitionContainer: React.FunctionComponent<IAcquisitionContainer
         isFormValid={isValid}
         error={error}
       />
-      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+      <ConfirmNavigation
+        navigate={history.push}
+        shouldBlockNavigation={shouldBlockNavigation}
+        showModal={!isPropertySelector}
+      />
     </>
   );
 };
diff --git a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
index 4895168fec..a69ff54581 100644
--- a/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/disposition/DispositionContainer.tsx
@@ -348,7 +348,11 @@ export const DispositionContainer: React.FunctionComponent<IDispositionContainer
         }
         isEditing={isEditing}
       ></View>
-      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+      <ConfirmNavigation
+        navigate={history.push}
+        shouldBlockNavigation={shouldBlockNavigation}
+        showModal={!isPropertySelector}
+      />
     </>
   );
 };
diff --git a/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx b/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
index 286f2d1781..53e1806875 100644
--- a/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/lease/LeaseContainer.tsx
@@ -393,7 +393,11 @@ export const LeaseContainer: React.FC<ILeaseContainerProps> = ({ leaseId, onClos
         isFormValid={isValid}
         lease={lease}
       ></View>
-      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+      <ConfirmNavigation
+        navigate={history.push}
+        shouldBlockNavigation={shouldBlockNavigation}
+        showModal={true}
+      />
     </>
   );
 };
diff --git a/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx b/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
index e5148e4bcf..ebffbc097a 100644
--- a/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/management/ManagementContainer.tsx
@@ -322,7 +322,11 @@ export const ManagementContainer: React.FunctionComponent<IManagementContainerPr
         }
         isEditing={isEditing}
       ></View>
-      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+      <ConfirmNavigation
+        navigate={history.push}
+        shouldBlockNavigation={shouldBlockNavigation}
+        showModal={!isPropertySelector}
+      />
     </>
   );
 };
diff --git a/source/frontend/src/features/mapSideBar/project/ProjectContainerView.tsx b/source/frontend/src/features/mapSideBar/project/ProjectContainerView.tsx
index 2c73083d24..1626a9c692 100644
--- a/source/frontend/src/features/mapSideBar/project/ProjectContainerView.tsx
+++ b/source/frontend/src/features/mapSideBar/project/ProjectContainerView.tsx
@@ -120,7 +120,11 @@ const ProjectContainerView: React.FC<IProjectContainerViewProps> = ({
           cancelButtonText="No"
           show
         />
-        <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+        <ConfirmNavigation
+          navigate={history.push}
+          shouldBlockNavigation={shouldBlockNavigation}
+          showModal={true}
+        />
       </StyledFormWrapper>
     </MapSideBarLayout>
   );
diff --git a/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx b/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
index ad35aeb5a0..820cda4f5a 100644
--- a/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/property/MotiInventoryContainer.tsx
@@ -127,7 +127,11 @@ export const MotiInventoryContainer: React.FunctionComponent<
         onSuccess={onSuccess}
         ref={formikRef}
       />
-      <ConfirmNavigation navigate={push} shouldBlockNavigation={shouldBlockNavigation} />
+      <ConfirmNavigation
+        navigate={push}
+        shouldBlockNavigation={shouldBlockNavigation}
+        showModal={true}
+      />
     </MapSideBarLayout>
   );
 };
diff --git a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
index 24669f92c3..739e159202 100644
--- a/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
+++ b/source/frontend/src/features/mapSideBar/research/ResearchContainer.tsx
@@ -294,7 +294,11 @@ export const ResearchContainer: React.FunctionComponent<IResearchContainerProps>
         onSuccess={onSuccess}
         isFormValid={isValid}
       />
-      <ConfirmNavigation navigate={history.push} shouldBlockNavigation={shouldBlockNavigation} />
+      <ConfirmNavigation
+        navigate={history.push}
+        shouldBlockNavigation={shouldBlockNavigation}
+        showModal={!isPropertySelector}
+      />
     </>
   );
 };

From f794ce3650299f19ed2dac0f29cc9193bdd73abd Mon Sep 17 00:00:00 2001
From: Arturo Reyes Lopez <arturo_reyes_lopez@hotmail.com>
Date: Tue, 27 Jan 2026 15:03:24 -0700
Subject: [PATCH 10/13] selectedFeatureDatasets includes PIMS or PMBC
 properties depending on Results section in Search View

---
 .../src/components/common/MoreOptionsMenu.tsx | 10 +++-
 .../Control/Search/SearchContainer.tsx        | 55 +++++++++++++------
 .../leaflet/Control/Search/SearchView.tsx     | 13 ++++-
 3 files changed, 58 insertions(+), 20 deletions(-)

diff --git a/source/frontend/src/components/common/MoreOptionsMenu.tsx b/source/frontend/src/components/common/MoreOptionsMenu.tsx
index 98f18b925f..536b7e0f2e 100644
--- a/source/frontend/src/components/common/MoreOptionsMenu.tsx
+++ b/source/frontend/src/components/common/MoreOptionsMenu.tsx
@@ -26,6 +26,8 @@ export interface IMoreOptionsMenuProps {
   /** List of menu options */
   options: MenuOption[];
   dataTestid?: string;
+  /** Called when the menu is opened */
+  onMenuOpen?: () => void;
 }
 
 /**
@@ -43,9 +45,15 @@ const MoreOptionsMenu: React.FC<IMoreOptionsMenuProps> = ({
   alignRight = true,
   variant = 'light',
   dataTestid,
+  onMenuOpen,
 }) => {
   return (
-    <Dropdown alignRight={alignRight}>
+    <Dropdown
+      alignRight={alignRight}
+      onToggle={isOpen => {
+        if (isOpen) onMenuOpen?.();
+      }}
+    >
       <TooltipWrapper tooltipId="more-options-tooltip" tooltip="More options...">
         <StyledToggleButton
           id="dropdown-ellipsis"
diff --git a/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx b/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
index 9e5e6ab5f6..2a091a699d 100644
--- a/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
@@ -40,6 +40,7 @@ export const SearchContainer: React.FC<ISearchContainerProps> = ({ View }) => {
   const pathGenerator = usePathGenerator();
 
   const { findDistrict, findRegion } = useAdminBoundaryMapLayer();
+  const [isPimsActive, setIsPimsActive] = useState(false);
 
   const handleMapFilterChange = (filter: IPropertyFilter) => {
     if (['coordinates', 'name', 'address'].includes(filter.searchBy)) {
@@ -70,23 +71,42 @@ export const SearchContainer: React.FC<ISearchContainerProps> = ({ View }) => {
 
   // Base dataset (no region/district yet)
   const baseDatasets = useMemo<SelectedFeatureDataset[]>(() => {
-    return (
-      mapFeatureData?.fullyAttributedFeatures.features.map<SelectedFeatureDataset>(pmbcParcel => {
-        const center = getFeatureBoundedCenter(pmbcParcel);
-        return {
-          parcelFeature: pmbcParcel,
-          pimsFeature: null,
-          location: { lat: center[1], lng: center[0] },
-          regionFeature: null,
-          fileLocation: null,
-          fileBoundary: null,
-          districtFeature: null,
-          municipalityFeature: null,
-          selectingComponentId: null,
-        };
-      }) ?? []
-    );
-  }, [mapFeatureData?.fullyAttributedFeatures?.features]);
+    if (isPimsActive) {
+      return (
+        mapFeatureData?.pimsFeatures.features.map<SelectedFeatureDataset>(pimsParcel => {
+          const center = getFeatureBoundedCenter(pimsParcel);
+          return {
+            parcelFeature: null,
+            pimsFeature: pimsParcel,
+            location: { lat: center[1], lng: center[0] },
+            regionFeature: null,
+            fileLocation: null,
+            fileBoundary: null,
+            districtFeature: null,
+            municipalityFeature: null,
+            selectingComponentId: null,
+          };
+        }) ?? []
+      );
+    } else {
+      return (
+        mapFeatureData?.fullyAttributedFeatures.features.map<SelectedFeatureDataset>(pmbcParcel => {
+          const center = getFeatureBoundedCenter(pmbcParcel);
+          return {
+            parcelFeature: pmbcParcel,
+            pimsFeature: null,
+            location: { lat: center[1], lng: center[0] },
+            regionFeature: null,
+            fileLocation: null,
+            fileBoundary: null,
+            districtFeature: null,
+            municipalityFeature: null,
+            selectingComponentId: null,
+          };
+        }) ?? []
+      );
+    }
+  }, [mapFeatureData, isPimsActive]);
 
   // Enrich dataset with region/district info
   const [selectedFeatureDatasets, setSelectedFeatureDatasets] = useState<SelectedFeatureDataset[]>(
@@ -177,6 +197,7 @@ export const SearchContainer: React.FC<ISearchContainerProps> = ({ View }) => {
       onCreateLeaseFile={onCreateLeaseFile}
       onCreateManagementFile={onCreateManagementFile}
       onAddToOpenFile={onAddToOpenFile}
+      setIsPimsActive={setIsPimsActive}
     />
   );
 };
diff --git a/source/frontend/src/components/maps/leaflet/Control/Search/SearchView.tsx b/source/frontend/src/components/maps/leaflet/Control/Search/SearchView.tsx
index d0773141a9..4daccf30a2 100644
--- a/source/frontend/src/components/maps/leaflet/Control/Search/SearchView.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/Search/SearchView.tsx
@@ -42,6 +42,7 @@ export interface ISearchViewProps {
   onCreateLeaseFile: () => void;
   onCreateManagementFile: () => void;
   onAddToOpenFile: () => void;
+  setIsPimsActive: (value: boolean) => void;
 }
 
 interface PropertyProjection<T> {
@@ -183,7 +184,11 @@ export const SearchView: React.FC<ISearchViewProps> = props => {
         className="my-0 py-0"
         header={
           <SimpleSectionHeader title="Results (PMBC)">
-            <MoreOptionsMenu options={menuOptions} ariaLabel="search pmbc results more options" />
+            <MoreOptionsMenu
+              options={menuOptions}
+              ariaLabel="search pmbc results more options"
+              onMenuOpen={() => props.setIsPimsActive(false)}
+            />
           </SimpleSectionHeader>
         }
         isCollapsable
@@ -196,7 +201,11 @@ export const SearchView: React.FC<ISearchViewProps> = props => {
         className="my-0 py-0"
         header={
           <SimpleSectionHeader title="Results (PIMS)">
-            <MoreOptionsMenu options={menuOptions} ariaLabel="search pims results more options" />
+            <MoreOptionsMenu
+              options={menuOptions}
+              ariaLabel="search pims results more options"
+              onMenuOpen={() => props.setIsPimsActive(true)}
+            />
           </SimpleSectionHeader>
         }
         isCollapsable

From 977d5152114646cabe4082723032f249e550d507 Mon Sep 17 00:00:00 2001
From: Arturo Reyes Lopez <arturo_reyes_lopez@hotmail.com>
Date: Fri, 30 Jan 2026 17:26:38 -0700
Subject: [PATCH 11/13] Do not reset the form if user wants to proceed

---
 source/frontend/src/hooks/useAddFileConfirmation.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/frontend/src/hooks/useAddFileConfirmation.ts b/source/frontend/src/hooks/useAddFileConfirmation.ts
index 3f24af7b9d..fca91e5167 100644
--- a/source/frontend/src/hooks/useAddFileConfirmation.ts
+++ b/source/frontend/src/hooks/useAddFileConfirmation.ts
@@ -40,7 +40,6 @@ export function useAddFileConfirmation<T>({
               cancelButtonText: 'No',
               handleOk: () => {
                 // allow the properties to be added to the file being created
-                formikRef.current?.resetForm();
                 formikRef.current?.setFieldValue(fieldName, properties);
                 setDisplayModal(false);
                 // show the user confirmation modal only once when creating a file

From 510887e3d872a747cae5a38ae219a6bb39343008 Mon Sep 17 00:00:00 2001
From: devinleighsmith <devinleighsmith@gmail.com>
Date: Wed, 4 Feb 2026 15:27:00 -0800
Subject: [PATCH 12/13] psp-11096 handle properties with no boundaries but with
 locations.

---
 .../maps/leaflet/Control/Search/SearchContainer.tsx      | 3 ++-
 .../search/PropertySelectorSearchContainer.tsx           | 2 +-
 source/frontend/src/utils/mapPropertyUtils.ts            | 9 ++++++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx b/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
index 2a091a699d..42b227f7c8 100644
--- a/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
+++ b/source/frontend/src/components/maps/leaflet/Control/Search/SearchContainer.tsx
@@ -95,7 +95,8 @@ export const SearchContainer: React.FC<ISearchContainerProps> = ({ View }) => {
           return {
             parcelFeature: pmbcParcel,
             pimsFeature: null,
-            location: { lat: center[1], lng: center[0] },
+            location:
+              exists(center) && center.length >= 2 ? { lat: center[1], lng: center[0] } : null,
             regionFeature: null,
             fileLocation: null,
             fileBoundary: null,
diff --git a/source/frontend/src/components/propertySelector/search/PropertySelectorSearchContainer.tsx b/source/frontend/src/components/propertySelector/search/PropertySelectorSearchContainer.tsx
index edf9471789..2bd95fe6f8 100644
--- a/source/frontend/src/components/propertySelector/search/PropertySelectorSearchContainer.tsx
+++ b/source/frontend/src/components/propertySelector/search/PropertySelectorSearchContainer.tsx
@@ -277,7 +277,7 @@ export const featureToLocationFeatureDataset = (feature: Feature<Geometry, GeoJs
   const locationDataSet: SelectedFeatureDataset = {
     parcelFeature: feature as Feature<Geometry, PMBC_FullyAttributed_Feature_Properties>,
     pimsFeature: null,
-    location: { lat: center[1], lng: center[0] },
+    location: exists(center) && center.length >= 2 ? { lat: center[1], lng: center[0] } : null,
     regionFeature: null,
     fileLocation: null,
     fileBoundary: null,
diff --git a/source/frontend/src/utils/mapPropertyUtils.ts b/source/frontend/src/utils/mapPropertyUtils.ts
index 076872fc10..bff70715c1 100644
--- a/source/frontend/src/utils/mapPropertyUtils.ts
+++ b/source/frontend/src/utils/mapPropertyUtils.ts
@@ -164,13 +164,16 @@ export const getFeatureBoundedCenter = (feature: Feature<Geometry, GeoJsonProper
   } else if (feature?.geometry?.type === ApiGen_CodeTypes_GeoJsonTypes.Point) {
     const boundedCenter = feature.geometry.coordinates;
     return boundedCenter;
+  } else if (exists(feature?.properties?.LOCATION)) {
+    const boundedCenter = feature.properties.LOCATION as Point;
+    return boundedCenter.coordinates;
+  } else if (exists(feature?.properties?.LATITUDE) && exists(feature?.properties?.LONGITUDE)) {
+    return [feature.properties.LONGITUDE, feature.properties.LATITUDE];
   } else {
     toast.error(
       'Unsupported geometry type, unable to determine bounded center. You will need to drop a pin instead.',
     );
-    throw Error(
-      'Unsupported geometry type, unable to determine bounded center. You will need to drop a pin instead.',
-    );
+    return null;
   }
 };
 

From d1e24ea8cccb46fd635aae1433eea8d58a77f2e3 Mon Sep 17 00:00:00 2001
From: Alejandro Sanchez <emailforasr@gmail.com>
Date: Thu, 5 Feb 2026 15:47:55 -0800
Subject: [PATCH 13/13] Update snapshots

---
 .../form/__snapshots__/PropertyImprovementForm.test.tsx.snap     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/source/frontend/src/features/mapSideBar/property/tabs/propertyImprovements/form/__snapshots__/PropertyImprovementForm.test.tsx.snap b/source/frontend/src/features/mapSideBar/property/tabs/propertyImprovements/form/__snapshots__/PropertyImprovementForm.test.tsx.snap
index 93b7f11a86..ea92db914b 100644
--- a/source/frontend/src/features/mapSideBar/property/tabs/propertyImprovements/form/__snapshots__/PropertyImprovementForm.test.tsx.snap
+++ b/source/frontend/src/features/mapSideBar/property/tabs/propertyImprovements/form/__snapshots__/PropertyImprovementForm.test.tsx.snap
@@ -292,7 +292,6 @@ exports[`PropertyImprovementForm component > renders as expected 1`] = `
           >
             <div
               class="align-content-end col"
-              style="overflow: hidden;"
             >
               Property Improvement Details
             </div>