From 0c87168ee41a329feccdd4fd343cb1589fa9f95b Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shreeyash.shrestha@togglecorp.com>
Date: Fri, 31 Oct 2025 16:15:39 +0545
Subject: [PATCH 1/3] feat(local-unit): add new fields in local unit form

---
 .../LocalUnitsFormModal/LocalUnitsForm/index.tsx          | 8 +++-----
 .../LocalUnitsFormModal/LocalUnitsForm/schema.ts          | 1 -
 go-api                                                    | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
index 255ff4caa..771a42a19 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
@@ -383,7 +383,8 @@ function LocalUnitsForm(props: Props) {
     });
 
     const hasValidatePermission = isAuthenticated && (
-        isSuperUser
+        !isExternallyManaged
+        || isSuperUser
         || isLocalUnitGlobalValidatorByType(value.type)
         || isLocalUnitCountryValidatorByType(countryResponse?.id, value.type)
         || isLocalUnitRegionValidatorByType(countryResponse?.region, value.type)
@@ -393,9 +394,6 @@ function LocalUnitsForm(props: Props) {
         || isRegionAdmin(countryResponse?.region)
         || hasValidatePermission;
 
-    const hasDeletePermission = isCountryAdmin(countryResponse?.id)
-        || hasValidatePermission;
-
     const handleFormSubmit = useCallback(
         () => {
             const result = validate();
@@ -543,7 +541,7 @@ function LocalUnitsForm(props: Props) {
                 <Portal container={actionsContainerRef.current}>
                     {isDefined(localUnitDetailsResponse) && (
                         <>
-                            {hasDeletePermission && (
+                            {hasValidatePermission && (
                                 <Button
                                     name={undefined}
                                     onClick={setShowDeleteLocalUnitModalTrue}
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts
index 439af3599..cdc9619eb 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts
@@ -1,4 +1,3 @@
-import { isNotDefined } from '@togglecorp/fujs';
 import {
     addCondition,
     emailCondition,
diff --git a/go-api b/go-api
index e818755e8..12c8869d6 160000
--- a/go-api
+++ b/go-api
@@ -1 +1 @@
-Subproject commit e818755e8c4119fadaeb820f70c1fd5df28b5d67
+Subproject commit 12c8869d60e85882b6380d102f0fb2278bb28ffc

From b20aa23981ac6bc9b766c4d9d9e941a382cf95d9 Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shreeyash.shrestha@togglecorp.com>
Date: Mon, 10 Nov 2025 12:30:21 +0545
Subject: [PATCH 2/3] fix(local-unit): update permission to delete local unit -
 update zoom level in local unit form map - update descriptions in import
 modal

---
 .../domain/BaseMapPointInput/index.tsx        | 11 +++--
 .../LocalUnitImportModal/i18n.json            |  4 +-
 .../LocalUnitImportModal/index.tsx            | 47 +++++++++++--------
 .../LocalUnitImportModal/styles.module.css    |  6 +++
 .../LocalUnitValidateButton/i18n.json         |  6 +++
 .../LocalUnitValidateButton/index.tsx         |  8 ++--
 .../LocalUnitsForm/index.tsx                  | 42 ++++++++---------
 .../LocalUnitsForm/schema.ts                  |  1 +
 .../LocalUnitTableActions/index.tsx           |  2 +-
 .../LocalUnitsTable/i18n.json                 |  5 +-
 .../LocalUnitsTable/index.tsx                 | 18 -------
 go-api                                        |  2 +-
 12 files changed, 80 insertions(+), 72 deletions(-)
 create mode 100644 app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitValidateButton/i18n.json

diff --git a/app/src/components/domain/BaseMapPointInput/index.tsx b/app/src/components/domain/BaseMapPointInput/index.tsx
index 5c11ba9ac..bca0a6bec 100644
--- a/app/src/components/domain/BaseMapPointInput/index.tsx
+++ b/app/src/components/domain/BaseMapPointInput/index.tsx
@@ -219,12 +219,15 @@ function BaseMapPointInput<NAME extends string>(props: Props<NAME>) {
     const [searchResult, setSearchResult] = useState<LocationSearchResult | undefined>();
 
     const center = useMemo(() => {
-        if (isNotDefined(searchResult)) {
-            return undefined;
+        if (isDefined(value?.lng) && isDefined(value?.lat)) {
+            return [value.lng, value.lat] satisfies [number, number];
+        }
+        if (isDefined(searchResult)) {
+            return [+searchResult.lon, +searchResult.lat] satisfies [number, number];
         }
 
-        return [+searchResult.lon, +searchResult.lat] satisfies [number, number];
-    }, [searchResult]);
+        return undefined;
+    }, [searchResult, value?.lng, value?.lat]);
 
     return (
         <div className={_cs(styles.baseMapPointInput, className)}>
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/i18n.json b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/i18n.json
index 9779b4f1a..756d0bca1 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/i18n.json
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/i18n.json
@@ -7,11 +7,13 @@
         "closeButtonLabel": "Close",
         "localUnitTypeInputLabel": "Local unit type",
         "uploadFileSectionTitle": "Upload xlsx file",
-        "uploadFileSectionDescription": "Please make sure to select a supported file format (xlsx) with size less than 10MB",
+        "uploadFileSectionDescription": "Please make sure to select a supported file format (xlsx, xlsm) with size less than 10MB",
         "selectFileButtonLabel": "Select a file",
         "cancelUploadButtonLabel": "Cancel",
         "startUploadButtonLabel": "Upload",
         "contentStructureDescription": "The contents in the xlsx should follow the structure provided in {templateLink}.",
+        "contentStructureNoteLabel": "Note",
+        "contentStructureNote": "To enable multi-select functionality in certain fields, please click \"Enable Macros\" when prompted after opening the downloaded template file.",
         "templateLinkLabel": "this template",
         "noPermissionBothDescription": "You don't have permission and this unit is not externally managed.",
         "noPermissionErrorDescription": "You do not have the permission to upload local unit data",
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/index.tsx
index fa61aabb9..ba9d95a73 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/index.tsx
@@ -14,6 +14,7 @@ import {
     Modal,
     RawFileInput,
     SelectInput,
+    TextOutput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
@@ -230,24 +231,32 @@ function LocalUnitBulkUploadModal(props: Props) {
                     withInternalPadding
                     footerContent={(
                         <div className={styles.fileStructureDescription}>
-                            {resolveToComponent(
-                                strings.contentStructureDescription,
-                                {
-                                    templateLink: (
-                                        <Link
-                                            external
-                                            href={localUnitType === TYPE_HEALTH_CARE
-                                                ? bulkUploadHealthTemplate?.template_url
-                                                : bulkUploadDefaultTemplate?.template_url}
-                                            variant="tertiary"
-                                            iconsContainerClassName={styles.downloadLink}
-                                            withUnderline
-                                        >
-                                            {strings.templateLinkLabel}
-                                        </Link>
-                                    ),
-                                },
-                            )}
+                            <span>
+                                {resolveToComponent(
+                                    strings.contentStructureDescription,
+                                    {
+                                        templateLink: (
+                                            <Link
+                                                external
+                                                href={localUnitType === TYPE_HEALTH_CARE
+                                                    ? bulkUploadHealthTemplate?.template_url
+                                                    : bulkUploadDefaultTemplate?.template_url}
+                                                variant="tertiary"
+                                                iconsContainerClassName={styles.downloadLink}
+                                                withUnderline
+                                            >
+                                                {strings.templateLinkLabel}
+                                            </Link>
+                                        ),
+                                    },
+                                )}
+                            </span>
+                            <TextOutput
+                                strongLabel
+                                valueType="text"
+                                label={strings.contentStructureNoteLabel}
+                                value={strings.contentStructureNote}
+                            />
                         </div>
                     )}
                 >
@@ -258,7 +267,7 @@ function LocalUnitBulkUploadModal(props: Props) {
                     {isNotDefined(bulkUploadFile) && (
                         <RawFileInput
                             name="file"
-                            accept=".xlsx"
+                            accept=".xlsx, .xlsm"
                             onChange={setBulkUploadFile}
                             variant="secondary"
                             disabled={
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/styles.module.css b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/styles.module.css
index 95e535762..54f90508f 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/styles.module.css
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitImportModal/styles.module.css
@@ -4,6 +4,12 @@
         background-color: var(--go-ui-color-background);
     }
 
+    .file-structure-description {
+        display: flex;
+        flex-direction: column;
+        gap: var(--go-ui-spacing-md);
+    }
+
     .upload-section {
         display: flex;
         align-items: start;
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitValidateButton/i18n.json b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitValidateButton/i18n.json
new file mode 100644
index 000000000..bad0c650d
--- /dev/null
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitValidateButton/i18n.json
@@ -0,0 +1,6 @@
+{
+    "namespace": "countryNsOverviewContextAndStructure",
+    "strings": {
+        "localUnitReviewButtonLabel": "Review"
+    }
+}
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitValidateButton/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitValidateButton/index.tsx
index be4acef6a..0571f4313 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitValidateButton/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitValidateButton/index.tsx
@@ -1,8 +1,10 @@
 import { Button } from '@ifrc-go/ui';
+import { useTranslation } from '@ifrc-go/ui/hooks';
 import { _cs } from '@togglecorp/fujs';
 
 import { VALIDATED } from '../common';
 
+import i18n from './i18n.json';
 import styles from './styles.module.css';
 
 interface Props {
@@ -13,11 +15,12 @@ interface Props {
 function LocalUnitValidateButton(props: Props) {
     const {
         status,
-        // statusDetails,
         onClick,
         hasValidatePermission,
     } = props;
 
+    const strings = useTranslation(i18n);
+
     const isValidated = status === VALIDATED;
 
     if (isValidated || !hasValidatePermission) {
@@ -36,9 +39,8 @@ function LocalUnitValidateButton(props: Props) {
                 !hasValidatePermission
                 || isValidated
             }
-            // FIXME: use translations
         >
-            Review
+            {strings.localUnitReviewButtonLabel}
         </Button>
     );
 }
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
index 771a42a19..095067c27 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
@@ -382,13 +382,13 @@ function LocalUnitsForm(props: Props) {
         },
     });
 
-    const hasValidatePermission = isAuthenticated && (
-        !isExternallyManaged
-        || isSuperUser
-        || isLocalUnitGlobalValidatorByType(value.type)
-        || isLocalUnitCountryValidatorByType(countryResponse?.id, value.type)
-        || isLocalUnitRegionValidatorByType(countryResponse?.region, value.type)
-    );
+    const hasValidatePermission = isAuthenticated
+        && !isExternallyManaged
+        && (isSuperUser
+            || isLocalUnitGlobalValidatorByType(value.type)
+            || isLocalUnitCountryValidatorByType(countryResponse?.id, value.type)
+            || isLocalUnitRegionValidatorByType(countryResponse?.region, value.type)
+        );
 
     const hasUpdatePermission = isCountryAdmin(countryResponse?.id)
         || isRegionAdmin(countryResponse?.region)
@@ -542,20 +542,20 @@ function LocalUnitsForm(props: Props) {
                     {isDefined(localUnitDetailsResponse) && (
                         <>
                             {hasValidatePermission && (
-                                <Button
-                                    name={undefined}
-                                    onClick={setShowDeleteLocalUnitModalTrue}
-                                    variant="secondary"
-                                >
-                                    {strings.localUnitDeleteButtonLabel}
-                                </Button>
-                            )}
-                            {hasValidatePermission && (
-                                <LocalUnitValidateButton
-                                    onClick={setShowValidateLocalUnitModalTrue}
-                                    status={localUnitDetailsResponse.status}
-                                    hasValidatePermission={hasValidatePermission}
-                                />
+                                <>
+                                    <Button
+                                        name={undefined}
+                                        onClick={setShowDeleteLocalUnitModalTrue}
+                                        variant="secondary"
+                                    >
+                                        {strings.localUnitDeleteButtonLabel}
+                                    </Button>
+                                    <LocalUnitValidateButton
+                                        onClick={setShowValidateLocalUnitModalTrue}
+                                        status={localUnitDetailsResponse.status}
+                                        hasValidatePermission={hasValidatePermission}
+                                    />
+                                </>
                             )}
                             {readOnlyFromProps
                                 && isEditable
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts
index cdc9619eb..439af3599 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/schema.ts
@@ -1,3 +1,4 @@
+import { isNotDefined } from '@togglecorp/fujs';
 import {
     addCondition,
     emailCondition,
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
index 120311e70..5f92c5fbd 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
@@ -168,7 +168,7 @@ function LocalUnitsTableActions(props: Props) {
                         >
                             {strings.localUnitActionsView}
                         </DropdownMenuItem>
-                        {((hasValidatePermission || countryAdmin)
+                        {(hasValidatePermission
                             && !isBulkUploadLocalUnit) && (
                             <DropdownMenuItem
                                 type="button"
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/i18n.json b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/i18n.json
index 7dd377e44..ba85f5735 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/i18n.json
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/i18n.json
@@ -4,9 +4,6 @@
         "localUnitsTableName": "Name",
         "localUnitsTableAddress": "Address",
         "localUnitsTableType": "Type",
-        "localUnitsTableFocal": "Focal Person",
-        "localUnitsTableStatus": "Status",
-        "localUnitsTablePhoneNumber": "Phone Number",
-        "localUnitsTableEmail": "Email"
+        "localUnitsTableStatus": "Status"
     }
 }
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx
index a210233e5..00e881082 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/index.tsx
@@ -134,21 +134,6 @@ function LocalUnitsTable(props: Props) {
                     (item) => item.type_details.name,
                     { columnClassName: styles.type },
                 ),
-                createStringColumn<LocalUnitsTableListItem, number>(
-                    'focal',
-                    strings.localUnitsTableFocal,
-                    (item) => getFirstTruthyString(item.focal_person_loc, item.focal_person_en),
-                ),
-                createStringColumn<LocalUnitsTableListItem, number>(
-                    'phone',
-                    strings.localUnitsTablePhoneNumber,
-                    (item) => item.phone,
-                ),
-                createStringColumn<LocalUnitsTableListItem, number>(
-                    'email',
-                    strings.localUnitsTableEmail,
-                    (item) => item.email,
-                ),
                 createElementColumn<LocalUnitsTableListItem, number, LocalUnitStatusProps>(
                     'status',
                     strings.localUnitsTableStatus,
@@ -227,9 +212,6 @@ function LocalUnitsTable(props: Props) {
         strings.localUnitsTableAddress,
         strings.localUnitsTableName,
         strings.localUnitsTableType,
-        strings.localUnitsTableFocal,
-        strings.localUnitsTablePhoneNumber,
-        strings.localUnitsTableEmail,
         strings.localUnitsTableStatus,
         refetchLocalUnits,
     ]);
diff --git a/go-api b/go-api
index 12c8869d6..86ea0fa6a 160000
--- a/go-api
+++ b/go-api
@@ -1 +1 @@
-Subproject commit 12c8869d60e85882b6380d102f0fb2278bb28ffc
+Subproject commit 86ea0fa6a114094b7766cc23f446de5d1ea136d3

From b65273e69d627bbd25e88088de4a1eef499f94e7 Mon Sep 17 00:00:00 2001
From: Shreeyash Shrestha <shreeyash.shrestha@togglecorp.com>
Date: Fri, 28 Nov 2025 15:20:17 +0545
Subject: [PATCH 3/3] feat(local-unit): add local unit edit permission for
 selected organization

---
 app/src/hooks/domain/usePermissions.ts        | 24 ++++++++++++++++++-
 .../LocalUnitsForm/index.tsx                  |  5 +++-
 .../LocalUnitTableActions/index.tsx           |  5 ++--
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/app/src/hooks/domain/usePermissions.ts b/app/src/hooks/domain/usePermissions.ts
index 9c0e19523..c1cd95fcd 100644
--- a/app/src/hooks/domain/usePermissions.ts
+++ b/app/src/hooks/domain/usePermissions.ts
@@ -1,8 +1,16 @@
 import { useMemo } from 'react';
-import { isDefined } from '@togglecorp/fujs';
+import {
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
 
+import { type GlobalEnums } from '#contexts/domain';
 import useUserMe from '#hooks/domain/useUserMe';
 
+type OrganizationType = NonNullable<GlobalEnums['api_profile_org_types']>[number]['key'];
+
+const canEditLocalUnitOrganization: OrganizationType[] = ['NTLS', 'DLGN', 'SCRT'];
+
 function usePermissions() {
     const userMe = useUserMe();
 
@@ -96,6 +104,19 @@ function usePermissions() {
                 )
             );
 
+            const canEditLocalUnit = (
+                countryId: number | undefined,
+            ) => {
+                if (isGuestUser
+                    || isNotDefined(countryId)
+                    || isNotDefined(userMe?.profile.org_type)) return false;
+
+                return (
+                    userMe?.profile.country?.id === countryId
+                    && canEditLocalUnitOrganization.includes(userMe?.profile.org_type)
+                );
+            };
+
             const isPerAdmin = !isGuestUser
                 && ((userMe?.is_per_admin_for_countries.length ?? 0) > 0
                     || (userMe?.is_per_admin_for_regions.length ?? 0) > 0);
@@ -126,6 +147,7 @@ function usePermissions() {
                 isSuperUser,
                 isGuestUser,
                 isRegionalOrCountryAdmin,
+                canEditLocalUnit,
             };
         },
         [userMe],
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
index 095067c27..661d9eaec 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsFormModal/LocalUnitsForm/index.tsx
@@ -159,6 +159,7 @@ function LocalUnitsForm(props: Props) {
         isLocalUnitGlobalValidatorByType,
         isLocalUnitRegionValidatorByType,
         isLocalUnitCountryValidatorByType,
+        canEditLocalUnit,
     } = usePermissions();
 
     const { api_visibility_choices: visibilityOptions } = useGlobalEnums();
@@ -392,7 +393,8 @@ function LocalUnitsForm(props: Props) {
 
     const hasUpdatePermission = isCountryAdmin(countryResponse?.id)
         || isRegionAdmin(countryResponse?.region)
-        || hasValidatePermission;
+        || hasValidatePermission
+        || canEditLocalUnit(countryResponse?.id);
 
     const handleFormSubmit = useCallback(
         () => {
@@ -1437,6 +1439,7 @@ function LocalUnitsForm(props: Props) {
                                                 className={styles.diffContainer}
                                             >
                                                 <TextInput
+                                                    required
                                                     name="other_training_facilities"
                                                     label={strings.otherTrainingFacilities}
                                                     value={value.health?.other_training_facilities}
diff --git a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
index 5f92c5fbd..be3798110 100644
--- a/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
+++ b/app/src/views/CountryNsOverviewContextAndStructure/NationalSocietyLocalUnits/LocalUnitsTable/LocalUnitTableActions/index.tsx
@@ -66,6 +66,7 @@ function LocalUnitsTableActions(props: Props) {
         isGuestUser,
         isCountryAdmin,
         isRegionAdmin,
+        canEditLocalUnit,
     } = usePermissions();
 
     const isLocked = status !== VALIDATED;
@@ -86,7 +87,7 @@ function LocalUnitsTableActions(props: Props) {
             || isLocalUnitRegionValidatorByType(countryDetails?.region, localUnitType));
 
     const hasAddEditLocalUnitPermission = !isLocked && (
-        (hasValidatePermission || countryAdmin || regionAdmin)
+        (hasValidatePermission || countryAdmin || regionAdmin || canEditLocalUnit(countryId))
     && !isBulkUploadLocalUnit);
 
     const [readOnlyLocalUnitModal, setReadOnlyLocalUnitModal] = useState(false);
@@ -178,7 +179,7 @@ function LocalUnitsTableActions(props: Props) {
                                 {strings.localUnitActionsDelete}
                             </DropdownMenuItem>
                         )}
-                        {hasAddEditLocalUnitPermission && (
+                        {(hasAddEditLocalUnitPermission) && (
                             <DropdownMenuItem
                                 type="button"
                                 name={localUnitId}