From e267902640c2764426aedf98d606787152da7d0d Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Fri, 31 Jul 2026 12:04:31 +0545
Subject: [PATCH 1/9] fix(eap): revise contact sections and form labels per
 feedback

- Remove National Society, delegation and partner NS contact sections from Full and Simplified overviews
- Drop the corresponding contact schema validations
- Require National Society contact name, title and email in EAP registration
- Point the "send us a message" link to mailto:DREF.anticipatorypillar@ifrc.org
- Add header descriptions to operation activity lists
- Hide the Admin2 select button instead of disabling it when unavailable
- Update EAP form labels and descriptions
---
 .../components/domain/Admin2Input/index.tsx   |   3 +-
 .../domain/ContactInputsSection/index.tsx     |   3 +
 .../domain/EapIndicatorInput/i18n.json        |   2 +-
 .../EapOperationActivityInput/i18n.json       |   2 +-
 .../EapOperationActivityListInput/i18n.json   |   6 +-
 .../EapOperationActivityListInput/index.tsx   |  34 ++-
 .../EapActivationProcess/i18n.json            |  10 +-
 .../EapFullForm/FinanceLogistics/i18n.json    |   6 +-
 app/src/views/EapFullForm/Meal/i18n.json      |   8 +-
 .../NationalSocietyCapacity/i18n.json         |   6 +-
 app/src/views/EapFullForm/Overview/i18n.json  |  20 +-
 app/src/views/EapFullForm/Overview/index.tsx  | 211 ++++------------
 .../views/EapFullForm/RiskAnalysis/i18n.json  |  12 +-
 .../EapFullForm/SelectionActions/i18n.json    |  11 +-
 .../EapFullForm/SelectionActions/index.tsx    |  19 +-
 .../views/EapFullForm/TriggerModel/i18n.json  |  11 +-
 .../views/EapFullForm/TriggerModel/index.tsx  |   1 -
 app/src/views/EapFullForm/schema.ts           |   4 -
 app/src/views/EapRegistration/i18n.json       |   6 +-
 app/src/views/EapRegistration/index.tsx       |   4 +-
 app/src/views/EapRegistration/schema.ts       |   5 +-
 .../EapSimplifiedForm/EarlyAction/i18n.json   |   8 +-
 .../EapSimplifiedForm/Overview/i18n.json      |  14 +-
 .../EapSimplifiedForm/Overview/index.tsx      | 228 ++++--------------
 .../EapSimplifiedForm/RiskAnalysis/i18n.json  |   4 +-
 app/src/views/EapSimplifiedForm/schema.ts     |   4 -
 app/src/views/EarlyActionProtocols/i18n.json  |   2 +-
 cacheppuccino                                 |   2 +-
 go-api                                        |   2 +-
 29 files changed, 189 insertions(+), 459 deletions(-)

diff --git a/app/src/components/domain/Admin2Input/index.tsx b/app/src/components/domain/Admin2Input/index.tsx
index 9771f90d17..0b206663ee 100644
--- a/app/src/components/domain/Admin2Input/index.tsx
+++ b/app/src/components/domain/Admin2Input/index.tsx
@@ -314,11 +314,10 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
             <Container
                 heading={strings.heading}
                 headingLevel={6}
-                footer={(
+                footer={hasAdmin2 && !readOnly && (
                     <Button
                         name={undefined}
                         onClick={setShowModalTrue}
-                        disabled={readOnly || !hasAdmin2}
                     >
                         {strings.buttonLabel}
                     </Button>
diff --git a/app/src/components/domain/ContactInputsSection/index.tsx b/app/src/components/domain/ContactInputsSection/index.tsx
index ae09641c14..c7136cec04 100644
--- a/app/src/components/domain/ContactInputsSection/index.tsx
+++ b/app/src/components/domain/ContactInputsSection/index.tsx
@@ -48,6 +48,7 @@ interface Props<
     readOnly?: boolean;
     withAsteriskOnTitle?: boolean;
     withRequiredNameAndEmail?: boolean;
+    withRequiredTitle?:boolean
 }
 
 function ContactInputsSection<
@@ -65,6 +66,7 @@ function ContactInputsSection<
         readOnly,
         withAsteriskOnTitle,
         withRequiredNameAndEmail,
+        withRequiredTitle,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -112,6 +114,7 @@ function ContactInputsSection<
                 onChange={setContactFieldValue}
                 disabled={disabled}
                 readOnly={readOnly}
+                required={withRequiredTitle}
             />
             <TextInput
                 label={strings.contactEmailInputLabel}
diff --git a/app/src/components/domain/EapIndicatorInput/i18n.json b/app/src/components/domain/EapIndicatorInput/i18n.json
index 960fdad93c..d4a885b760 100644
--- a/app/src/components/domain/EapIndicatorInput/i18n.json
+++ b/app/src/components/domain/EapIndicatorInput/i18n.json
@@ -2,7 +2,7 @@
     "namespace": "eapIndicatorInput",
     "strings": {
         "removeButtonTitle": "Remove",
-        "titleInputLabel": "Title",
+        "titleInputLabel": "Indicator name",
         "targetInputLabel": "Indicator Target"
     }
 }
diff --git a/app/src/components/domain/EapOperationActivityInput/i18n.json b/app/src/components/domain/EapOperationActivityInput/i18n.json
index b7fa2d0a49..9d1a8c2fc2 100644
--- a/app/src/components/domain/EapOperationActivityInput/i18n.json
+++ b/app/src/components/domain/EapOperationActivityInput/i18n.json
@@ -1,7 +1,7 @@
 {
     "namespace": "eapOperationActivityInput",
     "strings": {
-        "operationPriorityActionLabel": "Priority Action",
+        "operationPriorityActionLabel": "Activities",
         "operationTimeFrameLabel": "Timeframe",
         "operationTimeValueLabel": "Activity Time Span"
     }
diff --git a/app/src/components/domain/EapOperationActivityListInput/i18n.json b/app/src/components/domain/EapOperationActivityListInput/i18n.json
index 2f3ba72329..7c35d91111 100644
--- a/app/src/components/domain/EapOperationActivityListInput/i18n.json
+++ b/app/src/components/domain/EapOperationActivityListInput/i18n.json
@@ -4,11 +4,13 @@
         "addButtonLabel": "Add activity",
         "emptyMessage": "No activities yet!",
         "readinessTitle": "Readiness Activities",
+        "readinessTitleDescription": "Add activities and select when the specific activity will be implemented.",
         "readinessDescription": "Readiness activities are done year on year to ensure that the National Society is ready to conduct the early actions. These are activities that will happen irrespective of an activation. Readiness activities may include refresher training, coordination meetings with government, readiness meetings, simulations, etc. Under readiness they can include any ongoing costs and services (human resources and logistics) that are deemed indispensable for subsequent trigger-based early action activities. If, during the simplified EAP development process the National Society finds some areas for improvement to deliver on their selected early actions, these could be addressed with activities included under readiness.",
         "prepositioningTitle": "Pre-positioning Activities",
+        "prepositioningTitleDescription": "Add activities and select when the specific activity will be implemented. Pre-positioning for Activation 1 should be done in year 1 and pre-positioning for Activation 2 – after Activation 1 is concluded.",
         "prepositioningDescription": "The National Society should preposition the materials needed to undertake the early action, especially those that may require a longer procurement process.  For example, prepositioned stocks could include shelter kits (for house reinforcement), sandbags (for protecting infrastructure), or tarpaulins (for protecting water sources), etc. Food, medicine and other items with a shelf life of less than two years are not eligible as pre-positioning, they will have to be procured as part of the early actions. Pre-positioning activities are one-off and done in the first year following approval of the simplified EAP.",
         "earlyActionTitle": "Early Action Activities",
-        "earlyActionDescription": "Early action activities are implemented once a trigger is reached and before the impact of the hazard. Early actions seek to reduce or mitigate the impact of the hazard. Consider selecting only a few early actions, especially for sudden onset events, as they will have to be implemented within a short timeframe. The early actions will be unique to each hazard and context, but may be activities such as evacuation of at-risk communities and/or livestock, early harvest of crops, cash transfer, shelter strengthening, provision of water treatment, hygiene kits or mosquito nets, etc. For more examples of early action activities, visit the {earlyActionDatabaseLink} on the Anticipation Hub.",
-        "earlyActionDatabaseLinkLabel": "early action database"
+        "earlyActionTitleDescription": "Add activities and select when the specific activity will be implemented.",
+        "earlyActionDescription": "Early action activities are implemented once a trigger is reached and before the impact of the hazard. Early actions seek to reduce or mitigate the impact of the hazard. Consider selecting only a few early actions, especially for sudden onset events, as they will have to be implemented within a short timeframe. The early actions will be unique to each hazard and context, but may be activities such as evacuation of at-risk communities and/or livestock, early harvest of crops, cash transfer, shelter strengthening, provision of water treatment, hygiene kits or mosquito nets, etc."
     }
 }
diff --git a/app/src/components/domain/EapOperationActivityListInput/index.tsx b/app/src/components/domain/EapOperationActivityListInput/index.tsx
index e5b90a2771..6a4ec306be 100644
--- a/app/src/components/domain/EapOperationActivityListInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityListInput/index.tsx
@@ -10,7 +10,6 @@ import {
     ListView,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
-import { resolveToComponent } from '@ifrc-go/ui/utils';
 import {
     isNotDefined,
     randomString,
@@ -26,7 +25,6 @@ import {
 import EapOperationActivityInput, { type ActivityInputType } from '#components/domain/EapOperationActivityInput';
 import { type OperationActivityFormFields } from '#components/domain/EapOperationActivityInput/schema';
 import ExplanatoryNote from '#components/ExplanatoryNote';
-import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import { TIMEFRAME_YEAR } from '#utils/constants';
 
@@ -85,34 +83,31 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
 
     const [
         title,
+        titleDescription,
         description,
     ] = useMemo(() => {
         if (name === 'readiness_activities') {
-            return [strings.readinessTitle, strings.readinessDescription];
+            return [
+                strings.readinessTitle,
+                strings.readinessTitleDescription,
+                strings.readinessDescription,
+            ];
         }
 
         if (name === 'prepositioning_activities') {
-            return [strings.prepositioningTitle, strings.prepositioningDescription];
+            return [
+                strings.prepositioningTitle,
+                strings.prepositioningTitleDescription,
+                strings.prepositioningDescription,
+            ];
         }
 
         if (name === 'early_action_activities') {
             return [
                 strings.earlyActionTitle,
-                resolveToComponent(
-                    strings.earlyActionDescription,
-                    {
-                        earlyActionDatabaseLink: (
-                            <Link
-                                href="https://www.anticipation-hub.org/experience/early-action/early-action-database/ea-list"
-                                styleVariant="action"
-                                external
-                                withLinkIcon
-                            >
-                                {strings.earlyActionDatabaseLinkLabel}
-                            </Link>
-                        ),
-                    },
-                ),
+                strings.earlyActionTitleDescription,
+                strings.earlyActionDescription,
+
             ];
         }
 
@@ -123,6 +118,7 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
         <Container
             spacing="sm"
             withDarkBackground
+            headerDescription={titleDescription}
             withHeaderBorder
             withPadding
             heading={(
diff --git a/app/src/views/EapFullForm/EapActivationProcess/i18n.json b/app/src/views/EapFullForm/EapActivationProcess/i18n.json
index 9cdf91f14b..7b444fafba 100644
--- a/app/src/views/EapFullForm/EapActivationProcess/i18n.json
+++ b/app/src/views/EapFullForm/EapActivationProcess/i18n.json
@@ -2,10 +2,10 @@
     "namespace": "eapFullForm",
     "strings": {
         "activationProcessHeading": "EAP Activation Process",
-        "activationProcessTooltip": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see FbF Manual, Chapter 4.2 Select Early Actions.",
+        "activationProcessTooltip": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see Anticipatory Action Manual, Chapter 4.2 Select Early Actions.",
         "activationProcessTitle": "Early action implementation process",
         "activationProcessDescription1": "Include a matrix/flowchart for a quick overview of the early action implementation process.",
-        "activationProcessDescription2": "Early Describe the step-by-step process from Day 1 to Day X for the implementation of the selected early actions. Indicate the day when the Stop Mechanism would occur. Include all critical and support tasks that are necessary for each of the steps. Each task should indicate the position of the person responsible (including when cash-based actions are planned liaison with the financial service provider)... implementation process",
+        "activationProcessDescription2": "Early Describe the step-by-step process from Day 1 to Day X for the implementation of the selected early actions. Indicate the day when the Stop Mechanism would occur. Include all critical and support tasks that are necessary for each of the steps. Each task should indicate the position of the person responsible (including when cash-based actions are planned liaison with the financial service provider)",
         "activationProcessDescriptionLabel": "Description",
         "activationProcessExplanatoryLabel": "Explanatory Note",
         "activationProcessRequiredPointsLabel": "Required Points",
@@ -23,13 +23,13 @@
         "activationTriggerRequiredPoint1": "Describe the automatic system used to monitor the forecasts, generate the intervention map and send the alert message when the trigger is reached.",
         "activationTriggerRequiredPoint2": "If this automatic system does not yet exist, explain how forecasts will be monitored, intervention maps generated and how the relevant actors will be informed that the trigger has been reached.",
         "activationTriggerRequiredPoint3": "Indicate who gives the signal to start the activation.",
-        "activationPeopleTargetedTitle": "People targeted",
+        "activationPeopleTargetedTitle": "Total people targeted",
         "activationPeopleTargetedDescription": "Specify number of people targeted",
         "activationSelectionPopulationTitle": "Selection of target population",
         "activationSelectionDescription1": "Provide a short summary of the target population, (the number, location etc.)",
         "activationSelectionDescription2": "Describe how the target population will be selected, with a special focus on feasibility in the short period of time between forecast and event",
         "activationSelectionDescription3": "If  the EAP is intending to use Social Protection systems or other government      beneficiary databases, indicate how the potential number of targeted households be selected",
-        "activationSelectionExplanatoryNote": "FbF aims to protect the most vulnerable from the impact of extreme weather events. Based on the analysis on vulnerability and exposure (in section 3) and on the described mechanism for identifying intervention areas/communities (in section 4- Intervention area), it needs to be clear, how vulnerability criteria and impact forecasts will be applied to determine who will be targeted.",
+        "activationSelectionExplanatoryNote": "Anticipatory Action aims to protect the most vulnerable from the impact of extreme weather events. Based on the analysis on vulnerability and exposure (in section 3) and on the described mechanism for identifying intervention areas/communities (in section 4- Intervention area), it needs to be clear, how vulnerability criteria and impact forecasts will be applied to determine who will be targeted.",
         "activationStopMechanismTitle": "Stop mechanism",
         "activationStopDescription1": "Indicate on which day of activation the stop mechanism is foreseen, and who is responsible to give the signal to stop.",
         "activationStopDescription2": "Describe when the stop mechanism begins and whether in-kind/cash distribution would be stopped or not. For cash actions cancelled, how would this be coordinated with the financial service provider? For in-kind distribution, what would happen with the perishable items?",
@@ -43,7 +43,7 @@
         "activationImageCountLabel": "5 images max(optional)",
         "activationSourceOfInformationDescription": "Add the description of the sources one at a time. If the source has a link, add in the second field.",
         "activationSectionHeading": "Quality Criteria: EAP activation process",
-        "activationSectionCriteriaIntroduction1": "There is a mechanism in place to monitor the forecasts (ad /or trigger related indicators) and alert relevant actors as soon as a trigger is reached to initiate the early actions. This implies that the process to trigger the FbF system is clearly understood by all the key staff of the NS and relevant partners.",
+        "activationSectionCriteriaIntroduction1": "There is a mechanism in place to monitor the forecasts (ad /or trigger related indicators) and alert relevant actors as soon as a trigger is reached to initiate the early actions. This implies that the process to trigger the Anticipatory Action system is clearly understood by all the key staff of the NS and relevant partners.",
         "activationSectionCriteriaComment11": "Ideally, there is a system in place to automatically monitor the forecasts and send an automatic message of alert to relevant actors as soon as a trigger is reached. It is expected that this will be executed by the national meteorological office and/or national DRM authority. If this automatic system does not exist, a mechanism needs to be in place to monitor the forecasts/indicators and alert relevant actors as soon as a trigger is reached to initiate the early actions",
         "activationSectionCriteriaComment12": "If the trigger is based on a combination of multiple indicators (e.g. for slow onset hazard) and no suitable product exists yet, the EAP needs to explain who will provide the data and how it will be combined and analyzed. This may need to be a consortium of institutions, each providing pieces of information, therefore a clear communication mechanism is vital.",
         "activationSectionCriteriaComment13": "Any risk (e.g. certain data is not collected in time) and mitigation measures (e.g.MOU) should be outlined.",
diff --git a/app/src/views/EapFullForm/FinanceLogistics/i18n.json b/app/src/views/EapFullForm/FinanceLogistics/i18n.json
index 23dabb1dd1..8416fec1f9 100644
--- a/app/src/views/EapFullForm/FinanceLogistics/i18n.json
+++ b/app/src/views/EapFullForm/FinanceLogistics/i18n.json
@@ -11,13 +11,13 @@
         "financeDescriptionLabel": "Description",
         "financeExplanatoryNoteLabel": "Explanatory Note",
         "financeRequiredPointsLabel": "Required Points",
-        "financeExplanatoryNote": "The EAP budget consists of all the costs linked to the activation of the EAP as well as readiness and pre-positioning costs. The budget cannot include costs for the development of the EAP and the setting up of the FbF system in a country (e.g. initial trainings of volunteers, etc.). This process should be financed by other sources of longer-term funding. The maximum amount of funding available for each EAP from the DREF is 500,000 Swiss francs. The budget will have to include the IFRC indirect costs of 6,5%. The National Society may include administrative costs as well in the EAP which should not be more than 5% of the early action budget. If the 5% rate is not used the National Society will need to list out the each of the admin cost individually. The M&E budget should be maximum 5% of overall the budget.",
+        "financeExplanatoryNote": "The EAP budget consists of all the costs linked to the activation of the EAP as well as readiness and pre-positioning costs. The budget cannot include costs for the development of the EAP and the setting up of the Anticipatory Action system in a country (e.g. initial trainings of volunteers, etc.). This process should be financed by other sources of longer-term funding. The maximum amount of funding available for each EAP from the DREF is 500,000 Swiss francs. The budget will have to include the IFRC indirect costs of 6,5%. The National Society may include administrative costs as well in the EAP which should not be more than 5% of the early action budget. If the 5% rate is not used the National Society will need to list out the each of the admin cost individually. The M&E budget should be maximum 5% of overall the budget.",
         "financeUploadButtonLabel": "Upload",
         "financeBudgetDetails": "Budget details",
         "financeDownloadDescription": "Download full budget template",
         "financeUploadBudgetLabel": "Upload Budget",
         "financeReadinessCostTitle": "Readiness cost",
-        "financeReadinessCostExplanatoryNote": "Readiness costs cover those costs related to the upkeep/maintenance of the FbF system in-country, once it has been established and the EAP has been developed. This refers to the required costs to ensure that the NS is “ready” to implement the EAP at any point during the five-year lifecycle of the EAP. These could include, for example, costs for refresher trainings, warehouses, updating data, staff, costs for markets monitoring, costs for updating the cash transfer value etc. Readiness combined with pre-positioning costs are limited to 65% of the total EAP budget over the EAP’s lifecycle and are disbursed by the DREF on an annual basis through the IFRC Operational Plan for that specific country.",
+        "financeReadinessCostExplanatoryNote": "Readiness costs cover those costs related to the upkeep/maintenance of the Anticipatory Action system in-country, once it has been established and the EAP has been developed. This refers to the required costs to ensure that the NS is “ready” to implement the EAP at any point during the five-year lifecycle of the EAP. These could include, for example, costs for refresher trainings, warehouses, updating data, staff, costs for markets monitoring, costs for updating the cash transfer value etc. Readiness combined with pre-positioning costs are limited to 65% of the total EAP budget over the EAP’s lifecycle and are disbursed by the DREF on an annual basis through the IFRC Operational Plan for that specific country.",
         "financeReadinessCostDescription1": "For each item of readiness costs in the budget, explain why these are necessary for the upkeep of the EAP and how these were calculated.",
         "financeReadinessCostDescription2": "Indicate who will manage these funds and describe how it will be ensured that they are only used for the indicated purposes.",
         "financeReadinessBudgetLabel": "Readiness Budget(CHF)",
@@ -36,7 +36,7 @@
         "financeEarlyActionCostExplanatoryNote": "Early Action costs cover all expenditures that are linked to the activation of the EAP, once the trigger has been reached. This can cover identification of target populations; CVA; distribution of items and/or cash, and provision of services; deployment of volunteers and staff; reporting and M & E, such as implementation monitoring; and impact survey data collection and analysis.",
         "financeEapEndorsementHeading": "EAP endorsement/Approval",
         "financeEapEndorsementTitle": "EAP endorsement",
-        "financeEapEndorsementExplanatoryNote": "It should be ensured that at the point of the trigger being reached no further permissions are needed. Thus, the EAP should have prior approval from all relevant stakeholders. The EAP must be endorsed by the leadership of the submitting NS. The EAP should also be endorsed by other key relevant stakeholders, such as the NHMS and the respective DRM authorities. If technical working groups have been created for FbF, their members should also endorse the final version of the EAP before submission.",
+        "financeEapEndorsementExplanatoryNote": "It should be ensured that at the point of the trigger being reached no further permissions are needed. Thus, the EAP should have prior approval from all relevant stakeholders. The EAP must be endorsed by the leadership of the submitting NS. The EAP should also be endorsed by other key relevant stakeholders, such as the NHMS and the respective DRM authorities. If technical working groups have been created for Anticipatory Action, their members should also endorse the final version of the EAP before submission.",
         "financeEapEndorsementDescription": "Describe by whom, how and when the EAP was agreed and endorsed.",
         "updatedChecklistTitle": "Updated checklist",
         "financeSectionHeading": "Quality Criteria: Finance and logistics",
diff --git a/app/src/views/EapFullForm/Meal/i18n.json b/app/src/views/EapFullForm/Meal/i18n.json
index 91501db7cd..96bbe00615 100644
--- a/app/src/views/EapFullForm/Meal/i18n.json
+++ b/app/src/views/EapFullForm/Meal/i18n.json
@@ -2,18 +2,18 @@
     "namespace": "eapFullForm",
     "strings": {
         "mealHeading": "Monitoring, Evaluation, Accountability Learning (Meal)",
-        "mealTitle": "Meal",
-        "mealDescription1": "Following the guidance of the FbF Manual, describe the M&E plan for this EAP. Including:",
+        "mealTitle": "MEAL",
+        "mealDescription1": "Following the guidance of the Anticipatory Action Manual, describe the M&E plan for this EAP. Including:",
         "mealDescription11": "EAP Monitoring (between the trigger moment and the implementation of the actions)",
         "mealDescription12": "Impact evaluation plan: how, when and by whom will the robust impact evaluation to assess how early actions reduced the humanitarian impact of the extreme event be conducted. Please note that the IFRC DREF...",
         "mealDescription13": "Trigger evaluation by whom, when and how the trigger evaluation will be conducted)",
         "mealDescription14": "Learning (when, who and how the learning will take place. E.g workshop, interviews etc). ",
         "mealDescription2": "If a more detailed M&E plan is available add it as an annex. ",
-        "mealDescription3": "Describe how the FbF M&E plan is linked to the existing PMER system of the National Society. If the NS does not have a PMER system, explain how the EAP will be used to strengthen this area prior to activation",
+        "mealDescription3": "Describe how the Anticipatory Action M&E plan is linked to the existing PMER system of the National Society. If the NS does not have a PMER system, explain how the EAP will be used to strengthen this area prior to activation",
         "mealDescriptionLabel": "Description",
         "mealExplanatoryNoteLabel": "Explanatory Note",
         "mealRequiredPointsLabel": "Required Points",
-        "mealExplanatoryNote": "Building evidence about the impact of FbF systems is a priority. Therefore, the EAP should include an M&E plan to 1) assess the impact of the early actions and the extreme event after each activation and 2) identify if all activities were carried out as planned and document how early actions were implemented 3) learn from the process to improve the system in the future. The chapters 4.3 Design M&E plan and 6. Activate, Monitor, Evaluate in the FbF Manual, provide guidance on the set-up and implementation of the monitoring, evaluation, learning tools. Ideally, the M&E system should be set up to allow comparison of impacts between communities that received early actions and those that didn´t (please refer to FbF manual for more information). This M&E plan should be harmonized with the existing IFRC PMER guidance and tools, available on FedNet.",
+        "mealExplanatoryNote": "Building evidence about the impact of Anticipatory Action systems is a priority. Therefore, the EAP should include an M&E plan to 1) assess the impact of the early actions and the extreme event after each activation and 2) identify if all activities were carried out as planned and document how early actions were implemented 3) learn from the process to improve the system in the future. The chapters 4.3 Design M&E plan and 6. Activate, Monitor, Evaluate in the Anticipatory Action Manual, provide guidance on the set-up and implementation of the monitoring, evaluation, learning tools. Ideally, the M&E system should be set up to allow comparison of impacts between communities that received early actions and those that didn´t (please refer to Anticipatory Action manual for more information). This M&E plan should be harmonized with the existing IFRC PMER guidance and tools, available on FedNet.",
         "mealAttachRelevantFilesTitle": "Attach relevant files",
         "mealAttachRelevantFilesDescription": "Attach any additional maps, documentation, files, images, etc.",
         "mealAttachRelevantFilesUploadLabel": "Upload",
diff --git a/app/src/views/EapFullForm/NationalSocietyCapacity/i18n.json b/app/src/views/EapFullForm/NationalSocietyCapacity/i18n.json
index 5cafa814ab..c48fd403f7 100644
--- a/app/src/views/EapFullForm/NationalSocietyCapacity/i18n.json
+++ b/app/src/views/EapFullForm/NationalSocietyCapacity/i18n.json
@@ -2,11 +2,11 @@
     "namespace": "eapFullForm",
     "strings": {
         "capacityHeading": "National Society Capacity",
-        "capacityHeadingTooltip": "Capacity to deliver early action is a key aspect of the FbF system. To have access to the DREF the NS should describe why and how it will be able to implement the early actions proposed in this protocol within the lead time and reaching all of the targeted population. This section could make reference to NS’s experience with previous DREFs (types of disasters, quantity of operations, planned operations implemented, among others). If a National Society has already gone through a Preparedness for Effective Response (PER) assessment process the results of these assessments should be referred to in this section as they provide National Societies with systematic, evidence-based information on their ability to conduct timely early action (looking also at support areas).",
+        "capacityHeadingTooltip": "Capacity to deliver early action is a key aspect of the Anticipatory Action system. To have access to the DREF the NS should describe why and how it will be able to implement the early actions proposed in this protocol within the lead time and reaching all of the targeted population. This section could make reference to NS’s experience with previous DREFs (types of disasters, quantity of operations, planned operations implemented, among others). If a National Society has already gone through a Preparedness for Effective Response (PER) assessment process the results of these assessments should be referred to in this section as they provide National Societies with systematic, evidence-based information on their ability to conduct timely early action (looking also at support areas).",
         "capacityOperationalTitle": "Operational, thematic and administrative capacity",
         "capacityOperationalDescription1": "Describe how the National Society has operative and administrative capacity to implement the EAPs. Describe the National Society’s experience in the implementation of the selected early actions (Livelihoods, including Cash and Voucher Assistance; WASH: Food Security; Shelter, etc.). If the NS does not have experience in these areas, indicate the steps taken to improve its capacity in the respective sector to implement the EAP effectively and efficiently.",
-        "capacityOperationalDescription2": "If a feasibility study on FbF was conducted, indicate the findings in relation to the capacity of the NS to implement FbF.",
-        "capacityOperationalDescription3": "Indicate the number of staff and volunteers available for a potential activation. Explain how they have been trained on FbF/ activation.",
+        "capacityOperationalDescription2": "If a feasibility study on Anticipatory Action was conducted, indicate the findings in relation to the capacity of the NS to implement Anticipatory Action.",
+        "capacityOperationalDescription3": "Indicate the number of staff and volunteers available for a potential activation. Explain how they have been trained on Anticipatory Action/ activation.",
         "capacityOperationalDescription4": "Explain if special structures are foreseen for EAP activation, e.g. NDRTs and specially trained volunteers per branch.",
         "capacityDescriptionLabel": "Description",
         "capacityRequiredPointsLabel": "Required Points",
diff --git a/app/src/views/EapFullForm/Overview/i18n.json b/app/src/views/EapFullForm/Overview/i18n.json
index c10ceca461..51bdc99640 100644
--- a/app/src/views/EapFullForm/Overview/i18n.json
+++ b/app/src/views/EapFullForm/Overview/i18n.json
@@ -15,33 +15,24 @@
         "formExpectedSubmissionTimeDescription": "Include the propose time of submission, accounting for the time it will take to deliver the application.",
         "notSure": "Not Sure",
         "objectiveTitle": "Objective",
-        "objectiveDescription": "Please provide an objective statement that describes the main goal of the intervention.",
+        "objectiveDescription": "Please provide an objective statement that describes the main goal of the intervention. Example: {exampleObjective}",
+        "objectiveDescriptionExample": "This EAP aims to reduce/minimize the impact of river flooding in X region by providing early warning dissemination and cash distribution to at risk families.",
         "partnersInvolved": "Partners Involved",
         "partnersInvolvedDescription": "Select from the list the partners involved in this process. Add as many as needed or select not applicable if no partners involved.",
         "formContacts": "Contacts",
-        "nationalHeader": "National",
-        "delegationHeader": "Delegation",
-        "regionalHeader": "Regional and global",
         "stakeholderHeader": "Stakeholder",
-        "nSContact": "National Society Contact",
-        "nSContactDescription": "National Society contact responsible for the EAP process",
-        "partnerNS": "Partner NS",
-        "partnerNSDescription": "Partner National Society contact",
-        "formFocalPoint": "IFRC Delegation AA Focal Point",
-        "delegation": "IFRC Head of Delegation",
         "drefFocalPoint": "DREF Focal Point",
-        "drefFocalPointDescription": "The DREF contact person fro IFRC",
+        "drefFocalPointDescription": "The DREF contact person for IFRC",
         "regionalFocalPoint": "IFRC Regional AA Focal Point",
         "regionalManager": "IFRC Regional Ops Manager",
         "regionalHead": "IFRC Regional Head of DCC",
-        "regionalCoordinator": "IFRC Global Ops Coordinator",
         "keyActorsAddButton": "Add new actor",
         "workWithGovernmentTitle": "Did you work with the government and other relevant actors in the development of this EAP?",
         "workWithGovernmentDescription": "Please briefly describe the process",
         "overviewExplanatoryNoteLabel": "Explanatory Note",
         "overviewRequiredPointsLabel": "Required Points",
         "overviewRequiredPoint1": "Name the external actors and Movement components that have been involved in the development of this EAP. Include international, national, regional and local actors, if applicable.",
-        "overviewRequiredPoint2": "In case there are technical working groups for the development of the FbF system in country, indicate which organizations participate in these groups.",
+        "overviewRequiredPoint2": "In case there are technical working groups for the development of the Anticipatory Action system in country, indicate which organizations participate in these groups.",
         "overviewRequiredPoint3": "If stakeholders other than RC are involved in implementation/activation of EAP, indicate in one bullet point per organization, their role and list the formal agreement document.",
         "workExplanatoryNote": "In order to avoid creating parallel systems and to minimize additional discussions on permissions, etc. when a trigger occurs, all relevant key stakeholders in the country should be involved in the development, and when necessary, the approval, of the EAP. If stakeholders other than the National Society are involved in implementation of the EAP, roles and responsibilities should be determined in MoUs or other appropriate documents. It is key to highlight the importance of involving the IFRC at the country, cluster and/ or regional level early in the EAP development process as these offices can provide technical support.",
         "actorsExplanatoryNote": "In order to avoid creating parallel systems and to minimize additional discussions on permissions, etc. when a trigger occurs, all relevant key stakeholders in the country should be involved in the development, and when necessary, the approval, of the EAP. If stakeholders other than the National Society are involved in implementation of the EAP, roles and responsibilities should be determined in MoUs or other appropriate documents. It is key to highlight the importance of involving the IFRC at the country, cluster and/ or regional level early in the EAP development process as these offices can provide technical support. ",
@@ -50,8 +41,7 @@
         "keyActorsDescription": "Name the external actors and Movement components that have been involved in the development of this EAP. Include international, national, regional and local actors, if applicable.",
         "keyActorsDescription2": "Use the \"{addNewActorButtonLabel}\" button to list all the actors involved and explain their role.",
         "technicalWorkingGroupsTitle": "Technical working groups in place?",
-        "technicalWorkingGroupDescription": "In case there are technical working groups for the development of the FbF system in country, indicate which organizations participate in these groups.",
-        "addPartnerNSContactButton": "Add Partner NS",
+        "technicalWorkingGroupDescription": "In case there are technical working groups for the development of the Anticipatory Action system in country, indicate which organizations participate in these groups.",
         "technicalWorkingGroupsTitleLabel": "Title",
         "overviewSectionHeading": "Quality Criteria: Overview",
         "sectionCriteriaIntroduction1": "The following quality criteria are used by the IFRC Validation Committee as a benchmark to determine if the Early Action Protocol is eligible to be funded by the DREF. If any of the criteria are not adequately met or just partially met, the Validation Committee may require further information or additional work to demonstrate that the criteria are justified.",
diff --git a/app/src/views/EapFullForm/Overview/index.tsx b/app/src/views/EapFullForm/Overview/index.tsx
index fa9d4c6546..996b7156f4 100644
--- a/app/src/views/EapFullForm/Overview/index.tsx
+++ b/app/src/views/EapFullForm/Overview/index.tsx
@@ -13,7 +13,10 @@ import {
     TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
-import { resolveToString } from '@ifrc-go/ui/utils';
+import {
+    resolveToComponent,
+    resolveToString,
+} from '@ifrc-go/ui/utils';
 import {
     isNotDefined,
     randomString,
@@ -42,7 +45,6 @@ import { charLimits } from '../common';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
 import KeyActorsInput from './KeyActorsInput';
-import PartnerContactsInput from './PartnerContactsInput';
 
 import i18n from './i18n.json';
 
@@ -51,10 +53,6 @@ type KeyActorsFormFields = NonNullable<
     PartialEapFullFormType['key_actors']
 >[number];
 
-type PartnerContactFormFields = NonNullable<
-    PartialEapFullFormType['partner_contacts']
->[number];
-
 interface Props {
     value: PartialEapFullFormType;
     setFieldValue: (...entries: EntriesAsList<PartialEapFullFormType>) => void;
@@ -83,28 +81,17 @@ function Overview(props: Props) {
     const strings = useTranslation(i18n);
     const error = getErrorObject(formError);
 
-    // NOTE: We dont want some fields to have onChange functionality
-    const noop = () => { };
-    const {
-        setValue: onPartnerContactChange,
-        removeValue: onPartnerContactRemove,
-    } = useFormArray<'partner_contacts', PartnerContactFormFields>(
-        'partner_contacts',
-        setFieldValue,
+    const objectiveDescription = (
+        <span>
+            {resolveToComponent(
+                strings.objectiveDescription,
+                { exampleObjective: <i>{strings.objectiveDescriptionExample}</i> },
+            )}
+        </span>
     );
 
-    const handlePartnerContactAdd = useCallback(() => {
-        const newPartnerContactItem: PartnerContactFormFields = {
-            client_id: randomString(),
-        };
-
-        setFieldValue(
-            (oldValue: PartnerContactFormFields[] | undefined) => (
-                [...(oldValue ?? []), newPartnerContactItem]
-            ),
-            'partner_contacts' as const,
-        );
-    }, [setFieldValue]);
+    // NOTE: We dont want some fields to have onChange functionality
+    const noop = () => { };
 
     const { setValue: onKeyActorsChange, removeValue: onKeyActorsRemove } = useFormArray<'key_actors', KeyActorsFormFields>(
         'key_actors',
@@ -243,7 +230,7 @@ function Overview(props: Props) {
                     </InputSection>
                     <InputSection
                         title={strings.objectiveTitle}
-                        description={strings.objectiveDescription}
+                        description={objectiveDescription}
                         withAsteriskOnTitle
                     >
                         <TextArea
@@ -281,140 +268,46 @@ function Overview(props: Props) {
                     spacing="lg"
                 >
                     <Container
-                        heading={strings.nationalHeader}
-                        headingLevel={4}
-                        variant="form"
-                    >
-                        <ListView
-                            layout="block"
-                            spacing="sm"
-                        >
-                            <ContactInputsSection
-                                title={strings.nSContact}
-                                description={strings.nSContactDescription}
-                                namePrefix="national_society_contact"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                                withRequiredNameAndEmail
-                            />
-                            <InputSection
-                                title={strings.partnerNS}
-                                description={strings.partnerNSDescription}
-                            >
-                                <NonFieldError error={getErrorObject(error?.partner_contacts)} />
-                                {value.partner_contacts?.map((contact, index) => (
-                                    <PartnerContactsInput
-                                        key={contact.client_id}
-                                        index={index}
-                                        value={contact}
-                                        onChange={onPartnerContactChange}
-                                        onRemove={onPartnerContactRemove}
-                                        error={getErrorObject(error?.partner_contacts)}
-                                        disabled={disabled}
-                                        readOnly={readOnly}
-                                    />
-                                ))}
-                                <Button
-                                    name={undefined}
-                                    onClick={handlePartnerContactAdd}
-                                    disabled={disabled || readOnly}
-                                    before={<AddLineIcon />}
-                                >
-                                    {strings.addPartnerNSContactButton}
-                                </Button>
-                            </InputSection>
-                        </ListView>
-                    </Container>
-                    <Container
-                        heading={strings.delegationHeader}
-                        headingLevel={4}
-                        variant="form"
-                    >
-                        <ListView
-                            layout="block"
-                            spacing="sm"
-                        >
-                            <ContactInputsSection
-                                title={strings.formFocalPoint}
-                                namePrefix="ifrc_delegation_focal_point"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                                withRequiredNameAndEmail
-                            />
-                            <ContactInputsSection
-                                title={strings.delegation}
-                                namePrefix="ifrc_head_of_delegation"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                                withRequiredNameAndEmail
-                            />
-                        </ListView>
-                    </Container>
-                    <Container
-                        heading={strings.regionalHeader}
-                        headingLevel={4}
                         variant="form"
                     >
-                        <ListView
-                            layout="block"
-                            spacing="sm"
-                        >
-                            <ContactInputsSection
-                                title={strings.drefFocalPoint}
-                                description={strings.drefFocalPointDescription}
-                                namePrefix="dref_focal_point"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                            <ContactInputsSection
-                                title={strings.regionalFocalPoint}
-                                namePrefix="ifrc_regional_focal_point"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                            <ContactInputsSection
-                                title={strings.regionalManager}
-                                namePrefix="ifrc_regional_ops_manager"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                            <ContactInputsSection
-                                title={strings.regionalHead}
-                                namePrefix="ifrc_regional_head_dcc"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                            <ContactInputsSection
-                                title={strings.regionalCoordinator}
-                                namePrefix="ifrc_global_ops_coordinator"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                        </ListView>
+
+                        <ContactInputsSection
+                            title={strings.drefFocalPoint}
+                            description={strings.drefFocalPointDescription}
+                            namePrefix="dref_focal_point"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
+                        <ContactInputsSection
+                            title={strings.regionalFocalPoint}
+                            namePrefix="ifrc_regional_focal_point"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
+                        <ContactInputsSection
+                            title={strings.regionalManager}
+                            namePrefix="ifrc_regional_ops_manager"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
+                        <ContactInputsSection
+                            title={strings.regionalHead}
+                            namePrefix="ifrc_regional_head_dcc"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
                     </Container>
                 </ListView>
             </Container>
diff --git a/app/src/views/EapFullForm/RiskAnalysis/i18n.json b/app/src/views/EapFullForm/RiskAnalysis/i18n.json
index d10b4c8a99..4f02425804 100644
--- a/app/src/views/EapFullForm/RiskAnalysis/i18n.json
+++ b/app/src/views/EapFullForm/RiskAnalysis/i18n.json
@@ -4,12 +4,12 @@
         "riskAnalysisHeading": "Risk Analysis",
         "hazardSelectionTitle": "Hazard selection",
         "riskDescriptionLabel": "Description",
-        "hazardSelectionDescription1": "Provide a brief rationale about the selection of the hazard for the FbF system.",
+        "hazardSelectionDescription1": "Provide a brief rationale about the selection of the hazard for the Anticipatory Action system.",
         "hazardSelectionDescription2": "Explain the selection of the hazard based on an analysis of historical disaster impacts (using the events registered in the below-mentioned table).",
         "hazardSelectionDescription3": "Describe the extent to which this hazard has produced and will produce negative impacts on lives, livelihoods, well-being and other developmental aspects.",
         "hazardSelectionDescription4": "Ensure to address these key questions: What are the impacts of this hazard? How are people most affected? What are the largest daily challenges related to this disaster that will jeopardize their well-being and development? What are the most affected sectors?",
-        "hazardSelectionExplanatoryNote": "Which hazard needs to be addressed by FbF in the country as a priority? Provide an explanation on the reasons that the selected hazard was chosen for this EAP and why it is a major problem in the country.The DREF allocates funding for EAPs to reduce the impacts of extreme events of a strength or magnitude that in the past have required humanitarian assistance. In order to demonstrate that the selected hazard has caused extreme humanitarian impacts in the past, information on the previous impacts of the selected hazard in the country should be provided. This can be gathered from interviews with RC or DRM authorities, archives, records, etc. Other potential sources of information could be National disaster registries, Post Disaster Needs Assessment databases, Desinventar, EMDat, PreventionWeb, etc. For more guidance see the FbF Manual (Chapter 4.1 Set the Trigger)",
-        "hazardSelectionRequiredPoint1": "Provide a brief rationale about the selection of the hazard for the FbF system.",
+        "hazardSelectionExplanatoryNote": "Which hazard needs to be addressed by Anticipatory Action in the country as a priority? Provide an explanation on the reasons that the selected hazard was chosen for this EAP and why it is a major problem in the country.The DREF allocates funding for EAPs to reduce the impacts of extreme events of a strength or magnitude that in the past have required humanitarian assistance. In order to demonstrate that the selected hazard has caused extreme humanitarian impacts in the past, information on the previous impacts of the selected hazard in the country should be provided. This can be gathered from interviews with RC or DRM authorities, archives, records, etc. Other potential sources of information could be National disaster registries, Post Disaster Needs Assessment databases, Desinventar, EMDat, PreventionWeb, etc. For more guidance see the Anticipatory Action Manual (Chapter 4.1 Set the Trigger)",
+        "hazardSelectionRequiredPoint1": "Provide a brief rationale about the selection of the hazard for the Anticipatory Action system.",
         "hazardSelectionRequiredPoint2": "Explain the selection of the hazard based on an analysis of historical disaster impacts (using the events registered in the below-mentioned table).",
         "hazardSelectionRequiredPoint3": "Include a table with the most severe disasters caused by the selected hazard over the past 50 years ",
         "hazardSelectionRequiredPoint31": "Consider the following columns: a) Year and Date b) type of disaster with name (if applicable); c) Strength of event if available (e.g. windspeed on landfall); d) potential cascading hazards (e.g floods induced by hurricanes, landslides induced by extreme rainfall) e) Regions affected; f) Number of people affected; g) Most affected sectors; h) Most severe impacts in key words (e.g. 10000 houses destroyed, cholera epidemic with 2000 confirmed cases etc.)",
@@ -20,7 +20,7 @@
         "exposeElementDescription3": "Based on past impact and exposure, describe the key factors of vulnerability of the specific population, infrastructure, natural resources, assets (others) that are likely to be impacted.",
         "exposeElementDescription4": "Please explain how specific population groups (e.g elderly, children, people with disabilities, IDPs, Refugees, etc.) are most likely to be affected.",
         "exposeElementDescription5": "Note: this exposure and vulnerability analysis will be the basis for the selection of indicators used for the trigger model (section 4.4).",
-        "exposeElementExplanatoryNote": "An analysis of exposure is required to determine who and what is located in the area where the hazard might occur. This will help to determine who and what is likely to be impacted. In line with the impact-based forecasting logic, it is important to identify the main exposed elements on which the FbF intervention will focus. For example, if the prioritized impact of floods is the mortality of children under 5 due to water-borne diseases, then the exposed element will be the population of children under 5: or if the most frequently recurring and largest impact due to tropical storms is the damage to houses built with light materials, then the exposed element will be houses built with light materials. A thorough understanding of the levels of vulnerability (of the exposed elements) will help identify the main risks and ensure that Forecast-based actions are well suited. For instance, if children under 5 are susceptible to death or sickness due to floods, describe the underlying causes of the problem. For more guidance see the FbF Manual (Chapter 4.1 Set the Trigger)",
+        "exposeElementExplanatoryNote": "An analysis of exposure is required to determine who and what is located in the area where the hazard might occur. This will help to determine who and what is likely to be impacted. In line with the impact-based forecasting logic, it is important to identify the main exposed elements on which the Anticipatory Action intervention will focus. For example, if the prioritized impact of floods is the mortality of children under 5 due to water-borne diseases, then the exposed element will be the population of children under 5: or if the most frequently recurring and largest impact due to tropical storms is the damage to houses built with light materials, then the exposed element will be houses built with light materials. A thorough understanding of the levels of vulnerability (of the exposed elements) will help identify the main risks and ensure that Forecast-based actions are well suited. For instance, if children under 5 are susceptible to death or sickness due to floods, describe the underlying causes of the problem. For more guidance see the Anticipatory Action Manual (Chapter 4.1 Set the Trigger)",
         "exposeElementRequiredPoint1": "Explain which people are most likely to experience the impacts of this hazard? Where do they live, and why are they vulnerable? Note: This will inform the early action selection.",
         "exposeElementRequiredPoint2": "Based on the analysis of past impacts, provide a brief overview which population, infrastructure, natural resources, markets, assets (others) were and/or are likely to be exposed to the selected hazard and where are they located.",
         "exposeElementRequiredPoint3": "Based on past impact and exposure, describe the key factors of vulnerability of the specific population, infrastructure, natural resources, assets (others) that are likely to be impacted.",
@@ -29,7 +29,7 @@
         "prioritisedImpactTitle": "Prioritised impact",
         "prioritisedImpactsLabel": "Prioritised impacts",
         "prioritisedImpactDescription": "Add the list of prioritised impacts. Explain which priority impacts the EAP will address and why (e.g mortality of alpacas due to cold waves, Internal Displacement due to floods, malnutrition of children under 5 due to drought etc.).",
-        "prioritisedImpactExplanatoryNote": "Recognizing that an FbF system will not be able to address all risks and potential impacts, based on the analysis of past impact, exposure and vulnerability (sections 3.1. to 3.2) and the results of the joint identification conducted with key stakeholders, indicate which disaster impacts were prioritized, explaining how and why they were prioritized. For more guidance see the FbF Manual (Chapters 4.1 Set the Trigger and 4.2 Select Early Actions)",
+        "prioritisedImpactExplanatoryNote": "Recognizing that an Anticipatory Action system will not be able to address all risks and potential impacts, based on the analysis of past impact, exposure and vulnerability (sections 3.1. to 3.2) and the results of the joint identification conducted with key stakeholders, indicate which disaster impacts were prioritized, explaining how and why they were prioritized. For more guidance see the Anticipatory Action Manual (Chapters 4.1 Set the Trigger and 4.2 Select Early Actions)",
         "prioritizedImpactsEmptyMessage": "No impacts yet!",
         "attachFilesTitle": "Attach relevant files",
         "attachFilesDescription": "Attach any additional documentation, files, images, etc.",
@@ -42,7 +42,7 @@
         "riskAnalysisImagesCountLabel": "5 images max(optional)",
         "riskRequiredPointsLabel": "Required Points",
         "riskAnalysisSectionHeading": "Quality Criteria: Risk Analysis",
-        "riskSectionCriteriaIntroduction1": "The EAP triggers are based on a combination of the analysis of risk factors and the forecast in line with the steps of the trigger methodology outlined in the FbF manual. The EAP contains a clear trigger statement.",
+        "riskSectionCriteriaIntroduction1": "The EAP triggers are based on a combination of the analysis of risk factors and the forecast in line with the steps of the trigger methodology outlined in the Anticipatory Action manual. The EAP contains a clear trigger statement.",
         "riskSectionCriteriaComment11": "The EAP should clearly show how on the basis of available data on vulnerability, exposure and impact of past events the trigger was determined. The trigger should be clear as this information needs to be verifiable once the trigger is met, so the EAP needs to state in one sentence what exactly the trigger of your EAP will be, for example: When [source] issues a forecast of at least [probability of magnitude of event or impact], then we will act.",
         "riskSectionCriteriaComment12": "If the EAP has more than one trigger (e.g. phased or staggered triggers) then each trigger should be clearly explained along with explanation what action will be taken following each trigger and when transfer of the early action funds are required.",
         "riskSectionCriteriaComment13": "For slow onset hazards, the trigger can also be based on a combination of risk factors, forecasts and observation data especially if the impact is a result of accumulative factors (e.g. forecast of second consecutive failed rainy season). If unconventional triggers are used (e.g. combining multiple indicators, including socio-economic indicators like food prices), clear explanation should be given on which criteria/ conditions was used to assign certain weight to each indicator.",
diff --git a/app/src/views/EapFullForm/SelectionActions/i18n.json b/app/src/views/EapFullForm/SelectionActions/i18n.json
index 37054e64e5..944e265e2f 100644
--- a/app/src/views/EapFullForm/SelectionActions/i18n.json
+++ b/app/src/views/EapFullForm/SelectionActions/i18n.json
@@ -2,14 +2,14 @@
     "namespace": "eapFullForm",
     "strings": {
         "selectionActionsHeading": "Selection of Actions",
-        "selectionActionsTooltipDescription": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see FbF Manual, Chapter 4.2 Select Early Actions.",
+        "selectionActionsTooltipDescription": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see Anticipatory Action Manual, Chapter 4.2 Select Early Actions.",
         "selectionProcessTitle": "Early action selection process",
         "selectionProcessDescription1": "Add the list of early actions",
         "selectionProcessDescription2": "Based on the prioritized impacts/risks of section 3, provide a brief rationale (e.g. your criteria) for the selection of action(s), also indicating which actions were considered but not chosen.",
         "selectionProcessDescription3": "Describe the process used to select the actions: Who was consulted? Which assessments/research were carried out?",
-        "selectionProcessDescription4": "Does the FbF activation intend to use government social protection systems? Other State institutions’ databases and/or sources? Provide an explanation of potential number of target population to be selected.",
+        "selectionProcessDescription4": "Does the Anticipatory Action activation intend to use government social protection systems? Other State institutions’ databases and/or sources? Provide an explanation of potential number of target population to be selected.",
         "selectionProcessDescription5": "If CVA is included, has a cash feasibility assessment been conducted (including needs and affected population preference, markets, financial service providers and National Society capacity assessments)?",
-        "selectionProcessExplanatoryNote": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see FbF Manual, Chapter 4.2 Select Early Actions.",
+        "selectionProcessExplanatoryNote": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see Anticipatory Action Manual, Chapter 4.2 Select Early Actions.",
         "selectionProcessRequiredPoint1": "Based on the prioritized impacts/risks, provide a brief rationale (e.g. your criteria) for the selection of action(s), also indicating which actions were considered but not chosen (max. 1000 words)",
         "selectionProcessRequiredPoint2": "Describe the process used to select the actions: Who was consulted? Which assessments/research were carried out? (max 1000 words)",
         "selectionProcessRequiredPoint3": "Show how the selected action aims to reduce the expected humanitarian impact, by filling out the Theory of Change (ToC) table.",
@@ -24,6 +24,7 @@
         "selectionActionUploadLabel": "Upload",
         "selectionActionSelectImagesLabel": "Select images",
         "theoryOfChangeTableTitle": "Theory of Change Table",
+        "theoryOfChangeTableDescription": "Show how the selected action aims to reduce the expected humanitarian impact, by filling out the Theory of Change (ToC) table",
         "downloadTableLabel": "Download Theory of Change table",
         "selectionActionUploadTableLabel": "Upload Table",
         "evidenceBaseTitle": "Evidence base",
@@ -41,7 +42,7 @@
         "selectionSourceOfInformationDescription": "Add the description of the sources one at a time. If the source has a link, add in the second field.",
         "feasibilityTitle": "Feasibility",
         "feasibilityDescription": "Indicate how feasible it is to implement the proposed early actions in the planned timeframe. Has it been tested?  Have similar actions been carried out by the NS in past operations and/or in as short a time with similar resources? If not, was a simulation conducted? If Cash and Voucher Assistance (CVA) is chosen as an early action, describe how necessary information for disbursement is collected in the short period of time and how national legislative requirements are met.",
-        "feasibilityExplanatoryNote": "In this section please describe why it is feasible to implement the selected actions, based on: time to implement the action, capacity of the National Society to implement, available resources (human, logistics, materials, etc.) and access considerations (see FbF Manual Chapter 4.2 Select Early Actions on criteria.)",
+        "feasibilityExplanatoryNote": "In this section please describe why it is feasible to implement the selected actions, based on: time to implement the action, capacity of the National Society to implement, available resources (human, logistics, materials, etc.) and access considerations (see Anticipatory Action Manual Chapter 4.2 Select Early Actions on criteria.)",
         "feasibilityRequiredPoint1": "Indicate how feasible it is to implement the proposed early actions in the planned timeframe. Has it been tested?  Have similar actions been carried out by the NS in past operations and/or in as short a time with similar resources? If not, was a simulation conducted?",
         "feasibilityRequiredPoint2": "If Cash and Voucher Assistance (CVA) is chosen as an early action, describe how necessary information for disbursement is collected in the short period of time and how national legislative requirements are met.",
         "useFulnessActionsTitle": "Usefulness of actions in case of non-occurring event",
@@ -50,7 +51,7 @@
         "useFulnessActionsExplanatoryNote": "In cases where the expected event does not materialize, the early actions implemented by the National Society (funded by the DREF) should still contribute to risk reduction and resiliency building.",
         "actionsStatementSectionHeading": "Quality Criteria: Selection of actions",
         "actionsSectionCriteriaIntroduction1": "Forecast-based Early Actions are selected based on the reduction of risk that they will provide. The EAP describes the main steps used to determine which actions were selected to reduce a specific disaster impact.",
-        "actionsSectionCriteriaComment1": "The FbF design process described in the FbF Manual (chapter 4.2), should be followed and described in the EAP (it can be adapted to the respective context). If some disaster impacts are not addressed, an explanation should be provided and also indicate which actions were considered but not chosen",
+        "actionsSectionCriteriaComment1": "The Anticipatory Action design process described in the Anticipatory Action Manual (chapter 4.2), should be followed and described in the EAP (it can be adapted to the respective context). If some disaster impacts are not addressed, an explanation should be provided and also indicate which actions were considered but not chosen",
         "actionsSectionCriteriaIntroduction2": "For each early action selected, the EAP must include a Theory of Change and show that the action chosen is appropriate to reduce the specific risk. Selected actions should be socially acceptable according to the context and there should be evidence of its effectiveness.",
         "actionsSectionCriteriaComment21": "If evidence is available, it should ideally show that the action has reduced impact in prior (test or real) activations. In case evidence is available, there should be a description on the effectiveness of the action in reducing the targeted impact.",
         "actionsSectionCriteriaComment22": "If evidence it´s not available, the EAP should describe in detail how they foresee that the action chosen will reduce the specific risk.",
diff --git a/app/src/views/EapFullForm/SelectionActions/index.tsx b/app/src/views/EapFullForm/SelectionActions/index.tsx
index 9f40f9461a..fd534edaf0 100644
--- a/app/src/views/EapFullForm/SelectionActions/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/index.tsx
@@ -447,14 +447,17 @@ function SelectionActions(props: Props) {
                     <InputSection
                         title={strings.theoryOfChangeTableTitle}
                         description={(
-                            <Link
-                                external
-                                href={templateUrl?.url}
-                                withUnderline
-                                withLinkIcon
-                            >
-                                {strings.downloadTableLabel}
-                            </Link>
+                            <>
+                                {strings.theoryOfChangeTableDescription}
+                                <Link
+                                    external
+                                    href={templateUrl?.url}
+                                    withUnderline
+                                    withLinkIcon
+                                >
+                                    {strings.downloadTableLabel}
+                                </Link>
+                            </>
                         )}
                         withAsteriskOnTitle
                     >
diff --git a/app/src/views/EapFullForm/TriggerModel/i18n.json b/app/src/views/EapFullForm/TriggerModel/i18n.json
index 1a5632e98d..ba2d7f1178 100644
--- a/app/src/views/EapFullForm/TriggerModel/i18n.json
+++ b/app/src/views/EapFullForm/TriggerModel/i18n.json
@@ -2,12 +2,12 @@
     "namespace": "eapFullForm",
     "strings": {
         "triggerModelHeading": "Trigger Model",
-        "triggerModelTooltipDescription": "The work for the identification of triggers can be very technical and require expert resources. For this process, the National Society can get help from technical experts, Hydro-met services or specialist institutions. The chapter 4.1 Set the Trigger in the FbF Manual can be used for guidance.",
+        "triggerModelTooltipDescription": "The work for the identification of triggers can be very technical and require expert resources. For this process, the National Society can get help from technical experts, Hydro-met services or specialist institutions. The chapter 4.1 Set the Trigger in the Anticipatory Action Manual can be used for guidance.",
         "triggerExplanatoryNoteLabel": "Explanatory Note",
         "triggerRequiredPointsLabel": "Required Points",
         "triggerStatementTitle": "Trigger statement",
         "triggerStatementDescription": "State in one sentence what exactly the trigger of your EAP will be, for example: When [source] issues a forecast of at least [probability of magnitude of event or impact], then we will act. We expect the lead-time to be [xxx].",
-        "triggerStatementExplanatoryNote": "The work for the identification of triggers can be very technical and require expert resources. For this process, the National Society can get help from technical experts, Hydro-met services or specialist institutions. The chapter 4.1 Set the Trigger in the FbF Manual can be used for guidance.",
+        "triggerStatementExplanatoryNote": "The work for the identification of triggers can be very technical and require expert resources. For this process, the National Society can get help from technical experts, Hydro-met services or specialist institutions. The chapter 4.1 Set the Trigger in the Anticipatory Action Manual can be used for guidance.",
         "triggerModelDescriptionLabel": "Description",
         "triggerLeadTimeTitle": "Lead time",
         "sourcesForecastTitle": "Sources of forecast",
@@ -24,9 +24,8 @@
         "definitionJustificationDescription1": "Why did you select a certain magnitude of event?",
         "definitionJustificationDescription2": "Explain how your impact level was defined.",
         "definitionJustificationDescription3": "Explain how much impact can be expected based on the strength of the event.",
-        "definitionJustificationDescription4": "Indicate to which return period the selected impact-level corresponds (minimum: 1-in-5 years.)",
-        "definitionJustificationDescription5": "Explain how the return period was calculated",
-        "definitionJustificationExplanatoryNote": "The DREF provides funding for early action for events of a strength that has caused significant humanitarian impact in the past. Explain how a certain magnitude was selected and how the impact level was defined (see guidance in the FbF manual chapter 4.1 Set the Trigger (particularly Steps 6-8)). Define the relationship between impact (utilizing the prioritized impact/s section 3.3) and hazard magnitude to establish which impact can be expected given specific hazard magnitudes.",
+        "definitionJustificationDescription4": "Explain how the return period was calculated",
+        "definitionJustificationExplanatoryNote": "The DREF provides funding for early action for events of a strength that has caused significant humanitarian impact in the past. Explain how a certain magnitude was selected and how the impact level was defined (see guidance in the Anticipatory Action manual chapter 4.1 Set the Trigger (particularly Steps 6-8)). Define the relationship between impact (utilizing the prioritized impact/s section 3.3) and hazard magnitude to establish which impact can be expected given specific hazard magnitudes.",
         "definitionRequiredPoint1": "Why did you select a certain magnitude of event?",
         "definitionRequiredPoint2": "Explain how your impact level was defined. Explain how much impact can be expected based on the strength of the event.",
         "definitionRequiredPoint3": "Indicate to which return period the selected impact-level corresponds (minimum: 1-in-5 years.)",
@@ -50,7 +49,7 @@
         "sourceInformationDescription": "Add the description of the sources one at a time. If the source has a link, add in the second field.",
         "triggerModelImagesCountLabel": "5 images max(optional)",
         "triggerSectionHeading": "Quality Criteria: Trigger Model",
-        "triggerSectionCriteriaIntroduction1": "The EAP triggers are based on a combination of the analysis of risk factors and the forecast in line with the steps of the trigger methodology outlined in the FbF manual. The EAP contains a clear trigger statement.",
+        "triggerSectionCriteriaIntroduction1": "The EAP triggers are based on a combination of the analysis of risk factors and the forecast in line with the steps of the trigger methodology outlined in the Anticipatory Action manual. The EAP contains a clear trigger statement.",
         "triggerSectionCriteriaComment11": "The EAP should clearly show how on the basis of available data on vulnerability, exposure and impact of past events the trigger was determined. The trigger should be clear as this information needs to be verifiable once the trigger is met, so the EAP needs to state in one sentence what exactly the trigger of your EAP will be, for example: When [source] issues a forecast of at least [probability of magnitude of event or impact], then we will act.",
         "triggerSectionCriteriaComment12": "If the EAP has more than one trigger (e.g. phased or staggered triggers) then each trigger should be clearly explained along with explanation what action will be taken following each trigger and when transfer of the early action funds are required.",
         "triggerSectionCriteriaComment13": "For slow onset hazards, the trigger can also be based on a combination of risk factors, forecasts and observation data especially if the impact is a result of accumulative factors (e.g. forecast of second consecutive failed rainy season). If unconventional triggers are used (e.g. combining multiple indicators, including socio-economic indicators like food prices), clear explanation should be given on which criteria/ conditions was used to assign certain weight to each indicator.",
diff --git a/app/src/views/EapFullForm/TriggerModel/index.tsx b/app/src/views/EapFullForm/TriggerModel/index.tsx
index ee5feee9d4..cbd7b1bead 100644
--- a/app/src/views/EapFullForm/TriggerModel/index.tsx
+++ b/app/src/views/EapFullForm/TriggerModel/index.tsx
@@ -473,7 +473,6 @@ function TriggerModel(props: Props) {
                                 <li>{strings.definitionJustificationDescription2}</li>
                                 <li>{strings.definitionJustificationDescription3}</li>
                                 <li>{strings.definitionJustificationDescription4}</li>
-                                <li>{strings.definitionJustificationDescription5}</li>
                             </ul>
                         )}
                         withAsteriskOnTitle
diff --git a/app/src/views/EapFullForm/schema.ts b/app/src/views/EapFullForm/schema.ts
index 0b30e64249..2fb4d60185 100644
--- a/app/src/views/EapFullForm/schema.ts
+++ b/app/src/views/EapFullForm/schema.ts
@@ -620,14 +620,10 @@ export const formSchema: EapFullFormSchema = {
                 }),
             },
 
-            ...getContactSchema('national_society_contact', isSubmit),
-            ...getContactSchema('ifrc_delegation_focal_point', isSubmit),
-            ...getContactSchema('ifrc_head_of_delegation', isSubmit),
             ...getContactSchema('dref_focal_point'),
             ...getContactSchema('ifrc_regional_focal_point'),
             ...getContactSchema('ifrc_regional_ops_manager'),
             ...getContactSchema('ifrc_regional_head_dcc'),
-            ...getContactSchema('ifrc_global_ops_coordinator'),
 
             // Stakeholders
             is_worked_with_government: { required: isSubmit },
diff --git a/app/src/views/EapRegistration/i18n.json b/app/src/views/EapRegistration/i18n.json
index 6d22b3a8d5..dc80c26b36 100644
--- a/app/src/views/EapRegistration/i18n.json
+++ b/app/src/views/EapRegistration/i18n.json
@@ -2,8 +2,8 @@
     "namespace": "eapRegistration",
     "strings": {
         "registrationHeading": "EAP Development Registration",
-        "registrationDescription": "Use the following page to submit your National Society's interest in following the Early Action Protocol (EAP) application process. Once you submit this form, the EAP team members will contact you to start the procedure. You can find more information on the process and different ways to apply {link}",
-        "registrationLink": "on this page.",
+        "registrationDescription": "The purpose of this form is for you to notify the IFRC team of the start of your EAP process. If you need assistance with the initiation of the process, {link}",
+        "registrationLink": "send us a message.",
         "applicationDetails": "Application Details",
         "nationalSociety": "National Society (NS)",
         "nationalSocietyDescription": "Select National Society that is planning to apply for the EAP",
@@ -21,7 +21,7 @@
         "nsContact": "National Society Contact",
         "nsContactDescription": "National Society contact responsible for the EAP process",
         "ifrcContact": "IFRC Contact",
-        "ifrcContactDescription": "The most senior staff in the National Society responsible and knowledgable about the disaster event.",
+        "ifrcContactDescription": "IFRC contact supporting the EAP process",
         "focalPoint": "DREF Focal Point",
         "focalPointDescription": "The DREF contact person form IFRC",
         "submitButton": "Submit",
diff --git a/app/src/views/EapRegistration/index.tsx b/app/src/views/EapRegistration/index.tsx
index 50aa1facaf..7caebb0195 100644
--- a/app/src/views/EapRegistration/index.tsx
+++ b/app/src/views/EapRegistration/index.tsx
@@ -165,7 +165,8 @@ export function Component() {
                 {
                     link: (
                         <Link
-                            to="eapDetail"
+                            href="mailto:DREF.anticipatorypillar@ifrc.org"
+                            external
                             withUnderline
                         >
                             {strings.registrationLink}
@@ -314,6 +315,7 @@ export function Component() {
                             setFieldValue={setFieldValue}
                             namePrefix="national_society_contact"
                             withRequiredNameAndEmail
+                            withRequiredTitle
                         />
                         <ContactInputsSection
                             title={strings.ifrcContact}
diff --git a/app/src/views/EapRegistration/schema.ts b/app/src/views/EapRegistration/schema.ts
index 9c86ef5cb5..f6a4937417 100644
--- a/app/src/views/EapRegistration/schema.ts
+++ b/app/src/views/EapRegistration/schema.ts
@@ -35,9 +35,10 @@ export const formSchema: FormSchema = {
         partners: {
             required: true,
         },
-        national_society_contact_name: {},
-        national_society_contact_title: {},
+        national_society_contact_name: { required: true },
+        national_society_contact_title: { required: true },
         national_society_contact_email: {
+            required: true,
             validations: [emailCondition],
         },
         national_society_contact_phone_number: {},
diff --git a/app/src/views/EapSimplifiedForm/EarlyAction/i18n.json b/app/src/views/EapSimplifiedForm/EarlyAction/i18n.json
index 9aa04d52ce..97d321ffe7 100644
--- a/app/src/views/EapSimplifiedForm/EarlyAction/i18n.json
+++ b/app/src/views/EapSimplifiedForm/EarlyAction/i18n.json
@@ -11,10 +11,10 @@
         "geographicalRiskArea": "Potential geographical high-risk areas that the simplified EAP would target",
         "geographicalRiskAreaDescription": "Which high risk regions have been selected for this intervention and why?",
         "geographicalRiskAreaTooltip": "Simplified EAPs should be developed with national coverage in mind but because of the nature of certain hazards there might be geographical areas that are more at risk, for example: coastal districts (for cyclones), river areas (for riverine floods), international border areas (for population movement), etc. Provide an overview of the geographical areas targeted by this simplified EAP, and why these specific geographical areas are high risk. The National Society could also include a map of the most at risk geographical locations. For more guidance on how to select the geographic area of intervention, see the {practitionersManualLink} (Chapter 4.1, Step 3: Who and What is exposed?)",
-        "practitionersManualLink": "FbF Practitioner’s Manual",
+        "practitionersManualLink": "Anticipatory Action Practitioner’s Manual",
         "actionDescription": "Description",
         "actionValue": "Value",
-        "actionPeopleTargeted": "People targeted",
+        "actionPeopleTargeted": "Total people targeted",
         "actionPeopleTargetedDescription": "Enter the number of people targeted",
         "actionPeopleTargetedTooltip": "The National Society should reflect how many people they plan to target with their early action intervention. The simplified EAP should target at least 2,000 people.",
         "actionOperation": "Assisted through the operation",
@@ -38,8 +38,8 @@
         "triggerDatabaseLink": "trigger database",
         "actionsLeadTime": "sEAP lead time",
         "actionsLeadTimeDescription": "This is the time between the trigger being met and the impact of the hazard, this is the period of time when the early actions are undertaken. If the simplified EAP has a short lead time, the National Society may be asked to explain the feasibility of the early actions (funding, capacity etc.).",
-        "actionsOperational": "Operational timeframe",
-        "actionsOperationalDescription": "The operational timeframe starts from the trigger date and includes the time it takes to implement the early action activities plus the time it takes to finalize the operation, including time to settle the finances, facilitate the lessons learned workshop and prepare the final report. Normally the operational timeframe is the lead time plus 3 months, 2 months to allow the National Society to finalize the reports and 1 month for the IFRC to finalise and publish the final report.  (Note that the operational timeframe, expressed in months is not the same as the sEAP timeframe, which is expressed in years).",
+        "actionsOperational": "Activation timeframe",
+        "actionsOperationalDescription": "The operational timeframe starts from the trigger date and includes the time it takes to implement the early action activities plus the time it takes to finalize the activation, including time to settle the finances, facilitate the lessons learned workshop and prepare the activation report. Normally the operational timeframe is 3 months for rapid onset disasters and 6 months for slow onset disasters.",
         "justification": "Trigger threshold justification",
         "justificationDescription": "Explain how the triggers(s) were set and provide information showing that the level chosen has caused humanitarian impact in the past.",
         "justificationTooltipDescriptionOne": "If there is data on how often the trigger threshold has been reached in the past, please include this here and describe the humanitarian impact caused by the magnitude of disaster on those occasions.",
diff --git a/app/src/views/EapSimplifiedForm/Overview/i18n.json b/app/src/views/EapSimplifiedForm/Overview/i18n.json
index 4a09ee885c..181905afde 100644
--- a/app/src/views/EapSimplifiedForm/Overview/i18n.json
+++ b/app/src/views/EapSimplifiedForm/Overview/i18n.json
@@ -15,23 +15,11 @@
         "partnersInvolved": "Partners Involved",
         "partnersInvolvedDescription": "Select from the list the partners involved in this process. Add as many as needed or select not applicable if no partners involved.",
         "contacts": "Contacts",
-        "nationalHeader": "National",
-        "delegationHeader": "Delegation",
-        "regionalHeader": "Regional and global",
-        "nSContact": "National Society Contact",
-        "nSContactDescription": "National Society contact responsible for the EAP process",
-        "partnerNS": "Partner NS",
-        "partnerNSDescription": "Partner National Society contact",
-        "partnerNsEmptyMessage": "No partners added yet!",
-        "focalPoint": "IFRC Delegation AA Focal Point",
-        "delegation": "IFRC Head of Delegation",
         "drefFocalPoint": "DREF Focal Point",
-        "drefFocalPointDescription": "The DREF contact person fro IFRC",
+        "drefFocalPointDescription": "The DREF contact person for IFRC",
         "regionalFocalPoint": "IFRC Regional AA Focal Point",
         "regionalManager": "IFRC Regional Ops Manager",
         "regionalHead": "IFRC Regional Head of DCC",
-        "regionalCoordinator": "IFRC Global Ops Coordinator",
-        "addPartnerNSContactButton": "Add Partner NS",
         "overviewSectionHeading": "Quality Criteria: Overview",
         "sectionCriteriaIntroduction11": "All sections of the simplified EAP need to be completed including IFRC sectors, enabling approaches and budget.",
         "sectionCriteriaIntroduction12": "Check the feasibility of the fund transfer to the National Society in the lead time to fund the early action activities.",
diff --git a/app/src/views/EapSimplifiedForm/Overview/index.tsx b/app/src/views/EapSimplifiedForm/Overview/index.tsx
index 08edecf752..19eb71dd9d 100644
--- a/app/src/views/EapSimplifiedForm/Overview/index.tsx
+++ b/app/src/views/EapSimplifiedForm/Overview/index.tsx
@@ -1,7 +1,4 @@
-import { useCallback } from 'react';
-import { AddLineIcon } from '@ifrc-go/icons';
 import {
-    Button,
     Container,
     Description,
     InputSection,
@@ -10,16 +7,11 @@ import {
     NumberInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
-import {
-    isNotDefined,
-    randomString,
-} from '@togglecorp/fujs';
 import {
     type EntriesAsList,
     type Error,
     getErrorObject,
     getErrorString,
-    useFormArray,
 } from '@togglecorp/toggle-form';
 
 import ContactInputsSection from '#components/domain/ContactInputsSection';
@@ -28,18 +20,15 @@ import DisasterTypeSelectInput from '#components/domain/DisasterTypeSelectInput'
 import ImageWithCaptionInput from '#components/domain/ImageWithCaptionInput';
 import NationalSocietyMultiSelectInput from '#components/domain/NationalSocietyMultiSelectInput';
 import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
-import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type GoApiResponse } from '#utils/restRequest';
 
 import GuidanceSeap from '../GuidanceSeap';
-import PartnerContactsInput from '../PartnerContactInput';
 import { type PartialSimplifiedEapType } from '../schema';
 
 import i18n from './i18n.json';
 
 type EapRegistrationDetails = GoApiResponse<'/api/v2/eap-registration/{id}/'>;
-type PartnerContactFormFields = NonNullable<PartialSimplifiedEapType['partner_contacts']>[number];
 
 interface Props {
     value: PartialSimplifiedEapType;
@@ -69,27 +58,6 @@ function Overview(props: Props) {
 
     const noOp = () => {};
 
-    const {
-        setValue: onPartnerContactChange,
-        removeValue: onPartnerContactRemove,
-    } = useFormArray<'partner_contacts', PartnerContactFormFields>(
-        'partner_contacts',
-        setFieldValue,
-    );
-
-    const handlePartnerContactAdd = useCallback(() => {
-        const newPartnerContactItem: PartnerContactFormFields = {
-            client_id: randomString(),
-        };
-
-        setFieldValue(
-            (oldValue: PartnerContactFormFields[] | undefined) => (
-                [...(oldValue ?? []), newPartnerContactItem]
-            ),
-            'partner_contacts' as const,
-        );
-    }, [setFieldValue]);
-
     return (
         <TabPage
             spacingOffset={-2}
@@ -222,159 +190,53 @@ function Overview(props: Props) {
                 heading={strings.contacts}
                 variant="form"
             >
-                <ListView
-                    layout="block"
-                    spacing="lg"
+                <Container
+                    headingLevel={4}
+                    variant="form"
                 >
-                    <Container
-                        heading={strings.nationalHeader}
-                        headingLevel={4}
-                        variant="form"
-                    >
-                        <ListView
-                            layout="block"
-                            spacing="sm"
-                        >
-                            <ContactInputsSection
-                                title={strings.nSContact}
-                                description={strings.nSContactDescription}
-                                namePrefix="national_society_contact"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                                withRequiredNameAndEmail
-                            />
-                            <InputSection
-                                title={strings.partnerNS}
-                                description={strings.partnerNSDescription}
-                            >
-                                <NonFieldError error={getErrorObject(error?.partner_contacts)} />
-                                <Container
-                                    empty={isNotDefined(value.partner_contacts)
-                                        || value.partner_contacts?.length === 0}
-                                    emptyMessage={strings.partnerNsEmptyMessage}
-                                    withCompactMessage
-                                >
-                                    <ListView
-                                        spacing="sm"
-                                        layout="block"
-                                    >
-                                        {value.partner_contacts?.map((contact, index) => (
-                                            <PartnerContactsInput
-                                                key={contact.client_id}
-                                                index={index}
-                                                value={contact}
-                                                onChange={onPartnerContactChange}
-                                                onRemove={onPartnerContactRemove}
-                                                error={getErrorObject(error?.partner_contacts)}
-                                                disabled={disabled}
-                                                readOnly={readOnly}
-                                            />
-                                        ))}
-                                    </ListView>
-                                </Container>
-                                <Button
-                                    name={undefined}
-                                    onClick={handlePartnerContactAdd}
-                                    disabled={disabled || readOnly}
-                                    before={<AddLineIcon />}
-                                >
-                                    {strings.addPartnerNSContactButton}
-                                </Button>
-                            </InputSection>
-                        </ListView>
-                    </Container>
-                    <Container
-                        heading={strings.delegationHeader}
-                        headingLevel={4}
-                        variant="form"
+                    <ListView
+                        layout="block"
+                        spacing="sm"
                     >
-                        <ListView
-                            layout="block"
-                            spacing="sm"
-                        >
-                            <ContactInputsSection
-                                title={strings.focalPoint}
-                                namePrefix="ifrc_delegation_focal_point"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                                withRequiredNameAndEmail
-                            />
-                            <ContactInputsSection
-                                title={strings.delegation}
-                                namePrefix="ifrc_head_of_delegation"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                                withRequiredNameAndEmail
-                            />
-                        </ListView>
-                    </Container>
-                    <Container
-                        heading={strings.regionalHeader}
-                        headingLevel={4}
-                        variant="form"
-                    >
-                        <ListView
-                            layout="block"
-                            spacing="sm"
-                        >
-                            <ContactInputsSection
-                                title={strings.drefFocalPoint}
-                                description={strings.drefFocalPointDescription}
-                                namePrefix="dref_focal_point"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                            <ContactInputsSection
-                                title={strings.regionalFocalPoint}
-                                namePrefix="ifrc_regional_focal_point"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                            <ContactInputsSection
-                                title={strings.regionalManager}
-                                namePrefix="ifrc_regional_ops_manager"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                            <ContactInputsSection
-                                title={strings.regionalHead}
-                                namePrefix="ifrc_regional_head_dcc"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                            <ContactInputsSection
-                                title={strings.regionalCoordinator}
-                                namePrefix="ifrc_global_ops_coordinator"
-                                value={value}
-                                setFieldValue={setFieldValue}
-                                error={error}
-                                disabled={disabled}
-                                readOnly={readOnly}
-                            />
-                        </ListView>
-                    </Container>
-                </ListView>
+                        <ContactInputsSection
+                            title={strings.drefFocalPoint}
+                            description={strings.drefFocalPointDescription}
+                            namePrefix="dref_focal_point"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
+                        <ContactInputsSection
+                            title={strings.regionalFocalPoint}
+                            namePrefix="ifrc_regional_focal_point"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
+                        <ContactInputsSection
+                            title={strings.regionalManager}
+                            namePrefix="ifrc_regional_ops_manager"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
+                        <ContactInputsSection
+                            title={strings.regionalHead}
+                            namePrefix="ifrc_regional_head_dcc"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                        />
+                    </ListView>
+                </Container>
             </Container>
         </TabPage>
     );
diff --git a/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json b/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
index 8c77f1b1a2..19c53a8714 100644
--- a/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
+++ b/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
@@ -17,9 +17,9 @@
         "riskProtocolDescription": "Recognizing that the simplified EAP will not be able to address all potential risks and based on the analysis of past impacts, what are the main risks that the National Society has decided to focus on for this plan.",
         "earlyActionSelection": "Early Action Selection",
         "selectedEarlyAction": "Selected early actions",
-        "selectedEarlyActionDescription": "Explain how the early actions were selected and how they will mitigate the prioritized risk and bring about the intended outcome for the most vulnerable, at-risk individuals and communities.",
+        "selectedEarlyActionDescription": "List the early actions and explain how they will address the risks and lead to the intended outcome. Explain how the early actions were selected and how they will mitigate the prioritized risk and bring about the intended outcome for the most vulnerable, at-risk individuals and communities.",
         "selectedEarlyActionDescription1": "The early actions selected by the National Society have to be linked to the hazard’s impact. If ‘loss of key documentation (such as identifications, house deeds, and birth certificates)’ is put forward as one of the prioritized impacts of a flood, then select an early action that will mitigate the risk, e.g,: ‘distribution of dry bags before a flood’. In this section the National Society can explain the connection between the risk they want to mitigate and the early action they plan to implement. This chain of events is also called the ‘theory of change’. For more information on this process, please consult the selection of early actions in {earlyActionsLink}",
-        "earlyActionsLink": "the FbF Practitioners Manual.",
+        "earlyActionsLink": "the Anticipatory Action Practitioners Manual.",
         "selectedEarlyActionDescription2": "When deciding on the risk the National Society will prioritize, discuss the following:",
         "selectedEarlyActionDescription21": "Does this risk impact vulnerable people’s lives?",
         "selectedEarlyActionDescription22": "Is there something we can do to mitigate this risk in the given lead time?",
diff --git a/app/src/views/EapSimplifiedForm/schema.ts b/app/src/views/EapSimplifiedForm/schema.ts
index 771f381d37..f95ea59a06 100644
--- a/app/src/views/EapSimplifiedForm/schema.ts
+++ b/app/src/views/EapSimplifiedForm/schema.ts
@@ -336,14 +336,10 @@ export const formSchema: FormSchema = {
                     }),
                 }),
             },
-            ...getContactSchema('national_society_contact', isSubmit),
-            ...getContactSchema('ifrc_delegation_focal_point', isSubmit),
-            ...getContactSchema('ifrc_head_of_delegation', isSubmit),
             ...getContactSchema('dref_focal_point'),
             ...getContactSchema('ifrc_regional_focal_point'),
             ...getContactSchema('ifrc_regional_ops_manager'),
             ...getContactSchema('ifrc_regional_head_dcc'),
-            ...getContactSchema('ifrc_global_ops_coordinator'),
 
             // Risk Analysis
 
diff --git a/app/src/views/EarlyActionProtocols/i18n.json b/app/src/views/EarlyActionProtocols/i18n.json
index 9472e2952a..540407ee49 100644
--- a/app/src/views/EarlyActionProtocols/i18n.json
+++ b/app/src/views/EarlyActionProtocols/i18n.json
@@ -3,7 +3,7 @@
     "strings": {
         "eapRegistrationLink": "Register your EAP",
         "eapContent": "What is an EAP?",
-        "eapContentHeading": "Early Action Protocols (EAPs) are a core mechanism of the IFRC's Forecast-based Financing (FbF) approach, designed to ensure that humanitarian action happens before a disaster strikes, rather than only responding afterwards.",
+        "eapContentHeading": "Early Action Protocols (EAPs) are a core mechanism of the IFRC's Forecast-based Financing (Anticipatory Action) approach, designed to ensure that humanitarian action happens before a disaster strikes, rather than only responding afterwards.",
         "eapContentSubHeadingOne": "An EAP is a pre-agreed plan developed by a Nation Society together with partners, which outlines:",
         "eapDescriptionOne": "The triggers (based on scientific forecasts and risk analysis) that indicate when a hazard is likely to impact communities.",
         "eapDescriptionTwo": "The early actions to be implemented once those triggers are met - practical, life-saving measures that reduce the impacts of the forecasted disaster.",
diff --git a/cacheppuccino b/cacheppuccino
index 7fe8c83449..373b1659b5 160000
--- a/cacheppuccino
+++ b/cacheppuccino
@@ -1 +1 @@
-Subproject commit 7fe8c83449195f3df6dfbdebbdf60e11fedf19ca
+Subproject commit 373b1659b5f376cb6af9b05ce142a503ee23b085
diff --git a/go-api b/go-api
index e9949d5512..b58d643518 160000
--- a/go-api
+++ b/go-api
@@ -1 +1 @@
-Subproject commit e9949d55124523c375948b304ee65cdeb8d00f84
+Subproject commit b58d6435189500571851393f3bfa0d02ce93bc67

From 9644d2419d8779b52df22ed2b696311f29f94598 Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Fri, 31 Jul 2026 16:56:32 +0545
Subject: [PATCH 2/9] feat(ui): support word limits in TextArea

---
 app/src/utils/common.ts                       |  32 +++--
 app/src/utils/form.ts                         |  10 ++
 .../EapActivationProcess/index.tsx            |  10 +-
 .../EapFullForm/FinanceLogistics/index.tsx    |  12 +-
 app/src/views/EapFullForm/Meal/index.tsx      |   4 +-
 .../NationalSocietyCapacity/index.tsx         |   8 +-
 .../Overview/KeyActorsInput/index.tsx         |   4 +-
 .../Overview/PartnerContactsInput/i18n.json   |  10 --
 .../Overview/PartnerContactsInput/index.tsx   | 126 ------------------
 app/src/views/EapFullForm/Overview/index.tsx  |   4 +-
 .../views/EapFullForm/RiskAnalysis/index.tsx  |   8 +-
 .../EapFullForm/SelectionActions/index.tsx    |  10 +-
 .../views/EapFullForm/TriggerModel/index.tsx  |  10 +-
 app/src/views/EapFullForm/common.tsx          |   2 +-
 app/src/views/EapFullForm/schema.ts           |  56 ++++----
 .../DeliveryAndBudget/index.tsx               |   6 +-
 .../EapSimplifiedForm/EarlyAction/index.tsx   |  16 +--
 .../PartnerContactInput/i18n.json             |  10 --
 .../PartnerContactInput/index.tsx             | 121 -----------------
 .../EapSimplifiedForm/RiskAnalysis/index.tsx  |   8 +-
 app/src/views/EapSimplifiedForm/common.tsx    |   2 +-
 app/src/views/EapSimplifiedForm/schema.ts     |  35 ++---
 .../src/stories/TextArea.stories.tsx          |  18 +++
 packages/ui/src/components/TextArea/index.tsx |  47 ++++++-
 .../ui/src/components/TextBadge/i18n.json     |   6 +
 .../ui/src/components/TextBadge/index.tsx     |  35 ++++-
 packages/ui/src/utils/common.test.ts          |  23 ++++
 packages/ui/src/utils/common.ts               |  37 +++++
 28 files changed, 293 insertions(+), 377 deletions(-)
 delete mode 100644 app/src/views/EapFullForm/Overview/PartnerContactsInput/i18n.json
 delete mode 100644 app/src/views/EapFullForm/Overview/PartnerContactsInput/index.tsx
 delete mode 100644 app/src/views/EapSimplifiedForm/PartnerContactInput/i18n.json
 delete mode 100644 app/src/views/EapSimplifiedForm/PartnerContactInput/index.tsx
 create mode 100644 packages/ui/src/components/TextBadge/i18n.json

diff --git a/app/src/utils/common.ts b/app/src/utils/common.ts
index 855251944c..d616a228fb 100644
--- a/app/src/utils/common.ts
+++ b/app/src/utils/common.ts
@@ -1,7 +1,9 @@
 import { type Language } from '@ifrc-go/ui/contexts';
-import { DEFAULT_INVALID_TEXT } from '@ifrc-go/ui/utils';
 import {
-    isDefined,
+    DEFAULT_INVALID_TEXT,
+    getWordCount,
+} from '@ifrc-go/ui/utils';
+import {
     isNotDefined,
     isTruthyString,
 } from '@togglecorp/fujs';
@@ -94,10 +96,24 @@ export function formatSourceLink(value: string | undefined): string | undefined
     return `https://${value}`;
 }
 
-export function lengthSmallerOrEqualToCondition(x?: number) {
-    return (value: string | undefined) => (
-        (isDefined(value) && isDefined(x)) && value.length > x
-            ? `Length must be smaller or equal to ${x}`
-            : undefined
-    );
+export function lengthSmallerOrEqualToCondition(
+    x?: number,
+    type: 'word' | 'character' = 'word',
+) {
+    return (value: string | undefined) => {
+        if (isNotDefined(value) || isNotDefined(x)) {
+            return undefined;
+        }
+
+        const length = type === 'word' ? getWordCount(value) : value.length;
+
+        if (length <= x) {
+            return undefined;
+        }
+
+        // FIXME: use translations
+        return type === 'word'
+            ? `Must be smaller or equal to ${x} words`
+            : `Length must be smaller or equal to ${x}`;
+    };
 }
diff --git a/app/src/utils/form.ts b/app/src/utils/form.ts
index 1b24de4825..b8a9bf85f2 100644
--- a/app/src/utils/form.ts
+++ b/app/src/utils/form.ts
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+import { getWordCount } from '@ifrc-go/ui/utils';
 import type { Maybe } from '@togglecorp/fujs';
 import {
     isDefined,
@@ -45,6 +46,15 @@ export function dateGreaterThanOrEqualCondition(x: string) {
     );
 }
 
+export function wordCountLessThanOrEqualToCondition(maxWords: number) {
+    // FIXME: use translations
+    return (value: Maybe<string>) => (
+        isDefined(value) && getWordCount(value) > maxWords
+            ? `The field must have at most ${maxWords} words`
+            : undefined
+    );
+}
+
 export function nonZeroCondition(value: Maybe<number>) {
     // FIXME: use translations
     return isDefined(value) && value === 0
diff --git a/app/src/views/EapFullForm/EapActivationProcess/index.tsx b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
index 66677083ea..9aadd6a324 100644
--- a/app/src/views/EapFullForm/EapActivationProcess/index.tsx
+++ b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
@@ -26,7 +26,7 @@ import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
@@ -205,7 +205,7 @@ function EapActivationProcess(props: Props) {
                             error={error?.early_action_implementation_process}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.early_action_implementation_process}
+                            maxWords={wordLimits.early_action_implementation_process}
                         />
                         <MultiImageWithCaptionInput
                             name="early_action_implementation_images"
@@ -277,7 +277,7 @@ function EapActivationProcess(props: Props) {
                             error={error?.trigger_activation_system}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.trigger_activation_system}
+                            maxWords={wordLimits.trigger_activation_system}
                         />
                         <MultiImageWithCaptionInput
                             name="trigger_activation_system_images"
@@ -363,7 +363,7 @@ function EapActivationProcess(props: Props) {
                             error={error?.selection_of_target_population}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.selection_of_target_population}
+                            maxWords={wordLimits.selection_of_target_population}
                         />
                     </InputSection>
                     <InputSection
@@ -416,7 +416,7 @@ function EapActivationProcess(props: Props) {
                             error={error?.stop_mechanism}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.stop_mechanism}
+                            maxWords={wordLimits.stop_mechanism}
                         />
                     </InputSection>
                     <InputSection
diff --git a/app/src/views/EapFullForm/FinanceLogistics/index.tsx b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
index 7aad93333a..357babf99c 100644
--- a/app/src/views/EapFullForm/FinanceLogistics/index.tsx
+++ b/app/src/views/EapFullForm/FinanceLogistics/index.tsx
@@ -26,7 +26,7 @@ import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { useRequest } from '#utils/restRequest';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
 
@@ -191,7 +191,7 @@ function FinanceLogistics(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.budget_description}
+                            maxWords={wordLimits.budget_description}
                         />
                     </InputSection>
                     <InputSection
@@ -284,7 +284,7 @@ function FinanceLogistics(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.readiness_cost_description}
+                            maxWords={wordLimits.readiness_cost_description}
                         />
                     </InputSection>
                     <InputSection
@@ -353,7 +353,7 @@ function FinanceLogistics(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.prepositioning_cost_description}
+                            maxWords={wordLimits.prepositioning_cost_description}
                         />
                     </InputSection>
                     <InputSection
@@ -426,7 +426,7 @@ function FinanceLogistics(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.early_action_cost_description}
+                            maxWords={wordLimits.early_action_cost_description}
                         />
                     </InputSection>
                 </ListView>
@@ -466,7 +466,7 @@ function FinanceLogistics(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.eap_endorsement}
+                            maxWords={wordLimits.eap_endorsement}
                         />
                     </InputSection>
                 </ListView>
diff --git a/app/src/views/EapFullForm/Meal/index.tsx b/app/src/views/EapFullForm/Meal/index.tsx
index 254149d12d..a25b2e678b 100644
--- a/app/src/views/EapFullForm/Meal/index.tsx
+++ b/app/src/views/EapFullForm/Meal/index.tsx
@@ -24,7 +24,7 @@ import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
@@ -173,7 +173,7 @@ function Meal(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.meal}
+                            maxWords={wordLimits.meal}
                         />
                     </InputSection>
                     <InputSection
diff --git a/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx b/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
index 632c1ae1ae..ebd51c3813 100644
--- a/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
+++ b/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
@@ -24,7 +24,7 @@ import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
@@ -143,7 +143,7 @@ function NationalSocietyCapacity(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.operational_administrative_capacity}
+                            maxWords={wordLimits.operational_administrative_capacity}
                         />
                     </InputSection>
                     <InputSection
@@ -159,7 +159,7 @@ function NationalSocietyCapacity(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.strategies_and_plans}
+                            maxWords={wordLimits.strategies_and_plans}
                         />
                     </InputSection>
                     <InputSection
@@ -204,7 +204,7 @@ function NationalSocietyCapacity(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.advance_financial_capacity}
+                            maxWords={wordLimits.advance_financial_capacity}
                         />
                     </InputSection>
                     <InputSection
diff --git a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
index 2994191f7e..a0769194fe 100644
--- a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
+++ b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
@@ -17,7 +17,7 @@ import {
 
 import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
 import NonFieldError from '#components/NonFieldError';
-import { charLimits } from '#views/EapFullForm/common';
+import { wordLimits } from '#views/EapFullForm/common';
 import { type PartialEapFullFormType } from '#views/EapFullForm/schema';
 
 import i18n from './i18n.json';
@@ -102,7 +102,7 @@ function KeyActorsInput(props: Props) {
                         value={value?.description}
                         onChange={onFieldChange}
                         required
-                        maxLength={charLimits.key_actors}
+                        maxLength={wordLimits.key_actors}
                         readOnly={readOnly}
                     />
                 </ListView>
diff --git a/app/src/views/EapFullForm/Overview/PartnerContactsInput/i18n.json b/app/src/views/EapFullForm/Overview/PartnerContactsInput/i18n.json
deleted file mode 100644
index e76d66ee38..0000000000
--- a/app/src/views/EapFullForm/Overview/PartnerContactsInput/i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "namespace": "eapFullForm",
-    "strings": {
-        "partnerNSNameLabel": "Name",
-        "partnerNSEmailLabel": "Email",
-        "partnerNSPhoneNumberLabel": "Phone Number",
-        "partnerNSTitleLabel": "Title",
-        "partnerNSDeleteButton": "Remove Contact"
-    }
-}
diff --git a/app/src/views/EapFullForm/Overview/PartnerContactsInput/index.tsx b/app/src/views/EapFullForm/Overview/PartnerContactsInput/index.tsx
deleted file mode 100644
index 34b47a53f9..0000000000
--- a/app/src/views/EapFullForm/Overview/PartnerContactsInput/index.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-import { DeleteBinTwoLineIcon } from '@ifrc-go/icons';
-import {
-    Container,
-    IconButton,
-    InlineLayout,
-    ListView,
-    TextInput,
-} from '@ifrc-go/ui';
-import { useTranslation } from '@ifrc-go/ui/hooks';
-import { randomString } from '@togglecorp/fujs';
-import {
-    type ArrayError,
-    getErrorObject,
-    type SetValueArg,
-    useFormObject,
-} from '@togglecorp/toggle-form';
-
-import { type PartialEapFullFormType } from '../../schema';
-
-import i18n from './i18n.json';
-
-type PartnerContactsFormFields = NonNullable<PartialEapFullFormType['partner_contacts']>[number];
-
-interface Props {
-    value: PartnerContactsFormFields;
-    error: ArrayError<PartnerContactsFormFields> | undefined;
-    onChange: (value: SetValueArg<PartnerContactsFormFields>, index: number) => void;
-    onRemove: (index: number) => void;
-    index: number;
-    disabled?: boolean;
-    readOnly?: boolean;
-}
-
-function PartnerContactsInput(props: Props) {
-    const {
-        error: errorFromProps,
-        onChange,
-        value,
-        index,
-        onRemove,
-        disabled,
-        readOnly,
-    } = props;
-
-    const strings = useTranslation(i18n);
-
-    const onFieldChange = useFormObject(
-        index,
-        onChange,
-        () => ({
-            client_id: randomString(),
-        }),
-    );
-
-    const error = (value && value.client_id && errorFromProps)
-        ? getErrorObject(errorFromProps?.[value.client_id])
-        : undefined;
-
-    return (
-        <Container
-            headingLevel={5}
-            spacing="sm"
-            withBorder
-            withPadding
-        >
-            <InlineLayout
-                after={(
-                    <IconButton
-                        name={index}
-                        onClick={onRemove}
-                        disabled={disabled || readOnly}
-                        title={strings.partnerNSDeleteButton}
-                        ariaLabel={strings.partnerNSDeleteButton}
-                    >
-                        <DeleteBinTwoLineIcon />
-                    </IconButton>
-                )}
-                contentAlignment="start"
-            >
-                <ListView
-                    layout="grid"
-                    numPreferredGridColumns={2}
-                >
-                    <TextInput
-                        label={strings.partnerNSNameLabel}
-                        name="name"
-                        value={value.name}
-                        error={error?.name}
-                        onChange={onFieldChange}
-                        readOnly={readOnly}
-                        disabled={disabled}
-                    />
-                    <TextInput
-                        label={strings.partnerNSTitleLabel}
-                        name="title"
-                        value={value.title}
-                        error={error?.title}
-                        onChange={onFieldChange}
-                        readOnly={readOnly}
-                        disabled={disabled}
-                    />
-                    <TextInput
-                        label={strings.partnerNSEmailLabel}
-                        name="email"
-                        value={value.email}
-                        error={error?.email}
-                        onChange={onFieldChange}
-                        readOnly={readOnly}
-                        disabled={disabled}
-                    />
-                    <TextInput
-                        label={strings.partnerNSPhoneNumberLabel}
-                        name="phone_number"
-                        value={value.phone_number}
-                        error={error?.phone_number}
-                        onChange={onFieldChange}
-                        readOnly={readOnly}
-                        disabled={disabled}
-                    />
-                </ListView>
-            </InlineLayout>
-        </Container>
-    );
-}
-
-export default PartnerContactsInput;
diff --git a/app/src/views/EapFullForm/Overview/index.tsx b/app/src/views/EapFullForm/Overview/index.tsx
index 996b7156f4..eb3f54f446 100644
--- a/app/src/views/EapFullForm/Overview/index.tsx
+++ b/app/src/views/EapFullForm/Overview/index.tsx
@@ -41,7 +41,7 @@ import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type GoApiResponse } from '#utils/restRequest';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
 import KeyActorsInput from './KeyActorsInput';
@@ -488,7 +488,7 @@ function Overview(props: Props) {
                                                 ?.technical_working_groups_in_place_description}
                                             disabled={disabled}
                                             readOnly={readOnly}
-                                            maxLength={charLimits
+                                            maxWords={wordLimits
                                                 .technical_working_groups_in_place_description}
                                         />
                                     </>
diff --git a/app/src/views/EapFullForm/RiskAnalysis/index.tsx b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
index 249c9d5912..9563238996 100644
--- a/app/src/views/EapFullForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
@@ -28,7 +28,7 @@ import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
@@ -269,7 +269,7 @@ function RiskAnalysis(props: Props) {
                             error={error?.hazard_selection}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.hazard_selection}
+                            maxWords={wordLimits.hazard_selection}
                         />
                         <MultiImageWithCaptionInput
                             name="hazard_selection_images"
@@ -345,7 +345,7 @@ function RiskAnalysis(props: Props) {
                             error={error?.exposed_element_and_vulnerability_factor}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.exposed_element_and_vulnerability_factor}
+                            maxWords={wordLimits.exposed_element_and_vulnerability_factor}
                         />
                         <MultiImageWithCaptionInput
                             name="exposed_element_and_vulnerability_factor_images"
@@ -429,7 +429,7 @@ function RiskAnalysis(props: Props) {
                             error={error?.prioritized_impact}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.prioritized_impact}
+                            maxWords={wordLimits.prioritized_impact}
                         />
                         <MultiImageWithCaptionInput
                             name="prioritized_impact_images"
diff --git a/app/src/views/EapFullForm/SelectionActions/index.tsx b/app/src/views/EapFullForm/SelectionActions/index.tsx
index fd534edaf0..a4551a581a 100644
--- a/app/src/views/EapFullForm/SelectionActions/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/index.tsx
@@ -39,7 +39,7 @@ import { type components } from '#generated/types';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { useRequest } from '#utils/restRequest';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
@@ -428,7 +428,7 @@ function SelectionActions(props: Props) {
                             error={error?.early_action_selection_process}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.early_action_selection_process}
+                            maxWords={wordLimits.early_action_selection_process}
                         />
                         <MultiImageWithCaptionInput
                             name="early_action_selection_process_images"
@@ -509,7 +509,7 @@ function SelectionActions(props: Props) {
                             error={error?.evidence_base}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.evidence_base}
+                            maxWords={wordLimits.evidence_base}
                         />
                     </InputSection>
                     <InputSection
@@ -667,7 +667,7 @@ function SelectionActions(props: Props) {
                             error={error?.usefulness_of_actions}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.usefulness_of_actions}
+                            maxWords={wordLimits.usefulness_of_actions}
                         />
                     </InputSection>
                     <InputSection
@@ -713,7 +713,7 @@ function SelectionActions(props: Props) {
                             error={error?.feasibility}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.feasibility}
+                            maxWords={wordLimits.feasibility}
                         />
                     </InputSection>
                 </ListView>
diff --git a/app/src/views/EapFullForm/TriggerModel/index.tsx b/app/src/views/EapFullForm/TriggerModel/index.tsx
index cbd7b1bead..c5e51f887e 100644
--- a/app/src/views/EapFullForm/TriggerModel/index.tsx
+++ b/app/src/views/EapFullForm/TriggerModel/index.tsx
@@ -40,7 +40,7 @@ import {
     useRequest,
 } from '#utils/restRequest';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
 import { type PartialEapFullFormType } from '../schema';
 import SectionQualityCriteria from '../SectionQualityCriteria';
@@ -277,7 +277,7 @@ function TriggerModel(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.trigger_statement}
+                            maxLength={wordLimits.trigger_statement}
                         />
                     </InputSection>
                     <InputSection
@@ -384,7 +384,7 @@ function TriggerModel(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.forecast_selection}
+                            maxLength={wordLimits.forecast_selection}
                         />
                         <MultiImageWithCaptionInput
                             name="forecast_selection_images"
@@ -485,7 +485,7 @@ function TriggerModel(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.definition_and_justification_impact_level}
+                            maxLength={wordLimits.definition_and_justification_impact_level}
                         />
                         <MultiImageWithCaptionInput
                             name="definition_and_justification_impact_level_images"
@@ -559,7 +559,7 @@ function TriggerModel(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.identification_of_the_intervention_area}
+                            maxLength={wordLimits.identification_of_the_intervention_area}
                         />
                         <MultiImageWithCaptionInput
                             name="identification_of_the_intervention_area_images"
diff --git a/app/src/views/EapFullForm/common.tsx b/app/src/views/EapFullForm/common.tsx
index 7fb6f9c349..c84d2cac22 100644
--- a/app/src/views/EapFullForm/common.tsx
+++ b/app/src/views/EapFullForm/common.tsx
@@ -176,7 +176,7 @@ export function checkTabErrors(
     return hasErrorOnAnyField;
 }
 
-export const charLimits = {
+export const wordLimits = {
     key_actors: 150,
     technical_working_groups_in_place_description: 150,
     hazard_selection: 1000,
diff --git a/app/src/views/EapFullForm/schema.ts b/app/src/views/EapFullForm/schema.ts
index 2fb4d60185..2ad31ee66e 100644
--- a/app/src/views/EapFullForm/schema.ts
+++ b/app/src/views/EapFullForm/schema.ts
@@ -24,7 +24,7 @@ import { lengthSmallerOrEqualToCondition } from '#utils/common';
 import { positiveIntegerCondition } from '#utils/form';
 import { type GoApiBody } from '#utils/restRequest';
 
-import { charLimits } from './common';
+import { wordLimits } from './common';
 
 function lessThanEqualToFiveImagesCondition<T>(value: T[] | undefined) {
     return isDefined(value) && Array.isArray(value) && value.length > 5
@@ -642,7 +642,7 @@ export const formSchema: EapFullFormSchema = {
                         description: {
                             required: isSubmit,
                             requiredValidation: requiredStringCondition,
-                            validations: [lengthSmallerOrEqualToCondition(charLimits.key_actors)],
+                            validations: [lengthSmallerOrEqualToCondition(wordLimits.key_actors)],
                         },
                         national_society: { required: isSubmit },
                     }),
@@ -654,7 +654,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.technical_working_groups_in_place_description,
+                    wordLimits.technical_working_groups_in_place_description,
                 )],
             },
 
@@ -662,7 +662,7 @@ export const formSchema: EapFullFormSchema = {
             hazard_selection: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
-                validations: [lengthSmallerOrEqualToCondition(charLimits.hazard_selection)],
+                validations: [lengthSmallerOrEqualToCondition(wordLimits.hazard_selection)],
             },
 
             hazard_selection_images: {
@@ -681,7 +681,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.exposed_element_and_vulnerability_factor,
+                    wordLimits.exposed_element_and_vulnerability_factor,
                 )],
             },
             exposed_element_and_vulnerability_factor_images: {
@@ -700,7 +700,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.prioritized_impact,
+                    wordLimits.prioritized_impact,
                 )],
             },
             prioritized_impact_images: {
@@ -752,7 +752,7 @@ export const formSchema: EapFullFormSchema = {
             trigger_statement: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
-                validations: [lengthSmallerOrEqualToCondition(charLimits.trigger_statement)],
+                validations: [lengthSmallerOrEqualToCondition(wordLimits.trigger_statement)],
             },
             trigger_statement_source_of_information: {
                 keySelector: (item) => item.client_id,
@@ -777,7 +777,7 @@ export const formSchema: EapFullFormSchema = {
             forecast_selection: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
-                validations: [lengthSmallerOrEqualToCondition(charLimits.forecast_selection)],
+                validations: [lengthSmallerOrEqualToCondition(wordLimits.forecast_selection)],
             },
             forecast_selection_images: {
                 keySelector: (item) => item.client_id,
@@ -796,7 +796,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.definition_and_justification_impact_level,
+                    wordLimits.definition_and_justification_impact_level,
                 )],
             },
             definition_and_justification_impact_level_images: {
@@ -815,7 +815,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.identification_of_the_intervention_area,
+                    wordLimits.identification_of_the_intervention_area,
                 )],
             },
             identification_of_the_intervention_area_images: {
@@ -867,7 +867,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.early_action_selection_process,
+                    wordLimits.early_action_selection_process,
                 )],
             },
             early_action_selection_process_images: {
@@ -887,7 +887,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.evidence_base,
+                    wordLimits.evidence_base,
                 )],
             },
             evidence_base_source_of_information: {
@@ -1012,14 +1012,14 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.usefulness_of_actions,
+                    wordLimits.usefulness_of_actions,
                 )],
             },
             feasibility: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.feasibility,
+                    wordLimits.feasibility,
                 )],
             },
 
@@ -1028,7 +1028,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.early_action_implementation_process,
+                    wordLimits.early_action_implementation_process,
                 )],
             },
             early_action_implementation_images: {
@@ -1047,7 +1047,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.trigger_activation_system,
+                    wordLimits.trigger_activation_system,
                 )],
             },
             trigger_activation_system_images: {
@@ -1065,7 +1065,7 @@ export const formSchema: EapFullFormSchema = {
             people_targeted: {
                 required: isSubmit,
                 validations: [
-                    greaterThanOrEqualToCondition(charLimits.people_targeted),
+                    greaterThanOrEqualToCondition(wordLimits.people_targeted),
                     positiveIntegerCondition,
                 ],
             },
@@ -1073,14 +1073,14 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.selection_of_target_population,
+                    wordLimits.selection_of_target_population,
                 )],
             },
             stop_mechanism: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.stop_mechanism,
+                    wordLimits.stop_mechanism,
                 )],
             },
 
@@ -1109,7 +1109,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.meal,
+                    wordLimits.meal,
                 )],
             },
             meal_relevant_files: { defaultValue: [] },
@@ -1136,21 +1136,21 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.operational_administrative_capacity,
+                    wordLimits.operational_administrative_capacity,
                 )],
             },
             strategies_and_plans: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.strategies_and_plans,
+                    wordLimits.strategies_and_plans,
                 )],
             },
             advance_financial_capacity: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.advance_financial_capacity,
+                    wordLimits.advance_financial_capacity,
                 )],
             },
             capacity_relevant_files: { defaultValue: [] },
@@ -1183,7 +1183,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.budget_description,
+                    wordLimits.budget_description,
                 )],
             },
             budget_file: { required: isSubmit },
@@ -1197,7 +1197,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.readiness_cost_description,
+                    wordLimits.readiness_cost_description,
                 )],
             },
             pre_positioning_budget: {
@@ -1210,7 +1210,7 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.prepositioning_cost_description,
+                    wordLimits.prepositioning_cost_description,
                 )],
             },
             early_action_budget: {
@@ -1223,14 +1223,14 @@ export const formSchema: EapFullFormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.early_action_cost_description,
+                    wordLimits.early_action_cost_description,
                 )],
             },
             eap_endorsement: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.eap_endorsement,
+                    wordLimits.eap_endorsement,
                 )],
             },
         };
diff --git a/app/src/views/EapSimplifiedForm/DeliveryAndBudget/index.tsx b/app/src/views/EapSimplifiedForm/DeliveryAndBudget/index.tsx
index fd781d9b22..359863c2f9 100644
--- a/app/src/views/EapSimplifiedForm/DeliveryAndBudget/index.tsx
+++ b/app/src/views/EapSimplifiedForm/DeliveryAndBudget/index.tsx
@@ -29,7 +29,7 @@ import Link from '#components/Link';
 import TabPage from '#components/TabPage';
 import { useRequest } from '#utils/restRequest';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import GuidanceSeap from '../GuidanceSeap';
 import { type PartialSimplifiedEapType } from '../schema';
 
@@ -194,7 +194,7 @@ function DeliveryAndBudget(props: Props) {
                             error={error?.early_action_capability}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.early_action_capability}
+                            maxWords={wordLimits.early_action_capability}
                         />
                     </InputSection>
                     <InputSection
@@ -257,7 +257,7 @@ function DeliveryAndBudget(props: Props) {
                             error={error?.rcrc_movement_involvement}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.rcrc_movement_involvement}
+                            maxWords={wordLimits.rcrc_movement_involvement}
                         />
                     </InputSection>
                 </ListView>
diff --git a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
index 870e848dec..265c1aacf5 100644
--- a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
@@ -31,7 +31,7 @@ import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { TIMEFRAME_YEAR } from '#utils/constants';
 import { type GoApiResponse } from '#utils/restRequest';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import GuidanceSeap from '../GuidanceSeap';
 import { type PartialSimplifiedEapType } from '../schema';
 
@@ -183,7 +183,7 @@ function EarlyAction(props: Props) {
                             error={error?.overall_objective_intervention}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.overall_objective_intervention}
+                            maxWords={wordLimits.overall_objective_intervention}
                         />
                     </InputSection>
                     <InputSection
@@ -235,7 +235,7 @@ function EarlyAction(props: Props) {
                             error={error?.potential_geographical_high_risk_areas}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.potential_geographical_high_risk_areas}
+                            maxWords={wordLimits.potential_geographical_high_risk_areas}
                         />
                     </InputSection>
                     <InputSection
@@ -296,7 +296,7 @@ function EarlyAction(props: Props) {
                                 error={error?.assisted_through_operation}
                                 disabled={disabled}
                                 readOnly={readOnly}
-                                maxLength={charLimits.assisted_through_operation}
+                                maxWords={wordLimits.assisted_through_operation}
                             />
                         </InputSection>
                         <InputSection
@@ -328,7 +328,7 @@ function EarlyAction(props: Props) {
                                 error={error?.selection_criteria}
                                 disabled={disabled}
                                 readOnly={readOnly}
-                                maxLength={charLimits.selection_criteria}
+                                maxWords={wordLimits.selection_criteria}
                             />
                         </InputSection>
                     </ListView>
@@ -411,7 +411,7 @@ function EarlyAction(props: Props) {
                             error={error?.trigger_statement}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.trigger_statement}
+                            maxWords={wordLimits.trigger_statement}
                         />
                     </InputSection>
                     <InputSection
@@ -505,7 +505,7 @@ function EarlyAction(props: Props) {
                             error={error?.trigger_threshold_justification}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.trigger_threshold_justification}
+                            maxWords={wordLimits.trigger_threshold_justification}
                         />
                     </InputSection>
                     <InputSection
@@ -522,7 +522,7 @@ function EarlyAction(props: Props) {
                             error={error?.next_step_towards_full_eap}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.next_step_towards_full_eap}
+                            maxWords={wordLimits.next_step_towards_full_eap}
                         />
                     </InputSection>
                 </ListView>
diff --git a/app/src/views/EapSimplifiedForm/PartnerContactInput/i18n.json b/app/src/views/EapSimplifiedForm/PartnerContactInput/i18n.json
deleted file mode 100644
index 33fe901b8f..0000000000
--- a/app/src/views/EapSimplifiedForm/PartnerContactInput/i18n.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "namespace": "eapSimplifiedForm",
-    "strings": {
-        "partnerNSNameLabel": "Name",
-        "partnerNSEmailLabel": "Email",
-        "partnerNSPhoneNumberLabel": "Phone Number",
-        "partnerNSTitleLabel": "Title",
-        "partnerNSDeleteButton": "Remove Contact"
-    }
-}
diff --git a/app/src/views/EapSimplifiedForm/PartnerContactInput/index.tsx b/app/src/views/EapSimplifiedForm/PartnerContactInput/index.tsx
deleted file mode 100644
index 9b22ef8eed..0000000000
--- a/app/src/views/EapSimplifiedForm/PartnerContactInput/index.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { DeleteBinTwoLineIcon } from '@ifrc-go/icons';
-import {
-    Container,
-    IconButton,
-    ListView,
-    TextInput,
-} from '@ifrc-go/ui';
-import { useTranslation } from '@ifrc-go/ui/hooks';
-import { randomString } from '@togglecorp/fujs';
-import {
-    type ArrayError,
-    getErrorObject,
-    type SetValueArg,
-    useFormObject,
-} from '@togglecorp/toggle-form';
-
-import { type PartialSimplifiedEapType } from '../schema';
-
-import i18n from './i18n.json';
-
-type PartnerContactsFormFields = NonNullable<PartialSimplifiedEapType['partner_contacts']>[number];
-
-interface Props {
-    value: PartnerContactsFormFields;
-    error: ArrayError<PartnerContactsFormFields> | undefined;
-    onChange: (value: SetValueArg<PartnerContactsFormFields>, index: number) => void;
-    onRemove: (index: number) => void;
-    index: number;
-    disabled?: boolean;
-    readOnly?: boolean;
-}
-
-function PartnerContactsInput(props: Props) {
-    const {
-        error: errorFromProps,
-        onChange,
-        value,
-        index,
-        onRemove,
-        disabled,
-        readOnly,
-    } = props;
-
-    const strings = useTranslation(i18n);
-
-    const onFieldChange = useFormObject(
-        index,
-        onChange,
-        () => ({
-            client_id: randomString(),
-        }),
-    );
-
-    const error = (value && value.client_id && errorFromProps)
-        ? getErrorObject(errorFromProps?.[value.client_id])
-        : undefined;
-
-    return (
-        <Container
-            headingLevel={5}
-            headerActions={(
-                <IconButton
-                    name={index}
-                    onClick={onRemove}
-                    disabled={disabled || readOnly}
-                    title={strings.partnerNSDeleteButton}
-                    ariaLabel={strings.partnerNSDeleteButton}
-                >
-                    <DeleteBinTwoLineIcon />
-                </IconButton>
-            )}
-            spacing="sm"
-            withBorder
-            withPadding
-        >
-            <ListView
-                layout="grid"
-                numPreferredGridColumns={2}
-            >
-                <TextInput
-                    label={strings.partnerNSNameLabel}
-                    name="name"
-                    value={value.name}
-                    error={error?.name}
-                    onChange={onFieldChange}
-                    readOnly={readOnly}
-                    disabled={disabled}
-                />
-                <TextInput
-                    label={strings.partnerNSTitleLabel}
-                    name="title"
-                    value={value.title}
-                    error={error?.title}
-                    onChange={onFieldChange}
-                    readOnly={readOnly}
-                    disabled={disabled}
-                />
-                <TextInput
-                    label={strings.partnerNSEmailLabel}
-                    name="email"
-                    value={value.email}
-                    error={error?.email}
-                    onChange={onFieldChange}
-                    readOnly={readOnly}
-                    disabled={disabled}
-                />
-                <TextInput
-                    label={strings.partnerNSPhoneNumberLabel}
-                    name="phone_number"
-                    value={value.phone_number}
-                    error={error?.phone_number}
-                    onChange={onFieldChange}
-                    readOnly={readOnly}
-                    disabled={disabled}
-                />
-            </ListView>
-        </Container>
-    );
-}
-
-export default PartnerContactsInput;
diff --git a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
index 972611e1de..0242e3d4b3 100644
--- a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
@@ -20,7 +20,7 @@ import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import TabPage from '#components/TabPage';
 
-import { charLimits } from '../common';
+import { wordLimits } from '../common';
 import GuidanceSeap from '../GuidanceSeap';
 import { type PartialSimplifiedEapType } from '../schema';
 
@@ -208,7 +208,7 @@ function RiskAnalysis(props: Props) {
                             error={error?.prioritized_hazard_and_impact}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.prioritized_hazard_and_impact}
+                            maxWords={wordLimits.prioritized_hazard_and_impact}
                         />
                         <MultiImageWithCaptionInput
                             name="hazard_impact_images"
@@ -236,7 +236,7 @@ function RiskAnalysis(props: Props) {
                             error={error?.risks_selected_protocols}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.risks_selected_protocols}
+                            maxWords={wordLimits.risks_selected_protocols}
                         />
                         <MultiImageWithCaptionInput
                             name="risk_selected_protocols_images"
@@ -327,7 +327,7 @@ function RiskAnalysis(props: Props) {
                             error={error?.selected_early_actions}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={charLimits.selected_early_actions}
+                            maxWords={wordLimits.selected_early_actions}
                         />
                         <MultiImageWithCaptionInput
                             name="selected_early_actions_images"
diff --git a/app/src/views/EapSimplifiedForm/common.tsx b/app/src/views/EapSimplifiedForm/common.tsx
index 9bafe9b795..da8c11a0ec 100644
--- a/app/src/views/EapSimplifiedForm/common.tsx
+++ b/app/src/views/EapSimplifiedForm/common.tsx
@@ -180,7 +180,7 @@ export function checkTabErrors(
     return hasErrorOnAnyField;
 }
 
-export const charLimits = {
+export const wordLimits = {
     prioritized_hazard_and_impact: 500,
     risks_selected_protocols: 150,
     selected_early_actions: 150,
diff --git a/app/src/views/EapSimplifiedForm/schema.ts b/app/src/views/EapSimplifiedForm/schema.ts
index f95ea59a06..12bca27337 100644
--- a/app/src/views/EapSimplifiedForm/schema.ts
+++ b/app/src/views/EapSimplifiedForm/schema.ts
@@ -17,10 +17,13 @@ import {
 import indicatorSchema from '#components/domain/EapIndicatorInput/schema';
 import operationActivitySchema from '#components/domain/EapOperationActivityInput/schema';
 import { lengthSmallerOrEqualToCondition } from '#utils/common';
-import { positiveIntegerCondition } from '#utils/form';
+import {
+    positiveIntegerCondition,
+    wordCountLessThanOrEqualToCondition,
+} from '#utils/form';
 import { type GoApiBody } from '#utils/restRequest';
 
-import { charLimits } from './common';
+import { wordLimits } from './common';
 
 function lessThanEqualToFiveImagesCondition<T>(value: T[] | undefined) {
     return isDefined(value) && Array.isArray(value) && value.length > 5
@@ -346,8 +349,8 @@ export const formSchema: FormSchema = {
             prioritized_hazard_and_impact: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
-                validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.prioritized_hazard_and_impact,
+                validations: [wordCountLessThanOrEqualToCondition(
+                    wordLimits.prioritized_hazard_and_impact,
                 )],
             },
             hazard_impact_images: {
@@ -365,7 +368,7 @@ export const formSchema: FormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.risks_selected_protocols,
+                    wordLimits.risks_selected_protocols,
                 )],
             },
             risk_selected_protocols_images: {
@@ -383,7 +386,7 @@ export const formSchema: FormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.selected_early_actions,
+                    wordLimits.selected_early_actions,
                 )],
             },
             selected_early_actions_images: {
@@ -404,7 +407,7 @@ export const formSchema: FormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.overall_objective_intervention,
+                    wordLimits.overall_objective_intervention,
                 )],
             },
             // FIXME: add required condition
@@ -415,35 +418,35 @@ export const formSchema: FormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.potential_geographical_high_risk_areas,
+                    wordLimits.potential_geographical_high_risk_areas,
                 )],
             },
             people_targeted: {
                 required: isSubmit,
                 validations: [
                     positiveIntegerCondition,
-                    greaterThanOrEqualToCondition(charLimits.people_targeted),
+                    greaterThanOrEqualToCondition(wordLimits.people_targeted),
                 ],
             },
             assisted_through_operation: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.assisted_through_operation,
+                    wordLimits.assisted_through_operation,
                 )],
             },
             selection_criteria: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.selection_criteria,
+                    wordLimits.selection_criteria,
                 )],
             },
             trigger_statement: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.trigger_statement,
+                    wordLimits.trigger_statement,
                 )],
             },
             seap_lead_time: { required: isSubmit },
@@ -457,13 +460,13 @@ export const formSchema: FormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.trigger_threshold_justification,
+                    wordLimits.trigger_threshold_justification,
                 )],
             },
             next_step_towards_full_eap: {
                 required: isSubmit,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.next_step_towards_full_eap,
+                    wordLimits.next_step_towards_full_eap,
                 )],
             },
 
@@ -567,14 +570,14 @@ export const formSchema: FormSchema = {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.early_action_capability,
+                    wordLimits.early_action_capability,
                 )],
             },
             rcrc_movement_involvement: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(
-                    charLimits.rcrc_movement_involvement,
+                    wordLimits.rcrc_movement_involvement,
                 )],
             },
             total_budget: { required: isSubmit },
diff --git a/packages/go-ui-storybook/src/stories/TextArea.stories.tsx b/packages/go-ui-storybook/src/stories/TextArea.stories.tsx
index 1d73c1c224..d645f710d3 100644
--- a/packages/go-ui-storybook/src/stories/TextArea.stories.tsx
+++ b/packages/go-ui-storybook/src/stories/TextArea.stories.tsx
@@ -85,3 +85,21 @@ export const WithAsterisk: Story = {
         withAsterisk: true,
     },
 };
+
+export const WithCharacterLimit: Story = {
+    render: Template,
+    args: {
+        label: 'Feedback',
+        maxLength: 100,
+        value: 'I appreciate the quick response from your support team!',
+    },
+};
+
+export const WithWordLimit: Story = {
+    render: Template,
+    args: {
+        label: 'Feedback',
+        maxWords: 10,
+        value: 'I appreciate the quick response from your support team!',
+    },
+};
diff --git a/packages/ui/src/components/TextArea/index.tsx b/packages/ui/src/components/TextArea/index.tsx
index 7ba199c4c3..77cfe1af34 100644
--- a/packages/ui/src/components/TextArea/index.tsx
+++ b/packages/ui/src/components/TextArea/index.tsx
@@ -1,7 +1,11 @@
 import React, { useMemo } from 'react';
 import { isNotDefined } from '@togglecorp/fujs';
 
-import { getHighlightMode } from '#utils/common';
+import {
+    getHighlightMode,
+    getWordCount,
+    trimToWordLimit,
+} from '#utils/common';
 import { extractInputContainerProps } from '#utils/inputs';
 
 import InputContainer, { Props as InputContainerProps } from '../InputContainer';
@@ -12,9 +16,9 @@ const BULLET = '•';
 const KEY_ENTER = 'Enter';
 
 type InheritedProps<NAME> = Omit<InputContainerProps, 'input'>
-& Omit<RawTextAreaProps<NAME>, 'type' | 'className' | 'elementRef'>;
+& Omit<RawTextAreaProps<NAME>, 'type' | 'className' | 'elementRef' | 'maxLength'>;
 
-export interface Props<NAME> extends InheritedProps<NAME> {
+interface BaseProps<NAME> {
     inputElementRef?: React.RefObject<HTMLInputElement | null>;
     autoBullets?: boolean;
     inputClassName?: string;
@@ -22,6 +26,16 @@ export interface Props<NAME> extends InheritedProps<NAME> {
     prevValue?: RawTextAreaProps<NAME>['value'];
 }
 
+type LimitProps = {
+    maxLength?: number;
+    maxWords?: never;
+} | {
+    maxLength?: never;
+    maxWords?: number;
+};
+
+export type Props<NAME> = InheritedProps<NAME> & BaseProps<NAME> & LimitProps;
+
 function TextArea<const N>(props: Props<N>) {
     const {
         disabled,
@@ -38,6 +52,7 @@ function TextArea<const N>(props: Props<N>) {
         value,
         prevValue,
         maxLength,
+        maxWords,
         ...otherProps
     } = props;
 
@@ -50,6 +65,28 @@ function TextArea<const N>(props: Props<N>) {
         [value, prevValue, withDiffView],
     );
 
+    const wordCount = useMemo(
+        () => (isNotDefined(maxWords) ? undefined : getWordCount(value)),
+        [value, maxWords],
+    );
+
+    const handleChange = React.useCallback((
+        newValue: string | undefined,
+        inputName: N,
+        e?: React.ChangeEvent<HTMLTextAreaElement>,
+    ) => {
+        if (isNotDefined(onChange)) {
+            return;
+        }
+
+        if (isNotDefined(maxWords)) {
+            onChange(newValue, inputName, e);
+            return;
+        }
+
+        onChange(trimToWordLimit(newValue, maxWords), inputName, e);
+    }, [onChange, maxWords]);
+
     const handleInputFocus = React.useCallback((e: React.FocusEvent<HTMLTextAreaElement>) => {
         if (isNotDefined(onChange) || disabled || readOnly) {
             return;
@@ -89,7 +126,7 @@ function TextArea<const N>(props: Props<N>) {
                         disabled={disabled}
                         readOnly={readOnly}
                         required={required}
-                        onChange={onChange}
+                        onChange={handleChange}
                         name={name}
                         onFocus={autoBullets ? handleInputFocus : undefined}
                         onKeyUp={autoBullets ? handleKeyUp : undefined}
@@ -99,6 +136,8 @@ function TextArea<const N>(props: Props<N>) {
                     <TextBadge
                         length={value?.length}
                         maxLength={maxLength}
+                        wordCount={wordCount}
+                        maxWords={maxWords}
                     />
                 </>
             )}
diff --git a/packages/ui/src/components/TextBadge/i18n.json b/packages/ui/src/components/TextBadge/i18n.json
new file mode 100644
index 0000000000..fc764872b8
--- /dev/null
+++ b/packages/ui/src/components/TextBadge/i18n.json
@@ -0,0 +1,6 @@
+{
+    "namespace": "common",
+    "strings": {
+        "textBadgeWordCountLabel": "{wordCount} / {maxWords} words"
+    }
+}
diff --git a/packages/ui/src/components/TextBadge/index.tsx b/packages/ui/src/components/TextBadge/index.tsx
index 4310f7f9b0..094990ecd1 100644
--- a/packages/ui/src/components/TextBadge/index.tsx
+++ b/packages/ui/src/components/TextBadge/index.tsx
@@ -1,15 +1,46 @@
-import { isNotDefined } from '@togglecorp/fujs';
+import {
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
 
 import Description from '#components/Description';
 import InlineLayout from '#components/InlineLayout';
+import useTranslation from '#hooks/useTranslation';
+import { resolveToString } from '#utils/translation';
+
+import i18n from './i18n.json';
 
 export interface Props {
     maxLength?: number;
     length?: number;
+    maxWords?: number;
+    wordCount?: number;
 }
 
 function TextBadge(props: Props) {
-    const { maxLength, length = 0 } = props;
+    const {
+        maxLength,
+        length = 0,
+        maxWords,
+        wordCount = 0,
+    } = props;
+
+    const strings = useTranslation(i18n);
+
+    if (isDefined(maxWords)) {
+        return (
+            <InlineLayout
+                after={(
+                    <Description withLightText textSize="sm">
+                        {resolveToString(
+                            strings.textBadgeWordCountLabel,
+                            { wordCount, maxWords },
+                        )}
+                    </Description>
+                )}
+            />
+        );
+    }
 
     if (isNotDefined(maxLength)) {
         return null;
diff --git a/packages/ui/src/utils/common.test.ts b/packages/ui/src/utils/common.test.ts
index e3fc492e9f..bd578d9767 100644
--- a/packages/ui/src/utils/common.test.ts
+++ b/packages/ui/src/utils/common.test.ts
@@ -6,7 +6,9 @@ import {
 
 import {
     denormalizeList,
+    getWordCount,
     splitList,
+    trimToWordLimit,
 } from './common';
 
 test('Split list', () => {
@@ -189,3 +191,24 @@ test('Denormalize List', () => {
         },
     ]);
 });
+
+test('Get word count', () => {
+    expect(getWordCount(undefined)).toBe(0);
+    expect(getWordCount(null)).toBe(0);
+    expect(getWordCount('')).toBe(0);
+    expect(getWordCount('   \n  ')).toBe(0);
+    expect(getWordCount('hello')).toBe(1);
+    expect(getWordCount('  hello   world  ')).toBe(2);
+    expect(getWordCount('hello\nworld\tagain')).toBe(3);
+    expect(getWordCount('• one\n• two')).toBe(4);
+});
+
+test('Trim to word limit', () => {
+    expect(trimToWordLimit(undefined, 5)).toBe(undefined);
+    expect(trimToWordLimit('one two', 5)).toBe('one two');
+    expect(trimToWordLimit('one two three', 3)).toBe('one two three');
+    expect(trimToWordLimit('one two three', 2)).toBe('one two');
+    expect(trimToWordLimit('  one   two   three  ', 2)).toBe('  one   two');
+    expect(trimToWordLimit('one two three', 0)).toBe(undefined);
+    expect(trimToWordLimit('one\ntwo\nthree', 2)).toBe('one\ntwo');
+});
diff --git a/packages/ui/src/utils/common.ts b/packages/ui/src/utils/common.ts
index 4bce1c2342..35d7f21ece 100644
--- a/packages/ui/src/utils/common.ts
+++ b/packages/ui/src/utils/common.ts
@@ -836,6 +836,43 @@ function isNotDefinedValue(value: unknown) {
     return false;
 }
 
+const WORD_PATTERN = /\S+/g;
+
+export function getWordCount(value: string | undefined | null) {
+    if (isNotDefined(value)) {
+        return 0;
+    }
+
+    return [...value.matchAll(WORD_PATTERN)].length;
+}
+
+export function trimToWordLimit(
+    value: string | undefined,
+    maxWords: number,
+): string | undefined {
+    if (isNotDefined(value)) {
+        return value;
+    }
+
+    if (maxWords <= 0) {
+        return undefined;
+    }
+
+    const matches = [...value.matchAll(WORD_PATTERN)];
+
+    if (matches.length <= maxWords) {
+        return value;
+    }
+
+    const lastAllowedWord = matches[maxWords - 1];
+    const trimmedValue = value.slice(
+        0,
+        (lastAllowedWord.index ?? 0) + lastAllowedWord[0].length,
+    );
+
+    return trimmedValue === '' ? undefined : trimmedValue;
+}
+
 export function getHighlightMode<VALUE>(
     value: VALUE | undefined | null,
     prevValue: VALUE | undefined | null,

From ff956005d3f04b8cffd8fc9d502250565b4ca708 Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Tue, 4 Aug 2026 13:56:38 +0545
Subject: [PATCH 3/9] fix(eap): align forms and exports with updated API schema

- rename *_images fields to *_files, people_targeted to
  total_people_targeted, and operational_timeframe to activation_timeframe
- replace key actor national society select with free-text partner input
- add National Society contact section and RCRC Climate Center checkbox
- drop IFRC delegation, head of delegation and global ops coordinator contacts
- replace Pending PFA status with Approved / Project Agreement Signed
---
 .../EapOperationActivityInput/schema.ts       |   3 +-
 app/src/utils/constants.ts                    |   4 +-
 .../AccountMyFormsEap/EapStatus/index.tsx     |  12 +-
 .../EapTableActions/index.tsx                 |   6 +-
 app/src/views/AccountMyFormsEap/index.tsx     |  18 +-
 app/src/views/AccountMyFormsEap/utils.ts      |   2 +-
 app/src/views/EapFullExport/index.tsx         |  81 +++----
 .../EapActivationProcess/index.tsx            |  26 +--
 .../Overview/KeyActorsInput/index.tsx         |  10 +-
 app/src/views/EapFullForm/Overview/i18n.json  |   5 +-
 app/src/views/EapFullForm/Overview/index.tsx  |  41 +++-
 .../views/EapFullForm/RiskAnalysis/i18n.json  |   4 +-
 .../views/EapFullForm/RiskAnalysis/index.tsx  |  30 +--
 .../EapFullForm/SelectionActions/index.tsx    |  10 +-
 .../views/EapFullForm/TriggerModel/i18n.json  |   4 +-
 .../views/EapFullForm/TriggerModel/index.tsx  |  38 ++--
 app/src/views/EapFullForm/common.tsx          |  31 +--
 app/src/views/EapFullForm/index.tsx           | 138 ++++++------
 app/src/views/EapFullForm/schema.ts           | 209 +++++++++---------
 app/src/views/EapSimplifiedExport/index.tsx   |  34 +--
 .../EapSimplifiedForm/EarlyAction/index.tsx   |  18 +-
 .../EapSimplifiedForm/Overview/i18n.json      |   5 +-
 .../EapSimplifiedForm/Overview/index.tsx      |  40 +++-
 .../EapSimplifiedForm/RiskAnalysis/index.tsx  |  18 +-
 app/src/views/EapSimplifiedForm/common.tsx    |  27 +--
 app/src/views/EapSimplifiedForm/index.tsx     |  46 ++--
 app/src/views/EapSimplifiedForm/schema.ts     |  63 +++---
 app/src/views/EapSummaryExport/index.tsx      |  23 --
 go-api                                        |   2 +-
 29 files changed, 453 insertions(+), 495 deletions(-)

diff --git a/app/src/components/domain/EapOperationActivityInput/schema.ts b/app/src/components/domain/EapOperationActivityInput/schema.ts
index 1eb11d29d2..eeb1713572 100644
--- a/app/src/components/domain/EapOperationActivityInput/schema.ts
+++ b/app/src/components/domain/EapOperationActivityInput/schema.ts
@@ -1,13 +1,14 @@
 import {
     type ObjectSchema,
     type PartialForm,
+    type PurgeNull,
     requiredStringCondition,
     undefinedValue,
 } from '@togglecorp/toggle-form';
 
 import { type components } from '#generated/types';
 
-type OperationActivity = components<'write'>['schemas']['OperationActivity'];
+type OperationActivity = PurgeNull<components<'write'>['schemas']['OperationActivity']>;
 
 export type OperationActivityFormFields = PartialForm<OperationActivity> & {
     client_id: string;
diff --git a/app/src/utils/constants.ts b/app/src/utils/constants.ts
index fc0b0b3ae6..85532d8817 100644
--- a/app/src/utils/constants.ts
+++ b/app/src/utils/constants.ts
@@ -245,5 +245,5 @@ export const EAP_STATUS_UNDER_DEVELOPMENT = 10 satisfies EapStatus;
 export const EAP_STATUS_UNDER_REVIEW = 20 satisfies EapStatus;
 export const EAP_STATUS_NS_ADDRESSING_COMMENTS = 30 satisfies EapStatus;
 export const EAP_STATUS_TECHNICALLY_VALIDATED = 40 satisfies EapStatus;
-export const EAP_STATUS_PENDING_PFA = 50 satisfies EapStatus;
-export const EAP_STATUS_APPROVED = 60 satisfies EapStatus;
+export const EAP_STATUS_APPROVED = 50 satisfies EapStatus;
+export const EAP_STATUS_PROJECT_AGREEMENT_SIGNED = 60 satisfies EapStatus;
diff --git a/app/src/views/AccountMyFormsEap/EapStatus/index.tsx b/app/src/views/AccountMyFormsEap/EapStatus/index.tsx
index 17ebf8a0b7..aae6b7dd10 100644
--- a/app/src/views/AccountMyFormsEap/EapStatus/index.tsx
+++ b/app/src/views/AccountMyFormsEap/EapStatus/index.tsx
@@ -32,7 +32,7 @@ import useAlert from '#hooks/useAlert';
 import {
     EAP_STATUS_APPROVED,
     EAP_STATUS_NS_ADDRESSING_COMMENTS,
-    EAP_STATUS_PENDING_PFA,
+    EAP_STATUS_PROJECT_AGREEMENT_SIGNED,
     EAP_STATUS_TECHNICALLY_VALIDATED,
     EAP_STATUS_UNDER_DEVELOPMENT,
     EAP_STATUS_UNDER_REVIEW,
@@ -63,10 +63,10 @@ const validStatusTransition: Record<EapStatus, EapStatus[]> = {
     ],
     [EAP_STATUS_TECHNICALLY_VALIDATED]: [
         EAP_STATUS_NS_ADDRESSING_COMMENTS,
-        EAP_STATUS_PENDING_PFA,
+        EAP_STATUS_APPROVED,
     ],
-    [EAP_STATUS_PENDING_PFA]: [EAP_STATUS_APPROVED],
-    [EAP_STATUS_APPROVED]: [],
+    [EAP_STATUS_APPROVED]: [EAP_STATUS_PROJECT_AGREEMENT_SIGNED],
+    [EAP_STATUS_PROJECT_AGREEMENT_SIGNED]: [],
 };
 
 export interface Props {
@@ -179,7 +179,7 @@ function EapStatus(props: Props) {
 
     const confirmDisabled = (
         (newStatus === EAP_STATUS_NS_ADDRESSING_COMMENTS && isNotDefined(checklistFile))
-            || (newStatus === EAP_STATUS_PENDING_PFA && !hasValidatedBudgetFile)
+            || (newStatus === EAP_STATUS_APPROVED && !hasValidatedBudgetFile)
         || isDefined(responseFormErrors)
         || isSimplifiedEapLocked || isFullEapLocked
     );
@@ -312,7 +312,7 @@ function EapStatus(props: Props) {
                                     withoutShadow
                                 />
                             )}
-                        {newStatus === EAP_STATUS_PENDING_PFA && !hasValidatedBudgetFile && (
+                        {newStatus === EAP_STATUS_APPROVED && !hasValidatedBudgetFile && (
                             <Alert
                                 name="no-budget-file-warning"
                                 type="danger"
diff --git a/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx b/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
index a58a3dcb16..479cfa9c9a 100644
--- a/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
+++ b/app/src/views/AccountMyFormsEap/EapTableActions/index.tsx
@@ -29,8 +29,8 @@ import { environment } from '#config';
 import useAlert from '#hooks/useAlert';
 import useRouting from '#hooks/useRouting';
 import {
+    EAP_STATUS_APPROVED,
     EAP_STATUS_NS_ADDRESSING_COMMENTS,
-    EAP_STATUS_PENDING_PFA,
     EAP_STATUS_TECHNICALLY_VALIDATED,
     EAP_STATUS_UNDER_DEVELOPMENT,
     EAP_TYPE_FULL,
@@ -459,7 +459,7 @@ function EapTableActions(props: Props) {
                     )}
                 </>
             )}
-            {type === 'pending-pfa' && eap.status >= EAP_STATUS_PENDING_PFA && (
+            {type === 'approved' && eap.status >= EAP_STATUS_APPROVED && (
                 <ListView
                     layout="block"
                     spacing="sm"
@@ -530,7 +530,7 @@ function EapTableActions(props: Props) {
                     eapId={eap.id}
                     eapType={eap.eap_type}
                     onClose={setShowExportModalFalse}
-                    version={type === 'pending-pfa'
+                    version={type === 'approved'
                         ? latestVersion
                         : details?.data.version}
                     diff={exportWithDiffView}
diff --git a/app/src/views/AccountMyFormsEap/index.tsx b/app/src/views/AccountMyFormsEap/index.tsx
index d9369d2eef..821b13918f 100644
--- a/app/src/views/AccountMyFormsEap/index.tsx
+++ b/app/src/views/AccountMyFormsEap/index.tsx
@@ -31,7 +31,7 @@ import Link from '#components/Link';
 import useFilterState from '#hooks/useFilterState';
 import {
     EAP_STATUS_APPROVED,
-    EAP_STATUS_PENDING_PFA,
+    EAP_STATUS_PROJECT_AGREEMENT_SIGNED,
     EAP_STATUS_TECHNICALLY_VALIDATED,
     EAP_TYPE_FULL,
     EAP_TYPE_SIMPLIFIED,
@@ -246,20 +246,20 @@ export function Component() {
                         disabled: status < EAP_STATUS_TECHNICALLY_VALIDATED,
                     } satisfies EapExpandedListItem,
                     {
-                        label: 'Approved (Pending PFA)',
-                        lastUpdated: eapListItem.pending_pfa_at ?? undefined,
+                        label: 'Approved',
+                        lastUpdated: eapListItem.approved_at ?? undefined,
                         eap: eapListItem,
-                        type: 'pending-pfa',
+                        type: 'approved',
                         details: undefined,
-                        disabled: status < EAP_STATUS_PENDING_PFA,
+                        disabled: status < EAP_STATUS_APPROVED,
                     } satisfies EapExpandedListItem,
                     {
-                        label: 'Approved',
+                        label: 'Project Agreement Signed',
                         eap: eapListItem,
-                        lastUpdated: eapListItem.approved_at ?? undefined,
-                        type: 'approved',
+                        lastUpdated: eapListItem.project_agreement_signed_at ?? undefined,
+                        type: 'project-agreement-signed',
                         details: undefined,
-                        disabled: status < EAP_STATUS_APPROVED,
+                        disabled: status < EAP_STATUS_PROJECT_AGREEMENT_SIGNED,
                     } satisfies EapExpandedListItem,
                 ].filter(isDefined).toReversed();
 
diff --git a/app/src/views/AccountMyFormsEap/utils.ts b/app/src/views/AccountMyFormsEap/utils.ts
index c12eda4c8e..b9827999fd 100644
--- a/app/src/views/AccountMyFormsEap/utils.ts
+++ b/app/src/views/AccountMyFormsEap/utils.ts
@@ -21,7 +21,7 @@ export type EapExpandedListItem = {
     label: string;
     lastUpdated?: string;
     eap: EapListItem;
-    type: 'registration' | 'development' | 'validated' | 'pending-pfa' | 'approved';
+    type: 'registration' | 'development' | 'validated' | 'approved' | 'project-agreement-signed';
     disabled?: boolean;
 
     // Only applicable for development type
diff --git a/app/src/views/EapFullExport/index.tsx b/app/src/views/EapFullExport/index.tsx
index 15d314dc77..b315564025 100644
--- a/app/src/views/EapFullExport/index.tsx
+++ b/app/src/views/EapFullExport/index.tsx
@@ -135,11 +135,11 @@ export function Component() {
         technical_working_groups_in_place_description,
 
         hazard_selection,
-        hazard_selection_images,
+        hazard_selection_files,
         exposed_element_and_vulnerability_factor,
-        exposed_element_and_vulnerability_factor_images,
+        exposed_element_and_vulnerability_factor_files,
         prioritized_impact,
-        prioritized_impact_images,
+        prioritized_impact_files,
         prioritized_impacts,
         risk_analysis_source_of_information,
 
@@ -147,17 +147,17 @@ export function Component() {
         trigger_statement_source_of_information,
         lead_time,
         forecast_selection,
-        forecast_selection_images,
+        forecast_selection_files,
         forecast_table_file_details,
         definition_and_justification_impact_level,
-        definition_and_justification_impact_level_images,
+        definition_and_justification_impact_level_files,
         identification_of_the_intervention_area,
-        identification_of_the_intervention_area_images,
+        identification_of_the_intervention_area_files,
         trigger_model_source_of_information,
 
         early_actions,
         early_action_selection_process,
-        early_action_selection_process_images,
+        early_action_selection_process_files,
         theory_of_change_table_file_details,
         evidence_base,
         evidence_base_source_of_information,
@@ -168,10 +168,10 @@ export function Component() {
         feasibility,
 
         early_action_implementation_process,
-        early_action_implementation_images,
+        early_action_implementation_files,
         trigger_activation_system,
-        trigger_activation_system_images,
-        people_targeted,
+        trigger_activation_system_files,
+        total_people_targeted,
         selection_of_target_population,
         stop_mechanism,
         activation_process_source_of_information,
@@ -241,7 +241,7 @@ export function Component() {
         early_action_implementation_process:
         prev_early_action_implementation_process,
         trigger_activation_system: prev_trigger_activation_system,
-        people_targeted: prev_people_targeted,
+        total_people_targeted: prev_total_people_targeted,
         selection_of_target_population: prev_selection_of_target_population,
         stop_mechanism: prev_stop_mechanism,
         activation_process_source_of_information:
@@ -274,7 +274,7 @@ export function Component() {
         .join(' | ');
 
     const prevKeyActorsMapping = useMemo(
-        () => listToMap(prev_key_actors ?? [], (actor) => actor.national_society),
+        () => listToMap(prev_key_actors ?? [], (actor) => actor.partner),
         [prev_key_actors],
     );
 
@@ -622,25 +622,6 @@ export function Component() {
                             })}
                         </PrintableContainer>
                     </PrintableContainer>
-                    <PrintableContainer
-                        heading={strings.delegationLabel}
-                        headingLevel={4}
-                    >
-                        <PrintableContactOutput
-                            label={strings.delegationFocalLabel}
-                            namePrefix="ifrc_delegation_focal_point"
-                            data={fullEapResponse}
-                            prevData={prevFullEapResponse}
-                            withDiff={withDiff}
-                        />
-                        <PrintableContactOutput
-                            label={strings.delegationHeadLabel}
-                            namePrefix="ifrc_head_of_delegation"
-                            data={fullEapResponse}
-                            prevData={prevFullEapResponse}
-                            withDiff={withDiff}
-                        />
-                    </PrintableContainer>
                     <PrintableContainer
                         heading={strings.regionalGlobalLabel}
                         headingLevel={4}
@@ -673,13 +654,6 @@ export function Component() {
                             prevData={prevFullEapResponse}
                             withDiff={withDiff}
                         />
-                        <PrintableContactOutput
-                            label={strings.globalOpsLabel}
-                            namePrefix="ifrc_global_ops_coordinator"
-                            data={fullEapResponse}
-                            prevData={prevFullEapResponse}
-                            withDiff={withDiff}
-                        />
                     </PrintableContainer>
                 </PrintableContainer>
             </PrintableContainer>
@@ -721,11 +695,8 @@ export function Component() {
                             headingLevel={4}
                             heading={(
                                 <PrintableLabel
-                                    value={actor.national_society_details.society_name}
-                                    prevValue={
-                                        prevKeyActorsMapping[actor.national_society]
-                                            ?.national_society_details.society_name
-                                    }
+                                    value={actor.partner}
+                                    prevValue={prevKeyActorsMapping[actor.partner]?.partner}
                                     withDiff={withDiff}
                                 />
                             )}
@@ -733,7 +704,7 @@ export function Component() {
                             <PrintableDescription
                                 value={actor.description}
                                 prevValue={
-                                    prevKeyActorsMapping[actor.national_society]
+                                    prevKeyActorsMapping[actor.partner]
                                         ?.description
                                 }
                                 withDiff={withDiff}
@@ -796,7 +767,7 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer headingLevel={3}>
-                    {hazard_selection_images?.map((hazard) => (
+                    {hazard_selection_files?.map((hazard) => (
                         <Image key={hazard.id} src={hazard.file} caption={hazard.caption} />
                     ))}
                 </PrintableContainer>
@@ -812,7 +783,7 @@ export function Component() {
                 </PrintableContainer>
                 <PrintableContainer headingLevel={3}>
                     <div className={styles.imageItems}>
-                        {exposed_element_and_vulnerability_factor_images?.map((element) => (
+                        {exposed_element_and_vulnerability_factor_files?.map((element) => (
                             <Image
                                 key={element.id}
                                 src={element.file}
@@ -857,7 +828,7 @@ export function Component() {
                 </PrintableContainer>
                 <PrintableContainer>
                     <div className={styles.imageItems}>
-                        {prioritized_impact_images?.map((element) => (
+                        {prioritized_impact_files?.map((element) => (
                             <Image
                                 key={element.id}
                                 src={element.file}
@@ -1005,7 +976,7 @@ export function Component() {
                 </PrintableContainer>
                 <PrintableContainer>
                     <div className={styles.imageItems}>
-                        {forecast_selection_images?.map((element) => (
+                        {forecast_selection_files?.map((element) => (
                             <Image
                                 key={element.id}
                                 src={element.file}
@@ -1031,7 +1002,7 @@ export function Component() {
                 </PrintableContainer>
                 <PrintableContainer>
                     <div className={styles.imageItems}>
-                        {definition_and_justification_impact_level_images?.map(
+                        {definition_and_justification_impact_level_files?.map(
                             (element) => (
                                 <Image
                                     key={element.id}
@@ -1054,7 +1025,7 @@ export function Component() {
                 </PrintableContainer>
                 <PrintableContainer>
                     <div className={styles.imageItems}>
-                        {identification_of_the_intervention_area_images?.map((element) => (
+                        {identification_of_the_intervention_area_files?.map((element) => (
                             <Image
                                 key={element.id}
                                 src={element.file}
@@ -1157,7 +1128,7 @@ export function Component() {
                 </PrintableContainer>
                 <PrintableContainer>
                     <div className={styles.imageItems}>
-                        {early_action_selection_process_images?.map((element) => (
+                        {early_action_selection_process_files?.map((element) => (
                             <Image src={element.file} caption={element.caption} />
                         ))}
                     </div>
@@ -1625,7 +1596,7 @@ export function Component() {
                 </PrintableContainer>
                 <PrintableContainer>
                     <div className={styles.imageItems}>
-                        {early_action_implementation_images?.map((element) => (
+                        {early_action_implementation_files?.map((element) => (
                             <Image src={element.file} caption={element.caption} />
                         ))}
                     </div>
@@ -1650,7 +1621,7 @@ export function Component() {
                 </PrintableContainer>
                 <PrintableContainer headingLevel={3}>
                     <div className={styles.imageItems}>
-                        {trigger_activation_system_images?.map((element) => (
+                        {trigger_activation_system_files?.map((element) => (
                             <Image src={element.file} caption={element.caption} />
                         ))}
                     </div>
@@ -1659,8 +1630,8 @@ export function Component() {
                     <ListView layout="grid">
                         <PrintableDataDisplay
                             label={strings.peopleTargetLabel}
-                            value={people_targeted}
-                            prevValue={prev_people_targeted}
+                            value={total_people_targeted}
+                            prevValue={prev_total_people_targeted}
                             valueType="number"
                             variant="block"
                             withBackground
diff --git a/app/src/views/EapFullForm/EapActivationProcess/index.tsx b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
index 9aadd6a324..5464a130d5 100644
--- a/app/src/views/EapFullForm/EapActivationProcess/index.tsx
+++ b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
@@ -208,15 +208,15 @@ function EapActivationProcess(props: Props) {
                             maxWords={wordLimits.early_action_implementation_process}
                         />
                         <MultiImageWithCaptionInput
-                            name="early_action_implementation_images"
+                            name="early_action_implementation_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.early_action_implementation_images}
+                            value={value?.early_action_implementation_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.early_action_implementation_images)}
+                            error={getErrorObject(error?.early_action_implementation_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.activationSelectImagesLabel}
-                            description={strings.activationImageCountLabel}
+                            label={strings.activationSelectFilesLabel}
+                            description={strings.activationFilesCountLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                         />
@@ -280,15 +280,15 @@ function EapActivationProcess(props: Props) {
                             maxWords={wordLimits.trigger_activation_system}
                         />
                         <MultiImageWithCaptionInput
-                            name="trigger_activation_system_images"
+                            name="trigger_activation_system_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.trigger_activation_system_images}
+                            value={value?.trigger_activation_system_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.trigger_activation_system_images)}
+                            error={getErrorObject(error?.trigger_activation_system_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.activationSelectImagesLabel}
-                            description={strings.activationImageCountLabel}
+                            label={strings.activationSelectFilesLabel}
+                            description={strings.activationFilesCountLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                         />
@@ -299,10 +299,10 @@ function EapActivationProcess(props: Props) {
                         withAsteriskOnTitle
                     >
                         <NumberInput
-                            name="people_targeted"
+                            name="total_people_targeted"
                             onChange={setFieldValue}
-                            value={value?.people_targeted}
-                            error={error?.people_targeted}
+                            value={value?.total_people_targeted}
+                            error={error?.total_people_targeted}
                             disabled={disabled}
                             readOnly={readOnly}
                         />
diff --git a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
index a0769194fe..ab9aeec6ae 100644
--- a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
+++ b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
@@ -5,6 +5,7 @@ import {
     InlineLayout,
     ListView,
     TextArea,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { randomString } from '@togglecorp/fujs';
@@ -15,7 +16,6 @@ import {
     useFormObject,
 } from '@togglecorp/toggle-form';
 
-import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
 import NonFieldError from '#components/NonFieldError';
 import { wordLimits } from '#views/EapFullForm/common';
 import { type PartialEapFullFormType } from '#views/EapFullForm/schema';
@@ -85,12 +85,12 @@ function KeyActorsInput(props: Props) {
                     layout="block"
                     spacing="sm"
                 >
-                    <NationalSocietySelectInput
+                    <TextInput
                         placeholder={strings.overviewKeyActorsSelectPartnerLabel}
-                        error={error?.national_society}
-                        name="national_society"
+                        error={error?.partner}
+                        name="partner"
                         onChange={onFieldChange}
-                        value={value?.national_society}
+                        value={value?.partner}
                         disabled={disabled}
                         readOnly={readOnly}
                         required
diff --git a/app/src/views/EapFullForm/Overview/i18n.json b/app/src/views/EapFullForm/Overview/i18n.json
index 51bdc99640..ab923cc98e 100644
--- a/app/src/views/EapFullForm/Overview/i18n.json
+++ b/app/src/views/EapFullForm/Overview/i18n.json
@@ -21,6 +21,8 @@
         "partnersInvolvedDescription": "Select from the list the partners involved in this process. Add as many as needed or select not applicable if no partners involved.",
         "formContacts": "Contacts",
         "stakeholderHeader": "Stakeholder",
+        "nSContact": "National Society Contact",
+        "nSContactDescription": "National Society contact responsible for the EAP process",
         "drefFocalPoint": "DREF Focal Point",
         "drefFocalPointDescription": "The DREF contact person for IFRC",
         "regionalFocalPoint": "IFRC Regional AA Focal Point",
@@ -46,6 +48,7 @@
         "overviewSectionHeading": "Quality Criteria: Overview",
         "sectionCriteriaIntroduction1": "The following quality criteria are used by the IFRC Validation Committee as a benchmark to determine if the Early Action Protocol is eligible to be funded by the DREF. If any of the criteria are not adequately met or just partially met, the Validation Committee may require further information or additional work to demonstrate that the criteria are justified.",
         "sectionCriteriaIntroduction2": "The Forecast based Financing process has been conducted in a participatory manner with involvement of key stakeholders, including communities, movement components and external actors, especially Hydro-Met agencies, disaster risk management authorities, government ministries, development organizations, other hazard specific agencies (local and national level), and other major anticipatory humanitarian actors in the country/region.",
-        "sectionCriteriaComment2": "In order to avoid creating parallel systems and to minimize additional discussions on permissions, etc. when a trigger occurs, all relevant key stakeholders in the country should be involved in the development, and when necessary, the approval of the EAP."
+        "sectionCriteriaComment2": "In order to avoid creating parallel systems and to minimize additional discussions on permissions, etc. when a trigger occurs, all relevant key stakeholders in the country should be involved in the development, and when necessary, the approval of the EAP.",
+        "rcrcClimateCenter": "RCRC Climate Center"
     }
 }
diff --git a/app/src/views/EapFullForm/Overview/index.tsx b/app/src/views/EapFullForm/Overview/index.tsx
index eb3f54f446..2c337dc226 100644
--- a/app/src/views/EapFullForm/Overview/index.tsx
+++ b/app/src/views/EapFullForm/Overview/index.tsx
@@ -3,6 +3,7 @@ import { AddLineIcon } from '@ifrc-go/icons';
 import {
     BooleanInput,
     Button,
+    Checkbox,
     Container,
     Description,
     InputSection,
@@ -248,14 +249,25 @@ function Overview(props: Props) {
                         description={strings.partnersInvolvedDescription}
                         withAsteriskOnTitle
                     >
-                        <NationalSocietyMultiSelectInput
-                            name="partners"
-                            value={value.partners}
-                            error={getErrorString(error?.partners)}
-                            onChange={setFieldValue}
-                            disabled={disabled}
-                            readOnly={readOnly}
-                        />
+                        <ListView layout="block">
+                            <NationalSocietyMultiSelectInput
+                                name="partners"
+                                value={value.partners}
+                                error={getErrorString(error?.partners)}
+                                onChange={setFieldValue}
+                                disabled={disabled}
+                                readOnly={readOnly}
+                            />
+                            <Checkbox
+                                name="include_rcrc_climate_center"
+                                disabled={disabled}
+                                readOnly={readOnly}
+                                value={value?.include_rcrc_climate_center}
+                                onChange={setFieldValue}
+                                error={error?.include_rcrc_climate_center}
+                                label={strings.rcrcClimateCenter}
+                            />
+                        </ListView>
                     </InputSection>
                 </ListView>
             </Container>
@@ -270,7 +282,18 @@ function Overview(props: Props) {
                     <Container
                         variant="form"
                     >
-
+                        <ContactInputsSection
+                            title={strings.nSContact}
+                            description={strings.nSContactDescription}
+                            namePrefix="national_society_contact"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                            withRequiredNameAndEmail
+                            withRequiredTitle
+                        />
                         <ContactInputsSection
                             title={strings.drefFocalPoint}
                             description={strings.drefFocalPointDescription}
diff --git a/app/src/views/EapFullForm/RiskAnalysis/i18n.json b/app/src/views/EapFullForm/RiskAnalysis/i18n.json
index 4f02425804..53351b614b 100644
--- a/app/src/views/EapFullForm/RiskAnalysis/i18n.json
+++ b/app/src/views/EapFullForm/RiskAnalysis/i18n.json
@@ -33,13 +33,13 @@
         "prioritizedImpactsEmptyMessage": "No impacts yet!",
         "attachFilesTitle": "Attach relevant files",
         "attachFilesDescription": "Attach any additional documentation, files, images, etc.",
-        "attachFilesSelectImagesLabel": "Select Images",
+        "attachFilesSelectFilesLabel": "Select Files",
         "attachFilesUploadLabel": "Upload",
         "addButtonLabel": "Add",
         "sourceOfInformationTitle": "Sources of information",
         "sourceOfInformationDescription": "Add the description of the sources one at a time. If the source has a link, add in the second field.",
         "riskExplanatoryNoteLabel": "Explanatory Note",
-        "riskAnalysisImagesCountLabel": "5 images max(optional)",
+        "riskAnalysisFileCountLabel": "5 files max(optional)",
         "riskRequiredPointsLabel": "Required Points",
         "riskAnalysisSectionHeading": "Quality Criteria: Risk Analysis",
         "riskSectionCriteriaIntroduction1": "The EAP triggers are based on a combination of the analysis of risk factors and the forecast in line with the steps of the trigger methodology outlined in the Anticipatory Action manual. The EAP contains a clear trigger statement.",
diff --git a/app/src/views/EapFullForm/RiskAnalysis/index.tsx b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
index 9563238996..c9fe73d0bd 100644
--- a/app/src/views/EapFullForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
@@ -272,17 +272,17 @@ function RiskAnalysis(props: Props) {
                             maxWords={wordLimits.hazard_selection}
                         />
                         <MultiImageWithCaptionInput
-                            name="hazard_selection_images"
+                            name="hazard_selection_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.hazard_selection_images}
+                            value={value?.hazard_selection_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.hazard_selection_images)}
+                            error={getErrorObject(error?.hazard_selection_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.attachFilesSelectImagesLabel}
+                            label={strings.attachFilesSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.riskAnalysisImagesCountLabel}
+                            description={strings.riskAnalysisFileCountLabel}
                         />
                     </InputSection>
                     <InputSection
@@ -348,17 +348,17 @@ function RiskAnalysis(props: Props) {
                             maxWords={wordLimits.exposed_element_and_vulnerability_factor}
                         />
                         <MultiImageWithCaptionInput
-                            name="exposed_element_and_vulnerability_factor_images"
+                            name="exposed_element_and_vulnerability_factor_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.exposed_element_and_vulnerability_factor_images}
+                            value={value?.exposed_element_and_vulnerability_factor_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.hazard_selection_images)}
+                            error={getErrorObject(error?.hazard_selection_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.attachFilesSelectImagesLabel}
+                            label={strings.attachFilesSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.riskAnalysisImagesCountLabel}
+                            description={strings.riskAnalysisFileCountLabel}
                         />
                     </InputSection>
                     <InputSection
@@ -432,17 +432,17 @@ function RiskAnalysis(props: Props) {
                             maxWords={wordLimits.prioritized_impact}
                         />
                         <MultiImageWithCaptionInput
-                            name="prioritized_impact_images"
+                            name="prioritized_impact_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.prioritized_impact_images}
+                            value={value?.prioritized_impact_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.hazard_selection_images)}
+                            error={getErrorObject(error?.hazard_selection_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.attachFilesSelectImagesLabel}
+                            label={strings.attachFilesSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.riskAnalysisImagesCountLabel}
+                            description={strings.riskAnalysisFileCountLabel}
                         />
                     </InputSection>
                     <InputSection
diff --git a/app/src/views/EapFullForm/SelectionActions/index.tsx b/app/src/views/EapFullForm/SelectionActions/index.tsx
index a4551a581a..0bdca7d5cc 100644
--- a/app/src/views/EapFullForm/SelectionActions/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/index.tsx
@@ -431,17 +431,17 @@ function SelectionActions(props: Props) {
                             maxWords={wordLimits.early_action_selection_process}
                         />
                         <MultiImageWithCaptionInput
-                            name="early_action_selection_process_images"
+                            name="early_action_selection_process_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.early_action_selection_process_images}
+                            value={value?.early_action_selection_process_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.early_action_selection_process_images)}
+                            error={getErrorObject(error?.early_action_selection_process_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.selectionActionSelectImagesLabel}
+                            label={strings.selectionActionSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.selectionActionImagesCountLabel}
+                            description={strings.selectionActionFilesCountLabel}
                         />
                     </InputSection>
                     <InputSection
diff --git a/app/src/views/EapFullForm/TriggerModel/i18n.json b/app/src/views/EapFullForm/TriggerModel/i18n.json
index ba2d7f1178..9710696f57 100644
--- a/app/src/views/EapFullForm/TriggerModel/i18n.json
+++ b/app/src/views/EapFullForm/TriggerModel/i18n.json
@@ -42,12 +42,12 @@
         "attachRelevantFilesDescription": "Attach any additional maps, documentation, files, images, etc.",
         "attachRelevantFilesUploadLabel": "Upload",
         "triggerUploadTableLabel": "Upload table",
-        "triggerSelectImagesLabel": "Select images",
+        "triggerSelectFilesLabel": "Select files",
         "sourceInformationTitle": "Sources of information",
         "selectRegionTitle": "Select region on a map",
         "selectRegionDescription": "Select the respective regions on a map by clicking the link to the right",
         "sourceInformationDescription": "Add the description of the sources one at a time. If the source has a link, add in the second field.",
-        "triggerModelImagesCountLabel": "5 images max(optional)",
+        "triggerModelFileCountLabel": "5 files max(optional)",
         "triggerSectionHeading": "Quality Criteria: Trigger Model",
         "triggerSectionCriteriaIntroduction1": "The EAP triggers are based on a combination of the analysis of risk factors and the forecast in line with the steps of the trigger methodology outlined in the Anticipatory Action manual. The EAP contains a clear trigger statement.",
         "triggerSectionCriteriaComment11": "The EAP should clearly show how on the basis of available data on vulnerability, exposure and impact of past events the trigger was determined. The trigger should be clear as this information needs to be verifiable once the trigger is met, so the EAP needs to state in one sentence what exactly the trigger of your EAP will be, for example: When [source] issues a forecast of at least [probability of magnitude of event or impact], then we will act.",
diff --git a/app/src/views/EapFullForm/TriggerModel/index.tsx b/app/src/views/EapFullForm/TriggerModel/index.tsx
index c5e51f887e..e679ee3d29 100644
--- a/app/src/views/EapFullForm/TriggerModel/index.tsx
+++ b/app/src/views/EapFullForm/TriggerModel/index.tsx
@@ -277,7 +277,7 @@ function TriggerModel(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={wordLimits.trigger_statement}
+                            maxWords={wordLimits.trigger_statement}
                         />
                     </InputSection>
                     <InputSection
@@ -384,20 +384,20 @@ function TriggerModel(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={wordLimits.forecast_selection}
+                            maxWords={wordLimits.forecast_selection}
                         />
                         <MultiImageWithCaptionInput
-                            name="forecast_selection_images"
+                            name="forecast_selection_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.forecast_selection_images}
+                            value={value?.forecast_selection_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.forecast_selection_images)}
+                            error={getErrorObject(error?.forecast_selection_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.triggerSelectImagesLabel}
+                            label={strings.triggerSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.triggerModelImagesCountLabel}
+                            description={strings.triggerModelFileCountLabel}
                         />
                     </InputSection>
                     <InputSection
@@ -485,22 +485,22 @@ function TriggerModel(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={wordLimits.definition_and_justification_impact_level}
+                            maxWords={wordLimits.definition_and_justification_impact_level}
                         />
                         <MultiImageWithCaptionInput
-                            name="definition_and_justification_impact_level_images"
+                            name="definition_and_justification_impact_level_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.definition_and_justification_impact_level_images}
+                            value={value?.definition_and_justification_impact_level_files}
                             onChange={setFieldValue}
                             error={getErrorObject(
-                                error?.definition_and_justification_impact_level_images,
+                                error?.definition_and_justification_impact_level_files,
                             )}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.triggerSelectImagesLabel}
+                            label={strings.triggerSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.triggerModelImagesCountLabel}
+                            description={strings.triggerModelFileCountLabel}
                         />
                     </InputSection>
                     <InputSection
@@ -559,22 +559,22 @@ function TriggerModel(props: Props) {
                             onChange={setFieldValue}
                             disabled={disabled}
                             readOnly={readOnly}
-                            maxLength={wordLimits.identification_of_the_intervention_area}
+                            maxWords={wordLimits.identification_of_the_intervention_area}
                         />
                         <MultiImageWithCaptionInput
-                            name="identification_of_the_intervention_area_images"
+                            name="identification_of_the_intervention_area_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.identification_of_the_intervention_area_images}
+                            value={value?.identification_of_the_intervention_area_files}
                             onChange={setFieldValue}
                             error={getErrorObject(
-                                error?.identification_of_the_intervention_area_images,
+                                error?.identification_of_the_intervention_area_files,
                             )}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.triggerSelectImagesLabel}
+                            label={strings.triggerSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.triggerModelImagesCountLabel}
+                            description={strings.triggerModelFileCountLabel}
                         />
                     </InputSection>
                     <InputSection
diff --git a/app/src/views/EapFullForm/common.tsx b/app/src/views/EapFullForm/common.tsx
index c84d2cac22..8d0cf611fc 100644
--- a/app/src/views/EapFullForm/common.tsx
+++ b/app/src/views/EapFullForm/common.tsx
@@ -28,14 +28,11 @@ const overviewTabFields: (FormKeys)[] = [
     'national_society_contact_title',
     'national_society_contact_email',
     'national_society_contact_phone_number',
+    'include_rcrc_climate_center',
     'partner_contacts',
     'dref_focal_point_name',
     'dref_focal_point_email',
     'dref_focal_point_phone_number',
-    'ifrc_delegation_focal_point_name',
-    'ifrc_delegation_focal_point_title',
-    'ifrc_delegation_focal_point_email',
-    'ifrc_delegation_focal_point_phone_number',
     'dref_focal_point_name',
     'dref_focal_point_title',
     'dref_focal_point_email',
@@ -52,10 +49,6 @@ const overviewTabFields: (FormKeys)[] = [
     'ifrc_regional_head_dcc_title',
     'ifrc_regional_head_dcc_email',
     'ifrc_regional_head_dcc_phone_number',
-    'ifrc_global_ops_coordinator_name',
-    'ifrc_global_ops_coordinator_title',
-    'ifrc_global_ops_coordinator_email',
-    'ifrc_global_ops_coordinator_phone_number',
     'is_worked_with_government',
     'worked_with_government_description',
     'key_actors',
@@ -65,13 +58,13 @@ const overviewTabFields: (FormKeys)[] = [
 ];
 
 const riskAnalysisTabFields: (keyof PartialEapFullFormType)[] = [
-    'hazard_selection_images',
+    'hazard_selection_files',
     'hazard_selection',
     'exposed_element_and_vulnerability_factor',
-    'exposed_element_and_vulnerability_factor_images',
+    'exposed_element_and_vulnerability_factor_files',
     'prioritized_impact',
     'prioritized_impacts',
-    'prioritized_impact_images',
+    'prioritized_impact_files',
     'risk_analysis_relevant_files',
     'risk_analysis_source_of_information',
 ];
@@ -82,12 +75,12 @@ const triggerModelTabFields: (keyof PartialEapFullFormType)[] = [
     'lead_timeframe_unit',
     'trigger_statement_source_of_information',
     'forecast_selection',
-    'forecast_selection_images',
+    'forecast_selection_files',
     'forecast_table_file',
     'definition_and_justification_impact_level',
-    'definition_and_justification_impact_level_images',
+    'definition_and_justification_impact_level_files',
     'identification_of_the_intervention_area',
-    'identification_of_the_intervention_area_images',
+    'identification_of_the_intervention_area_files',
     'admin2',
     'trigger_model_source_of_information',
     'trigger_model_relevant_files',
@@ -96,7 +89,7 @@ const triggerModelTabFields: (keyof PartialEapFullFormType)[] = [
 const selectionActionsTabFields: (keyof PartialEapFullFormType)[] = [
     'early_actions',
     'early_action_selection_process',
-    'early_action_selection_process_images',
+    'early_action_selection_process_files',
     'theory_of_change_table_file',
     'evidence_base',
     'evidence_base_source_of_information',
@@ -109,10 +102,10 @@ const selectionActionsTabFields: (keyof PartialEapFullFormType)[] = [
 
 const eapActivationTabFields: (keyof PartialEapFullFormType)[] = [
     'early_action_implementation_process',
-    'early_action_implementation_images',
-    'trigger_activation_system_images',
+    'early_action_implementation_files',
+    'trigger_activation_system_files',
     'trigger_activation_system',
-    'people_targeted',
+    'total_people_targeted',
     'selection_of_target_population',
     'stop_mechanism',
     'activation_process_relevant_files',
@@ -203,5 +196,5 @@ export const wordLimits = {
     prepositioning_cost_description: 500,
     early_action_cost_description: 500,
     eap_endorsement: 300,
-    people_targeted: 10000,
+    total_people_targeted: 10000,
 } satisfies { [key in FormKeys]?: number };
diff --git a/app/src/views/EapFullForm/index.tsx b/app/src/views/EapFullForm/index.tsx
index b3cb58f21b..a02ea101e2 100644
--- a/app/src/views/EapFullForm/index.tsx
+++ b/app/src/views/EapFullForm/index.tsx
@@ -194,15 +194,15 @@ export function Component() {
         setFileIdToUrlMap((prevMap) => {
             const {
                 cover_image_file,
-                hazard_selection_images,
-                forecast_selection_images,
-                trigger_activation_system_images,
-                early_action_selection_process_images,
-                exposed_element_and_vulnerability_factor_images,
-                identification_of_the_intervention_area_images,
-                definition_and_justification_impact_level_images,
-                prioritized_impact_images,
-                early_action_implementation_images,
+                hazard_selection_files,
+                forecast_selection_files,
+                trigger_activation_system_files,
+                early_action_selection_process_files,
+                exposed_element_and_vulnerability_factor_files,
+                identification_of_the_intervention_area_files,
+                definition_and_justification_impact_level_files,
+                prioritized_impact_files,
+                early_action_implementation_files,
                 budget_file_details,
                 forecast_table_file_details,
                 updated_checklist_file_details,
@@ -213,15 +213,15 @@ export function Component() {
                 ...listToMap(
                     [
                         cover_image_file,
-                        ...(hazard_selection_images ?? []),
-                        ...(forecast_selection_images ?? []),
-                        ...(trigger_activation_system_images ?? []),
-                        ...(early_action_selection_process_images ?? []),
-                        ...(exposed_element_and_vulnerability_factor_images ?? []),
-                        ...(identification_of_the_intervention_area_images ?? []),
-                        ...(definition_and_justification_impact_level_images ?? []),
-                        ...(prioritized_impact_images ?? []),
-                        ...(early_action_implementation_images ?? []),
+                        ...(hazard_selection_files ?? []),
+                        ...(forecast_selection_files ?? []),
+                        ...(trigger_activation_system_files ?? []),
+                        ...(early_action_selection_process_files ?? []),
+                        ...(exposed_element_and_vulnerability_factor_files ?? []),
+                        ...(identification_of_the_intervention_area_files ?? []),
+                        ...(definition_and_justification_impact_level_files ?? []),
+                        ...(prioritized_impact_files ?? []),
+                        ...(early_action_implementation_files ?? []),
                         budget_file_details,
                         forecast_table_file_details,
                         updated_checklist_file_details,
@@ -260,15 +260,15 @@ export function Component() {
                 planned_operations,
                 enabling_approaches,
                 cover_image_file,
-                hazard_selection_images,
-                forecast_selection_images,
-                trigger_activation_system_images,
-                early_action_selection_process_images,
-                early_action_implementation_images,
-                exposed_element_and_vulnerability_factor_images,
-                identification_of_the_intervention_area_images,
-                definition_and_justification_impact_level_images,
-                prioritized_impact_images,
+                hazard_selection_files,
+                forecast_selection_files,
+                trigger_activation_system_files,
+                early_action_selection_process_files,
+                early_action_implementation_files,
+                exposed_element_and_vulnerability_factor_files,
+                identification_of_the_intervention_area_files,
+                definition_and_justification_impact_level_files,
+                prioritized_impact_files,
                 activation_process_source_of_information,
                 evidence_base_source_of_information,
                 early_actions,
@@ -309,23 +309,23 @@ export function Component() {
                     ? injectClientId(cover_image_file)
                     : undefined,
 
-                early_action_implementation_images:
-                    early_action_implementation_images?.map(injectClientId),
-                hazard_selection_images: hazard_selection_images?.map(injectClientId),
-                forecast_selection_images:
-                    forecast_selection_images?.map(injectClientId),
-                trigger_activation_system_images:
-                    trigger_activation_system_images?.map(injectClientId),
-                early_action_selection_process_images:
-                    early_action_selection_process_images?.map(injectClientId),
-                exposed_element_and_vulnerability_factor_images:
-                    exposed_element_and_vulnerability_factor_images?.map(injectClientId),
-                identification_of_the_intervention_area_images:
-                    identification_of_the_intervention_area_images?.map(injectClientId),
-                definition_and_justification_impact_level_images:
-                    definition_and_justification_impact_level_images?.map(injectClientId),
-                prioritized_impact_images:
-                    prioritized_impact_images?.map(injectClientId),
+                early_action_implementation_files:
+                    early_action_implementation_files?.map(injectClientId),
+                hazard_selection_files: hazard_selection_files?.map(injectClientId),
+                forecast_selection_files:
+                    forecast_selection_files?.map(injectClientId),
+                trigger_activation_system_files:
+                    trigger_activation_system_files?.map(injectClientId),
+                early_action_selection_process_files:
+                    early_action_selection_process_files?.map(injectClientId),
+                exposed_element_and_vulnerability_factor_files:
+                    exposed_element_and_vulnerability_factor_files?.map(injectClientId),
+                identification_of_the_intervention_area_files:
+                    identification_of_the_intervention_area_files?.map(injectClientId),
+                definition_and_justification_impact_level_files:
+                    definition_and_justification_impact_level_files?.map(injectClientId),
+                prioritized_impact_files:
+                    prioritized_impact_files?.map(injectClientId),
 
                 planned_operations: planned_operations?.map((intervention) => ({
                     ...intervention,
@@ -373,19 +373,19 @@ export function Component() {
                         return formValue?.partner_contacts?.[index!]?.client_id;
                     }
 
-                    match = matchArray(locations, ['hazard_selection_images', NUM]);
+                    match = matchArray(locations, ['hazard_selection_files', NUM]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.hazard_selection_images?.[index!]?.client_id;
+                        return formValue?.hazard_selection_files?.[index!]?.client_id;
                     }
 
                     match = matchArray(locations, [
-                        'exposed_element_and_vulnerability_factor_images',
+                        'exposed_element_and_vulnerability_factor_files',
                         NUM,
                     ]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.exposed_element_and_vulnerability_factor_images?.[
+                        return formValue?.exposed_element_and_vulnerability_factor_files?.[
                             index!
                         ]?.client_id;
                     }
@@ -396,10 +396,10 @@ export function Component() {
                         return formValue?.prioritized_impacts?.[index!]?.client_id;
                     }
 
-                    match = matchArray(locations, ['prioritized_impact_images', NUM]);
+                    match = matchArray(locations, ['prioritized_impact_files', NUM]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.prioritized_impact_images?.[index!]?.client_id;
+                        return formValue?.prioritized_impact_files?.[index!]?.client_id;
                     }
 
                     match = matchArray(locations, [
@@ -445,30 +445,30 @@ export function Component() {
                         return formValue?.ns_capacity_source_of_information?.[index!]
                             ?.client_id;
                     }
-                    match = matchArray(locations, ['forecast_selection_images', NUM]);
+                    match = matchArray(locations, ['forecast_selection_files', NUM]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.forecast_selection_images?.[index!]?.client_id;
+                        return formValue?.forecast_selection_files?.[index!]?.client_id;
                     }
 
                     match = matchArray(locations, [
-                        'definition_and_justification_impact_level_images',
+                        'definition_and_justification_impact_level_files',
                         NUM,
                     ]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.definition_and_justification_impact_level_images?.[
+                        return formValue?.definition_and_justification_impact_level_files?.[
                             index!
                         ]?.client_id;
                     }
 
                     match = matchArray(locations, [
-                        'identification_of_the_intervention_area_images',
+                        'identification_of_the_intervention_area_files',
                         NUM,
                     ]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.identification_of_the_intervention_area_images?.[
+                        return formValue?.identification_of_the_intervention_area_files?.[
                             index!
                         ]?.client_id;
                     }
@@ -490,22 +490,22 @@ export function Component() {
                     }
 
                     match = matchArray(locations, [
-                        'early_action_selection_process_images',
+                        'early_action_selection_process_files',
                         NUM,
                     ]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.early_action_selection_process_images?.[index!]
+                        return formValue?.early_action_selection_process_files?.[index!]
                             ?.client_id;
                     }
 
                     match = matchArray(locations, [
-                        'early_action_selection_process_images',
+                        'early_action_selection_process_files',
                         NUM,
                     ]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.early_action_selection_process_images?.[index!]
+                        return formValue?.early_action_selection_process_files?.[index!]
                             ?.client_id;
                     }
 
@@ -520,22 +520,22 @@ export function Component() {
                     }
 
                     match = matchArray(locations, [
-                        'early_action_implementation_images',
+                        'early_action_implementation_files',
                         NUM,
                     ]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.early_action_implementation_images?.[index!]
+                        return formValue?.early_action_implementation_files?.[index!]
                             ?.client_id;
                     }
 
                     match = matchArray(locations, [
-                        'trigger_activation_system_images',
+                        'trigger_activation_system_files',
                         NUM,
                     ]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.trigger_activation_system_images?.[index!]?.client_id;
+                        return formValue?.trigger_activation_system_files?.[index!]?.client_id;
                     }
 
                     match = matchArray(locations, [
@@ -544,7 +544,7 @@ export function Component() {
                     ]);
                     if (isDefined(match)) {
                         const [index] = match;
-                        return formValue?.trigger_activation_system_images?.[index!]?.client_id;
+                        return formValue?.trigger_activation_system_files?.[index!]?.client_id;
                     }
                     match = matchArray(locations, ['planned_operations',
                         NUM,
@@ -697,10 +697,6 @@ export function Component() {
             dref_focal_point_title,
             dref_focal_point_phone_number,
             dref_focal_point_email,
-            ifrc_contact_name,
-            ifrc_contact_email,
-            ifrc_contact_title,
-            ifrc_contact_phone_number,
         } = removeNull(eapDetailResponse);
 
         setValue((prevValue) => ({
@@ -714,10 +710,6 @@ export function Component() {
             dref_focal_point_title,
             dref_focal_point_phone_number,
             dref_focal_point_email,
-            ifrc_head_of_delegation_email: ifrc_contact_email,
-            ifrc_head_of_delegation_name: ifrc_contact_name,
-            ifrc_head_of_delegation_title: ifrc_contact_title,
-            ifrc_head_of_delegation_phone_number: ifrc_contact_phone_number,
             lead_timeframe_unit: TIMEFRAME_DAYS,
             partners,
         }));
diff --git a/app/src/views/EapFullForm/schema.ts b/app/src/views/EapFullForm/schema.ts
index 2ad31ee66e..eb31438592 100644
--- a/app/src/views/EapFullForm/schema.ts
+++ b/app/src/views/EapFullForm/schema.ts
@@ -26,9 +26,9 @@ import { type GoApiBody } from '#utils/restRequest';
 
 import { wordLimits } from './common';
 
-function lessThanEqualToFiveImagesCondition<T>(value: T[] | undefined) {
+function lessThanEqualToFiveFilesCondition<T>(value: T[] | undefined) {
     return isDefined(value) && Array.isArray(value) && value.length > 5
-        ? 'Maximum five images are allowed'
+        ? 'Maximum five files are allowed'
         : undefined;
 }
 
@@ -56,23 +56,23 @@ type CoverImageFileResponse = NonNullable<
 >;
 type CoverImageFileFields = CoverImageFileResponse & { client_id: string };
 
-type HazardSelectionImagesResponse = NonNullable<
-    EapFullRequestBody['hazard_selection_images']
+type HazardSelectionFilesResponse = NonNullable<
+    EapFullRequestBody['hazard_selection_files']
 >[number];
-type HazardSelectionImagesFields = HazardSelectionImagesResponse & {
+type HazardSelectionFilesFields = HazardSelectionFilesResponse & {
     client_id: string;
 };
 
-type ExposedElementAndVulnerabilityImagesResponse = NonNullable<
-    EapFullRequestBody['exposed_element_and_vulnerability_factor_images']
+type ExposedElementAndVulnerabilityFilesResponse = NonNullable<
+    EapFullRequestBody['exposed_element_and_vulnerability_factor_files']
 >[number];
 type ExposedElementAndVulnerabilityFields =
-    ExposedElementAndVulnerabilityImagesResponse & { client_id: string };
+    ExposedElementAndVulnerabilityFilesResponse & { client_id: string };
 
-type PrioritizedImpactImagesResponse = NonNullable<
-    EapFullRequestBody['prioritized_impact_images']
+type PrioritizedImpactFilesResponse = NonNullable<
+    EapFullRequestBody['prioritized_impact_files']
 >[number];
-type PrioritizedImpactImagesFields = PrioritizedImpactImagesResponse & {
+type PrioritizedImpactFilesFields = PrioritizedImpactFilesResponse & {
     client_id: string;
 };
 
@@ -89,24 +89,24 @@ type TriggerStatementSourceOfInformationResponse = NonNullable<
 type TriggerStatementSourceOfInformationFields =
     TriggerStatementSourceOfInformationResponse & { client_id: string };
 
-type ForecastSelectionImagesResponse = NonNullable<
-    EapFullRequestBody['forecast_selection_images']
+type ForecastSelectionFilesResponse = NonNullable<
+    EapFullRequestBody['forecast_selection_files']
 >[number];
-type ForecastSelectionImagesResponseFields = ForecastSelectionImagesResponse & {
+type ForecastSelectionFilesResponseFields = ForecastSelectionFilesResponse & {
     client_id: string;
 };
 
-type DefinitionAndJustificationImagesResponse = NonNullable<
-    EapFullRequestBody['definition_and_justification_impact_level_images']
+type DefinitionAndJustificationFilesResponse = NonNullable<
+    EapFullRequestBody['definition_and_justification_impact_level_files']
 >[number];
-type DefinitionAndJustificationImagesResponseFields =
-    DefinitionAndJustificationImagesResponse & { client_id: string };
+type DefinitionAndJustificationFilesResponseFields =
+    DefinitionAndJustificationFilesResponse & { client_id: string };
 
-type IdentificationInterventionImagesResponse = NonNullable<
-    EapFullRequestBody['identification_of_the_intervention_area_images']
+type IdentificationInterventionFilesResponse = NonNullable<
+    EapFullRequestBody['identification_of_the_intervention_area_files']
 >[number];
-type IdentificationInterventionImagesResponseFields =
-    IdentificationInterventionImagesResponse & { client_id: string };
+type IdentificationInterventionFilesResponseFields =
+    IdentificationInterventionFilesResponse & { client_id: string };
 
 type TriggerModelSourceOfInformationResponse = NonNullable<
     EapFullRequestBody['trigger_model_source_of_information']
@@ -127,17 +127,17 @@ type NSCapacitySourceOfInformationResponse = NonNullable<
 type NSCapacitySourceOfInformationResponseFields =
     NSCapacitySourceOfInformationResponse & { client_id: string };
 
-type EarlyActionImplementationImagesResponse = NonNullable<
-    EapFullRequestBody['early_action_implementation_images']
+type EarlyActionImplementationFilesResponse = NonNullable<
+    EapFullRequestBody['early_action_implementation_files']
 >[number];
-type EarlyActionImplementationImagesResponseFields =
-    EarlyActionImplementationImagesResponse & { client_id: string };
+type EarlyActionImplementationFilesResponseFields =
+    EarlyActionImplementationFilesResponse & { client_id: string };
 
-type TriggerActivationSystemImagesResponse = NonNullable<
-    EapFullRequestBody['trigger_activation_system_images']
+type TriggerActivationSystemFilesResponse = NonNullable<
+    EapFullRequestBody['trigger_activation_system_files']
 >[number];
-type TriggerActivationSystemImagesResponseFields =
-    TriggerActivationSystemImagesResponse & { client_id: string };
+type TriggerActivationSystemFilesResponseFields =
+    TriggerActivationSystemFilesResponse & { client_id: string };
 
 type ActivationProcessSourceInformationResponse = NonNullable<
     EapFullRequestBody['activation_process_source_of_information']
@@ -145,11 +145,11 @@ type ActivationProcessSourceInformationResponse = NonNullable<
 type ActivationProcessSourceInformationResponseFields =
     ActivationProcessSourceInformationResponse & { client_id: string };
 
-type EarlyActionsSelectionImagesResponse = NonNullable<
-    EapFullRequestBody['early_action_selection_process_images']
+type EarlyActionsSelectionFilesResponse = NonNullable<
+    EapFullRequestBody['early_action_selection_process_files']
 >[number];
-type EarlyActionsSelectionImagesResponseFields =
-    EarlyActionsSelectionImagesResponse & { client_id: string };
+type EarlyActionsSelectionFilesResponseFields =
+    EarlyActionsSelectionFilesResponse & { client_id: string };
 
 type EvidenceBaseSourceInformationResponse = NonNullable<
     EapFullRequestBody['evidence_base_source_of_information']
@@ -281,12 +281,12 @@ type FormFields = DeepReplace<
                                                                                         CoverImageFileFields
                                                                                     >,
                                                                 // eslint-disable-next-line max-len
-                                                                                    HazardSelectionImagesResponse,
+                                                                                    HazardSelectionFilesResponse,
                                                                 // eslint-disable-next-line max-len
-                                                                                    HazardSelectionImagesFields
+                                                                                    HazardSelectionFilesFields
                                                                                 >,
                                                                 // eslint-disable-next-line max-len
-                                                                                ExposedElementAndVulnerabilityImagesResponse,
+                                                                                ExposedElementAndVulnerabilityFilesResponse,
                                                                 // eslint-disable-next-line max-len
                                                                                 ExposedElementAndVulnerabilityFields
                                                                             >,
@@ -295,9 +295,8 @@ type FormFields = DeepReplace<
                                                                             PartnerContactsFormFields
                                                                         >,
                                                                 // eslint-disable-next-line max-len
-                                                                        PrioritizedImpactImagesResponse,
-                                                                // eslint-disable-next-line max-len
-                                                                        PrioritizedImpactImagesFields
+                                                                        PrioritizedImpactFilesResponse,
+                                                                        PrioritizedImpactFilesFields
                                                                     >,
                                                                 // eslint-disable-next-line max-len
                                                                     RiskAnalysisSourceOfInformationResponse,
@@ -309,15 +308,15 @@ type FormFields = DeepReplace<
                                                                 // eslint-disable-next-line max-len
                                                                 TriggerStatementSourceOfInformationFields
                                                             >,
-                                                            ForecastSelectionImagesResponse,
-                                                            ForecastSelectionImagesResponseFields
+                                                            ForecastSelectionFilesResponse,
+                                                            ForecastSelectionFilesResponseFields
                                                         >,
-                                                        DefinitionAndJustificationImagesResponse,
+                                                        DefinitionAndJustificationFilesResponse,
                                                         // eslint-disable-next-line max-len
-                                                        DefinitionAndJustificationImagesResponseFields
+                                                        DefinitionAndJustificationFilesResponseFields
                                                     >,
-                                                    IdentificationInterventionImagesResponse,
-                                                    IdentificationInterventionImagesResponseFields
+                                                    IdentificationInterventionFilesResponse,
+                                                    IdentificationInterventionFilesResponseFields
                                                 >,
                                                 TriggerModelSourceOfInformationResponse,
                                                 TriggerModelSourceOfInformationResponseFields
@@ -328,17 +327,17 @@ type FormFields = DeepReplace<
                                         NSCapacitySourceOfInformationResponse,
                                         NSCapacitySourceOfInformationResponseFields
                                     >,
-                                    EarlyActionImplementationImagesResponse,
-                                    EarlyActionImplementationImagesResponseFields
+                                    EarlyActionImplementationFilesResponse,
+                                    EarlyActionImplementationFilesResponseFields
                                 >,
-                                TriggerActivationSystemImagesResponse,
-                                TriggerActivationSystemImagesResponseFields
+                                TriggerActivationSystemFilesResponse,
+                                TriggerActivationSystemFilesResponseFields
                             >,
                             ActivationProcessSourceInformationResponse,
                             ActivationProcessSourceInformationResponseFields
                         >,
-                        EarlyActionsSelectionImagesResponse,
-                        EarlyActionsSelectionImagesResponseFields
+                        EarlyActionsSelectionFilesResponse,
+                        EarlyActionsSelectionFilesResponseFields
                     >,
                     EvidenceBaseSourceInformationResponse,
                     EvidenceBaseSourceInformationResponseFields
@@ -382,25 +381,25 @@ type PartnerContactFormFields = ReturnType<
         EapFullFormContext
     >['fields']
 >;
-type HazardSelectionImagesFormFields = ReturnType<
+type HazardSelectionFilesFormFields = ReturnType<
     ObjectSchema<
-        NonNullable<PartialEapFullFormType['hazard_selection_images']>[number],
+        NonNullable<PartialEapFullFormType['hazard_selection_files']>[number],
         PartialEapFullFormType,
         EapFullFormContext
     >['fields']
 >;
-type ExposedElementAndVulnerabilityImagesFormFields = ReturnType<
+type ExposedElementAndVulnerabilityFilesFormFields = ReturnType<
     ObjectSchema<
         NonNullable<
-            PartialEapFullFormType['exposed_element_and_vulnerability_factor_images']
+            PartialEapFullFormType['exposed_element_and_vulnerability_factor_files']
         >[number],
         PartialEapFullFormType,
         EapFullFormContext
     >['fields']
 >;
-type PrioritizedImpactImagesFormFields = ReturnType<
+type PrioritizedImpactFilesFormFields = ReturnType<
     ObjectSchema<
-        NonNullable<PartialEapFullFormType['prioritized_impact_images']>[number],
+        NonNullable<PartialEapFullFormType['prioritized_impact_files']>[number],
         PartialEapFullFormType,
         EapFullFormContext
     >['fields']
@@ -423,26 +422,26 @@ type TriggerStatementSourceOfInformationFormFields = ReturnType<
         EapFullFormContext
     >['fields']
 >;
-type ForecastSelectionImagesResponseFormFields = ReturnType<
+type ForecastSelectionFilesResponseFormFields = ReturnType<
     ObjectSchema<
-        NonNullable<PartialEapFullFormType['forecast_selection_images']>[number],
+        NonNullable<PartialEapFullFormType['forecast_selection_files']>[number],
         PartialEapFullFormType,
         EapFullFormContext
     >['fields']
 >;
-type DefinitionAndJustificationImagesResponseFormFields = ReturnType<
+type DefinitionAndJustificationFilesResponseFormFields = ReturnType<
     ObjectSchema<
         NonNullable<
-            PartialEapFullFormType['definition_and_justification_impact_level_images']
+            PartialEapFullFormType['definition_and_justification_impact_level_files']
         >[number],
         PartialEapFullFormType,
         EapFullFormContext
     >['fields']
 >;
-type IdentificationInterventionImagesResponseFormFields = ReturnType<
+type IdentificationInterventionFilesResponseFormFields = ReturnType<
     ObjectSchema<
         NonNullable<
-            PartialEapFullFormType['identification_of_the_intervention_area_images']
+            PartialEapFullFormType['identification_of_the_intervention_area_files']
         >[number],
         PartialEapFullFormType,
         EapFullFormContext
@@ -473,10 +472,10 @@ type NSCapacitySourceOfInformationResponseFormFields = ReturnType<
         EapFullFormContext
     >['fields']
 >;
-type EarlyActionImagesResponseFormFields = ReturnType<
+type EarlyActionFilesResponseFormFields = ReturnType<
     ObjectSchema<
         NonNullable<
-            PartialEapFullFormType['early_action_implementation_images']
+            PartialEapFullFormType['early_action_implementation_files']
         >[number],
         PartialEapFullFormType,
         EapFullFormContext
@@ -489,10 +488,10 @@ type EarlyActionsSelectionResponseFormFields = ReturnType<
         EapFullFormContext
     >['fields']
 >;
-type TriggerActivationImagesResponseFormFields = ReturnType<
+type TriggerActivationFilesResponseFormFields = ReturnType<
     ObjectSchema<
         NonNullable<
-            PartialEapFullFormType['early_action_implementation_images']
+            PartialEapFullFormType['early_action_implementation_files']
         >[number],
         PartialEapFullFormType,
         EapFullFormContext
@@ -562,7 +561,11 @@ type ExtractContactPrefix<KEY extends FieldKeys> =
 
 type ValidContactFieldPrefixes = ExtractContactPrefix<FieldKeys>;
 
-function getContactSchema<KEY extends ValidContactFieldPrefixes>(key: KEY, required?: boolean) {
+function getContactSchema<KEY extends ValidContactFieldPrefixes>(
+    key: KEY,
+    required?: boolean,
+    requiredTitle?: boolean,
+) {
     type ContactSchema = {
         [K in `${KEY}_${ContactFieldSuffix}`]: LiteralSchema<
             string | undefined,
@@ -576,7 +579,10 @@ function getContactSchema<KEY extends ValidContactFieldPrefixes>(key: KEY, requi
             required,
             requiredValidation: requiredStringCondition,
         },
-        [`${key}_title`]: {},
+        [`${key}_title`]: {
+            required: requiredTitle,
+            requiredValidation: requiredStringCondition,
+        },
         [`${key}_email`]: {
             required,
             requiredValidation: requiredStringCondition,
@@ -606,6 +612,7 @@ export const formSchema: EapFullFormSchema = {
             partners: {
                 required: isSubmit,
             },
+            include_rcrc_climate_center: {},
             partner_contacts: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
@@ -619,7 +626,7 @@ export const formSchema: EapFullFormSchema = {
                     }),
                 }),
             },
-
+            ...getContactSchema('national_society_contact', isSubmit, isSubmit),
             ...getContactSchema('dref_focal_point'),
             ...getContactSchema('ifrc_regional_focal_point'),
             ...getContactSchema('ifrc_regional_ops_manager'),
@@ -644,7 +651,7 @@ export const formSchema: EapFullFormSchema = {
                             requiredValidation: requiredStringCondition,
                             validations: [lengthSmallerOrEqualToCondition(wordLimits.key_actors)],
                         },
-                        national_society: { required: isSubmit },
+                        partner: { required: isSubmit },
                     }),
                 }),
             },
@@ -665,16 +672,16 @@ export const formSchema: EapFullFormSchema = {
                 validations: [lengthSmallerOrEqualToCondition(wordLimits.hazard_selection)],
             },
 
-            hazard_selection_images: {
+            hazard_selection_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): HazardSelectionImagesFormFields => ({
+                    fields: (): HazardSelectionFilesFormFields => ({
                         client_id: {},
                         caption: {},
                         id: {},
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
 
             exposed_element_and_vulnerability_factor: {
@@ -684,16 +691,16 @@ export const formSchema: EapFullFormSchema = {
                     wordLimits.exposed_element_and_vulnerability_factor,
                 )],
             },
-            exposed_element_and_vulnerability_factor_images: {
+            exposed_element_and_vulnerability_factor_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): ExposedElementAndVulnerabilityImagesFormFields => ({
+                    fields: (): ExposedElementAndVulnerabilityFilesFormFields => ({
                         client_id: {},
                         caption: {},
                         id: { defaultValue: undefinedValue },
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
 
             prioritized_impact: {
@@ -703,16 +710,16 @@ export const formSchema: EapFullFormSchema = {
                     wordLimits.prioritized_impact,
                 )],
             },
-            prioritized_impact_images: {
+            prioritized_impact_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): PrioritizedImpactImagesFormFields => ({
+                    fields: (): PrioritizedImpactFilesFormFields => ({
                         client_id: {},
                         caption: {},
                         id: { defaultValue: undefinedValue },
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
             prioritized_impacts: {
                 keySelector: (item) => item.client_id,
@@ -779,16 +786,16 @@ export const formSchema: EapFullFormSchema = {
                 requiredValidation: requiredStringCondition,
                 validations: [lengthSmallerOrEqualToCondition(wordLimits.forecast_selection)],
             },
-            forecast_selection_images: {
+            forecast_selection_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): ForecastSelectionImagesResponseFormFields => ({
+                    fields: (): ForecastSelectionFilesResponseFormFields => ({
                         client_id: {},
                         caption: {},
                         id: { defaultValue: undefinedValue },
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
             forecast_table_file: { required: isSubmit },
 
@@ -799,16 +806,16 @@ export const formSchema: EapFullFormSchema = {
                     wordLimits.definition_and_justification_impact_level,
                 )],
             },
-            definition_and_justification_impact_level_images: {
+            definition_and_justification_impact_level_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): DefinitionAndJustificationImagesResponseFormFields => ({
+                    fields: (): DefinitionAndJustificationFilesResponseFormFields => ({
                         client_id: {},
                         caption: {},
                         id: { defaultValue: undefinedValue },
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
 
             identification_of_the_intervention_area: {
@@ -818,16 +825,16 @@ export const formSchema: EapFullFormSchema = {
                     wordLimits.identification_of_the_intervention_area,
                 )],
             },
-            identification_of_the_intervention_area_images: {
+            identification_of_the_intervention_area_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): IdentificationInterventionImagesResponseFormFields => ({
+                    fields: (): IdentificationInterventionFilesResponseFormFields => ({
                         client_id: {},
                         caption: {},
                         id: { defaultValue: undefinedValue },
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
             admin2: {
                 defaultValue: [],
@@ -870,16 +877,16 @@ export const formSchema: EapFullFormSchema = {
                     wordLimits.early_action_selection_process,
                 )],
             },
-            early_action_selection_process_images: {
+            early_action_selection_process_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): IdentificationInterventionImagesResponseFormFields => ({
+                    fields: (): IdentificationInterventionFilesResponseFormFields => ({
                         client_id: {},
                         caption: {},
                         id: { defaultValue: undefinedValue },
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
             theory_of_change_table_file: { required: isSubmit },
 
@@ -1031,16 +1038,16 @@ export const formSchema: EapFullFormSchema = {
                     wordLimits.early_action_implementation_process,
                 )],
             },
-            early_action_implementation_images: {
+            early_action_implementation_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): EarlyActionImagesResponseFormFields => ({
+                    fields: (): EarlyActionFilesResponseFormFields => ({
                         client_id: {},
                         caption: {},
                         id: { defaultValue: undefinedValue },
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
 
             trigger_activation_system: {
@@ -1050,22 +1057,22 @@ export const formSchema: EapFullFormSchema = {
                     wordLimits.trigger_activation_system,
                 )],
             },
-            trigger_activation_system_images: {
+            trigger_activation_system_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
-                    fields: (): TriggerActivationImagesResponseFormFields => ({
+                    fields: (): TriggerActivationFilesResponseFormFields => ({
                         client_id: {},
                         caption: {},
                         id: { defaultValue: undefinedValue },
                     }),
                 }),
-                validation: lessThanEqualToFiveImagesCondition,
+                validation: lessThanEqualToFiveFilesCondition,
             },
 
-            people_targeted: {
+            total_people_targeted: {
                 required: isSubmit,
                 validations: [
-                    greaterThanOrEqualToCondition(wordLimits.people_targeted),
+                    greaterThanOrEqualToCondition(wordLimits.total_people_targeted),
                     positiveIntegerCondition,
                 ],
             },
diff --git a/app/src/views/EapSimplifiedExport/index.tsx b/app/src/views/EapSimplifiedExport/index.tsx
index 966d836727..b5e0b2a63c 100644
--- a/app/src/views/EapSimplifiedExport/index.tsx
+++ b/app/src/views/EapSimplifiedExport/index.tsx
@@ -144,7 +144,7 @@ export function Component() {
         early_action_capability,
         rcrc_movement_involvement,
 
-        people_targeted,
+        total_people_targeted,
         seap_lead_time,
         seap_lead_timeframe_unit,
     } = simplifiedEapResponse ?? {};
@@ -180,7 +180,7 @@ export function Component() {
         early_action_capability: prev_early_action_capability,
         rcrc_movement_involvement: prev_rcrc_movement_involvement,
 
-        people_targeted: prev_people_targeted,
+        total_people_targeted: prev_total_people_targeted,
         seap_lead_time: prev_seap_lead_time,
         seap_lead_timeframe_unit: prev_seap_lead_timeframe_unit,
     } = prevSimplifiedEapResponse ?? {};
@@ -305,25 +305,6 @@ export function Component() {
                         })}
                     </PrintableContainer>
                 </PrintableContainer>
-                <PrintableContainer
-                    heading={strings.delegationHeading}
-                    headingLevel={4}
-                >
-                    <PrintableContactOutput
-                        label={strings.delegationFocalPointLabel}
-                        namePrefix="ifrc_delegation_focal_point"
-                        data={simplifiedEapResponse}
-                        prevData={prevSimplifiedEapResponse}
-                        withDiff={withDiff}
-                    />
-                    <PrintableContactOutput
-                        label={strings.delegationHeadLabel}
-                        namePrefix="ifrc_head_of_delegation"
-                        data={simplifiedEapResponse}
-                        prevData={prevSimplifiedEapResponse}
-                        withDiff={withDiff}
-                    />
-                </PrintableContainer>
                 <PrintableContainer
                     heading={strings.regionalGlobalHeading}
                     headingLevel={4}
@@ -356,13 +337,6 @@ export function Component() {
                         prevData={prevSimplifiedEapResponse}
                         withDiff={withDiff}
                     />
-                    <PrintableContactOutput
-                        label={strings.globalOpsCoordinator}
-                        namePrefix="ifrc_global_ops_coordinator"
-                        data={simplifiedEapResponse}
-                        prevData={prevSimplifiedEapResponse}
-                        withDiff={withDiff}
-                    />
                 </PrintableContainer>
             </PrintableContainer>
             <PrintableContainer
@@ -409,8 +383,8 @@ export function Component() {
                     <ListView layout="grid" spacing="2xs" numPreferredGridColumns={3}>
                         <PrintableDataDisplay
                             label={strings.peopleTargetedHeading}
-                            value={people_targeted}
-                            prevValue={prev_people_targeted}
+                            value={total_people_targeted}
+                            prevValue={prev_total_people_targeted}
                             valueType="number"
                             withDiff={withDiff}
                             variant="block"
diff --git a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
index 265c1aacf5..42a8f32b4d 100644
--- a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
@@ -257,10 +257,10 @@ function EarlyAction(props: Props) {
                         numPreferredColumns={2}
                     >
                         <NumberInput
-                            name="people_targeted"
-                            value={value?.people_targeted}
+                            name="total_people_targeted"
+                            value={value?.total_people_targeted}
                             onChange={setFieldValue}
-                            error={error?.people_targeted}
+                            error={error?.total_people_targeted}
                             disabled={disabled}
                             readOnly={readOnly}
                         />
@@ -450,22 +450,22 @@ function EarlyAction(props: Props) {
                     >
                         <NumberInput
                             label={strings.actionValue}
-                            name="operational_timeframe"
-                            value={value?.operational_timeframe}
+                            name="activation_timeframe"
+                            value={value?.activation_timeframe}
                             onChange={setFieldValue}
-                            error={error?.operational_timeframe}
+                            error={error?.activation_timeframe}
                             disabled={disabled}
                             readOnly={readOnly}
                         />
                         <SelectInput
                             label={strings.operationTimeFrame}
-                            name="operational_timeframe_unit"
-                            value={value.operational_timeframe_unit}
+                            name="activation_timeframe_unit"
+                            value={value.activation_timeframe_unit}
                             onChange={setFieldValue}
                             keySelector={timeframeKeySelector}
                             labelSelector={stringValueSelector}
                             options={eapTimeframeOption}
-                            error={error?.operational_timeframe_unit}
+                            error={error?.activation_timeframe_unit}
                             disabled={disabled}
                             readOnly
                         />
diff --git a/app/src/views/EapSimplifiedForm/Overview/i18n.json b/app/src/views/EapSimplifiedForm/Overview/i18n.json
index 181905afde..56b68844d8 100644
--- a/app/src/views/EapSimplifiedForm/Overview/i18n.json
+++ b/app/src/views/EapSimplifiedForm/Overview/i18n.json
@@ -24,6 +24,9 @@
         "sectionCriteriaIntroduction11": "All sections of the simplified EAP need to be completed including IFRC sectors, enabling approaches and budget.",
         "sectionCriteriaIntroduction12": "Check the feasibility of the fund transfer to the National Society in the lead time to fund the early action activities.",
         "sectionCriteriaComment11": "IFRC Finance needs to confirm the transfer timeframe. Where a simplified EAP has a short lead time, an alternative plan needs to be developed to get the funds in country to fund the early action activities. ",
-        "sectionCriteriaComment12": "The alternative plan could, for example, involve PNS prefunding early action activities, being reimbursed when the DREF funds arrive in country, or IFRC delegation prefunds early action activities from other projects, being reimbursed when the funds arrive in country, and/or framework agreement with goods and service providers, with payment terms that mean that services can be paid two weeks or even a month after the services are delivered."
+        "sectionCriteriaComment12": "The alternative plan could, for example, involve PNS prefunding early action activities, being reimbursed when the DREF funds arrive in country, or IFRC delegation prefunds early action activities from other projects, being reimbursed when the funds arrive in country, and/or framework agreement with goods and service providers, with payment terms that mean that services can be paid two weeks or even a month after the services are delivered.",
+        "rcrcClimateCenter": "RCRC Climate Center",
+               "nSContact": "National Society Contact",
+        "nSContactDescription": "National Society contact responsible for the EAP process"
     }
 }
diff --git a/app/src/views/EapSimplifiedForm/Overview/index.tsx b/app/src/views/EapSimplifiedForm/Overview/index.tsx
index 19eb71dd9d..10fc9b9696 100644
--- a/app/src/views/EapSimplifiedForm/Overview/index.tsx
+++ b/app/src/views/EapSimplifiedForm/Overview/index.tsx
@@ -1,4 +1,5 @@
 import {
+    Checkbox,
     Container,
     Description,
     InputSection,
@@ -175,14 +176,25 @@ function Overview(props: Props) {
                         description={strings.partnersInvolvedDescription}
                         withAsteriskOnTitle
                     >
-                        <NationalSocietyMultiSelectInput
-                            name="partners"
-                            value={value.partners}
-                            error={getErrorString(error?.partners)}
-                            onChange={setFieldValue}
-                            disabled={disabled}
-                            readOnly={readOnly}
-                        />
+                        <ListView layout="block">
+                            <NationalSocietyMultiSelectInput
+                                name="partners"
+                                value={value.partners}
+                                error={getErrorString(error?.partners)}
+                                onChange={setFieldValue}
+                                disabled={disabled}
+                                readOnly={readOnly}
+                            />
+                            <Checkbox
+                                name="include_rcrc_climate_center"
+                                disabled={disabled}
+                                readOnly={readOnly}
+                                value={value?.include_rcrc_climate_center}
+                                onChange={setFieldValue}
+                                error={error?.include_rcrc_climate_center}
+                                label={strings.rcrcClimateCenter}
+                            />
+                        </ListView>
                     </InputSection>
                 </ListView>
             </Container>
@@ -198,6 +210,18 @@ function Overview(props: Props) {
                         layout="block"
                         spacing="sm"
                     >
+                        <ContactInputsSection
+                            title={strings.nSContact}
+                            description={strings.nSContactDescription}
+                            namePrefix="national_society_contact"
+                            value={value}
+                            setFieldValue={setFieldValue}
+                            error={error}
+                            disabled={disabled}
+                            readOnly={readOnly}
+                            withRequiredNameAndEmail
+                            withRequiredTitle
+                        />
                         <ContactInputsSection
                             title={strings.drefFocalPoint}
                             description={strings.drefFocalPointDescription}
diff --git a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
index 0242e3d4b3..39c4fba2f8 100644
--- a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
@@ -211,11 +211,11 @@ function RiskAnalysis(props: Props) {
                             maxWords={wordLimits.prioritized_hazard_and_impact}
                         />
                         <MultiImageWithCaptionInput
-                            name="hazard_impact_images"
+                            name="hazard_impact_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.hazard_impact_images}
+                            value={value?.hazard_impact_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.hazard_impact_images)}
+                            error={getErrorObject(error?.hazard_impact_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             disabled={disabled}
@@ -239,11 +239,11 @@ function RiskAnalysis(props: Props) {
                             maxWords={wordLimits.risks_selected_protocols}
                         />
                         <MultiImageWithCaptionInput
-                            name="risk_selected_protocols_images"
+                            name="risk_selected_protocols_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.risk_selected_protocols_images}
+                            value={value?.risk_selected_protocols_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.risk_selected_protocols_images)}
+                            error={getErrorObject(error?.risk_selected_protocols_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             disabled={disabled}
@@ -330,11 +330,11 @@ function RiskAnalysis(props: Props) {
                             maxWords={wordLimits.selected_early_actions}
                         />
                         <MultiImageWithCaptionInput
-                            name="selected_early_actions_images"
+                            name="selected_early_actions_files"
                             url="/api/v2/eap-file/multiple/"
-                            value={value?.selected_early_actions_images}
+                            value={value?.selected_early_actions_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.selected_early_actions_images)}
+                            error={getErrorObject(error?.selected_early_actions_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             disabled={disabled}
diff --git a/app/src/views/EapSimplifiedForm/common.tsx b/app/src/views/EapSimplifiedForm/common.tsx
index da8c11a0ec..bb7daefc7c 100644
--- a/app/src/views/EapSimplifiedForm/common.tsx
+++ b/app/src/views/EapSimplifiedForm/common.tsx
@@ -20,14 +20,11 @@ const overviewTabFields = [
     'national_society_contact_email',
     'national_society_contact_phone_number',
     'partners',
+    'include_rcrc_climate_center',
     'partner_contacts',
     'dref_focal_point_name',
     'dref_focal_point_email',
     'dref_focal_point_phone_number',
-    'ifrc_delegation_focal_point_name',
-    'ifrc_delegation_focal_point_title',
-    'ifrc_delegation_focal_point_email',
-    'ifrc_delegation_focal_point_phone_number',
     'dref_focal_point_name',
     'dref_focal_point_title',
     'dref_focal_point_email',
@@ -44,25 +41,17 @@ const overviewTabFields = [
     'ifrc_regional_head_dcc_title',
     'ifrc_regional_head_dcc_email',
     'ifrc_regional_head_dcc_phone_number',
-    'ifrc_global_ops_coordinator_name',
-    'ifrc_global_ops_coordinator_title',
-    'ifrc_global_ops_coordinator_email',
-    'ifrc_global_ops_coordinator_phone_number',
-    'ifrc_head_of_delegation_name',
-    'ifrc_head_of_delegation_title',
-    'ifrc_head_of_delegation_email',
-    'ifrc_head_of_delegation_phone_number',
 ] as const satisfies FormKeys[];
 
 type OverviewKeys = typeof overviewTabFields[number];
 
 const riskAnalysisTabFields = [
     'prioritized_hazard_and_impact',
-    'hazard_impact_images',
+    'hazard_impact_files',
     'risks_selected_protocols',
-    'risk_selected_protocols_images',
+    'risk_selected_protocols_files',
     'selected_early_actions',
-    'selected_early_actions_images',
+    'selected_early_actions_files',
 ] as const satisfies Exclude<FormKeys, OverviewKeys>[];
 
 type RiskAnalysisKeys = typeof riskAnalysisTabFields[number];
@@ -71,14 +60,14 @@ const earlyActionTabFields = [
     'overall_objective_intervention',
     'potential_geographical_high_risk_areas',
     'admin2',
-    'people_targeted',
+    'total_people_targeted',
     'assisted_through_operation',
     'selection_criteria',
     'trigger_statement',
     'seap_lead_time',
     'seap_lead_timeframe_unit',
-    'operational_timeframe',
-    'operational_timeframe_unit',
+    'activation_timeframe',
+    'activation_timeframe_unit',
     'trigger_threshold_justification',
     'next_step_towards_full_eap',
 ] as const satisfies Exclude<FormKeys, OverviewKeys | RiskAnalysisKeys>[];
@@ -193,5 +182,5 @@ export const wordLimits = {
     next_step_towards_full_eap: 100,
     early_action_capability: 500,
     rcrc_movement_involvement: 150,
-    people_targeted: 2000,
+    total_people_targeted: 2000,
 } satisfies { [key in FormKeys]?: number };
diff --git a/app/src/views/EapSimplifiedForm/index.tsx b/app/src/views/EapSimplifiedForm/index.tsx
index 0c62473ccb..8c3e315c15 100644
--- a/app/src/views/EapSimplifiedForm/index.tsx
+++ b/app/src/views/EapSimplifiedForm/index.tsx
@@ -188,9 +188,9 @@ export function Component() {
             const {
                 cover_image_file,
 
-                hazard_impact_images,
-                risk_selected_protocols_images,
-                selected_early_actions_images,
+                hazard_impact_files,
+                risk_selected_protocols_files,
+                selected_early_actions_files,
 
                 budget_file_details,
 
@@ -202,9 +202,9 @@ export function Component() {
                 ...listToMap(
                     [
                         cover_image_file,
-                        ...hazard_impact_images ?? [],
-                        ...risk_selected_protocols_images ?? [],
-                        ...selected_early_actions_images ?? [],
+                        ...hazard_impact_files ?? [],
+                        ...risk_selected_protocols_files ?? [],
+                        ...selected_early_actions_files ?? [],
                         budget_file_details,
                         updated_checklist_file_details,
                     ].map(
@@ -243,9 +243,9 @@ export function Component() {
             planned_operations,
             enabling_approaches,
             cover_image_file,
-            hazard_impact_images,
-            selected_early_actions_images,
-            risk_selected_protocols_images,
+            hazard_impact_files,
+            selected_early_actions_files,
+            risk_selected_protocols_files,
             partner_contacts,
             ...otherValues
         } = removeNull(response);
@@ -259,9 +259,9 @@ export function Component() {
 
             partner_contacts: partner_contacts?.map(injectClientId),
 
-            hazard_impact_images: hazard_impact_images?.map(injectClientId),
-            selected_early_actions_images: selected_early_actions_images?.map(injectClientId),
-            risk_selected_protocols_images: risk_selected_protocols_images?.map(injectClientId),
+            hazard_impact_files: hazard_impact_files?.map(injectClientId),
+            selected_early_actions_files: selected_early_actions_files?.map(injectClientId),
+            risk_selected_protocols_files: risk_selected_protocols_files?.map(injectClientId),
 
             planned_operations: planned_operations?.map((intervention) => ({
                 ...intervention,
@@ -299,22 +299,22 @@ export function Component() {
                     return formValue?.partner_contacts?.[index!]?.client_id;
                 }
 
-                match = matchArray(locations, ['hazard_impact_images', NUM]);
+                match = matchArray(locations, ['hazard_impact_files', NUM]);
                 if (isDefined(match)) {
                     const [index] = match;
-                    return formValue?.hazard_impact_images?.[index!]?.client_id;
+                    return formValue?.hazard_impact_files?.[index!]?.client_id;
                 }
 
-                match = matchArray(locations, ['risk_selected_protocols_images', NUM]);
+                match = matchArray(locations, ['risk_selected_protocols_files', NUM]);
                 if (isDefined(match)) {
                     const [index] = match;
-                    return formValue?.risk_selected_protocols_images?.[index!]?.client_id;
+                    return formValue?.risk_selected_protocols_files?.[index!]?.client_id;
                 }
 
-                match = matchArray(locations, ['selected_early_actions_images', NUM]);
+                match = matchArray(locations, ['selected_early_actions_files', NUM]);
                 if (isDefined(match)) {
                     const [index] = match;
-                    return formValue?.selected_early_actions_images?.[index!]?.client_id;
+                    return formValue?.selected_early_actions_files?.[index!]?.client_id;
                 }
 
                 match = matchArray(locations, ['planned_operations', NUM, 'indicators', NUM]);
@@ -425,10 +425,6 @@ export function Component() {
             dref_focal_point_title,
             dref_focal_point_email,
             dref_focal_point_phone_number,
-            ifrc_contact_name,
-            ifrc_contact_title,
-            ifrc_contact_email,
-            ifrc_contact_phone_number,
             partners,
         } = removeNull(eapRegistrationResponse);
 
@@ -443,12 +439,8 @@ export function Component() {
             dref_focal_point_title,
             dref_focal_point_email,
             dref_focal_point_phone_number,
-            ifrc_head_of_delegation_name: ifrc_contact_name,
-            ifrc_head_of_delegation_title: ifrc_contact_title,
-            ifrc_head_of_delegation_email: ifrc_contact_email,
-            ifrc_head_of_delegation_phone_number: ifrc_contact_phone_number,
             seap_timeframe: DEFAULT_SEAP_TIMEFRAME,
-            operational_timeframe_unit: OPERATION_TIMEFRAME_UNIT,
+            activation_timeframe_unit: OPERATION_TIMEFRAME_UNIT,
         }));
     }, [eapRegistrationResponse, simplifiedEapPending, simplifiedEapResponse, setValue]);
 
diff --git a/app/src/views/EapSimplifiedForm/schema.ts b/app/src/views/EapSimplifiedForm/schema.ts
index 12bca27337..01078ef9b8 100644
--- a/app/src/views/EapSimplifiedForm/schema.ts
+++ b/app/src/views/EapSimplifiedForm/schema.ts
@@ -82,14 +82,14 @@ type CoverImageFileResponse = NonNullable<
     EapSimplifiedRequestBody['cover_image_file']
 >;
 
-type HazardImagesResponse = NonNullable<
-    EapSimplifiedRequestBody['hazard_impact_images']
+type HazardFilesResponse = NonNullable<
+    EapSimplifiedRequestBody['hazard_impact_files']
 >[number];
-type RiskImagesResponse = NonNullable<
-    EapSimplifiedRequestBody['risk_selected_protocols_images']
+type RiskFilesResponse = NonNullable<
+    EapSimplifiedRequestBody['risk_selected_protocols_files']
 >[number];
-type EarlyActionImagesResponse = NonNullable<
-    EapSimplifiedRequestBody['selected_early_actions_images']
+type EarlyActionFilesResponse = NonNullable<
+    EapSimplifiedRequestBody['selected_early_actions_files']
 >[number];
 
 type PartnerContactsResponse = NonNullable<
@@ -116,9 +116,9 @@ type PrepositioningFormFields = PrepositioningResponse & { client_id: string };
 type ReadinessFormFields = ReadinessResponse & { client_id: string };
 type IndicatorFormFields = IndicatorResponse & { client_id: string };
 
-type HazardImagesFormFields = HazardImagesResponse & { client_id: string };
-type RiskImagesFormFields = RiskImagesResponse & { client_id: string };
-type EarlyActionImagesFormFields = EarlyActionImagesResponse & {
+type HazardFilesFormFields = HazardFilesResponse & { client_id: string };
+type RiskFilesFormFields = RiskFilesResponse & { client_id: string };
+type EarlyActionFilesFormFields = EarlyActionFilesResponse & {
     client_id: string;
 };
 
@@ -182,14 +182,14 @@ type FormFields = DeepReplace<
                 CoverImageFileResponse,
                 CoverImageFileFields
             >,
-            HazardImagesResponse,
-            HazardImagesFormFields
+            HazardFilesResponse,
+            HazardFilesFormFields
         >,
-        RiskImagesResponse,
-        RiskImagesFormFields
+        RiskFilesResponse,
+        RiskFilesFormFields
     >,
-    EarlyActionImagesResponse,
-    EarlyActionImagesFormFields
+    EarlyActionFilesResponse,
+    EarlyActionFilesFormFields
 >;
 
 export type PartialSimplifiedEapType = PartialForm<
@@ -222,7 +222,7 @@ type CoverImageFileFormFields = ReturnType<
 type RiskProtocolsFileFields = ReturnType<
     ObjectSchema<
         NonNullable<
-            PartialSimplifiedEapType['risk_selected_protocols_images']
+            PartialSimplifiedEapType['risk_selected_protocols_files']
         >[number],
         PartialSimplifiedEapType,
         EapSimplifiedFormContext
@@ -230,7 +230,7 @@ type RiskProtocolsFileFields = ReturnType<
 >;
 type HazardImpactFileFields = ReturnType<
     ObjectSchema<
-        NonNullable<PartialSimplifiedEapType['hazard_impact_images']>[number],
+        NonNullable<PartialSimplifiedEapType['hazard_impact_files']>[number],
         PartialSimplifiedEapType,
         EapSimplifiedFormContext
     >['fields']
@@ -238,7 +238,7 @@ type HazardImpactFileFields = ReturnType<
 type EarlyActionFileFields = ReturnType<
     ObjectSchema<
         NonNullable<
-            PartialSimplifiedEapType['selected_early_actions_images']
+            PartialSimplifiedEapType['selected_early_actions_files']
         >[number],
         PartialSimplifiedEapType,
         EapSimplifiedFormContext
@@ -276,7 +276,11 @@ type ExtractContactPrefix<KEY extends FieldKeys> =
 
 type ValidContactFieldPrefixes = ExtractContactPrefix<FieldKeys>;
 
-function getContactSchema<KEY extends ValidContactFieldPrefixes>(key: KEY, required = false) {
+function getContactSchema<KEY extends ValidContactFieldPrefixes>(
+    key: KEY,
+    required = false,
+    requiredTitle = false,
+) {
     type ContactSchema = {
         [K in `${KEY}_${ContactFieldSuffix}`]: LiteralSchema<
             string | undefined,
@@ -290,7 +294,10 @@ function getContactSchema<KEY extends ValidContactFieldPrefixes>(key: KEY, requi
             required,
             requiredValidation: requiredStringCondition,
         },
-        [`${key}_title`]: {},
+        [`${key}_title`]: {
+            required: requiredTitle,
+            requiredValidation: requiredStringCondition,
+        },
         [`${key}_email`]: {
             required,
             requiredValidation: requiredStringCondition,
@@ -326,6 +333,7 @@ export const formSchema: FormSchema = {
             partners: {
                 required: isSubmit,
             },
+            include_rcrc_climate_center: {},
             partner_contacts: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
@@ -339,6 +347,7 @@ export const formSchema: FormSchema = {
                     }),
                 }),
             },
+            ...getContactSchema('national_society_contact', isSubmit, isSubmit),
             ...getContactSchema('dref_focal_point'),
             ...getContactSchema('ifrc_regional_focal_point'),
             ...getContactSchema('ifrc_regional_ops_manager'),
@@ -353,7 +362,7 @@ export const formSchema: FormSchema = {
                     wordLimits.prioritized_hazard_and_impact,
                 )],
             },
-            hazard_impact_images: {
+            hazard_impact_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
                     fields: (): HazardImpactFileFields => ({
@@ -371,7 +380,7 @@ export const formSchema: FormSchema = {
                     wordLimits.risks_selected_protocols,
                 )],
             },
-            risk_selected_protocols_images: {
+            risk_selected_protocols_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
                     fields: (): RiskProtocolsFileFields => ({
@@ -389,7 +398,7 @@ export const formSchema: FormSchema = {
                     wordLimits.selected_early_actions,
                 )],
             },
-            selected_early_actions_images: {
+            selected_early_actions_files: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
                     fields: (): EarlyActionFileFields => ({
@@ -421,11 +430,11 @@ export const formSchema: FormSchema = {
                     wordLimits.potential_geographical_high_risk_areas,
                 )],
             },
-            people_targeted: {
+            total_people_targeted: {
                 required: isSubmit,
                 validations: [
                     positiveIntegerCondition,
-                    greaterThanOrEqualToCondition(wordLimits.people_targeted),
+                    greaterThanOrEqualToCondition(wordLimits.total_people_targeted),
                 ],
             },
             assisted_through_operation: {
@@ -451,11 +460,11 @@ export const formSchema: FormSchema = {
             },
             seap_lead_time: { required: isSubmit },
             seap_lead_timeframe_unit: { required: isSubmit },
-            operational_timeframe: {
+            activation_timeframe: {
                 required: isSubmit,
                 validations: [maxOperationalTimeframeCondition],
             },
-            operational_timeframe_unit: {},
+            activation_timeframe_unit: {},
             trigger_threshold_justification: {
                 required: isSubmit,
                 requiredValidation: requiredStringCondition,
diff --git a/app/src/views/EapSummaryExport/index.tsx b/app/src/views/EapSummaryExport/index.tsx
index bc3a60fd3d..2de2fda2c1 100644
--- a/app/src/views/EapSummaryExport/index.tsx
+++ b/app/src/views/EapSummaryExport/index.tsx
@@ -506,22 +506,6 @@ export function Component() {
                         ))}
                     </PrintableContainer>
                 </PrintableContainer>
-                <PrintableContainer heading={strings.delegationLabel} headingLevel={4}>
-                    <PrintableContactOutput
-                        label={strings.delegationFocalLabel}
-                        namePrefix="ifrc_delegation_focal_point"
-                        data={fullEapResponse}
-                        prevData={undefined}
-                        withDiff={false}
-                    />
-                    <PrintableContactOutput
-                        label={strings.delegationHeadLabel}
-                        namePrefix="ifrc_head_of_delegation"
-                        data={fullEapResponse}
-                        prevData={undefined}
-                        withDiff={false}
-                    />
-                </PrintableContainer>
                 <PrintableContainer
                     heading={strings.regionalGlobalLabel}
                     headingLevel={4}
@@ -554,13 +538,6 @@ export function Component() {
                         prevData={undefined}
                         withDiff={false}
                     />
-                    <PrintableContactOutput
-                        label={strings.globalOpsLabel}
-                        namePrefix="ifrc_global_ops_coordinator"
-                        data={fullEapResponse}
-                        prevData={undefined}
-                        withDiff={false}
-                    />
                 </PrintableContainer>
             </PrintableContainer>
         </PrintablePage>
diff --git a/go-api b/go-api
index b58d643518..154113a90f 160000
--- a/go-api
+++ b/go-api
@@ -1 +1 @@
-Subproject commit b58d6435189500571851393f3bfa0d02ce93bc67
+Subproject commit 154113a90fa15c7249a6f2733e67611c053c68d8

From ab6da6c1b36285564057bebce47113a1b6a1d3df Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Wed, 5 Aug 2026 10:57:00 +0545
Subject: [PATCH 4/9] fix(eap): add activity activations and disaster sub-type
 field

- Add Activation 1 / Activation 2 checklist to prepositioning and early
  action activities, and render it in the full and summary exports
- Add a disaster sub-type input to EAP registration, shown for epidemic
  and other disaster types, and show it read-only on the Full and sEAP
  overviews
- Make the trigger model timeframe selectable again
---
 .../EapOperationActivityInput/i18n.json       |   5 +-
 .../EapOperationActivityInput/index.tsx       | 108 +++++++++++++-----
 .../EapOperationActivityInput/schema.ts       |  27 ++++-
 .../EapOperationActivityListInput/i18n.json   |   2 +-
 .../EapOperationActivityListInput/index.tsx   |  15 ++-
 .../domain/PrintableActivityOutput/i18n.json  |   7 ++
 .../domain/PrintableActivityOutput/index.tsx  |  79 +++++++++++--
 app/src/utils/constants.ts                    |   3 +-
 app/src/views/EapFullExport/index.tsx         |   6 +
 .../EapActivationProcess/i18n.json            |   4 +-
 app/src/views/EapFullForm/Overview/i18n.json  |   2 +
 app/src/views/EapFullForm/Overview/index.tsx  |  20 ++++
 .../ApproachesInput/index.tsx                 |   3 +
 .../SelectionActions/OperationInput/index.tsx |   3 +
 .../EapFullForm/SelectionActions/i18n.json    |   4 +-
 .../views/EapFullForm/TriggerModel/index.tsx  |   1 -
 app/src/views/EapFullForm/schema.ts           |  12 +-
 app/src/views/EapRegistration/i18n.json       |   2 +
 app/src/views/EapRegistration/index.tsx       |  28 ++++-
 app/src/views/EapRegistration/schema.ts       |  98 ++++++++++------
 .../EapSimplifiedForm/Overview/i18n.json      |   2 +
 .../EapSimplifiedForm/Overview/index.tsx      |  22 +++-
 app/src/views/EapSimplifiedForm/schema.ts     |  12 +-
 app/src/views/EapSummaryExport/index.tsx      |  55 ++++-----
 24 files changed, 385 insertions(+), 135 deletions(-)
 create mode 100644 app/src/components/domain/PrintableActivityOutput/i18n.json

diff --git a/app/src/components/domain/EapOperationActivityInput/i18n.json b/app/src/components/domain/EapOperationActivityInput/i18n.json
index 9d1a8c2fc2..8182e70066 100644
--- a/app/src/components/domain/EapOperationActivityInput/i18n.json
+++ b/app/src/components/domain/EapOperationActivityInput/i18n.json
@@ -3,6 +3,9 @@
     "strings": {
         "operationPriorityActionLabel": "Activities",
         "operationTimeFrameLabel": "Timeframe",
-        "operationTimeValueLabel": "Activity Time Span"
+        "operationTimeValueLabel": "Activity Time Span",
+        "operationActivationLabel": "Activation",
+        "operationActivationOneLabel": "Activation 1",
+        "operationActivationTwoLabel": "Activation 2"
     }
 }
diff --git a/app/src/components/domain/EapOperationActivityInput/index.tsx b/app/src/components/domain/EapOperationActivityInput/index.tsx
index f6aac057f1..9147c0d8d2 100644
--- a/app/src/components/domain/EapOperationActivityInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityInput/index.tsx
@@ -4,9 +4,11 @@ import {
 } from 'react';
 import { DeleteBinTwoLineIcon } from '@ifrc-go/icons';
 import {
+    Checkbox,
     Checklist,
     IconButton,
     InlineLayout,
+    InputContainer,
     ListView,
     SelectInput,
     TextInput,
@@ -26,7 +28,10 @@ import { type components } from '#generated/types';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { TIMEFRAME_YEAR } from '#utils/constants';
 
-import { type OperationActivityFormFields } from './schema';
+import {
+    type ActivityInputType,
+    type OperationActivityFormFields,
+} from './schema';
 import TimeSpanCheck from './TimeSpanCheck';
 
 import i18n from './i18n.json';
@@ -35,8 +40,6 @@ const defaultActivityValue: OperationActivityFormFields = {
     client_id: '-1',
 };
 
-export type ActivityInputType = 'readiness_activities' | 'prepositioning_activities' | 'early_action_activities';
-
 type TimeframeOption = components['schemas']['EapTimeframeEnum'];
 
 function timeframeKeySelector(option: TimeframeOption) {
@@ -57,6 +60,8 @@ interface Props {
     readOnly?: boolean;
 
     name: ActivityInputType;
+    withActivationSelection?: boolean;
+    withoutTimeframeSelection?: boolean;
 }
 
 function EapOperationActivityInput(props: Props) {
@@ -69,6 +74,8 @@ function EapOperationActivityInput(props: Props) {
         disabled,
         readOnly,
         name,
+        withActivationSelection,
+        withoutTimeframeSelection,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -93,7 +100,7 @@ function EapOperationActivityInput(props: Props) {
         return eap_timeframe;
     }, [eap_timeframe, name]);
 
-    const eapTimeFrameReadOnly = name === 'readiness_activities' || name === 'prepositioning_activities';
+    const eapTimeFrameReadOnly = name === 'readiness_activities';
 
     const getTimeValueOptions = useCallback(
         (timeframe?: number) => {
@@ -154,36 +161,75 @@ function EapOperationActivityInput(props: Props) {
                     readOnly={readOnly}
                     withAsterisk
                 />
-                <ListView layout="grid">
-                    <SelectInput
-                        label={strings.operationTimeFrameLabel}
-                        name="timeframe"
-                        value={value.timeframe}
-                        onChange={handleTimeframeChange}
-                        keySelector={timeframeKeySelector}
-                        labelSelector={stringValueSelector}
-                        options={eapTimeframeOption}
-                        disabled={disabled}
-                        error={error?.timeframe}
-                        readOnly={readOnly || eapTimeFrameReadOnly}
-                    />
-                    {value?.timeframe && (
-                        <Checklist
-                            label={strings.operationTimeValueLabel}
-                            name="time_value"
-                            value={value?.time_value}
-                            spacing="xs"
-                            onChange={onFieldChange}
-                            keySelector={timeValueKeySelector}
-                            labelSelector={stringValueSelector}
-                            options={timeValueOptions}
+                <ListView
+                    layout="block"
+                >
+                    {withActivationSelection && (
+                        <InputContainer
+                            label={strings.operationActivationLabel}
                             disabled={disabled}
-                            renderer={TimeSpanCheck}
-                            withoutOpticalSpacingCorrection
-                            error={getErrorString(error?.time_value)}
-                            readOnly={readOnly}
+                            variant="transparent"
+                            withoutInputSectionPadding
+                            input={(
+                                <ListView
+                                    withWrap
+                                    spacing="xl"
+                                >
+                                    <Checkbox
+                                        name="activation_one"
+                                        label={strings.operationActivationOneLabel}
+                                        value={value.activation_one}
+                                        onChange={onFieldChange}
+                                        error={error?.activation_one}
+                                        disabled={disabled}
+                                        readOnly={readOnly}
+                                    />
+                                    <Checkbox
+                                        name="activation_two"
+                                        label={strings.operationActivationTwoLabel}
+                                        value={value.activation_two}
+                                        onChange={onFieldChange}
+                                        error={error?.activation_two}
+                                        disabled={disabled}
+                                        readOnly={readOnly}
+                                    />
+                                </ListView>
+                            )}
                         />
                     )}
+                    <ListView layout="grid">
+                        {!withoutTimeframeSelection && (
+                            <SelectInput
+                                label={strings.operationTimeFrameLabel}
+                                name="timeframe"
+                                value={value.timeframe}
+                                onChange={handleTimeframeChange}
+                                keySelector={timeframeKeySelector}
+                                labelSelector={stringValueSelector}
+                                options={eapTimeframeOption}
+                                disabled={disabled}
+                                error={error?.timeframe}
+                                readOnly={readOnly || eapTimeFrameReadOnly}
+                            />
+                        )}
+                        {!withoutTimeframeSelection && value?.timeframe && (
+                            <Checklist
+                                label={strings.operationTimeValueLabel}
+                                name="time_value"
+                                value={value?.time_value}
+                                spacing="xs"
+                                onChange={onFieldChange}
+                                keySelector={timeValueKeySelector}
+                                labelSelector={stringValueSelector}
+                                options={timeValueOptions}
+                                disabled={disabled}
+                                renderer={TimeSpanCheck}
+                                withoutOpticalSpacingCorrection
+                                error={getErrorString(error?.time_value)}
+                                readOnly={readOnly}
+                            />
+                        )}
+                    </ListView>
                 </ListView>
             </ListView>
         </InlineLayout>
diff --git a/app/src/components/domain/EapOperationActivityInput/schema.ts b/app/src/components/domain/EapOperationActivityInput/schema.ts
index eeb1713572..bb66494ed6 100644
--- a/app/src/components/domain/EapOperationActivityInput/schema.ts
+++ b/app/src/components/domain/EapOperationActivityInput/schema.ts
@@ -8,7 +8,15 @@ import {
 
 import { type components } from '#generated/types';
 
-type OperationActivity = PurgeNull<components<'write'>['schemas']['OperationActivity']>;
+type ReadinessOperationActivity = PurgeNull<components<'write'>['schemas']['OperationActivity']>;
+type PrepositioningOperationActivity = PurgeNull<components<'write'>['schemas']['PrepositioningOperationActivity']>;
+type EarlyActionOperationActivity = PurgeNull<components<'write'>['schemas']['EarlyActionOperationActivity']>;
+
+export type ActivityInputType = 'readiness_activities' | 'prepositioning_activities' | 'early_action_activities';
+
+type OperationActivity = Omit<ReadinessOperationActivity, 'activation_one' | 'activation_two'>
+    & Pick<EarlyActionOperationActivity, 'activation_one' | 'activation_two'>
+    & Pick<PrepositioningOperationActivity, 'timeframe' | 'time_value'>;
 
 export type OperationActivityFormFields = PartialForm<OperationActivity> & {
     client_id: string;
@@ -16,7 +24,7 @@ export type OperationActivityFormFields = PartialForm<OperationActivity> & {
 
 type OperationActivitySchema = ObjectSchema<OperationActivityFormFields>;
 
-const schema = (isSubmit: boolean): OperationActivitySchema => ({
+const schema = (isSubmit: boolean, type: ActivityInputType): OperationActivitySchema => ({
     fields: (): ReturnType<OperationActivitySchema['fields']> => ({
         client_id: {},
         id: { defaultValue: undefinedValue },
@@ -26,7 +34,20 @@ const schema = (isSubmit: boolean): OperationActivitySchema => ({
             requiredValidation: requiredStringCondition,
         },
         time_value: {},
-        timeframe: {},
+        // Prepositioning activities are not tied to a timeframe
+        timeframe: {
+            required: isSubmit && type !== 'prepositioning_activities',
+        },
+        // Activations are only applicable to prepositioning and early actions
+        ...(type === 'readiness_activities'
+            ? {
+                activation_one: { forceValue: undefinedValue },
+                activation_two: { forceValue: undefinedValue },
+            }
+            : {
+                activation_one: {},
+                activation_two: {},
+            }),
     }),
 });
 
diff --git a/app/src/components/domain/EapOperationActivityListInput/i18n.json b/app/src/components/domain/EapOperationActivityListInput/i18n.json
index 7c35d91111..adf86c8099 100644
--- a/app/src/components/domain/EapOperationActivityListInput/i18n.json
+++ b/app/src/components/domain/EapOperationActivityListInput/i18n.json
@@ -11,6 +11,6 @@
         "prepositioningDescription": "The National Society should preposition the materials needed to undertake the early action, especially those that may require a longer procurement process.  For example, prepositioned stocks could include shelter kits (for house reinforcement), sandbags (for protecting infrastructure), or tarpaulins (for protecting water sources), etc. Food, medicine and other items with a shelf life of less than two years are not eligible as pre-positioning, they will have to be procured as part of the early actions. Pre-positioning activities are one-off and done in the first year following approval of the simplified EAP.",
         "earlyActionTitle": "Early Action Activities",
         "earlyActionTitleDescription": "Add activities and select when the specific activity will be implemented.",
-        "earlyActionDescription": "Early action activities are implemented once a trigger is reached and before the impact of the hazard. Early actions seek to reduce or mitigate the impact of the hazard. Consider selecting only a few early actions, especially for sudden onset events, as they will have to be implemented within a short timeframe. The early actions will be unique to each hazard and context, but may be activities such as evacuation of at-risk communities and/or livestock, early harvest of crops, cash transfer, shelter strengthening, provision of water treatment, hygiene kits or mosquito nets, etc."
+        "earlyActionDescription": "Early action activities are implemented once a trigger is reached and before the impact of the hazard. Early actions seek to reduce or mitigate the impact of the hazard. Consider selecting only a few early actions, especially for sudden onset events, as they will have to be implemented within a short timeframe. The early actions will be unique to each hazard and context, but may be activities such as evacuation of at-risk communities and/or livestock, early harvest of crops, cash transfer, shelter strengthening, provision of water treatment, hygiene kits or mosquito nets, etc. Start counting the timeframe after the trigger is reached: day 1 is the day the trigger is met."
     }
 }
diff --git a/app/src/components/domain/EapOperationActivityListInput/index.tsx b/app/src/components/domain/EapOperationActivityListInput/index.tsx
index 6a4ec306be..27aa625316 100644
--- a/app/src/components/domain/EapOperationActivityListInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityListInput/index.tsx
@@ -22,8 +22,11 @@ import {
     useFormArray,
 } from '@togglecorp/toggle-form';
 
-import EapOperationActivityInput, { type ActivityInputType } from '#components/domain/EapOperationActivityInput';
-import { type OperationActivityFormFields } from '#components/domain/EapOperationActivityInput/schema';
+import EapOperationActivityInput from '#components/domain/EapOperationActivityInput';
+import {
+    type ActivityInputType,
+    type OperationActivityFormFields,
+} from '#components/domain/EapOperationActivityInput/schema';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import { TIMEFRAME_YEAR } from '#utils/constants';
@@ -38,6 +41,8 @@ interface Props<NAME> {
     value: OperationActivityFormFields[] | undefined;
     onChange: (newValue: SetValueArg<OperationActivityFormFields[]>, name: NAME) => void;
     error: ArrayError<OperationActivityFormFields> | LeafError | undefined;
+    withActivationSelection?: boolean;
+    withoutTimeframeSelection?: boolean;
 }
 
 function EapOperationActivityListInput<const NAME extends ActivityInputType>(props: Props<NAME>) {
@@ -49,6 +54,8 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
         value,
         onChange,
         error,
+        withActivationSelection,
+        withoutTimeframeSelection,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -63,7 +70,7 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
 
     const handleReadinessAddButtonClick = useCallback(
         () => {
-            const timeframeValue = name === 'readiness_activities' || name === 'prepositioning_activities'
+            const timeframeValue = name === 'readiness_activities'
                 ? TIMEFRAME_YEAR
                 : undefined;
             const newActionItem: OperationActivityFormFields = {
@@ -171,6 +178,8 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
                         error={getErrorObject(error)}
                         disabled={disabled}
                         readOnly={readOnly}
+                        withActivationSelection={withActivationSelection}
+                        withoutTimeframeSelection={withoutTimeframeSelection}
                     />
                 ))}
             </ListView>
diff --git a/app/src/components/domain/PrintableActivityOutput/i18n.json b/app/src/components/domain/PrintableActivityOutput/i18n.json
new file mode 100644
index 0000000000..fc31267148
--- /dev/null
+++ b/app/src/components/domain/PrintableActivityOutput/i18n.json
@@ -0,0 +1,7 @@
+{
+    "namespace": "printableActivityOutput",
+    "strings": {
+        "activationOneLabel": "Activation 1",
+        "activationTwoLabel": "Activation 2"
+    }
+}
diff --git a/app/src/components/domain/PrintableActivityOutput/index.tsx b/app/src/components/domain/PrintableActivityOutput/index.tsx
index baa3d53ed6..a6a1810a5f 100644
--- a/app/src/components/domain/PrintableActivityOutput/index.tsx
+++ b/app/src/components/domain/PrintableActivityOutput/index.tsx
@@ -2,10 +2,13 @@ import {
     useCallback,
     useMemo,
 } from 'react';
+import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
     compareNumber,
     isDefined,
+    isFalsyString,
     isNotDefined,
+    isTruthyString,
     listToMap,
 } from '@togglecorp/fujs';
 
@@ -21,7 +24,11 @@ import {
     type TimeFrameEnumKey,
 } from '#utils/constants';
 
-type OperationActivity = components['schemas']['OperationActivity'];
+import i18n from './i18n.json';
+
+type OperationActivity = components['schemas']['OperationActivity']
+    | components['schemas']['PrepositioningOperationActivity']
+    | components['schemas']['EarlyActionOperationActivity'];
 
 type ExtendedOperationActivity = Omit<OperationActivity, 'time_value'> & {
     time_value: number[] | string[];
@@ -31,7 +38,17 @@ type DaysTimeFrameKey = components['schemas']['EapDaysTimeframeValueEnumKey'];
 type YearsTimeFrameKey = components['schemas']['EapYearsTimeframeValueEnumKey'];
 type MonthsTimeFrameKey = components['schemas']['EapMonthsTimeframeValueEnumKey'];
 
-function getFormattedActivityTimeline(activity: ExtendedOperationActivity | undefined) {
+interface TimelineOptions {
+    withActivation?: boolean;
+    withoutTimeframe?: boolean;
+    activationOneLabel: string;
+    activationTwoLabel: string;
+}
+
+function getFormattedActivityTimeline(
+    activity: ExtendedOperationActivity | undefined,
+    options: TimelineOptions,
+) {
     if (isNotDefined(activity)) {
         return undefined;
     }
@@ -39,13 +56,37 @@ function getFormattedActivityTimeline(activity: ExtendedOperationActivity | unde
     const {
         time_value,
         timeframe_display,
+        activation_one,
+        activation_two,
     } = activity;
 
-    const timeValueDisplay = time_value.join(',');
+    const {
+        withActivation,
+        withoutTimeframe,
+        activationOneLabel,
+        activationTwoLabel,
+    } = options;
+
+    const timeframeDisplay = withoutTimeframe || time_value.length === 0
+        ? undefined
+        : [time_value.join(','), timeframe_display].filter(isTruthyString).join(' ');
+
+    const activationDisplay = withActivation
+        ? [
+            activation_one ? activationOneLabel : undefined,
+            activation_two ? activationTwoLabel : undefined,
+        ].filter(isDefined).join(', ')
+        : undefined;
+
+    if (isFalsyString(activationDisplay)) {
+        return timeframeDisplay;
+    }
 
-    return (
-        `${timeValueDisplay} ${timeframe_display}`
-    );
+    if (isFalsyString(timeframeDisplay)) {
+        return activationDisplay;
+    }
+
+    return `${timeframeDisplay} (${activationDisplay})`;
 }
 
 function getFormattedActivityLabel(activity: ExtendedOperationActivity | undefined, index: number) {
@@ -61,6 +102,8 @@ interface Props {
     prevActivity: OperationActivity | undefined;
     withDiff: boolean;
     index: number;
+    withActivation?: boolean;
+    withoutTimeframe?: boolean;
 }
 
 function PrintableActivityOutput(props: Props) {
@@ -69,8 +112,12 @@ function PrintableActivityOutput(props: Props) {
         prevActivity: previousActivity,
         withDiff,
         index,
+        withActivation,
+        withoutTimeframe,
     } = props;
 
+    const strings = useTranslation(i18n);
+
     const {
         eap_years_timeframe_value,
         eap_months_timeframe_value,
@@ -110,7 +157,14 @@ function PrintableActivityOutput(props: Props) {
         )
     ), [eap_years_timeframe_value]);
 
-    const timeValue = useCallback((timeArray: number[], timeframeKey: TimeFrameEnumKey) => {
+    const timeValue = useCallback((
+        timeArray: number[] | undefined | null,
+        timeframeKey: TimeFrameEnumKey | undefined | null,
+    ) => {
+        if (isNotDefined(timeArray)) {
+            return [];
+        }
+
         const sortedTimeValue = timeArray.toSorted(compareNumber);
 
         if (timeframeKey === TIMEFRAME_HOURS && isDefined(hoursTimeframeMap)) {
@@ -154,6 +208,13 @@ function PrintableActivityOutput(props: Props) {
         time_value: timeValue(previousActivity?.time_value, previousActivity?.timeframe),
     } : previousActivity;
 
+    const timelineOptions = {
+        withActivation,
+        withoutTimeframe,
+        activationOneLabel: strings.activationOneLabel,
+        activationTwoLabel: strings.activationTwoLabel,
+    };
+
     return (
         <PrintableDataDisplay
             label={(
@@ -163,9 +224,9 @@ function PrintableActivityOutput(props: Props) {
                     withDiff={withDiff}
                 />
             )}
-            value={getFormattedActivityTimeline(activity)}
+            value={getFormattedActivityTimeline(activity, timelineOptions)}
             prevValue={
-                getFormattedActivityTimeline(prevActivity)
+                getFormattedActivityTimeline(prevActivity, timelineOptions)
             }
             valueType="text"
             variant="contents"
diff --git a/app/src/utils/constants.ts b/app/src/utils/constants.ts
index 85532d8817..027cf2b5bf 100644
--- a/app/src/utils/constants.ts
+++ b/app/src/utils/constants.ts
@@ -138,8 +138,9 @@ export type CategoryType = components<'read'>['schemas']['ApiActionCategoryEnumK
 
 // Common
 
-// FIXME: we need to identify a typesafe way to get this value
+// FIXME: we need to identify a typesafe way to get these values
 export const DISASTER_TYPE_EPIDEMIC = 1;
+export const DISASTER_TYPE_OTHER = 13;
 
 type Visibility = components<'read'>['schemas']['ApiVisibilityChoicesEnumKey'];
 export const VISIBILITY_RCRC_MOVEMENT = 1 satisfies Visibility;
diff --git a/app/src/views/EapFullExport/index.tsx b/app/src/views/EapFullExport/index.tsx
index b315564025..03912a14bd 100644
--- a/app/src/views/EapFullExport/index.tsx
+++ b/app/src/views/EapFullExport/index.tsx
@@ -1378,6 +1378,8 @@ export function Component() {
                                                     prevActivity={prevActivity}
                                                     index={index}
                                                     withDiff={withDiff}
+                                                    withActivation
+                                                    withoutTimeframe
                                                 />
                                             );
                                         },
@@ -1399,6 +1401,7 @@ export function Component() {
                                                 prevActivity={prevActivity}
                                                 index={index}
                                                 withDiff={withDiff}
+                                                withActivation
                                             />
                                         );
                                     })}
@@ -1543,6 +1546,8 @@ export function Component() {
                                                 prevActivity={prevActivity}
                                                 index={index}
                                                 withDiff={withDiff}
+                                                withActivation
+                                                withoutTimeframe
                                             />
                                         );
                                     })}
@@ -1563,6 +1568,7 @@ export function Component() {
                                                 prevActivity={prevActivity}
                                                 index={index}
                                                 withDiff={withDiff}
+                                                withActivation
                                             />
                                         );
                                     })}
diff --git a/app/src/views/EapFullForm/EapActivationProcess/i18n.json b/app/src/views/EapFullForm/EapActivationProcess/i18n.json
index 7b444fafba..33c8ead1f4 100644
--- a/app/src/views/EapFullForm/EapActivationProcess/i18n.json
+++ b/app/src/views/EapFullForm/EapActivationProcess/i18n.json
@@ -39,8 +39,8 @@
         "activationAttachFilesDescription": "Attach any additional maps, documentation, files, images, etc.",
         "activationSourceOfInformationTitle": "Sources of information",
         "activationAddNewButtonLabel": "Add",
-        "activationSelectImagesLabel": "Select images",
-        "activationImageCountLabel": "5 images max(optional)",
+        "activationSelectFilesLabel": "Select files",
+        "activationFilesCountLabel": "5 files max(optional)",
         "activationSourceOfInformationDescription": "Add the description of the sources one at a time. If the source has a link, add in the second field.",
         "activationSectionHeading": "Quality Criteria: EAP activation process",
         "activationSectionCriteriaIntroduction1": "There is a mechanism in place to monitor the forecasts (ad /or trigger related indicators) and alert relevant actors as soon as a trigger is reached to initiate the early actions. This implies that the process to trigger the Anticipatory Action system is clearly understood by all the key staff of the NS and relevant partners.",
diff --git a/app/src/views/EapFullForm/Overview/i18n.json b/app/src/views/EapFullForm/Overview/i18n.json
index ab923cc98e..e92d515b59 100644
--- a/app/src/views/EapFullForm/Overview/i18n.json
+++ b/app/src/views/EapFullForm/Overview/i18n.json
@@ -8,6 +8,8 @@
         "formCountryDescription": "The country will be pre-populated based on the NS selection, but can be adapted as needed.",
         "disasterType": "Disaster type",
         "disasterTypeDescription": "Select the disaster type for which the EAP is needed.",
+        "epidemicType": "Type of Epidemic",
+        "otherDisasterType": "Other Disaster Type",
         "formUploadCoverImage": "Cover photo",
         "formUploadCoverImageDescription": "Upload a image for the cover page of the publicly published DREF application.",
         "formUploadAnImageLabel": "Select an Image",
diff --git a/app/src/views/EapFullForm/Overview/index.tsx b/app/src/views/EapFullForm/Overview/index.tsx
index 2c337dc226..00cf7ec30d 100644
--- a/app/src/views/EapFullForm/Overview/index.tsx
+++ b/app/src/views/EapFullForm/Overview/index.tsx
@@ -40,6 +40,10 @@ import NationalSocietySelectInput from '#components/domain/NationalSocietySelect
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
+import {
+    DISASTER_TYPE_EPIDEMIC,
+    DISASTER_TYPE_OTHER,
+} from '#utils/constants';
 import { type GoApiResponse } from '#utils/restRequest';
 
 import { wordLimits } from '../common';
@@ -94,6 +98,10 @@ function Overview(props: Props) {
     // NOTE: We dont want some fields to have onChange functionality
     const noop = () => { };
 
+    const isEpidemicDisasterType = eapRegistrationDetail
+        ?.disaster_type === DISASTER_TYPE_EPIDEMIC;
+    const isOtherDisasterType = eapRegistrationDetail?.disaster_type === DISASTER_TYPE_OTHER;
+
     const { setValue: onKeyActorsChange, removeValue: onKeyActorsRemove } = useFormArray<'key_actors', KeyActorsFormFields>(
         'key_actors',
         setFieldValue,
@@ -185,6 +193,18 @@ function Overview(props: Props) {
                             disabled={disabled}
                             readOnly
                         />
+                        {(isEpidemicDisasterType || isOtherDisasterType) && (
+                            <TextInput
+                                name="disaster_sub_type"
+                                value={eapRegistrationDetail?.disaster_sub_type}
+                                onChange={noop}
+                                disabled={disabled}
+                                label={isEpidemicDisasterType
+                                    ? strings.epidemicType
+                                    : strings.otherDisasterType}
+                                readOnly
+                            />
+                        )}
                     </InputSection>
                     <InputSection
                         title={strings.formUploadCoverImage}
diff --git a/app/src/views/EapFullForm/SelectionActions/ApproachesInput/index.tsx b/app/src/views/EapFullForm/SelectionActions/ApproachesInput/index.tsx
index 0e72cd79fc..5cad92803f 100644
--- a/app/src/views/EapFullForm/SelectionActions/ApproachesInput/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/ApproachesInput/index.tsx
@@ -131,6 +131,8 @@ function ApproachesInput(props: Props) {
                         onChange={onFieldChange}
                         readOnly={readOnly}
                         error={getErrorObject(error)?.prepositioning_activities}
+                        withActivationSelection
+                        withoutTimeframeSelection
                     />
                     <EapOperationActivityListInput
                         name="early_action_activities"
@@ -138,6 +140,7 @@ function ApproachesInput(props: Props) {
                         onChange={onFieldChange}
                         readOnly={readOnly}
                         error={getErrorObject(error)?.early_action_activities}
+                        withActivationSelection
                     />
                 </ListView>
             </ListView>
diff --git a/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx b/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
index 7fee2c460d..53c7f8d423 100644
--- a/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
@@ -147,6 +147,8 @@ function OperationsInput(props: Props) {
                         onChange={onFieldChange}
                         readOnly={readOnly}
                         error={getErrorObject(error)?.prepositioning_activities}
+                        withActivationSelection
+                        withoutTimeframeSelection
                     />
                     <EapOperationActivityListInput
                         name="early_action_activities"
@@ -154,6 +156,7 @@ function OperationsInput(props: Props) {
                         onChange={onFieldChange}
                         readOnly={readOnly}
                         error={getErrorObject(error)?.early_action_activities}
+                        withActivationSelection
                     />
                 </ListView>
             </ListView>
diff --git a/app/src/views/EapFullForm/SelectionActions/i18n.json b/app/src/views/EapFullForm/SelectionActions/i18n.json
index 944e265e2f..08d13db5a5 100644
--- a/app/src/views/EapFullForm/SelectionActions/i18n.json
+++ b/app/src/views/EapFullForm/SelectionActions/i18n.json
@@ -22,7 +22,7 @@
         "earlyActionsAddButtonLabel": "Add",
         "earlyActionsEmptyMessage": "No actions yet!",
         "selectionActionUploadLabel": "Upload",
-        "selectionActionSelectImagesLabel": "Select images",
+        "selectionActionSelectFilesLabel": "Select files",
         "theoryOfChangeTableTitle": "Theory of Change Table",
         "theoryOfChangeTableDescription": "Show how the selected action aims to reduce the expected humanitarian impact, by filling out the Theory of Change (ToC) table",
         "downloadTableLabel": "Download Theory of Change table",
@@ -47,7 +47,7 @@
         "feasibilityRequiredPoint2": "If Cash and Voucher Assistance (CVA) is chosen as an early action, describe how necessary information for disbursement is collected in the short period of time and how national legislative requirements are met.",
         "useFulnessActionsTitle": "Usefulness of actions in case of non-occurring event",
         "useFulnessActionsDescription": "Describe how your selected actions will contribute to the well-being of the population even if the expected event does not materialize. Include a description of the measures taken to ensure that the actions taken will be of maximum use for the targeted population in a future event.",
-        "selectionActionImagesCountLabel": "5 images max(optional)",
+        "selectionActionFilesCountLabel": "5 files max(optional)",
         "useFulnessActionsExplanatoryNote": "In cases where the expected event does not materialize, the early actions implemented by the National Society (funded by the DREF) should still contribute to risk reduction and resiliency building.",
         "actionsStatementSectionHeading": "Quality Criteria: Selection of actions",
         "actionsSectionCriteriaIntroduction1": "Forecast-based Early Actions are selected based on the reduction of risk that they will provide. The EAP describes the main steps used to determine which actions were selected to reduce a specific disaster impact.",
diff --git a/app/src/views/EapFullForm/TriggerModel/index.tsx b/app/src/views/EapFullForm/TriggerModel/index.tsx
index e679ee3d29..425e83c6c5 100644
--- a/app/src/views/EapFullForm/TriggerModel/index.tsx
+++ b/app/src/views/EapFullForm/TriggerModel/index.tsx
@@ -304,7 +304,6 @@ function TriggerModel(props: Props) {
                             keySelector={timeframeKeySelector}
                             labelSelector={stringValueSelector}
                             disabled={disabled}
-                            readOnly
                         />
                     </InputSection>
                     <InputSection
diff --git a/app/src/views/EapFullForm/schema.ts b/app/src/views/EapFullForm/schema.ts
index eb31438592..7818a770f7 100644
--- a/app/src/views/EapFullForm/schema.ts
+++ b/app/src/views/EapFullForm/schema.ts
@@ -945,15 +945,15 @@ export const formSchema: EapFullFormSchema = {
                         },
                         early_action_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'early_action_activities'),
                         },
                         readiness_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'readiness_activities'),
                         },
                         prepositioning_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'prepositioning_activities'),
                         },
                     }),
                 }),
@@ -992,15 +992,15 @@ export const formSchema: EapFullFormSchema = {
                         },
                         early_action_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'early_action_activities'),
                         },
                         readiness_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'readiness_activities'),
                         },
                         prepositioning_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'prepositioning_activities'),
                         },
                     }),
                 }),
diff --git a/app/src/views/EapRegistration/i18n.json b/app/src/views/EapRegistration/i18n.json
index dc80c26b36..b3a16c8c9a 100644
--- a/app/src/views/EapRegistration/i18n.json
+++ b/app/src/views/EapRegistration/i18n.json
@@ -11,6 +11,8 @@
         "countryDescription": "The country will be pre-populated based on the NS selection, but can be adapted as needed.",
         "disasterType": "Disaster Type",
         "disasterTypeDescription": "Select the disaster type for which the EAP is needed.",
+        "epidemicType": "Type of Epidemic",
+        "otherDisasterType": "Please Specify",
         "type": "EAP Type",
         "typeDescription": "Select the EAP type. Find details of both under this link.",
         "submission": "Expected Time of Submission",
diff --git a/app/src/views/EapRegistration/index.tsx b/app/src/views/EapRegistration/index.tsx
index 7caebb0195..9ea6e2c429 100644
--- a/app/src/views/EapRegistration/index.tsx
+++ b/app/src/views/EapRegistration/index.tsx
@@ -12,6 +12,7 @@ import {
     Modal,
     Radio,
     RadioInput,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
@@ -37,6 +38,10 @@ import Page from '#components/Page';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import useAlert from '#hooks/useAlert';
 import useRouting from '#hooks/useRouting';
+import {
+    DISASTER_TYPE_EPIDEMIC,
+    DISASTER_TYPE_OTHER,
+} from '#utils/constants';
 import {
     type GoApiResponse,
     useLazyRequest,
@@ -145,6 +150,12 @@ export function Component() {
         setError,
     ]);
 
+    const handleDisasterTypeChange = useCallback((newValue: number | undefined) => {
+        setFieldValue(newValue, 'disaster_type');
+        // NOTE: The sub type is specific to the selected disaster type
+        setFieldValue(undefined, 'disaster_sub_type');
+    }, [setFieldValue]);
+
     const handleNationalSocietyInputChange = useCallback((newValue: number | undefined) => {
         setFieldValue(newValue, 'national_society');
         setFieldValue(newValue, 'country');
@@ -157,6 +168,9 @@ export function Component() {
 
     const disabled = eapRegistrationPending;
 
+    const isEpidemicDisasterType = value?.disaster_type === DISASTER_TYPE_EPIDEMIC;
+    const isOtherDisasterType = value?.disaster_type === DISASTER_TYPE_OTHER;
+
     return (
         <Page
             heading={strings.registrationHeading}
@@ -234,10 +248,22 @@ export function Component() {
                             <DisasterTypeSelectInput
                                 name="disaster_type"
                                 value={value?.disaster_type}
-                                onChange={setFieldValue}
+                                onChange={handleDisasterTypeChange}
                                 error={error?.disaster_type}
                                 disabled={disabled}
                             />
+                            {(isEpidemicDisasterType || isOtherDisasterType) && (
+                                <TextInput
+                                    name="disaster_sub_type"
+                                    value={value?.disaster_sub_type}
+                                    onChange={setFieldValue}
+                                    error={error?.disaster_sub_type}
+                                    disabled={disabled}
+                                    placeholder={isEpidemicDisasterType
+                                        ? strings.epidemicType
+                                        : strings.otherDisasterType}
+                                />
+                            )}
                         </InputSection>
                         <InputSection
                             title={strings.type}
diff --git a/app/src/views/EapRegistration/schema.ts b/app/src/views/EapRegistration/schema.ts
index f6a4937417..a63a6485ee 100644
--- a/app/src/views/EapRegistration/schema.ts
+++ b/app/src/views/EapRegistration/schema.ts
@@ -1,10 +1,16 @@
 import {
+    addCondition,
     emailCondition,
+    nullValue,
     type ObjectSchema,
     type PartialForm,
     type PurgeNull,
 } from '@togglecorp/toggle-form';
 
+import {
+    DISASTER_TYPE_EPIDEMIC,
+    DISASTER_TYPE_OTHER,
+} from '#utils/constants';
 import { type GoApiBody } from '#utils/restRequest';
 
 export type EapRegisterRequestBody = PurgeNull<GoApiBody<'/api/v2/eap-registration/', 'POST'>>;
@@ -20,39 +26,61 @@ type FormSchema = ObjectSchema<EapRegisterFormFields>;
 type FormSchemaFields = ReturnType<FormSchema['fields']>
 
 export const formSchema: FormSchema = {
-    fields: (): FormSchemaFields => ({
-        national_society: {
-            required: true,
-        },
-        country: {
-            required: true,
-        },
-        disaster_type: {
-            required: true,
-        },
-        eap_type: {},
-        expected_submission_time: {},
-        partners: {
-            required: true,
-        },
-        national_society_contact_name: { required: true },
-        national_society_contact_title: { required: true },
-        national_society_contact_email: {
-            required: true,
-            validations: [emailCondition],
-        },
-        national_society_contact_phone_number: {},
-        ifrc_contact_name: {},
-        ifrc_contact_title: {},
-        ifrc_contact_email: {
-            validations: [emailCondition],
-        },
-        ifrc_contact_phone_number: {},
-        dref_focal_point_name: {},
-        dref_focal_point_title: {},
-        dref_focal_point_email: {
-            validations: [emailCondition],
-        },
-        dref_focal_point_phone_number: {},
-    }),
+    fields: (formValue): FormSchemaFields => {
+        let formFields: FormSchemaFields = {
+            national_society: {
+                required: true,
+            },
+            country: {
+                required: true,
+            },
+            disaster_type: {
+                required: true,
+            },
+            eap_type: {},
+            expected_submission_time: {},
+            partners: {
+                required: true,
+            },
+            national_society_contact_name: { required: true },
+            national_society_contact_title: { required: true },
+            national_society_contact_email: {
+                required: true,
+                validations: [emailCondition],
+            },
+            national_society_contact_phone_number: {},
+            ifrc_contact_name: {},
+            ifrc_contact_title: {},
+            ifrc_contact_email: {
+                validations: [emailCondition],
+            },
+            ifrc_contact_phone_number: {},
+            dref_focal_point_name: {},
+            dref_focal_point_title: {},
+            dref_focal_point_email: {
+                validations: [emailCondition],
+            },
+            dref_focal_point_phone_number: {},
+        };
+
+        formFields = addCondition(
+            formFields,
+            formValue,
+            ['disaster_type'],
+            ['disaster_sub_type'],
+            (val): Pick<FormSchemaFields, 'disaster_sub_type'> => {
+                if (val?.disaster_type === DISASTER_TYPE_EPIDEMIC
+                     || val?.disaster_type === DISASTER_TYPE_OTHER) {
+                    return {
+                        disaster_sub_type: {},
+                    };
+                }
+                return {
+                    disaster_sub_type: { forceValue: nullValue },
+                };
+            },
+        );
+
+        return formFields;
+    },
 };
diff --git a/app/src/views/EapSimplifiedForm/Overview/i18n.json b/app/src/views/EapSimplifiedForm/Overview/i18n.json
index 56b68844d8..9535f0439b 100644
--- a/app/src/views/EapSimplifiedForm/Overview/i18n.json
+++ b/app/src/views/EapSimplifiedForm/Overview/i18n.json
@@ -8,6 +8,8 @@
         "countryDescription": "The country will be pre-populated based on the NS selection, but can be adapted as needed.",
         "disasterType": "Disaster type",
         "disasterTypeDescription": "Select the disaster type for which the EAP is needed.",
+        "epidemicType": "Type of Epidemic",
+        "otherDisasterType": "Other Disaster Type",
         "uploadCoverImage": "Cover photo",
         "uploadCoverImageDescription": "Upload a image for the cover page of the publicly published DREF application.",
         "timeframe": "sEAP timeframe",
diff --git a/app/src/views/EapSimplifiedForm/Overview/index.tsx b/app/src/views/EapSimplifiedForm/Overview/index.tsx
index 10fc9b9696..be58307a01 100644
--- a/app/src/views/EapSimplifiedForm/Overview/index.tsx
+++ b/app/src/views/EapSimplifiedForm/Overview/index.tsx
@@ -6,6 +6,7 @@ import {
     Label,
     ListView,
     NumberInput,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
@@ -22,6 +23,10 @@ import ImageWithCaptionInput from '#components/domain/ImageWithCaptionInput';
 import NationalSocietyMultiSelectInput from '#components/domain/NationalSocietyMultiSelectInput';
 import NationalSocietySelectInput from '#components/domain/NationalSocietySelectInput';
 import TabPage from '#components/TabPage';
+import {
+    DISASTER_TYPE_EPIDEMIC,
+    DISASTER_TYPE_OTHER,
+} from '#utils/constants';
 import { type GoApiResponse } from '#utils/restRequest';
 
 import GuidanceSeap from '../GuidanceSeap';
@@ -59,6 +64,10 @@ function Overview(props: Props) {
 
     const noOp = () => {};
 
+    const isEpidemicDisasterType = eapRegistrationDetail
+        ?.disaster_type === DISASTER_TYPE_EPIDEMIC;
+    const isOtherDisasterType = eapRegistrationDetail?.disaster_type === DISASTER_TYPE_OTHER;
+
     return (
         <TabPage
             spacingOffset={-2}
@@ -128,7 +137,6 @@ function Overview(props: Props) {
                         title={strings.disasterType}
                         description={strings.disasterTypeDescription}
                         withAsteriskOnTitle
-                        numPreferredColumns={2}
                     >
                         <DisasterTypeSelectInput
                             name="disaster_type"
@@ -137,6 +145,18 @@ function Overview(props: Props) {
                             disabled={disabled}
                             readOnly
                         />
+                        {(isEpidemicDisasterType || isOtherDisasterType) && (
+                            <TextInput
+                                name="disaster_sub_type"
+                                value={eapRegistrationDetail?.disaster_sub_type}
+                                onChange={noOp}
+                                disabled={disabled}
+                                label={isEpidemicDisasterType
+                                    ? strings.epidemicType
+                                    : strings.otherDisasterType}
+                                readOnly
+                            />
+                        )}
                     </InputSection>
                     <InputSection
                         title={strings.uploadCoverImage}
diff --git a/app/src/views/EapSimplifiedForm/schema.ts b/app/src/views/EapSimplifiedForm/schema.ts
index 01078ef9b8..5f0b4c8502 100644
--- a/app/src/views/EapSimplifiedForm/schema.ts
+++ b/app/src/views/EapSimplifiedForm/schema.ts
@@ -503,15 +503,15 @@ export const formSchema: FormSchema = {
                         },
                         early_action_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'early_action_activities'),
                         },
                         readiness_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'readiness_activities'),
                         },
                         prepositioning_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'prepositioning_activities'),
                         },
                     }),
                 }),
@@ -550,15 +550,15 @@ export const formSchema: FormSchema = {
                         },
                         early_action_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'early_action_activities'),
                         },
                         readiness_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'readiness_activities'),
                         },
                         prepositioning_activities: {
                             keySelector: (item) => item.client_id,
-                            member: () => operationActivitySchema(isSubmit),
+                            member: () => operationActivitySchema(isSubmit, 'prepositioning_activities'),
                         },
                     }),
                 }),
diff --git a/app/src/views/EapSummaryExport/index.tsx b/app/src/views/EapSummaryExport/index.tsx
index 2de2fda2c1..1398c52848 100644
--- a/app/src/views/EapSummaryExport/index.tsx
+++ b/app/src/views/EapSummaryExport/index.tsx
@@ -17,6 +17,7 @@ import {
     listToMap,
 } from '@togglecorp/fujs';
 
+import PrintableActivityOutput from '#components/domain/PrintableActivityOutput';
 import Link from '#components/printable/Link';
 import PrintableContainer from '#components/printable/PrintableContainer';
 import PrintableDataDisplay from '#components/printable/PrintableDataDisplay';
@@ -299,16 +300,14 @@ export function Component() {
                             >
                                 <div className={styles.indicatorItems}>
                                     {operation.prepositioning_activities.map((activity, index) => (
-                                        <PrintableDataDisplay
+                                        <PrintableActivityOutput
                                             key={activity.id}
-                                            label={`${index + 1}. ${activity.activity}`}
-                                            value={`${activity.time_value} ${activity.timeframe_display}`}
-                                            valueType="text"
-                                            variant="contents"
-                                            withBackground
-                                            withPadding
-                                            withoutLabelColon
+                                            activity={activity}
+                                            prevActivity={undefined}
+                                            index={index}
                                             withDiff={false}
+                                            withActivation
+                                            withoutTimeframe
                                         />
                                     ))}
                                 </div>
@@ -319,16 +318,13 @@ export function Component() {
                             >
                                 <div className={styles.indicatorItems}>
                                     {operation.early_action_activities.map((activity, index) => (
-                                        <PrintableDataDisplay
+                                        <PrintableActivityOutput
                                             key={activity.id}
-                                            label={`${index + 1}. ${activity.activity}`}
-                                            value={`${activity.time_value} ${activity.timeframe_display}`}
-                                            valueType="text"
-                                            variant="contents"
-                                            withBackground
-                                            withPadding
-                                            withoutLabelColon
+                                            activity={activity}
+                                            prevActivity={undefined}
+                                            index={index}
                                             withDiff={false}
+                                            withActivation
                                         />
                                     ))}
                                 </div>
@@ -426,16 +422,14 @@ export function Component() {
                             >
                                 <div className={styles.indicatorItems}>
                                     {approach.prepositioning_activities.map((activity, index) => (
-                                        <PrintableDataDisplay
+                                        <PrintableActivityOutput
                                             key={activity.id}
-                                            label={`${index + 1}. ${activity.activity}`}
-                                            value={`${activity.time_value} ${activity.timeframe_display}`}
-                                            valueType="text"
-                                            variant="contents"
-                                            withBackground
-                                            withPadding
-                                            withoutLabelColon
+                                            activity={activity}
+                                            prevActivity={undefined}
+                                            index={index}
                                             withDiff={false}
+                                            withActivation
+                                            withoutTimeframe
                                         />
                                     ))}
                                 </div>
@@ -446,16 +440,13 @@ export function Component() {
                             >
                                 <div className={styles.indicatorItems}>
                                     {approach.early_action_activities.map((activity, index) => (
-                                        <PrintableDataDisplay
+                                        <PrintableActivityOutput
                                             key={activity.id}
-                                            label={`${index + 1}. ${activity.activity}`}
-                                            value={`${activity.time_value} ${activity.timeframe_display}`}
-                                            valueType="text"
-                                            variant="contents"
-                                            withBackground
-                                            withPadding
-                                            withoutLabelColon
+                                            activity={activity}
+                                            prevActivity={undefined}
+                                            index={index}
                                             withDiff={false}
+                                            withActivation
                                         />
                                     ))}
                                 </div>

From 21ca454a10460db3a8167a155dbe724a69b5c32c Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Wed, 5 Aug 2026 11:01:32 +0545
Subject: [PATCH 5/9] feat(eap): confirm before discarding planned operation
 sector data

---
 .../domain/ConfirmationModal/i18n.json        |   8 ++
 .../domain/ConfirmationModal/index.tsx        |  67 +++++++++
 app/src/hooks/domain/useChecklistFormArray.ts | 115 +++++++++++++++
 .../EapFullForm/SelectionActions/i18n.json    |   4 +
 .../EapFullForm/SelectionActions/index.tsx    | 131 ++++++++++--------
 .../EnablingApproaches/i18n.json              |   2 +
 .../EnablingApproaches/index.tsx              |  64 ++++++---
 .../PlannedOperations/i18n.json               |   2 +
 .../PlannedOperations/index.tsx               |  64 ++++++---
 app/src/views/FlashUpdateDetails/index.tsx    |   4 +-
 10 files changed, 361 insertions(+), 100 deletions(-)
 create mode 100644 app/src/components/domain/ConfirmationModal/i18n.json
 create mode 100644 app/src/components/domain/ConfirmationModal/index.tsx
 create mode 100644 app/src/hooks/domain/useChecklistFormArray.ts

diff --git a/app/src/components/domain/ConfirmationModal/i18n.json b/app/src/components/domain/ConfirmationModal/i18n.json
new file mode 100644
index 0000000000..55976d738b
--- /dev/null
+++ b/app/src/components/domain/ConfirmationModal/i18n.json
@@ -0,0 +1,8 @@
+{
+    "namespace": "confirmationModal",
+    "strings": {
+        "confirmationHeading": "Are you sure?",
+        "confirmationCancelButton": "Cancel",
+        "confirmationConfirmButton": "Continue"
+    }
+}
diff --git a/app/src/components/domain/ConfirmationModal/index.tsx b/app/src/components/domain/ConfirmationModal/index.tsx
new file mode 100644
index 0000000000..54ea30d557
--- /dev/null
+++ b/app/src/components/domain/ConfirmationModal/index.tsx
@@ -0,0 +1,67 @@
+import {
+    Button,
+    Description,
+    ListView,
+    Modal,
+} from '@ifrc-go/ui';
+import { useTranslation } from '@ifrc-go/ui/hooks';
+
+import i18n from './i18n.json';
+
+interface Props {
+    heading?: React.ReactNode;
+    message: React.ReactNode;
+    cancelButtonLabel?: string;
+    confirmButtonLabel?: string;
+    onCancel: () => void;
+    onConfirm: () => void;
+    disabled?: boolean;
+}
+
+function ConfirmationModal(props: Props) {
+    const {
+        heading,
+        message,
+        cancelButtonLabel,
+        confirmButtonLabel,
+        onCancel,
+        onConfirm,
+        disabled,
+    } = props;
+
+    const strings = useTranslation(i18n);
+
+    return (
+        <Modal
+            heading={heading ?? strings.confirmationHeading}
+            headingLevel={3}
+            size="sm"
+            onClose={onCancel}
+            footerActions={(
+                <ListView>
+                    <Button
+                        name={undefined}
+                        onClick={onCancel}
+                        disabled={disabled}
+                    >
+                        {cancelButtonLabel ?? strings.confirmationCancelButton}
+                    </Button>
+                    <Button
+                        name={undefined}
+                        onClick={onConfirm}
+                        styleVariant="filled"
+                        disabled={disabled}
+                    >
+                        {confirmButtonLabel ?? strings.confirmationConfirmButton}
+                    </Button>
+                </ListView>
+            )}
+        >
+            <Description>
+                {message}
+            </Description>
+        </Modal>
+    );
+}
+
+export default ConfirmationModal;
diff --git a/app/src/hooks/domain/useChecklistFormArray.ts b/app/src/hooks/domain/useChecklistFormArray.ts
new file mode 100644
index 0000000000..67216d422f
--- /dev/null
+++ b/app/src/hooks/domain/useChecklistFormArray.ts
@@ -0,0 +1,115 @@
+import {
+    useCallback,
+    useMemo,
+    useState,
+} from 'react';
+import {
+    isNotDefined,
+    listToMap,
+} from '@togglecorp/fujs';
+
+type PendingRemoval<KEY extends string | number> = {
+    type: 'checklist';
+    keys: KEY[] | undefined;
+} | {
+    type: 'delete';
+    index: number;
+};
+
+interface Options<KEY extends string | number, ITEM> {
+    value: ITEM[] | undefined;
+    // NOTE: keySelector and createItem must be stable references, otherwise the
+    // returned handlers are re-created on each render
+    keySelector: (item: ITEM) => KEY;
+    createItem: (key: KEY) => ITEM;
+    setValue: (getNewValue: (previousValue: ITEM[] | undefined) => ITEM[] | undefined) => void;
+    removeValue: (index: number) => void;
+}
+
+function useChecklistFormArray<KEY extends string | number, ITEM>(
+    options: Options<KEY, ITEM>,
+) {
+    const {
+        value,
+        keySelector,
+        createItem,
+        setValue,
+        removeValue,
+    } = options;
+
+    const [pendingRemoval, setPendingRemoval] = useState<PendingRemoval<KEY> | undefined>();
+
+    const applyKeys = useCallback(
+        (keys: KEY[] | undefined) => {
+            setValue((previousValue) => {
+                const previousValueMapping = listToMap(previousValue, keySelector);
+
+                return keys?.map((key) => previousValueMapping?.[key] ?? createItem(key));
+            });
+        },
+        [setValue, keySelector, createItem],
+    );
+
+    const handleChecklistChange = useCallback(
+        (keys: KEY[] | undefined) => {
+            const hasRemovedKey = value?.some(
+                (item) => isNotDefined(keys) || !keys.includes(keySelector(item)),
+            );
+
+            if (hasRemovedKey) {
+                setPendingRemoval({ type: 'checklist', keys });
+                return;
+            }
+
+            applyKeys(keys);
+        },
+        [value, keySelector, applyKeys],
+    );
+
+    const handleRemoveClick = useCallback(
+        (index: number) => {
+            setPendingRemoval({ type: 'delete', index });
+        },
+        [],
+    );
+
+    const handleRemovalCancel = useCallback(
+        () => {
+            setPendingRemoval(undefined);
+        },
+        [],
+    );
+
+    const handleRemovalConfirm = useCallback(
+        () => {
+            if (isNotDefined(pendingRemoval)) {
+                return;
+            }
+
+            if (pendingRemoval.type === 'checklist') {
+                applyKeys(pendingRemoval.keys);
+            } else {
+                removeValue(pendingRemoval.index);
+            }
+
+            setPendingRemoval(undefined);
+        },
+        [pendingRemoval, applyKeys, removeValue],
+    );
+
+    const selectedKeys = useMemo(
+        () => value?.map(keySelector),
+        [value, keySelector],
+    );
+
+    return {
+        selectedKeys,
+        pendingRemoval,
+        handleChecklistChange,
+        handleRemoveClick,
+        handleRemovalCancel,
+        handleRemovalConfirm,
+    };
+}
+
+export default useChecklistFormArray;
diff --git a/app/src/views/EapFullForm/SelectionActions/i18n.json b/app/src/views/EapFullForm/SelectionActions/i18n.json
index 08d13db5a5..dbe8b818cf 100644
--- a/app/src/views/EapFullForm/SelectionActions/i18n.json
+++ b/app/src/views/EapFullForm/SelectionActions/i18n.json
@@ -34,8 +34,12 @@
         "selectionActionPlannedOperationHeadingDescription": "Organize the actions according to the IFRC Plan and Budget, 2021 - 2025 sets out objectives for the IFRC Secretariat in support of National Societies and will guide the IFRC in the implementation Strategy 2030 and the Agenda for Renewal. These indicate the thematic areas in which the IFRC provides support to National Societies and where consolidated results are measured. Support on the IFRC programming and budgeting structure can be obtained from the IFRC focal point for Anticipation at country or regional level, regional disaster manager, Finance unit and/or Planning, Monitoring, Evaluation and Reporting (PMER) unit.",
         "plannedOperationTitle": "Planned Operation",
         "plannedOperationDescription": "Select sectors which are used in this Early Action Protocol.",
+        "plannedOperationSectorUnselectConfirmation": "Unselecting a sector will delete all the data entered for it. Do you want to continue?",
+        "plannedOperationSectorRemoveConfirmation": "Removing this sector will delete all the data entered for it. Do you want to continue?",
         "enablingApproachesTitle": "Enabling Approaches",
         "enablingApproachesDescription": "Select approaches which are used in this Early Action Protocol.",
+        "enablingApproachUnselectConfirmation": "Unselecting an approach will delete all the data entered for it. Do you want to continue?",
+        "enablingApproachRemoveConfirmation": "Removing this approach will delete all the data entered for it. Do you want to continue?",
         "selectionAttachFilesTitle": "Attach relevant files",
         "selectionAttachFilesDescription": "Attach any additional documentation, files, images, etc.",
         "selectionSourceOfInformationTitle": "Sources of information",
diff --git a/app/src/views/EapFullForm/SelectionActions/index.tsx b/app/src/views/EapFullForm/SelectionActions/index.tsx
index 0bdca7d5cc..722b16cad4 100644
--- a/app/src/views/EapFullForm/SelectionActions/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/index.tsx
@@ -16,6 +16,7 @@ import {
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
 import {
+    isDefined,
     isNotDefined,
     listToMap,
     randomString,
@@ -28,6 +29,7 @@ import {
     useFormArray,
 } from '@togglecorp/toggle-form';
 
+import ConfirmationModal from '#components/domain/ConfirmationModal';
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
 import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
@@ -36,6 +38,7 @@ import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
+import useChecklistFormArray from '#hooks/domain/useChecklistFormArray';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { useRequest } from '#utils/restRequest';
 
@@ -75,6 +78,22 @@ function approachesKeySelector(option: EapApproachOption) {
     return option.key;
 }
 
+function operationSectorSelector(operation: PlannedOperationFormFields) {
+    return operation.sector;
+}
+
+function createOperation(sector: EapSector) {
+    return { sector } satisfies PlannedOperationFormFields;
+}
+
+function approachSelector(approach: EnablingApproachesFormFields) {
+    return approach.approach;
+}
+
+function createApproach(approach: EapApproach) {
+    return { approach } satisfies EnablingApproachesFormFields;
+}
+
 interface Props {
     value: PartialEapFullFormType;
     setFieldValue: (...entries: EntriesAsList<PartialEapFullFormType>) => void;
@@ -127,36 +146,29 @@ function SelectionActions(props: Props) {
         setFieldValue,
     );
 
-    const handleOperationChecklistChange = useCallback(
-        (sectors: EapSector[] | undefined) => {
-            setFieldValue(
-                (previousValue: PlannedOperationFormFields[] | undefined) => {
-                    const previousValueMapping = listToMap(
-                        previousValue,
-                        ({ sector }) => sector,
-                    );
-
-                    return sectors?.map((sector) => {
-                        const prevSectorValue = previousValueMapping?.[sector];
-
-                        if (prevSectorValue) {
-                            return prevSectorValue;
-                        }
-
-                        return {
-                            sector,
-                        } satisfies PlannedOperationFormFields;
-                    });
-                },
-                'planned_operations',
-            );
+    const setPlannedOperations = useCallback(
+        (getNewValue: (
+            previousValue: PlannedOperationFormFields[] | undefined,
+        ) => PlannedOperationFormFields[] | undefined) => {
+            setFieldValue(getNewValue, 'planned_operations');
         },
         [setFieldValue],
     );
 
-    const selectedSectors = value?.planned_operations?.map(
-        ({ sector }) => sector,
-    );
+    const {
+        selectedKeys: selectedSectors,
+        pendingRemoval: pendingSectorRemoval,
+        handleChecklistChange: handleOperationChecklistChange,
+        handleRemoveClick: handleOperationRemoveClick,
+        handleRemovalCancel: handleSectorRemovalCancel,
+        handleRemovalConfirm: handleSectorRemovalConfirm,
+    } = useChecklistFormArray({
+        value: value.planned_operations,
+        keySelector: operationSectorSelector,
+        createItem: createOperation,
+        setValue: setPlannedOperations,
+        removeValue: onOperationRemove,
+    });
 
     const eapApproachLabelMapping = useMemo(
         () => listToMap(
@@ -172,36 +184,29 @@ function SelectionActions(props: Props) {
         setFieldValue,
     );
 
-    const handleApproachChecklistChange = useCallback(
-        (approaches: EapApproach[] | undefined) => {
-            setFieldValue(
-                (previousValue: EnablingApproachesFormFields[] | undefined) => {
-                    const previousValueMapping = listToMap(
-                        previousValue,
-                        ({ approach }) => approach,
-                    );
-
-                    return approaches?.map((approach) => {
-                        const prevApproachValue = previousValueMapping?.[approach];
-
-                        if (prevApproachValue) {
-                            return prevApproachValue;
-                        }
-
-                        return {
-                            approach,
-                        } satisfies EnablingApproachesFormFields;
-                    });
-                },
-                'enabling_approaches',
-            );
+    const setEnablingApproaches = useCallback(
+        (getNewValue: (
+            previousValue: EnablingApproachesFormFields[] | undefined,
+        ) => EnablingApproachesFormFields[] | undefined) => {
+            setFieldValue(getNewValue, 'enabling_approaches');
         },
         [setFieldValue],
     );
 
-    const selectedApproaches = value?.enabling_approaches?.map(
-        ({ approach }) => approach,
-    );
+    const {
+        selectedKeys: selectedApproaches,
+        pendingRemoval: pendingApproachRemoval,
+        handleChecklistChange: handleApproachChecklistChange,
+        handleRemoveClick: handleApproachRemoveClick,
+        handleRemovalCancel: handleApproachRemovalCancel,
+        handleRemovalConfirm: handleApproachRemovalConfirm,
+    } = useChecklistFormArray({
+        value: value.enabling_approaches,
+        keySelector: approachSelector,
+        createItem: createApproach,
+        setValue: setEnablingApproaches,
+        removeValue: onApproachRemove,
+    });
 
     const {
         setValue: onSourceInformationChange,
@@ -597,7 +602,7 @@ function SelectionActions(props: Props) {
                             index={index}
                             value={operation}
                             onChange={onOperationChange}
-                            onRemove={onOperationRemove}
+                            onRemove={handleOperationRemoveClick}
                             error={getErrorObject(error?.planned_operations)}
                             disabled={disabled}
                             readOnly={readOnly}
@@ -630,7 +635,7 @@ function SelectionActions(props: Props) {
                             index={index}
                             value={approach}
                             onChange={onApproachChange}
-                            onRemove={onApproachRemove}
+                            onRemove={handleApproachRemoveClick}
                             error={getErrorObject(error?.enabling_approaches)}
                             approachApCodeOption={apCodeOptions?.approach_ap_codes}
                             disabled={disabled}
@@ -718,6 +723,24 @@ function SelectionActions(props: Props) {
                     </InputSection>
                 </ListView>
             </Container>
+            {isDefined(pendingSectorRemoval) && (
+                <ConfirmationModal
+                    message={pendingSectorRemoval.type === 'checklist'
+                        ? strings.plannedOperationSectorUnselectConfirmation
+                        : strings.plannedOperationSectorRemoveConfirmation}
+                    onCancel={handleSectorRemovalCancel}
+                    onConfirm={handleSectorRemovalConfirm}
+                />
+            )}
+            {isDefined(pendingApproachRemoval) && (
+                <ConfirmationModal
+                    message={pendingApproachRemoval.type === 'checklist'
+                        ? strings.enablingApproachUnselectConfirmation
+                        : strings.enablingApproachRemoveConfirmation}
+                    onCancel={handleApproachRemovalCancel}
+                    onConfirm={handleApproachRemovalConfirm}
+                />
+            )}
         </TabPage>
     );
 }
diff --git a/app/src/views/EapSimplifiedForm/EnablingApproaches/i18n.json b/app/src/views/EapSimplifiedForm/EnablingApproaches/i18n.json
index 481dbba8ee..107f58f2eb 100644
--- a/app/src/views/EapSimplifiedForm/EnablingApproaches/i18n.json
+++ b/app/src/views/EapSimplifiedForm/EnablingApproaches/i18n.json
@@ -3,6 +3,8 @@
     "strings": {
         "enablingApproachesTitle": "Enabling Approaches",
         "enablingApproachesDescription": "Select approaches which are used in this Early Action Protocol.",
+        "enablingApproachUnselectConfirmation": "Unselecting an approach will delete all the data entered for it. Do you want to continue?",
+        "enablingApproachRemoveConfirmation": "Removing this approach will delete all the data entered for it. Do you want to continue?",
         "enablingApproachesTooltip": "In this section you should present the activities that are not sector specific or cross cutting for the operation. For example, work with partners, governments, etc. is usually listed under Enabling Approach 1: Coordination and Partnership. The IFRC support costs to the implementation of the simplified should be reflected under Enabling Action 2: Secretariat Services, while any activities or costs related to the National Society, including volunteer insurance, volunteer visibility, contributions to salaries should be listed here under Enabling Approach 3: National Society Development.",
         "enablingSectionHeading": "Quality Criteria: Enabling Operations",
         "eapEnablingSectionHeading": "EAP activation",
diff --git a/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx b/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
index c5358deb24..b7bea6b86a 100644
--- a/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EnablingApproaches/index.tsx
@@ -13,7 +13,10 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
-import { listToMap } from '@togglecorp/fujs';
+import {
+    isDefined,
+    listToMap,
+} from '@togglecorp/fujs';
 import {
     type EntriesAsList,
     type Error,
@@ -21,10 +24,12 @@ import {
     useFormArray,
 } from '@togglecorp/toggle-form';
 
+import ConfirmationModal from '#components/domain/ConfirmationModal';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
+import useChecklistFormArray from '#hooks/domain/useChecklistFormArray';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { type GoApiResponse } from '#utils/restRequest';
 
@@ -40,6 +45,14 @@ type EapApproachOption = components['schemas']['EapApproachEnum'];
 type EnablingApproachesFormFields = NonNullable<PartialSimplifiedEapType['enabling_approaches']>[number];
 type EapApproachApCodeOption = NonNullable<GoApiResponse<'/api/v2/eap/options/'>['approach_ap_codes']>;
 
+function approachSelector(approach: EnablingApproachesFormFields) {
+    return approach.approach;
+}
+
+function createApproach(approach: EapApproach) {
+    return { approach } satisfies EnablingApproachesFormFields;
+}
+
 interface Props {
     value: PartialSimplifiedEapType;
     error: Error<PartialSimplifiedEapType> | undefined;
@@ -84,28 +97,26 @@ function EnablingApproaches(props: Props) {
         setFieldValue,
     );
 
-    const handleApproachChecklistChange = useCallback((approaches: EapApproach[] | undefined) => {
-        setFieldValue((previousValue: EnablingApproachesFormFields[] | undefined) => {
-            const previousValueMapping = listToMap(
-                previousValue,
-                ({ approach }) => approach,
-            );
-
-            return approaches?.map((approach) => {
-                const prevApproachValue = previousValueMapping?.[approach];
-
-                if (prevApproachValue) {
-                    return prevApproachValue;
-                }
-
-                return {
-                    approach,
-                } satisfies EnablingApproachesFormFields;
-            });
-        }, 'enabling_approaches');
+    const setEnablingApproaches = useCallback((getNewValue: (
+        previousValue: EnablingApproachesFormFields[] | undefined,
+    ) => EnablingApproachesFormFields[] | undefined) => {
+        setFieldValue(getNewValue, 'enabling_approaches');
     }, [setFieldValue]);
 
-    const selectedApproaches = value?.enabling_approaches?.map(({ approach }) => approach);
+    const {
+        selectedKeys: selectedApproaches,
+        pendingRemoval: pendingApproachRemoval,
+        handleChecklistChange: handleApproachChecklistChange,
+        handleRemoveClick: handleApproachRemoveClick,
+        handleRemovalCancel: handleApproachRemovalCancel,
+        handleRemovalConfirm: handleApproachRemovalConfirm,
+    } = useChecklistFormArray({
+        value: value?.enabling_approaches,
+        keySelector: approachSelector,
+        createItem: createApproach,
+        setValue: setEnablingApproaches,
+        removeValue: onApproachRemove,
+    });
 
     return (
         <TabPage
@@ -207,7 +218,7 @@ function EnablingApproaches(props: Props) {
                             index={index}
                             value={approach}
                             onChange={onApproachChange}
-                            onRemove={onApproachRemove}
+                            onRemove={handleApproachRemoveClick}
                             error={getErrorObject(error?.enabling_approaches)}
                             disabled={disabled}
                             readOnly={readOnly}
@@ -216,6 +227,15 @@ function EnablingApproaches(props: Props) {
                     ))}
                 </ListView>
             </Container>
+            {isDefined(pendingApproachRemoval) && (
+                <ConfirmationModal
+                    message={pendingApproachRemoval.type === 'checklist'
+                        ? strings.enablingApproachUnselectConfirmation
+                        : strings.enablingApproachRemoveConfirmation}
+                    onCancel={handleApproachRemovalCancel}
+                    onConfirm={handleApproachRemovalConfirm}
+                />
+            )}
         </TabPage>
     );
 }
diff --git a/app/src/views/EapSimplifiedForm/PlannedOperations/i18n.json b/app/src/views/EapSimplifiedForm/PlannedOperations/i18n.json
index 81c5bd8b76..69eccbf2b7 100644
--- a/app/src/views/EapSimplifiedForm/PlannedOperations/i18n.json
+++ b/app/src/views/EapSimplifiedForm/PlannedOperations/i18n.json
@@ -4,6 +4,8 @@
         "plannedOperationsTitle": "Planned Operations",
         "plannedOperationsDescription": "Select sectors which are used in this Early Action Protocol.",
         "plannedOperationsTooltipDescription": "In this section the National Society should reflect the sectors they plan to work on and delete the sectors that are not needed. We recommend keeping the plan simple, focus on key deliverables and not on all the steps that need to be taken to reach those deliverables. In the budget template the National Society can be much more specific and list all the activities that the plan to undertake (more details regarding the budget are provided in the ‘Budget’ section.",
+        "plannedOperationsSectorUnselectConfirmation": "Unselecting a sector will delete all the data entered for it. Do you want to continue?",
+        "plannedOperationsSectorRemoveConfirmation": "Removing this sector will delete all the data entered for it. Do you want to continue?",
         "plannedSectionHeading": "Quality Criteria: Planned Operations",
         "eapPlannedSectionHeading": "EAP activation",
         "plannedSectionCriteriaIntroduction1": "National Society aims to implement the early action activities in the lead time, between the trigger and the impact of the event.",
diff --git a/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx b/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
index 8540733ec8..a426312ad3 100644
--- a/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
+++ b/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
@@ -13,7 +13,10 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
-import { listToMap } from '@togglecorp/fujs';
+import {
+    isDefined,
+    listToMap,
+} from '@togglecorp/fujs';
 import {
     type EntriesAsList,
     type Error,
@@ -21,10 +24,12 @@ import {
     useFormArray,
 } from '@togglecorp/toggle-form';
 
+import ConfirmationModal from '#components/domain/ConfirmationModal';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
+import useChecklistFormArray from '#hooks/domain/useChecklistFormArray';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { type GoApiResponse } from '#utils/restRequest';
 
@@ -44,6 +49,14 @@ function sectorKeySelector(option: EapSectorOption) {
     return option.key;
 }
 
+function operationSectorSelector(operation: PlannedOperationFormFields) {
+    return operation.sector;
+}
+
+function createOperation(sector: EapSector) {
+    return { sector } satisfies PlannedOperationFormFields;
+}
+
 interface Props {
     value: PartialSimplifiedEapType;
     error: Error<PartialSimplifiedEapType> | undefined;
@@ -83,28 +96,26 @@ function PlannedOperations(props: Props) {
         setFieldValue,
     );
 
-    const handleOperationChecklistChange = useCallback((sectors: EapSector[] | undefined) => {
-        setFieldValue((previousValue: PlannedOperationFormFields[] | undefined) => {
-            const previousValueMapping = listToMap(
-                previousValue,
-                ({ sector }) => sector,
-            );
-
-            return sectors?.map((sector) => {
-                const prevSectorValue = previousValueMapping?.[sector];
-
-                if (prevSectorValue) {
-                    return prevSectorValue;
-                }
-
-                return {
-                    sector,
-                } satisfies PlannedOperationFormFields;
-            });
-        }, 'planned_operations');
+    const setPlannedOperations = useCallback((getNewValue: (
+        previousValue: PlannedOperationFormFields[] | undefined,
+    ) => PlannedOperationFormFields[] | undefined) => {
+        setFieldValue(getNewValue, 'planned_operations');
     }, [setFieldValue]);
 
-    const selectedSectors = value?.planned_operations?.map(({ sector }) => sector);
+    const {
+        selectedKeys: selectedSectors,
+        pendingRemoval: pendingSectorRemoval,
+        handleChecklistChange: handleOperationChecklistChange,
+        handleRemoveClick: handleOperationRemoveClick,
+        handleRemovalCancel: handleSectorRemovalCancel,
+        handleRemovalConfirm: handleSectorRemovalConfirm,
+    } = useChecklistFormArray({
+        value: value?.planned_operations,
+        keySelector: operationSectorSelector,
+        createItem: createOperation,
+        setValue: setPlannedOperations,
+        removeValue: onOperationRemove,
+    });
 
     return (
         <TabPage
@@ -207,7 +218,7 @@ function PlannedOperations(props: Props) {
                             index={index}
                             value={operation}
                             onChange={onOperationChange}
-                            onRemove={onOperationRemove}
+                            onRemove={handleOperationRemoveClick}
                             error={getErrorObject(error?.planned_operations)}
                             sectorApCodeOption={sectorApCodeOption}
                             disabled={disabled}
@@ -216,6 +227,15 @@ function PlannedOperations(props: Props) {
                     ))}
                 </ListView>
             </Container>
+            {isDefined(pendingSectorRemoval) && (
+                <ConfirmationModal
+                    message={pendingSectorRemoval.type === 'checklist'
+                        ? strings.plannedOperationsSectorUnselectConfirmation
+                        : strings.plannedOperationsSectorRemoveConfirmation}
+                    onCancel={handleSectorRemovalCancel}
+                    onConfirm={handleSectorRemovalConfirm}
+                />
+            )}
         </TabPage>
     );
 }
diff --git a/app/src/views/FlashUpdateDetails/index.tsx b/app/src/views/FlashUpdateDetails/index.tsx
index ef6ae5b7c8..7bee917d04 100644
--- a/app/src/views/FlashUpdateDetails/index.tsx
+++ b/app/src/views/FlashUpdateDetails/index.tsx
@@ -215,7 +215,7 @@ export function Component() {
                                 {flashUpdateResponse.map_files.map((item) => (
                                     <Image
                                         key={item.id}
-                                        src={item.file}
+                                        src={item.file ?? undefined}
                                         size="md"
                                     />
                                 ))}
@@ -236,7 +236,7 @@ export function Component() {
                                     {flashUpdateResponse?.graphics_files?.map((item) => (
                                         <Image
                                             key={item.id}
-                                            src={item.file}
+                                            src={item.file ?? undefined}
                                             caption={item.caption}
                                             size="md"
                                         />

From fa75dfcc601df0d13313d896e6ff90df1cfeaf60 Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Thu, 6 Aug 2026 13:49:33 +0545
Subject: [PATCH 6/9] fix(eap): lock early action timeframe and add
 MultiFileObjectInput

---
 .../EapOperationActivityInput/i18n.json       |   1 +
 .../EapOperationActivityInput/index.tsx       |  27 +-
 .../EapOperationActivityListInput/index.tsx   |  49 ++-
 .../domain/GoMultiFileInput/index.tsx         |   2 +-
 .../domain/MultiFileObjectInput/i18n.json     |  10 +
 .../domain/MultiFileObjectInput/index.tsx     | 321 ++++++++++++++++++
 .../MultiFileObjectInput/styles.module.css    |  31 ++
 .../printable/PrintableFileOutput/index.tsx   |  68 ++++
 .../PrintableFileOutput/styles.module.css     |  24 ++
 app/src/utils/common.ts                       |  23 ++
 app/src/utils/constants.ts                    |   1 +
 app/src/views/EapFullExport/i18n.json         |   8 +-
 app/src/views/EapFullExport/index.tsx         | 125 +++----
 app/src/views/EapFullExport/styles.module.css |   5 -
 .../EapActivationProcess/index.tsx            |  21 +-
 app/src/views/EapFullForm/Meal/i18n.json      |   4 +-
 app/src/views/EapFullForm/Meal/index.tsx      |   3 +-
 .../NationalSocietyCapacity/index.tsx         |   3 +-
 .../Overview/KeyActorsInput/index.tsx         |   2 +-
 .../views/EapFullForm/RiskAnalysis/index.tsx  |  35 +-
 .../SelectionActions/OperationInput/index.tsx |   4 +
 .../EapFullForm/SelectionActions/index.tsx    |  14 +-
 .../views/EapFullForm/TriggerModel/index.tsx  |  33 +-
 app/src/views/EapFullForm/i18n.json           |   2 +-
 app/src/views/EapFullForm/index.tsx           |   6 +-
 app/src/views/EapFullForm/schema.ts           |   2 +-
 app/src/views/EapSimplifiedExport/i18n.json   |   4 -
 .../OperationsInput/index.tsx                 |   4 +
 .../PlannedOperations/index.tsx               |   1 +
 .../EapSimplifiedForm/RiskAnalysis/i18n.json  |   3 +-
 .../EapSimplifiedForm/RiskAnalysis/index.tsx  |  30 +-
 app/src/views/EapSimplifiedForm/index.tsx     |   4 +-
 app/src/views/EapSimplifiedForm/schema.ts     |   2 +-
 app/src/views/EapSummaryExport/i18n.json      |   4 -
 app/src/views/EapSummaryExport/index.tsx      |  22 +-
 go-api                                        |   2 +-
 36 files changed, 736 insertions(+), 164 deletions(-)
 create mode 100644 app/src/components/domain/MultiFileObjectInput/i18n.json
 create mode 100644 app/src/components/domain/MultiFileObjectInput/index.tsx
 create mode 100644 app/src/components/domain/MultiFileObjectInput/styles.module.css
 create mode 100644 app/src/components/printable/PrintableFileOutput/index.tsx
 create mode 100644 app/src/components/printable/PrintableFileOutput/styles.module.css

diff --git a/app/src/components/domain/EapOperationActivityInput/i18n.json b/app/src/components/domain/EapOperationActivityInput/i18n.json
index 8182e70066..82f58179cd 100644
--- a/app/src/components/domain/EapOperationActivityInput/i18n.json
+++ b/app/src/components/domain/EapOperationActivityInput/i18n.json
@@ -3,6 +3,7 @@
     "strings": {
         "operationPriorityActionLabel": "Activities",
         "operationTimeFrameLabel": "Timeframe",
+        "operationTimeFrameLeadTimeHint": "Taken from the lead time in the trigger section. Change it there to update this.",
         "operationTimeValueLabel": "Activity Time Span",
         "operationActivationLabel": "Activation",
         "operationActivationOneLabel": "Activation 1",
diff --git a/app/src/components/domain/EapOperationActivityInput/index.tsx b/app/src/components/domain/EapOperationActivityInput/index.tsx
index 9147c0d8d2..29a91f0559 100644
--- a/app/src/components/domain/EapOperationActivityInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityInput/index.tsx
@@ -15,6 +15,7 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
+import { isDefined } from '@togglecorp/fujs';
 import {
     type ArrayError,
     getErrorObject,
@@ -26,7 +27,10 @@ import {
 
 import { type components } from '#generated/types';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
-import { TIMEFRAME_YEAR } from '#utils/constants';
+import {
+    TIMEFRAME_YEAR,
+    type TimeFrameEnumKey,
+} from '#utils/constants';
 
 import {
     type ActivityInputType,
@@ -62,6 +66,7 @@ interface Props {
     name: ActivityInputType;
     withActivationSelection?: boolean;
     withoutTimeframeSelection?: boolean;
+    leadTimeframeUnit?: TimeFrameEnumKey;
 }
 
 function EapOperationActivityInput(props: Props) {
@@ -76,6 +81,7 @@ function EapOperationActivityInput(props: Props) {
         name,
         withActivationSelection,
         withoutTimeframeSelection,
+        leadTimeframeUnit,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -93,14 +99,20 @@ function EapOperationActivityInput(props: Props) {
         ? getErrorObject(getErrorObject(errorFromProps)?.[value.client_id])
         : undefined;
 
+    const isTimeframeFixedToLeadTime = name === 'early_action_activities'
+        && isDefined(leadTimeframeUnit);
+
     const eapTimeframeOption = useMemo(() => {
-        if (name === 'early_action_activities') {
-            return eap_timeframe?.filter((item) => item.key !== TIMEFRAME_YEAR);
+        if (name !== 'early_action_activities') {
+            return eap_timeframe;
+        }
+        if (isDefined(leadTimeframeUnit)) {
+            return eap_timeframe?.filter((item) => item.key === leadTimeframeUnit);
         }
-        return eap_timeframe;
-    }, [eap_timeframe, name]);
+        return eap_timeframe?.filter((item) => item.key !== TIMEFRAME_YEAR);
+    }, [eap_timeframe, name, leadTimeframeUnit]);
 
-    const eapTimeFrameReadOnly = name === 'readiness_activities';
+    const eapTimeFrameReadOnly = name === 'readiness_activities' || isTimeframeFixedToLeadTime;
 
     const getTimeValueOptions = useCallback(
         (timeframe?: number) => {
@@ -210,6 +222,9 @@ function EapOperationActivityInput(props: Props) {
                                 disabled={disabled}
                                 error={error?.timeframe}
                                 readOnly={readOnly || eapTimeFrameReadOnly}
+                                hint={isTimeframeFixedToLeadTime
+                                    ? strings.operationTimeFrameLeadTimeHint
+                                    : undefined}
                             />
                         )}
                         {!withoutTimeframeSelection && value?.timeframe && (
diff --git a/app/src/components/domain/EapOperationActivityListInput/index.tsx b/app/src/components/domain/EapOperationActivityListInput/index.tsx
index 27aa625316..c103adfbeb 100644
--- a/app/src/components/domain/EapOperationActivityListInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityListInput/index.tsx
@@ -1,5 +1,6 @@
 import {
     useCallback,
+    useEffect,
     useMemo,
 } from 'react';
 import { AddLineIcon } from '@ifrc-go/icons';
@@ -11,6 +12,7 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
+    isDefined,
     isNotDefined,
     randomString,
 } from '@togglecorp/fujs';
@@ -29,7 +31,10 @@ import {
 } from '#components/domain/EapOperationActivityInput/schema';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
-import { TIMEFRAME_YEAR } from '#utils/constants';
+import {
+    TIMEFRAME_YEAR,
+    type TimeFrameEnumKey,
+} from '#utils/constants';
 
 import i18n from './i18n.json';
 
@@ -43,6 +48,7 @@ interface Props<NAME> {
     error: ArrayError<OperationActivityFormFields> | LeafError | undefined;
     withActivationSelection?: boolean;
     withoutTimeframeSelection?: boolean;
+    leadTimeframeUnit?: TimeFrameEnumKey;
 }
 
 function EapOperationActivityListInput<const NAME extends ActivityInputType>(props: Props<NAME>) {
@@ -56,6 +62,7 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
         error,
         withActivationSelection,
         withoutTimeframeSelection,
+        leadTimeframeUnit,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -70,9 +77,12 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
 
     const handleReadinessAddButtonClick = useCallback(
         () => {
-            const timeframeValue = name === 'readiness_activities'
-                ? TIMEFRAME_YEAR
-                : undefined;
+            let timeframeValue: TimeFrameEnumKey | undefined;
+            if (name === 'readiness_activities') {
+                timeframeValue = TIMEFRAME_YEAR;
+            } else if (name === 'early_action_activities') {
+                timeframeValue = leadTimeframeUnit;
+            }
             const newActionItem: OperationActivityFormFields = {
                 client_id: randomString(),
                 timeframe: timeframeValue,
@@ -85,7 +95,35 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
                 name,
             );
         },
-        [onChange, name],
+        [onChange, name, leadTimeframeUnit],
+    );
+    const hasOutdatedTimeframe = name === 'early_action_activities'
+        && isDefined(leadTimeframeUnit)
+        && isDefined(value)
+        && value.some((activity) => activity.timeframe !== leadTimeframeUnit);
+
+    useEffect(
+        () => {
+            if (!hasOutdatedTimeframe) {
+                return;
+            }
+
+            onChange(
+                (oldValue: OperationActivityFormFields[] | undefined) => (
+                    oldValue?.map((activity) => (
+                        activity.timeframe === leadTimeframeUnit
+                            ? activity
+                            : {
+                                ...activity,
+                                timeframe: leadTimeframeUnit,
+                                time_value: undefined,
+                            }
+                    )) ?? []
+                ),
+                name,
+            );
+        },
+        [hasOutdatedTimeframe, leadTimeframeUnit, name, onChange],
     );
 
     const [
@@ -180,6 +218,7 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
                         readOnly={readOnly}
                         withActivationSelection={withActivationSelection}
                         withoutTimeframeSelection={withoutTimeframeSelection}
+                        leadTimeframeUnit={leadTimeframeUnit}
                     />
                 ))}
             </ListView>
diff --git a/app/src/components/domain/GoMultiFileInput/index.tsx b/app/src/components/domain/GoMultiFileInput/index.tsx
index a83f06105c..87c34bc2db 100644
--- a/app/src/components/domain/GoMultiFileInput/index.tsx
+++ b/app/src/components/domain/GoMultiFileInput/index.tsx
@@ -51,7 +51,7 @@ function getFileNameFromUrl(urlString: string | undefined) {
     return splits[splits.length - 1];
 }
 
-type Props<NAME> = Omit<CommonRawFileInputProps<NAME>, 'value'> & {
+export type Props<NAME> = Omit<CommonRawFileInputProps<NAME>, 'value'> & {
     name: NAME;
     clearable?: boolean;
     description?: React.ReactNode;
diff --git a/app/src/components/domain/MultiFileObjectInput/i18n.json b/app/src/components/domain/MultiFileObjectInput/i18n.json
new file mode 100644
index 0000000000..a64b2daa21
--- /dev/null
+++ b/app/src/components/domain/MultiFileObjectInput/i18n.json
@@ -0,0 +1,10 @@
+{
+    "namespace": "multiFileObjectInput",
+    "strings": {
+        "removeFileButtonTitle": "Delete",
+        "imagePreviewFallbackText": "Preview not available",
+        "captionInputPlaceholder": "Enter caption",
+        "acceptedFileFormatsDescription": "Accepted file formats: {fileFormats}",
+        "imageFilesLabel": "Images"
+    }
+}
diff --git a/app/src/components/domain/MultiFileObjectInput/index.tsx b/app/src/components/domain/MultiFileObjectInput/index.tsx
new file mode 100644
index 0000000000..7b4bc28153
--- /dev/null
+++ b/app/src/components/domain/MultiFileObjectInput/index.tsx
@@ -0,0 +1,321 @@
+import {
+    useCallback,
+    useMemo,
+} from 'react';
+import { DeleteBinLineIcon } from '@ifrc-go/icons';
+import {
+    Description,
+    IconButton,
+    Image,
+    InlineLayout,
+    ListView,
+    type NameType,
+    TextInput,
+} from '@ifrc-go/ui';
+import { useTranslation } from '@ifrc-go/ui/hooks';
+import { resolveToString } from '@ifrc-go/ui/utils';
+import {
+    isDefined,
+    isNotDefined,
+    isTruthyString,
+    randomString,
+} from '@togglecorp/fujs';
+import {
+    type ArrayError,
+    getErrorObject,
+    type SetValueArg,
+    useFormArray,
+} from '@togglecorp/toggle-form';
+
+import GoMultiFileInput, { type Props as GoMultiFileInputProps } from '#components/domain/GoMultiFileInput';
+import Link from '#components/Link';
+import NonFieldError from '#components/NonFieldError';
+import {
+    getFileNameFromUrl,
+    isImageFile,
+} from '#utils/common';
+
+import i18n from './i18n.json';
+import styles from './styles.module.css';
+
+function getFileExtension(fileName: string | undefined) {
+    if (isNotDefined(fileName)) {
+        return undefined;
+    }
+
+    const [, extension] = fileName.match(/\.([^.]+)$/) ?? [];
+
+    return extension?.toUpperCase();
+}
+
+type InputValue = {
+    id?: number;
+    client_id: string;
+    caption?: string | null;
+};
+
+type OutputValue = {
+    id?: number;
+    client_id: string;
+    caption?: string;
+};
+
+type Props<N extends NameType> = Omit<GoMultiFileInputProps<N>, 'value' | 'onChange' | 'error'> & {
+    value: InputValue[] | null | undefined;
+    onChange: (value: SetValueArg<OutputValue[] | undefined>, name: N) => void;
+    error: ArrayError<InputValue> | undefined;
+};
+
+function MultiFileObjectInput<const N extends NameType>(props: Props<N>) {
+    const {
+        className,
+        name,
+        value,
+        onChange,
+        error: formError,
+        fileIdToUrlMap,
+        disabled,
+        readOnly,
+        accept,
+        description,
+        ...otherProps
+    } = props;
+
+    const strings = useTranslation(i18n);
+
+    const error = getErrorObject(formError);
+
+    const {
+        setValue: setFieldValue,
+        removeValue,
+    } = useFormArray(name, onChange);
+
+    const fileInputValue = useMemo(() => (
+        value
+            ?.map((fileValue) => fileValue.id)
+            .filter(isDefined)
+    ), [value]);
+
+    const acceptedFileFormatsDescription = useMemo(
+        () => {
+            if (isNotDefined(accept)) {
+                return undefined;
+            }
+
+            const fileFormats = accept
+                .split(',')
+                .map((fileFormat) => fileFormat.trim())
+                .filter(isTruthyString)
+                .map((fileFormat) => (
+                    fileFormat === 'image/*'
+                        ? strings.imageFilesLabel
+                        : fileFormat.replace(/^\./, '').toUpperCase()
+                ));
+
+            if (fileFormats.length === 0) {
+                return undefined;
+            }
+
+            return resolveToString(
+                strings.acceptedFileFormatsDescription,
+                { fileFormats: fileFormats.join(', ') },
+            );
+        },
+        [accept, strings],
+    );
+
+    const handleFileInputChange = useCallback(
+        (newValue: number[] | undefined, inputName: N) => {
+            if (isNotDefined(newValue)) {
+                onChange(undefined, inputName);
+                return;
+            }
+
+            newValue.forEach(
+                (fileId, index) => {
+                    const oldValue = value?.[index];
+
+                    if (isNotDefined(oldValue)) {
+                        setFieldValue(
+                            {
+                                client_id: String(fileId),
+                                id: fileId,
+                            },
+                            index,
+                        );
+                    }
+                },
+            );
+        },
+        [value, setFieldValue, onChange],
+    );
+
+    const handleCaptionChange = useCallback(
+        (newValue: string | undefined, index: number) => {
+            setFieldValue(
+                (prevValue) => {
+                    if (isNotDefined(prevValue)) {
+                        return {
+                            client_id: randomString(),
+                            caption: newValue,
+                        };
+                    }
+
+                    return {
+                        ...prevValue,
+                        caption: newValue,
+                    };
+                },
+                index,
+            );
+        },
+        [setFieldValue],
+    );
+
+    return (
+        <ListView
+            layout="block"
+            className={className}
+            withSpacingOpticalCorrection
+        >
+            <NonFieldError error={error} />
+            <GoMultiFileInput
+                // eslint-disable-next-line react/jsx-props-no-spreading
+                {...otherProps}
+                name={name}
+                value={fileInputValue}
+                onChange={handleFileInputChange}
+                fileIdToUrlMap={fileIdToUrlMap}
+                disabled={disabled}
+                readOnly={readOnly}
+                accept={accept}
+                description={(
+                    <>
+                        {description}
+                        {isDefined(acceptedFileFormatsDescription) && (
+                            <Description
+                                textSize="xs"
+                                className={styles.acceptedFileFormats}
+                            >
+                                {acceptedFileFormatsDescription}
+                            </Description>
+                        )}
+                    </>
+                )}
+                withoutPreview
+            />
+            {isDefined(value) && value.length > 0 && (
+                <ListView
+                    layout="grid"
+                    numPreferredGridColumns={3}
+                    spacing="sm"
+                >
+                    {value.map((fileValue, index) => {
+                        if (isNotDefined(fileValue.id)) {
+                            return null;
+                        }
+
+                        const fileError = getErrorObject(error?.[fileValue.client_id]);
+                        const fileUrl = fileIdToUrlMap?.[fileValue.id];
+                        const fileName = getFileNameFromUrl(fileUrl);
+
+                        // NOTE: only the images get a preview and a caption
+                        if (!isImageFile(fileUrl)) {
+                            const fileExtension = getFileExtension(fileName);
+
+                            return (
+                                <ListView
+                                    key={fileValue.id}
+                                    layout="block"
+                                    spacing="xs"
+                                    withSpacingOpticalCorrection
+                                    withDarkBackground
+                                    withPadding
+                                >
+                                    <InlineLayout
+                                        className={styles.deleteButton}
+                                        after={(
+                                            <IconButton
+                                                name={index}
+                                                onClick={removeValue}
+                                                title={strings.removeFileButtonTitle}
+                                                ariaLabel={strings.removeFileButtonTitle}
+                                                variant="secondary"
+                                                spacing="none"
+                                                disabled={disabled || readOnly}
+                                            >
+                                                <DeleteBinLineIcon />
+                                            </IconButton>
+                                        )}
+                                    />
+                                    <NonFieldError error={fileError} />
+                                    <div className={styles.filePreview}>
+                                        {isDefined(fileExtension) && (
+                                            <div className={styles.fileExtension}>
+                                                {fileExtension}
+                                            </div>
+                                        )}
+                                    </div>
+                                    <Link
+                                        className={styles.fileName}
+                                        href={fileUrl}
+                                        external
+                                        withEllipsizedContent
+                                        withUnderline
+                                    >
+                                        {fileName}
+                                    </Link>
+                                </ListView>
+                            );
+                        }
+
+                        return (
+                            <ListView
+                                key={fileValue.id}
+                                layout="block"
+                                spacing="xs"
+                                withSpacingOpticalCorrection
+                                withDarkBackground
+                                withPadding
+                            >
+                                <InlineLayout
+                                    className={styles.deleteButton}
+                                    after={(
+                                        <IconButton
+                                            name={index}
+                                            onClick={removeValue}
+                                            title={strings.removeFileButtonTitle}
+                                            ariaLabel={strings.removeFileButtonTitle}
+                                            variant="secondary"
+                                            spacing="none"
+                                            disabled={disabled || readOnly}
+                                        >
+                                            <DeleteBinLineIcon />
+                                        </IconButton>
+                                    )}
+                                />
+                                <NonFieldError error={fileError} />
+                                <Image
+                                    alt={strings.imagePreviewFallbackText}
+                                    src={fileUrl}
+                                    size="sm"
+                                />
+                                <TextInput
+                                    name={index}
+                                    value={fileValue.caption}
+                                    onChange={handleCaptionChange}
+                                    error={fileError?.caption}
+                                    placeholder={strings.captionInputPlaceholder}
+                                    disabled={disabled}
+                                    readOnly={readOnly}
+                                />
+                            </ListView>
+                        );
+                    })}
+                </ListView>
+            )}
+        </ListView>
+    );
+}
+
+export default MultiFileObjectInput;
diff --git a/app/src/components/domain/MultiFileObjectInput/styles.module.css b/app/src/components/domain/MultiFileObjectInput/styles.module.css
new file mode 100644
index 0000000000..506faa9813
--- /dev/null
+++ b/app/src/components/domain/MultiFileObjectInput/styles.module.css
@@ -0,0 +1,31 @@
+.delete-button {
+    margin-block-end: -1.5rem;
+}
+
+.file-preview {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background-color: var(--go-ui-color-background);
+    height: 8rem;
+}
+
+.file-extension {
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    color: var(--go-ui-color-gray-60);
+    font-size: var(--go-ui-font-size-2xl);
+    font-weight: var(--go-ui-font-weight-bold);
+    padding-inline: var(--go-ui-spacing-sm);
+}
+
+.file-name {
+    justify-content: center;
+    text-align: center;
+}
+
+.accepted-file-formats {
+    font-style: italic;
+}
diff --git a/app/src/components/printable/PrintableFileOutput/index.tsx b/app/src/components/printable/PrintableFileOutput/index.tsx
new file mode 100644
index 0000000000..c8af15d95f
--- /dev/null
+++ b/app/src/components/printable/PrintableFileOutput/index.tsx
@@ -0,0 +1,68 @@
+import { Image } from '@ifrc-go/ui/printable';
+import {
+    _cs,
+    isNotDefined,
+} from '@togglecorp/fujs';
+
+import Link from '#components/printable/Link';
+import {
+    getFileNameFromUrl,
+    isImageFile,
+} from '#utils/common';
+
+import styles from './styles.module.css';
+
+interface FileType {
+    id: number;
+    file?: string | null;
+    caption?: string | null;
+}
+
+interface Props {
+    className?: string;
+    files: FileType[] | null | undefined;
+}
+
+function PrintableFileOutput(props: Props) {
+    const {
+        className,
+        files,
+    } = props;
+
+    if (isNotDefined(files) || files.length === 0) {
+        return null;
+    }
+
+    const imageFiles = files.filter(({ file }) => isImageFile(file));
+    const otherFiles = files.filter(({ file }) => !isImageFile(file));
+
+    return (
+        <div className={_cs(styles.printableFileOutput, className)}>
+            {imageFiles.length > 0 && (
+                <div className={styles.imageItems}>
+                    {imageFiles.map((imageFile) => (
+                        <Image
+                            key={imageFile.id}
+                            src={imageFile.file}
+                            caption={imageFile.caption}
+                        />
+                    ))}
+                </div>
+            )}
+            {otherFiles.length > 0 && (
+                <div className={styles.fileItems}>
+                    {otherFiles.map((otherFile) => (
+                        <Link
+                            key={otherFile.id}
+                            href={otherFile.file}
+                        >
+                            {getFileNameFromUrl(otherFile.file)}
+                        </Link>
+                    ))}
+                </div>
+            )}
+        </div>
+    );
+}
+
+export default PrintableFileOutput;
diff --git a/app/src/components/printable/PrintableFileOutput/styles.module.css b/app/src/components/printable/PrintableFileOutput/styles.module.css
new file mode 100644
index 0000000000..3cebfeea9a
--- /dev/null
+++ b/app/src/components/printable/PrintableFileOutput/styles.module.css
@@ -0,0 +1,24 @@
+.printable-file-output {
+    display: flex;
+    flex-direction: column;
+    gap: var(--go-ui-spacing-md);
+
+    .image-items {
+        display: flex;
+        align-items: stretch;
+        flex-direction: column;
+        gap: var(--go-ui-width-separator-md);
+
+        > * {
+            flex-basis: 0;
+            flex-grow: 1;
+            min-width: 0;
+        }
+    }
+
+    .file-items {
+        display: flex;
+        flex-direction: column;
+        gap: var(--go-ui-spacing-xs);
+    }
+}
diff --git a/app/src/utils/common.ts b/app/src/utils/common.ts
index d616a228fb..d82d22eb48 100644
--- a/app/src/utils/common.ts
+++ b/app/src/utils/common.ts
@@ -75,6 +75,29 @@ export function joinStrings(
     return values.filter(Boolean).join(separator);
 }
 
+const imageFileExtensions = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'bmp', 'svg', 'avif'];
+
+// NOTE: not using `new URL` here as it throws for the relative urls
+export function getFileNameFromUrl(urlString: string | undefined | null) {
+    if (isNotDefined(urlString)) {
+        return undefined;
+    }
+
+    const [pathname] = urlString.split(/[?#]/);
+    return pathname?.split('/').pop();
+}
+
+export function isImageFile(urlString: string | undefined | null) {
+    const fileName = getFileNameFromUrl(urlString);
+
+    if (isNotDefined(fileName)) {
+        return false;
+    }
+
+    const extension = fileName.split('.').pop()?.toLowerCase();
+    return isTruthyString(extension) && imageFileExtensions.includes(extension);
+}
+
 export function formatSourceLink(value: string | undefined): string | undefined {
     if (
         isNotDefined(value)
diff --git a/app/src/utils/constants.ts b/app/src/utils/constants.ts
index 027cf2b5bf..50227bf29c 100644
--- a/app/src/utils/constants.ts
+++ b/app/src/utils/constants.ts
@@ -248,3 +248,4 @@ export const EAP_STATUS_NS_ADDRESSING_COMMENTS = 30 satisfies EapStatus;
 export const EAP_STATUS_TECHNICALLY_VALIDATED = 40 satisfies EapStatus;
 export const EAP_STATUS_APPROVED = 50 satisfies EapStatus;
 export const EAP_STATUS_PROJECT_AGREEMENT_SIGNED = 60 satisfies EapStatus;
+export const EAP_ACCEPTED_FILE_FORMATS = '.pdf, .docx, .pptx, image/*';
diff --git a/app/src/views/EapFullExport/i18n.json b/app/src/views/EapFullExport/i18n.json
index c6dcb3fe31..379dc059c1 100644
--- a/app/src/views/EapFullExport/i18n.json
+++ b/app/src/views/EapFullExport/i18n.json
@@ -17,15 +17,11 @@
         "nationalLabel": "National",
         "nationalSocietyContactLabel": "National Society Contact",
         "partnerNationalSocietyContactLabel": "Partner National Society Contact",
-        "delegationLabel": "Delegation",
-        "delegationFocalLabel": "IFRC Delegation AA Focal Point",
-        "delegationHeadLabel": "IFRC Head of Delegation",
         "regionalGlobalLabel": "Regional and Global",
         "drefFocalLabel": "DREF Focal Point",
         "regionalFocalLabel":"IFRC Regional AA Focal Point",
         "regionalOpsLabel":"IFRC Regional Ops Manager",
         "regionalHeadLabel":"IFRC Regional Head of DCC",
-        "globalOpsLabel":"IFRC Global Ops Coordinator",
         "stakeholdersHeading":"Stakeholders",
         "workWithGovernmentLabel":"Did you work with the government and other relevant actors in the development of this EAP? *",
         "workWithGovernmentDescription":"Please briefly describe the process",
@@ -66,8 +62,8 @@
         "linkLabel": "Link",
         "descriptionLabel": "Description",
         "titleLabel": "Title",
-        "mealHeading": "Monitoring, Evaluation, Accountability Learning(Meal)",
-        "mealLabel": "Meal",
+        "mealHeading": "Monitoring, Evaluation, Accountability Learning (MEAL)",
+        "mealLabel": "MEAL",
         "nationalSocietyHeading": "National Society Capacity",
         "operationalThematicLabel": "Operational, thematic and administrative capacity",
         "strategiesPlanLabel": "Strategies and plans",
diff --git a/app/src/views/EapFullExport/index.tsx b/app/src/views/EapFullExport/index.tsx
index 03912a14bd..5b77368523 100644
--- a/app/src/views/EapFullExport/index.tsx
+++ b/app/src/views/EapFullExport/index.tsx
@@ -22,6 +22,7 @@ import Link from '#components/printable/Link';
 import PrintableContainer from '#components/printable/PrintableContainer';
 import PrintableDataDisplay from '#components/printable/PrintableDataDisplay';
 import PrintableDescription from '#components/printable/PrintableDescription';
+import PrintableFileOutput from '#components/printable/PrintableFileOutput';
 import PrintableLabel from '#components/printable/PrintableLabel';
 import PrintablePage from '#components/printable/PrintablePage';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
@@ -100,7 +101,7 @@ export function Component() {
         url: '/api/v2/eap/options/',
     });
 
-    const { eap_sector, eap_approach } = useGlobalEnums();
+    const { eap_sector, eap_approach, eap_timeframe } = useGlobalEnums();
 
     const eapSectorTitleMap = listToMap(
         eap_sector,
@@ -114,6 +115,12 @@ export function Component() {
         ({ value }) => value,
     );
 
+    const eapTimeframeTitleMap = listToMap(
+        eap_timeframe,
+        ({ key }) => key,
+        ({ value }) => value,
+    );
+
     const {
         disaster_type_details,
         country_details,
@@ -146,6 +153,7 @@ export function Component() {
         trigger_statement,
         trigger_statement_source_of_information,
         lead_time,
+        lead_timeframe_unit,
         forecast_selection,
         forecast_selection_files,
         forecast_table_file_details,
@@ -219,6 +227,7 @@ export function Component() {
         trigger_statement_source_of_information:
         prev_trigger_statement_source_of_information,
         lead_time: prev_lead_time,
+        lead_timeframe_unit: prev_lead_timeframe_unit,
         forecast_selection: prev_forecast_selection,
         definition_and_justification_impact_level:
         prev_definition_and_justification_impact_level,
@@ -343,6 +352,22 @@ export function Component() {
         [prev_early_actions],
     );
 
+    const leadTimeUnitLabel = lead_timeframe_unit
+        ? eapTimeframeTitleMap?.[lead_timeframe_unit]
+        : undefined;
+
+    const leadTimeWithUnit = lead_time && leadTimeUnitLabel
+        ? `${lead_time} ${leadTimeUnitLabel}`
+        : lead_time;
+
+    const prevLeadTimeUnitLabel = prev_lead_timeframe_unit
+        ? eapTimeframeTitleMap?.[prev_lead_timeframe_unit]
+        : undefined;
+
+    const prevLeadTimeWithUnit = prev_lead_time && prevLeadTimeUnitLabel
+        ? `${prev_lead_time} ${prevLeadTimeUnitLabel}`
+        : prev_lead_time;
+
     const previewReady = !eapRegistrationPending && !fullEapPending && !prevFullEapPending;
 
     // NOTE: We render Table of Content after preview is ready so adding additional delay
@@ -767,9 +792,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer headingLevel={3}>
-                    {hazard_selection_files?.map((hazard) => (
-                        <Image key={hazard.id} src={hazard.file} caption={hazard.caption} />
-                    ))}
+                    <PrintableFileOutput
+                        files={hazard_selection_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer
                     heading={strings.exposedElementsLabel}
@@ -782,15 +807,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer headingLevel={3}>
-                    <div className={styles.imageItems}>
-                        {exposed_element_and_vulnerability_factor_files?.map((element) => (
-                            <Image
-                                key={element.id}
-                                src={element.file}
-                                caption={element.caption}
-                            />
-                        ))}
-                    </div>
+                    <PrintableFileOutput
+                        files={exposed_element_and_vulnerability_factor_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer
                     heading={strings.prioritizedImpactHeading}
@@ -827,15 +846,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer>
-                    <div className={styles.imageItems}>
-                        {prioritized_impact_files?.map((element) => (
-                            <Image
-                                key={element.id}
-                                src={element.file}
-                                caption={element.caption}
-                            />
-                        ))}
-                    </div>
+                    <PrintableFileOutput
+                        files={prioritized_impact_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer
                     heading={strings.sourceInformationLabel}
@@ -910,9 +923,9 @@ export function Component() {
                     <ListView layout="grid">
                         <PrintableDataDisplay
                             label={strings.leadTimeLabel}
-                            value={lead_time}
-                            prevValue={prev_lead_time}
-                            valueType="number"
+                            value={leadTimeWithUnit}
+                            prevValue={prevLeadTimeWithUnit}
+                            valueType="text"
                             variant="block"
                             withBackground
                             withPadding
@@ -975,15 +988,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer>
-                    <div className={styles.imageItems}>
-                        {forecast_selection_files?.map((element) => (
-                            <Image
-                                key={element.id}
-                                src={element.file}
-                                caption={element.caption}
-                            />
-                        ))}
-                    </div>
+                    <PrintableFileOutput
+                        files={forecast_selection_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer>
                     <Link href={forecast_table_file_details?.file}>
@@ -1001,17 +1008,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer>
-                    <div className={styles.imageItems}>
-                        {definition_and_justification_impact_level_files?.map(
-                            (element) => (
-                                <Image
-                                    key={element.id}
-                                    src={element.file}
-                                    caption={element.caption}
-                                />
-                            ),
-                        )}
-                    </div>
+                    <PrintableFileOutput
+                        files={definition_and_justification_impact_level_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer
                     heading={strings.identificationInterventionLabel}
@@ -1024,15 +1023,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer>
-                    <div className={styles.imageItems}>
-                        {identification_of_the_intervention_area_files?.map((element) => (
-                            <Image
-                                key={element.id}
-                                src={element.file}
-                                caption={element.caption}
-                            />
-                        ))}
-                    </div>
+                    <PrintableFileOutput
+                        files={identification_of_the_intervention_area_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer
                     heading={strings.sourceInformationLabel}
@@ -1127,11 +1120,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer>
-                    <div className={styles.imageItems}>
-                        {early_action_selection_process_files?.map((element) => (
-                            <Image src={element.file} caption={element.caption} />
-                        ))}
-                    </div>
+                    <PrintableFileOutput
+                        files={early_action_selection_process_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer>
                     <Link href={theory_of_change_table_file_details?.file}>
@@ -1601,11 +1592,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer>
-                    <div className={styles.imageItems}>
-                        {early_action_implementation_files?.map((element) => (
-                            <Image src={element.file} caption={element.caption} />
-                        ))}
-                    </div>
+                    <PrintableFileOutput
+                        files={early_action_implementation_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer
                     heading={strings.triggerActivationLabel}
@@ -1626,11 +1615,9 @@ export function Component() {
                     />
                 </PrintableContainer>
                 <PrintableContainer headingLevel={3}>
-                    <div className={styles.imageItems}>
-                        {trigger_activation_system_files?.map((element) => (
-                            <Image src={element.file} caption={element.caption} />
-                        ))}
-                    </div>
+                    <PrintableFileOutput
+                        files={trigger_activation_system_files}
+                    />
                 </PrintableContainer>
                 <PrintableContainer headingLevel={3}>
                     <ListView layout="grid">
diff --git a/app/src/views/EapFullExport/styles.module.css b/app/src/views/EapFullExport/styles.module.css
index 4c77bdb54f..cd413986c8 100644
--- a/app/src/views/EapFullExport/styles.module.css
+++ b/app/src/views/EapFullExport/styles.module.css
@@ -23,11 +23,6 @@
     grid-template-columns: 2fr 1fr;
 }
 
-.image-items {
-    display: flex;
-    gap: var(--go-ui-width-separator-md);
-}
-
 .sources {
     display: flex;
     gap: var(--go-ui-spacing-md);
diff --git a/app/src/views/EapFullForm/EapActivationProcess/index.tsx b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
index 5464a130d5..35e06fd4d2 100644
--- a/app/src/views/EapFullForm/EapActivationProcess/index.tsx
+++ b/app/src/views/EapFullForm/EapActivationProcess/index.tsx
@@ -21,10 +21,11 @@ import {
 } from '@togglecorp/toggle-form';
 
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
-import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import MultiFileObjectInput from '#components/domain/MultiFileObjectInput';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
+import { EAP_ACCEPTED_FILE_FORMATS } from '#utils/constants';
 
 import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
@@ -207,19 +208,21 @@ function EapActivationProcess(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.early_action_implementation_process}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="early_action_implementation_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.early_action_implementation_files}
                             onChange={setFieldValue}
                             error={getErrorObject(error?.early_action_implementation_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.activationSelectFilesLabel}
                             description={strings.activationFilesCountLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                        />
+                        >
+                            {strings.activationSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         withAsteriskOnTitle
@@ -279,19 +282,21 @@ function EapActivationProcess(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.trigger_activation_system}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="trigger_activation_system_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.trigger_activation_system_files}
                             onChange={setFieldValue}
                             error={getErrorObject(error?.trigger_activation_system_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.activationSelectFilesLabel}
                             description={strings.activationFilesCountLabel}
                             disabled={disabled}
                             readOnly={readOnly}
-                        />
+                        >
+                            {strings.activationSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.activationPeopleTargetedTitle}
@@ -425,7 +430,7 @@ function EapActivationProcess(props: Props) {
                     >
                         <GoMultiFileInput
                             name="activation_process_relevant_files"
-                            accept=".pdf, .docx, .pptx, image/*"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/Meal/i18n.json b/app/src/views/EapFullForm/Meal/i18n.json
index 96bbe00615..9161601672 100644
--- a/app/src/views/EapFullForm/Meal/i18n.json
+++ b/app/src/views/EapFullForm/Meal/i18n.json
@@ -1,7 +1,7 @@
 {
     "namespace": "eapFullForm",
     "strings": {
-        "mealHeading": "Monitoring, Evaluation, Accountability Learning (Meal)",
+        "mealHeading": "Monitoring, Evaluation, Accountability Learning (MEAL)",
         "mealTitle": "MEAL",
         "mealDescription1": "Following the guidance of the Anticipatory Action Manual, describe the M&E plan for this EAP. Including:",
         "mealDescription11": "EAP Monitoring (between the trigger moment and the implementation of the actions)",
@@ -17,7 +17,7 @@
         "mealAttachRelevantFilesTitle": "Attach relevant files",
         "mealAttachRelevantFilesDescription": "Attach any additional maps, documentation, files, images, etc.",
         "mealAttachRelevantFilesUploadLabel": "Upload",
-        "mealSectionHeading": "Quality Criteria: Meal",
+        "mealSectionHeading": "Quality Criteria: MEAL",
         "mealCriteriaIntroduction1": "The EAP includes an M&E plan to",
         "mealCriteriaIntroduction11": "assess the impact of the early actions and the extreme event after each activation and",
         "mealCriteriaIntroduction12": "identify if all activities were carried out as planned and document how early actions were implemented",
diff --git a/app/src/views/EapFullForm/Meal/index.tsx b/app/src/views/EapFullForm/Meal/index.tsx
index a25b2e678b..c2201f56d9 100644
--- a/app/src/views/EapFullForm/Meal/index.tsx
+++ b/app/src/views/EapFullForm/Meal/index.tsx
@@ -23,6 +23,7 @@ import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
+import { EAP_ACCEPTED_FILE_FORMATS } from '#utils/constants';
 
 import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
@@ -182,7 +183,7 @@ function Meal(props: Props) {
                     >
                         <GoMultiFileInput
                             name="meal_relevant_files"
-                            accept=".pdf, .docx, .pptx, image/*"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx b/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
index ebd51c3813..1e19d61b86 100644
--- a/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
+++ b/app/src/views/EapFullForm/NationalSocietyCapacity/index.tsx
@@ -23,6 +23,7 @@ import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
+import { EAP_ACCEPTED_FILE_FORMATS } from '#utils/constants';
 
 import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
@@ -213,7 +214,7 @@ function NationalSocietyCapacity(props: Props) {
                     >
                         <GoMultiFileInput
                             name="capacity_relevant_files"
-                            accept=".pdf, .docx, .pptx, image/*"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
index ab9aeec6ae..e7b41e7cff 100644
--- a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
+++ b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
@@ -102,7 +102,7 @@ function KeyActorsInput(props: Props) {
                         value={value?.description}
                         onChange={onFieldChange}
                         required
-                        maxLength={wordLimits.key_actors}
+                        maxWords={wordLimits.key_actors}
                         readOnly={readOnly}
                     />
                 </ListView>
diff --git a/app/src/views/EapFullForm/RiskAnalysis/index.tsx b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
index c9fe73d0bd..be996e2d5a 100644
--- a/app/src/views/EapFullForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapFullForm/RiskAnalysis/index.tsx
@@ -23,10 +23,11 @@ import {
 } from '@togglecorp/toggle-form';
 
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
-import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import MultiFileObjectInput from '#components/domain/MultiFileObjectInput';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
+import { EAP_ACCEPTED_FILE_FORMATS } from '#utils/constants';
 
 import { wordLimits } from '../common';
 import EAPSourceInformationInput, { type SourceInformationFormFields } from '../EAPSourceInformationInput';
@@ -271,19 +272,21 @@ function RiskAnalysis(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.hazard_selection}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="hazard_selection_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.hazard_selection_files}
                             onChange={setFieldValue}
                             error={getErrorObject(error?.hazard_selection_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.attachFilesSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                             description={strings.riskAnalysisFileCountLabel}
-                        />
+                        >
+                            {strings.attachFilesSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.exposeElementTitle}
@@ -347,19 +350,23 @@ function RiskAnalysis(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.exposed_element_and_vulnerability_factor}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="exposed_element_and_vulnerability_factor_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.exposed_element_and_vulnerability_factor_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.hazard_selection_files)}
+                            error={getErrorObject(
+                                error?.exposed_element_and_vulnerability_factor_files,
+                            )}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.attachFilesSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                             description={strings.riskAnalysisFileCountLabel}
-                        />
+                        >
+                            {strings.attachFilesSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.prioritisedImpactTitle}
@@ -431,19 +438,21 @@ function RiskAnalysis(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.prioritized_impact}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="prioritized_impact_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.prioritized_impact_files}
                             onChange={setFieldValue}
-                            error={getErrorObject(error?.hazard_selection_files)}
+                            error={getErrorObject(error?.prioritized_impact_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.attachFilesSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                             description={strings.riskAnalysisFileCountLabel}
-                        />
+                        >
+                            {strings.attachFilesSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.attachFilesTitle}
@@ -451,7 +460,7 @@ function RiskAnalysis(props: Props) {
                     >
                         <GoMultiFileInput
                             name="risk_analysis_relevant_files"
-                            accept=".pdf, .docx, .pptx, image/*"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx b/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
index 53c7f8d423..7347eec09d 100644
--- a/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/OperationInput/index.tsx
@@ -17,6 +17,7 @@ import {
 
 import EapIndicatorListInput from '#components/domain/EapIndicatorListInput';
 import EapOperationActivityListInput from '#components/domain/EapOperationActivityListInput';
+import { type TimeFrameEnumKey } from '#utils/constants';
 import { type GoApiResponse } from '#utils/restRequest';
 
 import { type PartialEapFullFormType } from '../../schema';
@@ -46,6 +47,7 @@ interface Props {
     operationTitle?: React.ReactNode;
     readOnly?: boolean;
     sectorApCodeOption?: EapSectorApCodeOption;
+    leadTimeframeUnit?: TimeFrameEnumKey;
 }
 
 function OperationsInput(props: Props) {
@@ -59,6 +61,7 @@ function OperationsInput(props: Props) {
         operationTitle,
         readOnly,
         sectorApCodeOption,
+        leadTimeframeUnit,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -157,6 +160,7 @@ function OperationsInput(props: Props) {
                         readOnly={readOnly}
                         error={getErrorObject(error)?.early_action_activities}
                         withActivationSelection
+                        leadTimeframeUnit={leadTimeframeUnit}
                     />
                 </ListView>
             </ListView>
diff --git a/app/src/views/EapFullForm/SelectionActions/index.tsx b/app/src/views/EapFullForm/SelectionActions/index.tsx
index 722b16cad4..73029f0943 100644
--- a/app/src/views/EapFullForm/SelectionActions/index.tsx
+++ b/app/src/views/EapFullForm/SelectionActions/index.tsx
@@ -32,7 +32,7 @@ import {
 import ConfirmationModal from '#components/domain/ConfirmationModal';
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
-import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import MultiFileObjectInput from '#components/domain/MultiFileObjectInput';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
@@ -40,6 +40,7 @@ import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
 import useChecklistFormArray from '#hooks/domain/useChecklistFormArray';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
+import { EAP_ACCEPTED_FILE_FORMATS } from '#utils/constants';
 import { useRequest } from '#utils/restRequest';
 
 import { wordLimits } from '../common';
@@ -435,19 +436,21 @@ function SelectionActions(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.early_action_selection_process}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="early_action_selection_process_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.early_action_selection_process_files}
                             onChange={setFieldValue}
                             error={getErrorObject(error?.early_action_selection_process_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.selectionActionSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                             description={strings.selectionActionFilesCountLabel}
-                        />
+                        >
+                            {strings.selectionActionSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.theoryOfChangeTableTitle}
@@ -523,7 +526,7 @@ function SelectionActions(props: Props) {
                     >
                         <GoMultiFileInput
                             name="evidence_base_relevant_files"
-                            accept=".pdf, .docx, .pptx, image/*"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
@@ -607,6 +610,7 @@ function SelectionActions(props: Props) {
                             disabled={disabled}
                             readOnly={readOnly}
                             sectorApCodeOption={apCodeOptions?.sector_ap_codes}
+                            leadTimeframeUnit={value?.lead_timeframe_unit}
                         />
                     ))}
                     <InputSection
diff --git a/app/src/views/EapFullForm/TriggerModel/index.tsx b/app/src/views/EapFullForm/TriggerModel/index.tsx
index 425e83c6c5..47946bf36a 100644
--- a/app/src/views/EapFullForm/TriggerModel/index.tsx
+++ b/app/src/views/EapFullForm/TriggerModel/index.tsx
@@ -7,9 +7,9 @@ import {
     InputSection,
     Label,
     ListView,
-    NumberInput,
     SelectInput,
     TextArea,
+    TextInput,
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { stringValueSelector } from '@ifrc-go/ui/utils';
@@ -28,13 +28,14 @@ import {
 import Admin2Input from '#components/domain/Admin2Input';
 import GoMultiFileInput from '#components/domain/GoMultiFileInput';
 import GoSingleFileInput from '#components/domain/GoSingleFileInput';
-import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import MultiFileObjectInput from '#components/domain/MultiFileObjectInput';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import NonFieldError from '#components/NonFieldError';
 import TabPage from '#components/TabPage';
 import { type components } from '#generated/types';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
+import { EAP_ACCEPTED_FILE_FORMATS } from '#utils/constants';
 import {
     type GoApiResponse,
     useRequest,
@@ -285,7 +286,7 @@ function TriggerModel(props: Props) {
                         withAsteriskOnTitle
                         numPreferredColumns={2}
                     >
-                        <NumberInput
+                        <TextInput
                             required
                             name="lead_time"
                             value={value?.lead_time}
@@ -385,19 +386,21 @@ function TriggerModel(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.forecast_selection}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="forecast_selection_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.forecast_selection_files}
                             onChange={setFieldValue}
                             error={getErrorObject(error?.forecast_selection_files)}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.triggerSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                             description={strings.triggerModelFileCountLabel}
-                        />
+                        >
+                            {strings.triggerSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.forecastTableDetails}
@@ -486,21 +489,23 @@ function TriggerModel(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.definition_and_justification_impact_level}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="definition_and_justification_impact_level_files"
                             url="/api/v2/eap-file/multiple/"
                             value={value?.definition_and_justification_impact_level_files}
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             onChange={setFieldValue}
                             error={getErrorObject(
                                 error?.definition_and_justification_impact_level_files,
                             )}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.triggerSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                             description={strings.triggerModelFileCountLabel}
-                        />
+                        >
+                            {strings.triggerSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.identificationInterventionTitle}
@@ -560,21 +565,23 @@ function TriggerModel(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.identification_of_the_intervention_area}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="identification_of_the_intervention_area_files"
                             url="/api/v2/eap-file/multiple/"
                             value={value?.identification_of_the_intervention_area_files}
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             onChange={setFieldValue}
                             error={getErrorObject(
                                 error?.identification_of_the_intervention_area_files,
                             )}
                             fileIdToUrlMap={fileIdToUrlMap}
                             setFileIdToUrlMap={setFileIdToUrlMap}
-                            label={strings.triggerSelectFilesLabel}
                             disabled={disabled}
                             readOnly={readOnly}
                             description={strings.triggerModelFileCountLabel}
-                        />
+                        >
+                            {strings.triggerSelectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.selectRegionTitle}
@@ -598,7 +605,7 @@ function TriggerModel(props: Props) {
                     >
                         <GoMultiFileInput
                             name="trigger_model_relevant_files"
-                            accept=".pdf, .docx, .pptx, image/*"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             fileIdToUrlMap={fileIdToUrlMap}
                             onChange={setFieldValue}
                             url="/api/v2/eap-file/multiple/"
diff --git a/app/src/views/EapFullForm/i18n.json b/app/src/views/EapFullForm/i18n.json
index 894d55ab14..773f70651a 100644
--- a/app/src/views/EapFullForm/i18n.json
+++ b/app/src/views/EapFullForm/i18n.json
@@ -8,7 +8,7 @@
         "triggerModelTabLabel": "Trigger Model",
         "selectionActionsTabLabel": "Selection of Actions",
         "activationProcessTabLabel": "EAP Activation Process",
-        "mealTabLabel": "Meal",
+        "mealTabLabel": "MEAL",
         "nationalSocietyCapacityTabLabel": "National Society Capacity",
         "financeLogisticsTabLabel": "Finance and Logistics",
         "backButton": "Back",
diff --git a/app/src/views/EapFullForm/index.tsx b/app/src/views/EapFullForm/index.tsx
index a02ea101e2..099431ba0e 100644
--- a/app/src/views/EapFullForm/index.tsx
+++ b/app/src/views/EapFullForm/index.tsx
@@ -112,7 +112,9 @@ function getNextStep(current: TabKeys, direction: 1 | -1) {
     return tabKeyList[currentIndex + direction];
 }
 
-const defaultFormValue: PartialEapFullFormType = {};
+const defaultFormValue: PartialEapFullFormType = {
+    include_rcrc_climate_center: false,
+};
 
 // eslint-disable-next-line import/prefer-default-export
 export function Component() {
@@ -207,6 +209,7 @@ export function Component() {
                 forecast_table_file_details,
                 updated_checklist_file_details,
                 theory_of_change_table_file_details,
+                risk_analysis_relevant_files_details,
             } = response;
             return {
                 ...prevMap,
@@ -222,6 +225,7 @@ export function Component() {
                         ...(definition_and_justification_impact_level_files ?? []),
                         ...(prioritized_impact_files ?? []),
                         ...(early_action_implementation_files ?? []),
+                        ...(risk_analysis_relevant_files_details ?? []),
                         budget_file_details,
                         forecast_table_file_details,
                         updated_checklist_file_details,
diff --git a/app/src/views/EapFullForm/schema.ts b/app/src/views/EapFullForm/schema.ts
index 7818a770f7..6b7018a03d 100644
--- a/app/src/views/EapFullForm/schema.ts
+++ b/app/src/views/EapFullForm/schema.ts
@@ -612,7 +612,7 @@ export const formSchema: EapFullFormSchema = {
             partners: {
                 required: isSubmit,
             },
-            include_rcrc_climate_center: {},
+            include_rcrc_climate_center: { defaultValue: false },
             partner_contacts: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
diff --git a/app/src/views/EapSimplifiedExport/i18n.json b/app/src/views/EapSimplifiedExport/i18n.json
index 8872b438f9..add6b58988 100644
--- a/app/src/views/EapSimplifiedExport/i18n.json
+++ b/app/src/views/EapSimplifiedExport/i18n.json
@@ -37,15 +37,11 @@
         "nationalHeading": "National",
         "nationalSocietyContactHeading": "National Society Contact",
         "partnerNationalSocietyContactHeading": "Partner National Society Contact",
-        "delegationHeading": "Delegation",
-        "delegationFocalPointLabel": "IFRC Delegation AA Focal Point",
-        "delegationHeadLabel": "IFRC Head of Delegation",
         "regionalGlobalHeading": "Regional & global",
         "drefFocalPointLabel": "DREF Focal Point",
         "regionalFocalPointLabel": "IFRC Regional AA Focal Point",
         "regionalOpsManager": "IFRC Regional Ops Manager",
         "regionalHeadLabel": "IFRC Regional Head of DCC",
-        "globalOpsCoordinator": "IFRC Global Ops Coordinator",
         "enablingApproachesLabel": "Enabling Approaches",
         "conditionsToDeliverHeading": "Conditions to deliver the Early Action",
         "earlyActionCapacityHeading": "Experience and/or capacity to implement the early actions",
diff --git a/app/src/views/EapSimplifiedForm/PlannedOperations/OperationsInput/index.tsx b/app/src/views/EapSimplifiedForm/PlannedOperations/OperationsInput/index.tsx
index 9ce2a3fd86..4ae8ecab06 100644
--- a/app/src/views/EapSimplifiedForm/PlannedOperations/OperationsInput/index.tsx
+++ b/app/src/views/EapSimplifiedForm/PlannedOperations/OperationsInput/index.tsx
@@ -17,6 +17,7 @@ import {
 
 import EapIndicatorListInput from '#components/domain/EapIndicatorListInput';
 import EapOperationActivityListInput from '#components/domain/EapOperationActivityListInput';
+import { type TimeFrameEnumKey } from '#utils/constants';
 import { type GoApiResponse } from '#utils/restRequest';
 
 import { type PartialSimplifiedEapType } from '../../schema';
@@ -41,6 +42,7 @@ interface Props {
     operationTitle?: React.ReactNode;
     readOnly?: boolean;
     sectorApCodeOption?: EapSectorApCodeOption;
+    leadTimeframeUnit?: TimeFrameEnumKey;
 }
 
 function OperationsBySectorInput(props: Props) {
@@ -54,6 +56,7 @@ function OperationsBySectorInput(props: Props) {
         operationTitle,
         readOnly,
         sectorApCodeOption,
+        leadTimeframeUnit,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -149,6 +152,7 @@ function OperationsBySectorInput(props: Props) {
                         onChange={onFieldChange}
                         readOnly={readOnly}
                         error={getErrorObject(error)?.early_action_activities}
+                        leadTimeframeUnit={leadTimeframeUnit}
                     />
                 </ListView>
             </ListView>
diff --git a/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx b/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
index a426312ad3..1d5327942d 100644
--- a/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
+++ b/app/src/views/EapSimplifiedForm/PlannedOperations/index.tsx
@@ -223,6 +223,7 @@ function PlannedOperations(props: Props) {
                             sectorApCodeOption={sectorApCodeOption}
                             disabled={disabled}
                             readOnly={readOnly}
+                            leadTimeframeUnit={value?.seap_lead_timeframe_unit}
                         />
                     ))}
                 </ListView>
diff --git a/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json b/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
index 19c53a8714..95239105c1 100644
--- a/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
+++ b/app/src/views/EapSimplifiedForm/RiskAnalysis/i18n.json
@@ -9,7 +9,8 @@
         "reliefwebLink": "reliefweb",
         "desinventarLink": "Desinventar",
         "eMdATLink": "EM-DAT",
-        "uploadImageLabel": "Upload upto 5 images (optional)",
+        "uploadFileLabel": "Upload upto 5 files (optional)",
+        "selectFilesLabel": "Select files",
         "idmcLink": "Internal Displacement Monitoring Centre",
         "historicalImpact": "Prioritized hazard and its historical impact",
         "riskDescriptionLabel": "Description",
diff --git a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
index 39c4fba2f8..86adb44de5 100644
--- a/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
+++ b/app/src/views/EapSimplifiedForm/RiskAnalysis/index.tsx
@@ -15,10 +15,11 @@ import {
     getErrorObject,
 } from '@togglecorp/toggle-form';
 
-import MultiImageWithCaptionInput from '#components/domain/MultiImageWithCaptionInput';
+import MultiFileObjectInput from '#components/domain/MultiFileObjectInput';
 import ExplanatoryNote from '#components/ExplanatoryNote';
 import Link from '#components/Link';
 import TabPage from '#components/TabPage';
+import { EAP_ACCEPTED_FILE_FORMATS } from '#utils/constants';
 
 import { wordLimits } from '../common';
 import GuidanceSeap from '../GuidanceSeap';
@@ -210,9 +211,10 @@ function RiskAnalysis(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.prioritized_hazard_and_impact}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="hazard_impact_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.hazard_impact_files}
                             onChange={setFieldValue}
                             error={getErrorObject(error?.hazard_impact_files)}
@@ -220,8 +222,10 @@ function RiskAnalysis(props: Props) {
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.uploadImageLabel}
-                        />
+                            description={strings.uploadFileLabel}
+                        >
+                            {strings.selectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                     <InputSection
                         title={strings.riskProtocol}
@@ -238,9 +242,10 @@ function RiskAnalysis(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.risks_selected_protocols}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="risk_selected_protocols_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.risk_selected_protocols_files}
                             onChange={setFieldValue}
                             error={getErrorObject(error?.risk_selected_protocols_files)}
@@ -248,8 +253,10 @@ function RiskAnalysis(props: Props) {
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.uploadImageLabel}
-                        />
+                            description={strings.uploadFileLabel}
+                        >
+                            {strings.selectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                 </ListView>
             </Container>
@@ -329,9 +336,10 @@ function RiskAnalysis(props: Props) {
                             readOnly={readOnly}
                             maxWords={wordLimits.selected_early_actions}
                         />
-                        <MultiImageWithCaptionInput
+                        <MultiFileObjectInput
                             name="selected_early_actions_files"
                             url="/api/v2/eap-file/multiple/"
+                            accept={EAP_ACCEPTED_FILE_FORMATS}
                             value={value?.selected_early_actions_files}
                             onChange={setFieldValue}
                             error={getErrorObject(error?.selected_early_actions_files)}
@@ -339,8 +347,10 @@ function RiskAnalysis(props: Props) {
                             setFileIdToUrlMap={setFileIdToUrlMap}
                             disabled={disabled}
                             readOnly={readOnly}
-                            description={strings.uploadImageLabel}
-                        />
+                            description={strings.uploadFileLabel}
+                        >
+                            {strings.selectFilesLabel}
+                        </MultiFileObjectInput>
                     </InputSection>
                 </ListView>
             </Container>
diff --git a/app/src/views/EapSimplifiedForm/index.tsx b/app/src/views/EapSimplifiedForm/index.tsx
index 8c3e315c15..f14a13fed5 100644
--- a/app/src/views/EapSimplifiedForm/index.tsx
+++ b/app/src/views/EapSimplifiedForm/index.tsx
@@ -113,7 +113,9 @@ function getNextStep(current: TabKeys, direction: 1 | -1) {
     return tabKeyList[currentIndex + direction];
 }
 
-const defaultFormValue: PartialSimplifiedEapType = {};
+const defaultFormValue: PartialSimplifiedEapType = {
+    include_rcrc_climate_center: false,
+};
 
 // eslint-disable-next-line import/prefer-default-export
 export function Component() {
diff --git a/app/src/views/EapSimplifiedForm/schema.ts b/app/src/views/EapSimplifiedForm/schema.ts
index 5f0b4c8502..81e5cfbe96 100644
--- a/app/src/views/EapSimplifiedForm/schema.ts
+++ b/app/src/views/EapSimplifiedForm/schema.ts
@@ -333,7 +333,7 @@ export const formSchema: FormSchema = {
             partners: {
                 required: isSubmit,
             },
-            include_rcrc_climate_center: {},
+            include_rcrc_climate_center: { defaultValue: false },
             partner_contacts: {
                 keySelector: (item) => item.client_id,
                 member: () => ({
diff --git a/app/src/views/EapSummaryExport/i18n.json b/app/src/views/EapSummaryExport/i18n.json
index aaa4e2f8c2..0f0fa1fb2b 100644
--- a/app/src/views/EapSummaryExport/i18n.json
+++ b/app/src/views/EapSummaryExport/i18n.json
@@ -12,15 +12,11 @@
         "nationalLabel": "National",
         "nationalSocietyContactLabel": "National Society Contact",
         "partnerNationalSocietyContactLabel": "Partner National Society Contact",
-        "delegationLabel": "Delegation",
-        "delegationFocalLabel": "IFRC Delegation AA Focal Point",
-        "delegationHeadLabel": "IFRC Head of Delegation",
         "regionalGlobalLabel": "Regional and Global",
         "drefFocalLabel": "DREF Focal Point",
         "regionalFocalLabel":"IFRC Regional AA Focal Point",
         "regionalOpsLabel":"IFRC Regional Ops Manager",
         "regionalHeadLabel":"IFRC Regional Head of DCC",
-        "globalOpsLabel":"IFRC Global Ops Coordinator",
         "plannedOperationsHeading": "Planned Operations",
         "operationBudgetLabel": "Budget",
         "operationPeopleTargetedLabel": "No. people targeted",
diff --git a/app/src/views/EapSummaryExport/index.tsx b/app/src/views/EapSummaryExport/index.tsx
index 1398c52848..d830ca1739 100644
--- a/app/src/views/EapSummaryExport/index.tsx
+++ b/app/src/views/EapSummaryExport/index.tsx
@@ -41,7 +41,7 @@ export function Component() {
 
     const version = searchParams.get('version') ?? undefined;
 
-    const { eap_sector, eap_approach } = useGlobalEnums();
+    const { eap_sector, eap_approach, eap_timeframe } = useGlobalEnums();
 
     const { pending: eapRegistrationPending, response: eapRegistrationResponse } = useRequest({
         skip: isFalsyString(eapId),
@@ -90,6 +90,7 @@ export function Component() {
 
         admin2_details,
         lead_time,
+        lead_timeframe_unit,
         planned_operations,
         enabling_approaches,
 
@@ -116,6 +117,21 @@ export function Component() {
         ({ value }) => value,
     );
 
+    const eapTimeframeTitleMap = listToMap(
+        eap_timeframe,
+        ({ key }) => key,
+        ({ value }) => value,
+    );
+
+    const leadTimeWithUnit = [
+        lead_time,
+        isDefined(lead_timeframe_unit)
+            ? eapTimeframeTitleMap?.[lead_timeframe_unit]
+            : undefined,
+    ]
+        .filter(isTruthyString)
+        .join(' ');
+
     return (
         <PrintablePage
             mainRef={mainRef}
@@ -147,8 +163,8 @@ export function Component() {
                         />
                         <PrintableDataDisplay
                             label={strings.eapLeadTimeLabel}
-                            value={lead_time}
-                            valueType="number"
+                            value={leadTimeWithUnit}
+                            valueType="text"
                             strongValue
                             variant="block"
                             withPadding
diff --git a/go-api b/go-api
index 154113a90f..1d3c0ee44f 160000
--- a/go-api
+++ b/go-api
@@ -1 +1 @@
-Subproject commit 154113a90fa15c7249a6f2733e67611c053c68d8
+Subproject commit 1d3c0ee44f8db46eda41bfb4daf14770ebcaaecc

From c12f0a1570767479e7dc3ba85dfb0c2007850e17 Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Fri, 7 Aug 2026 15:43:36 +0545
Subject: [PATCH 7/9] fix(eap): activity timeframe layout and date format in
 exports

---
 .../EapOperationActivityInput/index.tsx       | 42 +++++++++----------
 .../EapOperationActivityInput/schema.ts       |  4 +-
 .../EapOperationActivityListInput/index.tsx   |  1 -
 app/src/views/EapFullExport/index.tsx         |  2 +-
 app/src/views/EapSummaryExport/index.tsx      |  4 +-
 5 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/app/src/components/domain/EapOperationActivityInput/index.tsx b/app/src/components/domain/EapOperationActivityInput/index.tsx
index 29a91f0559..e904106829 100644
--- a/app/src/components/domain/EapOperationActivityInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityInput/index.tsx
@@ -209,8 +209,8 @@ function EapOperationActivityInput(props: Props) {
                             )}
                         />
                     )}
-                    <ListView layout="grid">
-                        {!withoutTimeframeSelection && (
+                    {!withoutTimeframeSelection && (
+                        <ListView layout="grid">
                             <SelectInput
                                 label={strings.operationTimeFrameLabel}
                                 name="timeframe"
@@ -226,25 +226,25 @@ function EapOperationActivityInput(props: Props) {
                                     ? strings.operationTimeFrameLeadTimeHint
                                     : undefined}
                             />
-                        )}
-                        {!withoutTimeframeSelection && value?.timeframe && (
-                            <Checklist
-                                label={strings.operationTimeValueLabel}
-                                name="time_value"
-                                value={value?.time_value}
-                                spacing="xs"
-                                onChange={onFieldChange}
-                                keySelector={timeValueKeySelector}
-                                labelSelector={stringValueSelector}
-                                options={timeValueOptions}
-                                disabled={disabled}
-                                renderer={TimeSpanCheck}
-                                withoutOpticalSpacingCorrection
-                                error={getErrorString(error?.time_value)}
-                                readOnly={readOnly}
-                            />
-                        )}
-                    </ListView>
+                            {value?.timeframe && (
+                                <Checklist
+                                    label={strings.operationTimeValueLabel}
+                                    name="time_value"
+                                    value={value?.time_value}
+                                    spacing="xs"
+                                    onChange={onFieldChange}
+                                    keySelector={timeValueKeySelector}
+                                    labelSelector={stringValueSelector}
+                                    options={timeValueOptions}
+                                    disabled={disabled}
+                                    renderer={TimeSpanCheck}
+                                    withoutOpticalSpacingCorrection
+                                    error={getErrorString(error?.time_value)}
+                                    readOnly={readOnly}
+                                />
+                            ) }
+                        </ListView>
+                    )}
                 </ListView>
             </ListView>
         </InlineLayout>
diff --git a/app/src/components/domain/EapOperationActivityInput/schema.ts b/app/src/components/domain/EapOperationActivityInput/schema.ts
index bb66494ed6..4f4dafb1d9 100644
--- a/app/src/components/domain/EapOperationActivityInput/schema.ts
+++ b/app/src/components/domain/EapOperationActivityInput/schema.ts
@@ -45,8 +45,8 @@ const schema = (isSubmit: boolean, type: ActivityInputType): OperationActivitySc
                 activation_two: { forceValue: undefinedValue },
             }
             : {
-                activation_one: {},
-                activation_two: {},
+                activation_one: { defaultValue: false },
+                activation_two: { defaultValue: false },
             }),
     }),
 });
diff --git a/app/src/components/domain/EapOperationActivityListInput/index.tsx b/app/src/components/domain/EapOperationActivityListInput/index.tsx
index c103adfbeb..7173cd64cc 100644
--- a/app/src/components/domain/EapOperationActivityListInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityListInput/index.tsx
@@ -152,7 +152,6 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
                 strings.earlyActionTitle,
                 strings.earlyActionTitleDescription,
                 strings.earlyActionDescription,
-
             ];
         }
 
diff --git a/app/src/views/EapFullExport/index.tsx b/app/src/views/EapFullExport/index.tsx
index 5b77368523..399ef02473 100644
--- a/app/src/views/EapFullExport/index.tsx
+++ b/app/src/views/EapFullExport/index.tsx
@@ -570,7 +570,7 @@ export function Component() {
                             <PrintableDataDisplay
                                 label={strings.eapApprovedLabel}
                                 value={approved_at}
-                                valueType="text"
+                                valueType="date"
                                 strongValue
                                 variant="block"
                                 withPadding
diff --git a/app/src/views/EapSummaryExport/index.tsx b/app/src/views/EapSummaryExport/index.tsx
index d830ca1739..0eee17c0f5 100644
--- a/app/src/views/EapSummaryExport/index.tsx
+++ b/app/src/views/EapSummaryExport/index.tsx
@@ -153,7 +153,7 @@ export function Component() {
                     <ListView layout="grid" spacing="2xs" numPreferredGridColumns={3}>
                         <PrintableDataDisplay
                             label={strings.eapNoLabel}
-                            value={1234}
+                            value={null}
                             valueType="number"
                             strongValue
                             variant="block"
@@ -187,7 +187,7 @@ export function Component() {
                         <PrintableDataDisplay
                             label={strings.eapApprovedLabel}
                             value={approved_at}
-                            valueType="text"
+                            valueType="date"
                             strongValue
                             variant="block"
                             withPadding

From fc061cec6ed8610716cec8953326f5899abe8d23 Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Mon, 10 Aug 2026 13:31:07 +0545
Subject: [PATCH 8/9] feat(eap): add summary,admin2 map, strategy and budget
 sections to EAP summary export

---
 .../components/domain/Admin2Input/index.tsx   |  21 +-
 app/src/components/domain/Admin2Map/index.tsx | 298 ++++++++++++++++
 .../domain/Admin2Map/styles.module.css        |   3 +
 app/src/utils/map.ts                          |  38 ++
 app/src/views/EapSummaryExport/i18n.json      |  21 +-
 app/src/views/EapSummaryExport/index.tsx      | 330 +++++++++++++++---
 .../views/EapSummaryExport/styles.module.css  |  22 ++
 7 files changed, 682 insertions(+), 51 deletions(-)
 create mode 100644 app/src/components/domain/Admin2Map/index.tsx
 create mode 100644 app/src/components/domain/Admin2Map/styles.module.css

diff --git a/app/src/components/domain/Admin2Input/index.tsx b/app/src/components/domain/Admin2Input/index.tsx
index 0b206663ee..233fde52e1 100644
--- a/app/src/components/domain/Admin2Input/index.tsx
+++ b/app/src/components/domain/Admin2Input/index.tsx
@@ -49,6 +49,10 @@ import {
     MAX_PAGE_LIMIT,
 } from '#utils/constants';
 import { getGeoJsonBounds } from '#utils/geo';
+import {
+    getAdmin2CentroidTileset,
+    getAdmin2Tileset,
+} from '#utils/map';
 import {
     useLazyRequest,
     useRequest,
@@ -190,7 +194,7 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
 
         return {
             type: 'line',
-            'source-layer': `go-admin2-${iso3}-staging`,
+            'source-layer': getAdmin2Tileset(iso3).sourceLayer,
             paint: {
                 'line-color': COLOR_BLACK,
                 'line-opacity': 1,
@@ -213,7 +217,7 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
         ];
         const options: Omit<FillLayer, 'id'> = {
             type: 'fill',
-            'source-layer': `go-admin2-${iso3}-staging`,
+            'source-layer': getAdmin2Tileset(iso3).sourceLayer,
             paint: {
                 'fill-color': (!value || value.length <= 0)
                     ? defaultColor
@@ -237,6 +241,10 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
     }, [iso3, value, admin2CodeMap]);
 
     const adminTwoLabelLayerOptions = useMemo((): Omit<SymbolLayer, 'id'> | undefined => {
+        if (!iso3) {
+            return undefined;
+        }
+
         const textColor: NonNullable<SymbolLayer['paint']>['text-color'] = (
             value && value.length > 0
                 ? [
@@ -253,7 +261,7 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
 
         const options: Omit<SymbolLayer, 'id'> = {
             type: 'symbol',
-            'source-layer': `go-admin2-${iso3}-centroids`,
+            'source-layer': getAdmin2CentroidTileset(iso3).sourceLayer,
             paint: {
                 'text-color': textColor,
                 'text-opacity': 1,
@@ -397,14 +405,13 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
                             />
                         )}
                         {/* eslint-disable-next-line max-len */}
-                        {adminTwoFillLayerOptions && adminTwoLineLayerOptions && adminTwoLabelLayerOptions && (
+                        {iso3 && adminTwoFillLayerOptions && adminTwoLineLayerOptions && adminTwoLabelLayerOptions && (
                             <>
                                 <MapSource
                                     sourceKey="country-admin-2"
                                     sourceOptions={{
                                         type: 'vector',
-                                        // FIXME: this should be defined as a constant
-                                        url: `mapbox://go-ifrc.go-admin2-${iso3}-staging`,
+                                        url: getAdmin2Tileset(iso3).url,
                                     }}
                                 >
                                     <MapLayer
@@ -422,7 +429,7 @@ function Admin2Input<const NAME>(props: Props<NAME>) {
                                     sourceKey="country-admin-2-labels"
                                     sourceOptions={{
                                         type: 'vector',
-                                        url: `mapbox://go-ifrc.go-admin2-${iso3}-centroids`,
+                                        url: getAdmin2CentroidTileset(iso3).url,
                                     }}
                                 >
                                     <MapLayer
diff --git a/app/src/components/domain/Admin2Map/index.tsx b/app/src/components/domain/Admin2Map/index.tsx
new file mode 100644
index 0000000000..7e26226939
--- /dev/null
+++ b/app/src/components/domain/Admin2Map/index.tsx
@@ -0,0 +1,298 @@
+import {
+    useContext,
+    useEffect,
+    useMemo,
+} from 'react';
+import {
+    _cs,
+    isDefined,
+    isNotDefined,
+} from '@togglecorp/fujs';
+import {
+    MapBounds,
+    MapChildContext,
+    MapContainer,
+    MapLayer,
+    MapSource,
+} from '@togglecorp/re-map';
+import {
+    type Expression,
+    type FillLayer,
+    type LineLayer,
+    type SymbolLayer,
+} from 'mapbox-gl';
+
+import useCountry from '#hooks/domain/useCountry';
+import {
+    COLOR_DARK_GREY,
+    COLOR_LIGHT_GREY,
+    COLOR_PRIMARY_RED,
+    COLOR_WHITE,
+} from '#utils/constants';
+import { getGeoJsonBounds } from '#utils/geo';
+import {
+    getAdmin2CentroidTileset,
+    getAdmin2Tileset,
+    getBboxListBoundingBox,
+} from '#utils/map';
+
+import BaseMap from '../BaseMap';
+
+import styles from './styles.module.css';
+
+const MAP_LOAD_TIMEOUT = 15_000;
+const ADMIN_2_MIN_ZOOM = 5;
+
+const MAP_PADDING = 8;
+
+interface Admin2 {
+    code: string;
+    bbox?: Record<string, unknown> | null;
+}
+
+interface MapControllerProps {
+    bounds: [number, number, number, number] | undefined;
+    onLoad?: () => void;
+}
+
+// NOTE: This lets the consumer (eg. pdf export) know that the map is
+// completely rendered
+function MapController(props: MapControllerProps) {
+    const {
+        bounds,
+        onLoad,
+    } = props;
+
+    const { map } = useContext(MapChildContext);
+
+    useEffect(() => {
+        if (isNotDefined(map) || isNotDefined(onLoad) || isNotDefined(bounds)) {
+            return undefined;
+        }
+        const handleIdle = () => {
+            if (!map.areTilesLoaded()) {
+                return;
+            }
+            map.off('idle', handleIdle);
+            onLoad();
+        };
+
+        map.on('idle', handleIdle);
+
+        return () => {
+            map.off('idle', handleIdle);
+        };
+    }, [map, onLoad, bounds]);
+
+    if (isNotDefined(bounds)) {
+        return null;
+    }
+    return (
+        <MapBounds
+            bounds={bounds}
+            padding={MAP_PADDING}
+            duration={0}
+        />
+    );
+}
+
+interface Props {
+    className?: string;
+    countryId: number;
+    admin2Details: Admin2[] | undefined;
+    onLoad?: () => void;
+}
+
+function Admin2Map(props: Props) {
+    const {
+        className,
+        countryId,
+        admin2Details,
+        onLoad,
+    } = props;
+
+    const countryDetails = useCountry({ id: countryId });
+    const iso3 = countryDetails?.iso3;
+
+    useEffect(() => {
+        if (isNotDefined(onLoad)) {
+            return undefined;
+        }
+
+        const timeout = setTimeout(onLoad, MAP_LOAD_TIMEOUT);
+
+        return () => {
+            clearTimeout(timeout);
+        };
+    }, [onLoad]);
+
+    const isSelectedExpression = useMemo<Expression>(
+        () => [
+            'in',
+            ['get', 'code'],
+            ['literal', admin2Details?.map(({ code }) => code) ?? []],
+        ],
+        [admin2Details],
+    );
+
+    const bounds = useMemo(() => {
+        const selectedBounds = getBboxListBoundingBox(
+            admin2Details?.map(({ bbox }) => bbox),
+        );
+
+        if (isDefined(selectedBounds)) {
+            return selectedBounds;
+        }
+
+        if (isNotDefined(countryDetails?.bbox)) {
+            return undefined;
+        }
+
+        return getGeoJsonBounds(countryDetails.bbox);
+    }, [admin2Details, countryDetails]);
+
+    const adminOneLabelLayerOptions: Omit<SymbolLayer, 'id'> = useMemo(() => ({
+        type: 'symbol',
+        paint: {
+            'text-opacity': [
+                'match',
+                ['get', 'country_id'],
+                countryId,
+                1,
+                0,
+            ],
+        },
+        layout: {
+            'text-offset': [
+                0,
+                1,
+            ],
+            visibility: 'visible',
+        },
+    }), [countryId]);
+
+    const adminTwoLayerOptions = useMemo(() => {
+        if (isNotDefined(iso3)) {
+            return undefined;
+        }
+
+        const { sourceLayer } = getAdmin2Tileset(iso3);
+        const { sourceLayer: centroidSourceLayer } = getAdmin2CentroidTileset(iso3);
+
+        const fill: Omit<FillLayer, 'id'> = {
+            type: 'fill',
+            'source-layer': sourceLayer,
+            paint: {
+                'fill-color': [
+                    'case',
+                    isSelectedExpression,
+                    COLOR_PRIMARY_RED,
+                    COLOR_LIGHT_GREY,
+                ],
+                'fill-opacity': [
+                    'case',
+                    isSelectedExpression,
+                    1,
+                    0.5,
+                ],
+            },
+            layout: {
+                visibility: 'visible',
+            },
+        };
+
+        const line: Omit<LineLayer, 'id'> = {
+            type: 'line',
+            'source-layer': sourceLayer,
+            paint: {
+                'line-color': [
+                    'case',
+                    isSelectedExpression,
+                    COLOR_WHITE,
+                    COLOR_DARK_GREY,
+                ],
+                'line-width': 0.5,
+                'line-opacity': 1,
+            },
+            layout: {
+                visibility: 'visible',
+            },
+        };
+
+        const label: Omit<SymbolLayer, 'id'> = {
+            type: 'symbol',
+            'source-layer': centroidSourceLayer,
+            filter: isSelectedExpression,
+            layout: {
+                'text-field': ['get', 'name'],
+                'text-anchor': 'center',
+                'text-size': 10,
+                'text-padding': 4,
+            },
+        };
+
+        return {
+            fill,
+            line,
+            label,
+        };
+    }, [iso3, isSelectedExpression]);
+
+    return (
+        <BaseMap
+            mapOptions={{
+                interactive: false,
+                minZoom: ADMIN_2_MIN_ZOOM,
+                fadeDuration: 0,
+            }}
+            navControlShown={false}
+            scaleControlShown={false}
+            baseLayers={(
+                <MapLayer
+                    layerKey="admin-1-label"
+                    layerOptions={adminOneLabelLayerOptions}
+                />
+            )}
+        >
+            <MapContainer className={_cs(styles.admin2Map, className)} />
+            <MapController
+                bounds={bounds}
+                onLoad={onLoad}
+            />
+            {isNotDefined(iso3) || isNotDefined(adminTwoLayerOptions) ? null : (
+                <>
+                    <MapSource
+                        sourceKey="country-admin-2"
+                        sourceOptions={{
+                            type: 'vector',
+                            url: getAdmin2Tileset(iso3).url,
+                        }}
+                    >
+                        <MapLayer
+                            layerKey="admin-2-fill"
+                            layerOptions={adminTwoLayerOptions.fill}
+                        />
+                        <MapLayer
+                            layerKey="admin-2-line"
+                            layerOptions={adminTwoLayerOptions.line}
+                        />
+                    </MapSource>
+                    <MapSource
+                        sourceKey="country-admin-2-labels"
+                        sourceOptions={{
+                            type: 'vector',
+                            url: getAdmin2CentroidTileset(iso3).url,
+                        }}
+                    >
+                        <MapLayer
+                            layerKey="admin-2-label"
+                            layerOptions={adminTwoLayerOptions.label}
+                        />
+                    </MapSource>
+                </>
+            )}
+        </BaseMap>
+    );
+}
+
+export default Admin2Map;
diff --git a/app/src/components/domain/Admin2Map/styles.module.css b/app/src/components/domain/Admin2Map/styles.module.css
new file mode 100644
index 0000000000..539bdd7b94
--- /dev/null
+++ b/app/src/components/domain/Admin2Map/styles.module.css
@@ -0,0 +1,3 @@
+.admin2-map {
+    min-height: 12rem;
+}
diff --git a/app/src/utils/map.ts b/app/src/utils/map.ts
index 643a18ed86..d30543161a 100644
--- a/app/src/utils/map.ts
+++ b/app/src/utils/map.ts
@@ -53,3 +53,41 @@ export function getCountryListBoundingBox(countryList: Country[]) {
 
     return getGeoJsonBounds(collection);
 }
+
+type Bbox = Record<string, unknown> | GeoJSON.Geometry;
+
+export function getBboxListBoundingBox(bboxList: (Bbox | null | undefined)[] | undefined) {
+    const definedBboxList = bboxList?.filter(isDefined) ?? [];
+
+    if (definedBboxList.length < 1) {
+        return undefined;
+    }
+
+    const collection: GeoJSON.FeatureCollection = {
+        type: 'FeatureCollection',
+        features: definedBboxList.map((bbox) => ({
+            type: 'Feature' as const,
+            geometry: bbox as GeoJSON.Geometry,
+            properties: null,
+        })),
+    };
+
+    return getGeoJsonBounds(collection);
+}
+
+const ADMIN_2_TILESET_OWNER = 'go-ifrc';
+
+function getTileset(sourceLayer: string) {
+    return {
+        sourceLayer,
+        url: `mapbox://${ADMIN_2_TILESET_OWNER}.${sourceLayer}`,
+    };
+}
+
+export function getAdmin2Tileset(iso3: string) {
+    return getTileset(`go-admin2-${iso3}-staging`);
+}
+
+export function getAdmin2CentroidTileset(iso3: string) {
+    return getTileset(`go-admin2-${iso3}-centroids`);
+}
diff --git a/app/src/views/EapSummaryExport/i18n.json b/app/src/views/EapSummaryExport/i18n.json
index 0f0fa1fb2b..1cb2f9c020 100644
--- a/app/src/views/EapSummaryExport/i18n.json
+++ b/app/src/views/EapSummaryExport/i18n.json
@@ -2,13 +2,31 @@
     "namespace": "eapSummaryExport",
     "strings": {
         "summaryPageTitle": "Early Action Protocol Summary",
+        "drefAllocationDescription": "The IFRC Disaster Response Emergency Fund (DREF) has approved a total of CHF {totalBudget} for the implementation of the {nationalSociety} {hazard} EAP. The approved amount consists of an allocation of CHF {readinessAndPrepositioningBudget} for readiness and pre-positioning and CHF {earlyActionBudget} allocated to implement early actions once the defined triggers are met.",
+        "summaryHeading": "Summary",
+        "hazardLabel": "Hazard",
+        "objectiveLabel": "Objective",
+        "prioritizedImpactsSummaryLabel": "Prioritized risks/impacts to be addressed by early actions",
+        "earlyActionsSummaryLabel": "Proposed Early Actions by based on the IFRC’s Planned Operation Matrix",
+        "houseHoldsSummaryLabel": "Potential No. of households to be reached",
+        "eapBudgetSummaryLabel": "EAP budget",
+        "sourceForecastLabel": "Sources of Forecast",
+        "triggerStatementLabel": "Trigger Statement",
+        "operationalStrategyHeading": "Operational Strategy",
+        "nationalSocietyStrategyHeading": "1. Who will implement the EAP - The National Society",
+        "triggerStrategyHeading": "2. How the EAP will be activated - The Trigger",
+        "earlyActionsStrategyHeading": "3. How the EAP will reduce the impact on the population - The Early Actions",
         "eapNoLabel": "EAP No",
         "eapLeadTimeLabel": "Early action lead time",
         "eapTimeframeLabel": "EAP Timeframe",
         "eapApprovedLabel": "EAP Approved",
         "operationNumberLabel": "Operation No",
         "operationTimeframeLabel": "Operational Timeframe",
-        "downloadBudgetLabel": "Download Full Budget Template",
+        "budgetHeading": "Budget",
+        "totalBudgetLabel": "Total Budget",
+        "totalReadinessLabel": "Total Readiness",
+        "totalPrepositioningLabel": "Total Pre-positioning",
+        "totalEarlyActionsLabel": "Total Early Actions",
         "nationalLabel": "National",
         "nationalSocietyContactLabel": "National Society Contact",
         "partnerNationalSocietyContactLabel": "Partner National Society Contact",
@@ -20,6 +38,7 @@
         "plannedOperationsHeading": "Planned Operations",
         "operationBudgetLabel": "Budget",
         "operationPeopleTargetedLabel": "No. people targeted",
+        "apCodeLabel": "AP Code",
         "indicatorsHeading": "Indicators",
         "indicatorTitleLabel": "Title",
         "indicatorTargetLabel": "Target",
diff --git a/app/src/views/EapSummaryExport/index.tsx b/app/src/views/EapSummaryExport/index.tsx
index 0eee17c0f5..d72d2e1104 100644
--- a/app/src/views/EapSummaryExport/index.tsx
+++ b/app/src/views/EapSummaryExport/index.tsx
@@ -1,4 +1,8 @@
-import { useRef } from 'react';
+import {
+    useCallback,
+    useRef,
+    useState,
+} from 'react';
 import {
     useParams,
     useSearchParams,
@@ -10,6 +14,12 @@ import {
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import { Image } from '@ifrc-go/ui/printable';
 import {
+    formatNumber,
+    resolveToString,
+    sumSafe,
+} from '@ifrc-go/ui/utils';
+import {
+    _cs,
     isDefined,
     isFalsyString,
     isNotDefined,
@@ -17,11 +27,12 @@ import {
     listToMap,
 } from '@togglecorp/fujs';
 
+import Admin2Map from '#components/domain/Admin2Map';
 import PrintableActivityOutput from '#components/domain/PrintableActivityOutput';
-import Link from '#components/printable/Link';
 import PrintableContainer from '#components/printable/PrintableContainer';
 import PrintableDataDisplay from '#components/printable/PrintableDataDisplay';
 import PrintableDescription from '#components/printable/PrintableDescription';
+import PrintableLabel from '#components/printable/PrintableLabel';
 import PrintablePage from '#components/printable/PrintablePage';
 import useGlobalEnums from '#hooks/domain/useGlobalEnums';
 import { useRequest } from '#utils/restRequest';
@@ -53,7 +64,12 @@ export function Component() {
             : undefined,
     });
 
-    const { disaster_type_details, country_details, approved_at } = eapRegistrationResponse ?? {};
+    const {
+        disaster_type_details,
+        country_details,
+        national_society_details,
+        approved_at,
+    } = eapRegistrationResponse ?? {};
 
     const selectedFullEap = eapRegistrationResponse?.full_eap_details?.find(
         (fullEap) => String(fullEap.version) === String(version),
@@ -81,10 +97,15 @@ export function Component() {
         url: '/api/v2/eap/options/',
     });
 
-    const previewReady = !eapRegistrationPending && !fullEapPending;
+    const [mapLoaded, setMapLoaded] = useState(false);
+
+    const handleMapLoad = useCallback(() => {
+        setMapLoaded(true);
+    }, []);
 
     const {
         cover_image_file,
+        objective,
 
         partner_contacts,
 
@@ -94,9 +115,28 @@ export function Component() {
         planned_operations,
         enabling_approaches,
 
-        budget_file_details,
+        prioritized_impacts,
+        early_actions,
+        trigger_statement,
+        trigger_statement_source_of_information,
+
+        operational_administrative_capacity,
+
+        total_budget,
+        readiness_budget,
+        pre_positioning_budget,
+        early_action_budget,
     } = fullEapResponse ?? {};
 
+    // NOTE: The map is only shown when there are selected admin2 areas
+    const mapCountryId = (admin2_details?.length ?? 0) > 0
+        ? country_details?.id
+        : undefined;
+
+    const previewReady = !eapRegistrationPending
+        && !fullEapPending
+        && (isNotDefined(mapCountryId) || mapLoaded);
+
     const eapTitle = [
         country_details?.name,
         admin2_details?.map(({ name }) => name).join(', '),
@@ -123,6 +163,19 @@ export function Component() {
         ({ value }) => value,
     );
 
+    const drefAllocationDescription = resolveToString(
+        strings.drefAllocationDescription,
+        {
+            totalBudget: formatNumber(total_budget) ?? '--',
+            nationalSociety: national_society_details?.society_name ?? '--',
+            hazard: disaster_type_details?.name ?? '--',
+            readinessAndPrepositioningBudget: formatNumber(
+                sumSafe([readiness_budget, pre_positioning_budget]),
+            ) ?? '--',
+            earlyActionBudget: formatNumber(early_action_budget) ?? '--',
+        },
+    );
+
     const leadTimeWithUnit = [
         lead_time,
         isDefined(lead_timeframe_unit)
@@ -218,6 +271,155 @@ export function Component() {
                     </ListView>
                 </ListView>
             </PrintableContainer>
+            <PrintableContainer
+                heading={strings.summaryHeading}
+                headingLevel={2}
+            >
+                <div
+                    className={_cs(
+                        styles.summary,
+                        isNotDefined(mapCountryId) && styles.withoutMap,
+                    )}
+                >
+                    {isDefined(mapCountryId) && (
+                        <Admin2Map
+                            className={styles.admin2Map}
+                            countryId={mapCountryId}
+                            admin2Details={admin2_details}
+                            onLoad={handleMapLoad}
+                        />
+                    )}
+                    <PrintableDescription value={drefAllocationDescription} />
+                </div>
+                <div className={styles.summaryTable}>
+                    <PrintableDataDisplay
+                        label={strings.hazardLabel}
+                        value={disaster_type_details?.name}
+                        valueType="text"
+                        strongLabel
+                        variant="contents"
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.objectiveLabel}
+                        value={<PrintableDescription value={objective} />}
+                        strongLabel
+                        variant="contents"
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.prioritizedImpactsSummaryLabel}
+                        value={(
+                            <ol>
+                                {prioritized_impacts?.map((impact) => (
+                                    <li key={impact.id}>
+                                        <PrintableDescription value={impact.impact} />
+                                    </li>
+                                ))}
+                            </ol>
+                        )}
+                        strongLabel
+                        variant="contents"
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.earlyActionsSummaryLabel}
+                        value={(
+                            <ol>
+                                {early_actions?.map((action) => (
+                                    <li key={action.id}>
+                                        <PrintableDescription value={action.action} />
+                                    </li>
+                                ))}
+                            </ol>
+                        )}
+                        strongLabel
+                        variant="contents"
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.houseHoldsSummaryLabel}
+                        // FIXME need to add value TBD
+                        value={undefined}
+                        valueType="text"
+                        strongLabel
+                        variant="contents"
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.eapBudgetSummaryLabel}
+                        value={total_budget}
+                        valueType="number"
+                        strongLabel
+                        variant="contents"
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.sourceForecastLabel}
+                        value={trigger_statement_source_of_information?.map((source) => (
+                            <PrintableLabel
+                                key={source.id}
+                                value={source.source_name}
+                            />
+                        ))}
+                        strongLabel
+                        variant="contents"
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.triggerStatementLabel}
+                        value={<PrintableDescription value={trigger_statement} />}
+                        strongLabel
+                        variant="contents"
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                </div>
+            </PrintableContainer>
+            <PrintableContainer
+                heading={strings.operationalStrategyHeading}
+                headingLevel={2}
+            >
+                <PrintableContainer
+                    heading={strings.nationalSocietyStrategyHeading}
+                    headingLevel={3}
+                >
+                    <PrintableDescription value={operational_administrative_capacity} />
+                </PrintableContainer>
+                <PrintableContainer
+                    heading={strings.triggerStrategyHeading}
+                    headingLevel={3}
+                >
+                    <PrintableDescription value={trigger_statement} />
+                </PrintableContainer>
+                <PrintableContainer
+                    heading={strings.earlyActionsStrategyHeading}
+                    headingLevel={3}
+                >
+                    <ol>
+                        {early_actions?.map((action) => (
+                            <li key={action.id}>
+                                <PrintableDescription value={action.action} />
+                            </li>
+                        ))}
+                    </ol>
+                </PrintableContainer>
+            </PrintableContainer>
             <PrintableContainer
                 heading={strings.plannedOperationsHeading}
                 headingLevel={2}
@@ -239,6 +441,7 @@ export function Component() {
                                         value={operation.budget_per_sector}
                                         valueType="number"
                                         prefix="CHF "
+                                        variant="block"
                                         withPadding
                                         withBackground
                                         strongLabel
@@ -248,15 +451,16 @@ export function Component() {
                                         label={strings.operationPeopleTargetedLabel}
                                         value={operation.people_targeted}
                                         valueType="number"
+                                        variant="block"
                                         strongLabel
                                         withPadding
                                         withBackground
                                         withDiff={false}
                                     />
                                     <PrintableDataDisplay
-                                        label="AP Code"
+                                        label={strings.apCodeLabel}
                                         value={apCodeSectorValue}
-                                        valueType="text"
+                                        variant="block"
                                         strongLabel
                                         withPadding
                                         withBackground
@@ -266,7 +470,7 @@ export function Component() {
                             </PrintableContainer>
                             <PrintableContainer
                                 heading={strings.indicatorsHeading}
-                                headingLevel={3}
+                                headingLevel={4}
                             >
                                 <div className={styles.indicatorItems}>
                                     <Label textSize="sm" strong>
@@ -292,19 +496,15 @@ export function Component() {
                             </PrintableContainer>
                             <PrintableContainer
                                 heading={strings.readinessActivitiesHeading}
-                                headingLevel={3}
+                                headingLevel={4}
                             >
-                                <div className={styles.indicatorItems}>
+                                <div className={styles.activityItems}>
                                     {operation.readiness_activities.map((activity, index) => (
-                                        <PrintableDataDisplay
+                                        <PrintableActivityOutput
                                             key={activity.id}
-                                            label={`${index + 1}. ${activity.activity}`}
-                                            value={`${activity.time_value} ${activity.timeframe_display}`}
-                                            valueType="text"
-                                            variant="contents"
-                                            withBackground
-                                            withPadding
-                                            withoutLabelColon
+                                            activity={activity}
+                                            prevActivity={undefined}
+                                            index={index}
                                             withDiff={false}
                                         />
                                     ))}
@@ -312,9 +512,9 @@ export function Component() {
                             </PrintableContainer>
                             <PrintableContainer
                                 heading={strings.prepositioningActivitiesHeading}
-                                headingLevel={3}
+                                headingLevel={4}
                             >
-                                <div className={styles.indicatorItems}>
+                                <div className={styles.activityItems}>
                                     {operation.prepositioning_activities.map((activity, index) => (
                                         <PrintableActivityOutput
                                             key={activity.id}
@@ -330,9 +530,9 @@ export function Component() {
                             </PrintableContainer>
                             <PrintableContainer
                                 heading={strings.earlyActionActivitiesHeading}
-                                headingLevel={3}
+                                headingLevel={4}
                             >
-                                <div className={styles.indicatorItems}>
+                                <div className={styles.activityItems}>
                                     {operation.early_action_activities.map((activity, index) => (
                                         <PrintableActivityOutput
                                             key={activity.id}
@@ -370,15 +570,16 @@ export function Component() {
                                         value={approach.budget_per_approach}
                                         valueType="number"
                                         prefix="CHF "
+                                        variant="block"
                                         strongLabel
                                         withBackground
                                         withPadding
                                         withDiff={false}
                                     />
                                     <PrintableDataDisplay
-                                        label="AP Code"
+                                        label={strings.apCodeLabel}
                                         value={apCodeApproachValue}
-                                        valueType="text"
+                                        variant="block"
                                         strongLabel
                                         withBackground
                                         withPadding
@@ -388,7 +589,7 @@ export function Component() {
                             </PrintableContainer>
                             <PrintableContainer
                                 heading={strings.indicatorsHeading}
-                                headingLevel={3}
+                                headingLevel={4}
                             >
                                 <div className={styles.indicatorItems}>
                                     <Label textSize="sm" strong>
@@ -414,19 +615,15 @@ export function Component() {
                             </PrintableContainer>
                             <PrintableContainer
                                 heading={strings.readinessActivitiesHeading}
-                                headingLevel={3}
+                                headingLevel={4}
                             >
-                                <div className={styles.indicatorItems}>
+                                <div className={styles.activityItems}>
                                     {approach.readiness_activities.map((activity, index) => (
-                                        <PrintableDataDisplay
+                                        <PrintableActivityOutput
                                             key={activity.id}
-                                            label={`${index + 1}. ${activity.activity}`}
-                                            value={`${activity.time_value} ${activity.timeframe_display}`}
-                                            valueType="text"
-                                            variant="contents"
-                                            withBackground
-                                            withPadding
-                                            withoutLabelColon
+                                            activity={activity}
+                                            prevActivity={undefined}
+                                            index={index}
                                             withDiff={false}
                                         />
                                     ))}
@@ -434,9 +631,9 @@ export function Component() {
                             </PrintableContainer>
                             <PrintableContainer
                                 heading={strings.prepositioningActivitiesHeading}
-                                headingLevel={3}
+                                headingLevel={4}
                             >
-                                <div className={styles.indicatorItems}>
+                                <div className={styles.activityItems}>
                                     {approach.prepositioning_activities.map((activity, index) => (
                                         <PrintableActivityOutput
                                             key={activity.id}
@@ -452,9 +649,9 @@ export function Component() {
                             </PrintableContainer>
                             <PrintableContainer
                                 heading={strings.earlyActionActivitiesHeading}
-                                headingLevel={3}
+                                headingLevel={4}
                             >
-                                <div className={styles.indicatorItems}>
+                                <div className={styles.activityItems}>
                                     {approach.early_action_activities.map((activity, index) => (
                                         <PrintableActivityOutput
                                             key={activity.id}
@@ -471,10 +668,57 @@ export function Component() {
                     );
                 })}
             </PrintableContainer>
-            <PrintableContainer headingLevel={3}>
-                <Link href={budget_file_details?.file}>
-                    {strings.downloadBudgetLabel}
-                </Link>
+            <PrintableContainer
+                heading={strings.budgetHeading}
+                headingLevel={2}
+            >
+                <ListView
+                    layout="grid"
+                    spacing="4xs"
+                    numPreferredGridColumns={4}
+                    minGridColumnSize="10rem"
+                >
+                    <PrintableDataDisplay
+                        label={strings.totalBudgetLabel}
+                        value={total_budget}
+                        valueType="number"
+                        variant="block"
+                        strongLabel
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.totalReadinessLabel}
+                        value={readiness_budget}
+                        valueType="number"
+                        variant="block"
+                        strongLabel
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.totalPrepositioningLabel}
+                        value={pre_positioning_budget}
+                        valueType="number"
+                        variant="block"
+                        strongLabel
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                    <PrintableDataDisplay
+                        label={strings.totalEarlyActionsLabel}
+                        value={early_action_budget}
+                        valueType="number"
+                        variant="block"
+                        strongLabel
+                        withPadding
+                        withBackground
+                        withDiff={false}
+                    />
+                </ListView>
             </PrintableContainer>
             <PrintableContainer
                 heading={strings.contactInformationHeading}
diff --git a/app/src/views/EapSummaryExport/styles.module.css b/app/src/views/EapSummaryExport/styles.module.css
index 3bb0b654a3..93d099bccf 100644
--- a/app/src/views/EapSummaryExport/styles.module.css
+++ b/app/src/views/EapSummaryExport/styles.module.css
@@ -1,3 +1,24 @@
+.summary {
+    display: grid;
+    margin-block-end: var(--go-ui-spacing-lg);
+    gap: var(--go-ui-spacing-lg);
+    grid-template-columns: 2fr 2fr;
+
+    .admin2-map {
+        height: 16rem;
+    }
+
+    &.without-map {
+        grid-template-columns: 1fr;
+    }
+}
+
+.summary-table {
+    display: grid;
+    gap: var(--go-ui-width-separator-md);
+    grid-template-columns: 3fr 7fr;
+}
+
 .meta-items {
     display: flex;
     flex-direction: column;
@@ -10,6 +31,7 @@
     }
 }
 
+.activity-items,
 .indicator-items {
     display: grid;
     gap: var(--go-ui-width-separator-md);

From 0ec7b78cae6661e8acc7c16a7d721febaba1ed3f Mon Sep 17 00:00:00 2001
From: crssstha <shresthacyrus85@gmail.com>
Date: Mon, 10 Aug 2026 13:47:41 +0545
Subject: [PATCH 9/9] fix(eap): address review feedback on EAP forms

---
 .../EapOperationActivityInput/index.tsx       |    2 +
 .../EapOperationActivityInput/schema.ts       |    4 +-
 .../EapOperationActivityListInput/index.tsx   |   31 -
 .../printable/PrintableFileOutput/index.tsx   |   64 +-
 .../PrintableFileOutput/styles.module.css     |   24 -
 app/src/hooks/domain/useChecklistFormArray.ts |    1 +
 app/src/views/AccountMyFormsEap/i18n.json     |    7 +-
 app/src/views/AccountMyFormsEap/index.tsx     |   33 +-
 .../Overview/KeyActorsInput/i18n.json         |    2 +-
 .../Overview/KeyActorsInput/index.tsx         |    2 +-
 .../views/EapFullForm/TriggerModel/index.tsx  |   29 +-
 .../EapSimplifiedForm/EarlyAction/index.tsx   |   30 +-
 cacheppuccino                                 |    2 +-
 .../000087-1786348663165.json                 | 1031 +++++++++++++++++
 14 files changed, 1160 insertions(+), 102 deletions(-)
 delete mode 100644 app/src/components/printable/PrintableFileOutput/styles.module.css
 create mode 100644 translationMigrations/000087-1786348663165.json

diff --git a/app/src/components/domain/EapOperationActivityInput/index.tsx b/app/src/components/domain/EapOperationActivityInput/index.tsx
index e904106829..1832f44b9e 100644
--- a/app/src/components/domain/EapOperationActivityInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityInput/index.tsx
@@ -42,6 +42,8 @@ import i18n from './i18n.json';
 
 const defaultActivityValue: OperationActivityFormFields = {
     client_id: '-1',
+    activation_one: false,
+    activation_two: false,
 };
 
 type TimeframeOption = components['schemas']['EapTimeframeEnum'];
diff --git a/app/src/components/domain/EapOperationActivityInput/schema.ts b/app/src/components/domain/EapOperationActivityInput/schema.ts
index 4f4dafb1d9..bb66494ed6 100644
--- a/app/src/components/domain/EapOperationActivityInput/schema.ts
+++ b/app/src/components/domain/EapOperationActivityInput/schema.ts
@@ -45,8 +45,8 @@ const schema = (isSubmit: boolean, type: ActivityInputType): OperationActivitySc
                 activation_two: { forceValue: undefinedValue },
             }
             : {
-                activation_one: { defaultValue: false },
-                activation_two: { defaultValue: false },
+                activation_one: {},
+                activation_two: {},
             }),
     }),
 });
diff --git a/app/src/components/domain/EapOperationActivityListInput/index.tsx b/app/src/components/domain/EapOperationActivityListInput/index.tsx
index 7173cd64cc..3f2d4b1f7b 100644
--- a/app/src/components/domain/EapOperationActivityListInput/index.tsx
+++ b/app/src/components/domain/EapOperationActivityListInput/index.tsx
@@ -1,6 +1,5 @@
 import {
     useCallback,
-    useEffect,
     useMemo,
 } from 'react';
 import { AddLineIcon } from '@ifrc-go/icons';
@@ -12,7 +11,6 @@ import {
 } from '@ifrc-go/ui';
 import { useTranslation } from '@ifrc-go/ui/hooks';
 import {
-    isDefined,
     isNotDefined,
     randomString,
 } from '@togglecorp/fujs';
@@ -97,35 +95,6 @@ function EapOperationActivityListInput<const NAME extends ActivityInputType>(pro
         },
         [onChange, name, leadTimeframeUnit],
     );
-    const hasOutdatedTimeframe = name === 'early_action_activities'
-        && isDefined(leadTimeframeUnit)
-        && isDefined(value)
-        && value.some((activity) => activity.timeframe !== leadTimeframeUnit);
-
-    useEffect(
-        () => {
-            if (!hasOutdatedTimeframe) {
-                return;
-            }
-
-            onChange(
-                (oldValue: OperationActivityFormFields[] | undefined) => (
-                    oldValue?.map((activity) => (
-                        activity.timeframe === leadTimeframeUnit
-                            ? activity
-                            : {
-                                ...activity,
-                                timeframe: leadTimeframeUnit,
-                                time_value: undefined,
-                            }
-                    )) ?? []
-                ),
-                name,
-            );
-        },
-        [hasOutdatedTimeframe, leadTimeframeUnit, name, onChange],
-    );
-
     const [
         title,
         titleDescription,
diff --git a/app/src/components/printable/PrintableFileOutput/index.tsx b/app/src/components/printable/PrintableFileOutput/index.tsx
index c8af15d95f..dd29e96218 100644
--- a/app/src/components/printable/PrintableFileOutput/index.tsx
+++ b/app/src/components/printable/PrintableFileOutput/index.tsx
@@ -1,8 +1,6 @@
+import { ListView } from '@ifrc-go/ui';
 import { Image } from '@ifrc-go/ui/printable';
-import {
-    _cs,
-    isNotDefined,
-} from '@togglecorp/fujs';
+import { isNotDefined } from '@togglecorp/fujs';
 
 import Link from '#components/printable/Link';
 import {
@@ -10,8 +8,6 @@ import {
     isImageFile,
 } from '#utils/common';
 
-import styles from './styles.module.css';
-
 interface FileType {
     id: number;
     file?: string | null;
@@ -37,31 +33,37 @@ function PrintableFileOutput(props: Props) {
     const otherFiles = files.filter(({ file }) => !isImageFile(file));
 
     return (
-        <div className={_cs(styles.printableFileOutput, className)}>
-            {imageFiles.length > 0 && (
-                <div className={styles.imageItems}>
-                    {imageFiles.map((imageFile) => (
-                        <Image
-                            key={imageFile.id}
-                            src={imageFile.file}
-                            caption={imageFile.caption}
-                        />
-                    ))}
-                </div>
-            )}
-            {otherFiles.length > 0 && (
-                <div className={styles.fileItems}>
-                    {otherFiles.map((otherFile) => (
-                        <Link
-                            key={otherFile.id}
-                            href={otherFile.file}
-                        >
-                            {getFileNameFromUrl(otherFile.file)}
-                        </Link>
-                    ))}
-                </div>
-            )}
-        </div>
+        <ListView
+            className={className}
+            layout="block"
+            spacing="md"
+        >
+            <ListView
+                layout="block"
+                spacing="4xs"
+            >
+                {imageFiles.map((imageFile) => (
+                    <Image
+                        key={imageFile.id}
+                        src={imageFile.file}
+                        caption={imageFile.caption}
+                    />
+                ))}
+            </ListView>
+            <ListView
+                layout="block"
+                spacing="xs"
+            >
+                {otherFiles.map((otherFile) => (
+                    <Link
+                        key={otherFile.id}
+                        href={otherFile.file}
+                    >
+                        {getFileNameFromUrl(otherFile.file)}
+                    </Link>
+                ))}
+            </ListView>
+        </ListView>
     );
 }
 
diff --git a/app/src/components/printable/PrintableFileOutput/styles.module.css b/app/src/components/printable/PrintableFileOutput/styles.module.css
deleted file mode 100644
index 3cebfeea9a..0000000000
--- a/app/src/components/printable/PrintableFileOutput/styles.module.css
+++ /dev/null
@@ -1,24 +0,0 @@
-.printable-file-output {
-    display: flex;
-    flex-direction: column;
-    gap: var(--go-ui-spacing-md);
-
-    .image-items {
-        display: flex;
-        align-items: stretch;
-        flex-direction: column;
-        gap: var(--go-ui-width-separator-md);
-
-        > * {
-            flex-basis: 0;
-            flex-grow: 1;
-            min-width: 0;
-        }
-    }
-
-    .file-items {
-        display: flex;
-        flex-direction: column;
-        gap: var(--go-ui-spacing-xs);
-    }
-}
diff --git a/app/src/hooks/domain/useChecklistFormArray.ts b/app/src/hooks/domain/useChecklistFormArray.ts
index 67216d422f..6dad10410a 100644
--- a/app/src/hooks/domain/useChecklistFormArray.ts
+++ b/app/src/hooks/domain/useChecklistFormArray.ts
@@ -26,6 +26,7 @@ interface Options<KEY extends string | number, ITEM> {
     removeValue: (index: number) => void;
 }
 
+// FIXME: Revisit this hook in the future
 function useChecklistFormArray<KEY extends string | number, ITEM>(
     options: Options<KEY, ITEM>,
 ) {
diff --git a/app/src/views/AccountMyFormsEap/i18n.json b/app/src/views/AccountMyFormsEap/i18n.json
index 4fcb4dcfd7..f9b1d0fc1c 100644
--- a/app/src/views/AccountMyFormsEap/i18n.json
+++ b/app/src/views/AccountMyFormsEap/i18n.json
@@ -6,6 +6,11 @@
         "eapLastUpdated": "Last Updated",
         "eapName": "Name/Phase",
         "eapType": "EAP Type",
-        "eapStatus": "Status"
+        "eapStatus": "Status",
+        "eapDevelopmentRegistration": "EAP Development Registration",
+        "eapApplicationVersion": "EAP Application v{version}",
+        "eapTechnicallyValidated": "Technically Validated",
+        "eapApproved": "Approved",
+        "eapProjectAgreementSigned": "Project Agreement Signed"
     }
 }
diff --git a/app/src/views/AccountMyFormsEap/index.tsx b/app/src/views/AccountMyFormsEap/index.tsx
index 821b13918f..7fcd5c7a2d 100644
--- a/app/src/views/AccountMyFormsEap/index.tsx
+++ b/app/src/views/AccountMyFormsEap/index.tsx
@@ -19,6 +19,7 @@ import {
     createExpansionIndicatorColumn,
     createStringColumn,
     numericIdSelector,
+    resolveToString,
 } from '@ifrc-go/ui/utils';
 import {
     isDefined,
@@ -192,7 +193,7 @@ export function Component() {
 
                 const items = [
                     {
-                        label: 'EAP Development Registration',
+                        label: strings.eapDevelopmentRegistration,
                         lastUpdated: modified_at,
                         eap: eapListItem,
                         type: 'registration',
@@ -201,7 +202,10 @@ export function Component() {
                     } satisfies EapExpandedListItem,
                     ...(eap_type === EAP_TYPE_SIMPLIFIED
                         ? simplified_eap_details.map((simplifiedEap) => ({
-                            label: `EAP Application v${simplifiedEap.version}`,
+                            label: resolveToString(
+                                strings.eapApplicationVersion,
+                                { version: simplifiedEap.version },
+                            ),
                             lastUpdated: simplifiedEap.modified_at,
                             eap: eapListItem,
                             type: 'development',
@@ -215,7 +219,10 @@ export function Component() {
                     ),
                     ...(eap_type === EAP_TYPE_FULL
                         ? full_eap_details.map((fullEap) => ({
-                            label: `EAP Application v${fullEap.version}`,
+                            label: resolveToString(
+                                strings.eapApplicationVersion,
+                                { version: fullEap.version },
+                            ),
                             lastUpdated: fullEap.modified_at,
                             eap: eapListItem,
                             type: 'development',
@@ -229,7 +236,10 @@ export function Component() {
                     ),
                     ((isNotDefined(eap_type) || !eapStarted)
                         ? ({
-                            label: 'EAP Application v1',
+                            label: resolveToString(
+                                strings.eapApplicationVersion,
+                                { version: 1 },
+                            ),
                             eap: eapListItem,
                             type: 'development',
                             details: undefined,
@@ -238,7 +248,7 @@ export function Component() {
                         : undefined
                     ),
                     {
-                        label: 'Technically Validated',
+                        label: strings.eapTechnicallyValidated,
                         eap: eapListItem,
                         type: 'validated',
                         lastUpdated: eapListItem.technically_validated_at ?? undefined,
@@ -246,7 +256,7 @@ export function Component() {
                         disabled: status < EAP_STATUS_TECHNICALLY_VALIDATED,
                     } satisfies EapExpandedListItem,
                     {
-                        label: 'Approved',
+                        label: strings.eapApproved,
                         lastUpdated: eapListItem.approved_at ?? undefined,
                         eap: eapListItem,
                         type: 'approved',
@@ -254,7 +264,7 @@ export function Component() {
                         disabled: status < EAP_STATUS_APPROVED,
                     } satisfies EapExpandedListItem,
                     {
-                        label: 'Project Agreement Signed',
+                        label: strings.eapProjectAgreementSigned,
                         eap: eapListItem,
                         lastUpdated: eapListItem.project_agreement_signed_at ?? undefined,
                         type: 'project-agreement-signed',
@@ -269,7 +279,14 @@ export function Component() {
                 } satisfies EapExpandedItem;
             },
         )
-    ), [eapListResponse]);
+    ), [
+        eapListResponse,
+        strings.eapDevelopmentRegistration,
+        strings.eapApplicationVersion,
+        strings.eapTechnicallyValidated,
+        strings.eapApproved,
+        strings.eapProjectAgreementSigned,
+    ]);
 
     const detailColumns = useMemo(
         () => ([
diff --git a/app/src/views/EapFullForm/Overview/KeyActorsInput/i18n.json b/app/src/views/EapFullForm/Overview/KeyActorsInput/i18n.json
index 9c62c218c1..db3254b449 100644
--- a/app/src/views/EapFullForm/Overview/KeyActorsInput/i18n.json
+++ b/app/src/views/EapFullForm/Overview/KeyActorsInput/i18n.json
@@ -1,7 +1,7 @@
 {
     "namespace": "eapFullForm",
     "strings": {
-        "overviewKeyActorsSelectPartnerLabel": "Select Partner",
+        "overviewKeyActorsPartnerPlaceholder": "Enter partner",
         "overviewKeyActorsDescriptionLabel": "Description",
         "overviewKeyActorsDeleteButton": "Delete Actor"
     }
diff --git a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
index e7b41e7cff..944c8d321f 100644
--- a/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
+++ b/app/src/views/EapFullForm/Overview/KeyActorsInput/index.tsx
@@ -86,7 +86,7 @@ function KeyActorsInput(props: Props) {
                     spacing="sm"
                 >
                     <TextInput
-                        placeholder={strings.overviewKeyActorsSelectPartnerLabel}
+                        placeholder={strings.overviewKeyActorsPartnerPlaceholder}
                         error={error?.partner}
                         name="partner"
                         onChange={onFieldChange}
diff --git a/app/src/views/EapFullForm/TriggerModel/index.tsx b/app/src/views/EapFullForm/TriggerModel/index.tsx
index 47946bf36a..4c44ac09df 100644
--- a/app/src/views/EapFullForm/TriggerModel/index.tsx
+++ b/app/src/views/EapFullForm/TriggerModel/index.tsx
@@ -99,6 +99,33 @@ function TriggerModel(props: Props) {
         SourceInformationFormFields
     >('trigger_statement_source_of_information', setFieldValue);
 
+    const handleLeadTimeframeUnitChange = useCallback(
+        (newValue: TimeframeOption['key'] | undefined) => {
+            setFieldValue(newValue, 'lead_timeframe_unit' as const);
+
+            setFieldValue(
+                (oldValue: PartialEapFullFormType['planned_operations']) => (
+                    oldValue?.map((operation) => ({
+                        ...operation,
+                        early_action_activities: operation.early_action_activities?.map(
+                            (activity) => (
+                                activity.timeframe === newValue
+                                    ? activity
+                                    : {
+                                        ...activity,
+                                        timeframe: newValue,
+                                        time_value: undefined,
+                                    }
+                            ),
+                        ),
+                    }))
+                ),
+                'planned_operations' as const,
+            );
+        },
+        [setFieldValue],
+    );
+
     const handleSourcesForecastAdd = useCallback(() => {
         const newSourceInformationItem: SourceInformationFormFields = {
             client_id: randomString(),
@@ -300,7 +327,7 @@ function TriggerModel(props: Props) {
                             name="lead_timeframe_unit"
                             value={value?.lead_timeframe_unit}
                             error={error?.lead_timeframe_unit}
-                            onChange={setFieldValue}
+                            onChange={handleLeadTimeframeUnitChange}
                             options={eap_timeframe}
                             keySelector={timeframeKeySelector}
                             labelSelector={stringValueSelector}
diff --git a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
index 42a8f32b4d..0a11573f9d 100644
--- a/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
+++ b/app/src/views/EapSimplifiedForm/EarlyAction/index.tsx
@@ -1,3 +1,4 @@
+import { useCallback } from 'react';
 import {
     Container,
     Description,
@@ -75,6 +76,33 @@ function EarlyAction(props: Props) {
         (item) => item.key !== TIMEFRAME_YEAR,
     );
 
+    const handleLeadTimeframeUnitChange = useCallback(
+        (newValue: TimeframeOption['key'] | undefined) => {
+            setFieldValue(newValue, 'seap_lead_timeframe_unit' as const);
+
+            setFieldValue(
+                (oldValue: PartialSimplifiedEapType['planned_operations']) => (
+                    oldValue?.map((operation) => ({
+                        ...operation,
+                        early_action_activities: operation.early_action_activities?.map(
+                            (activity) => (
+                                activity.timeframe === newValue
+                                    ? activity
+                                    : {
+                                        ...activity,
+                                        timeframe: newValue,
+                                        time_value: undefined,
+                                    }
+                            ),
+                        ),
+                    }))
+                ),
+                'planned_operations' as const,
+            );
+        },
+        [setFieldValue],
+    );
+
     return (
         <TabPage
             headerAction={(
@@ -433,7 +461,7 @@ function EarlyAction(props: Props) {
                             label={strings.operationTimeFrame}
                             name="seap_lead_timeframe_unit"
                             value={value.seap_lead_timeframe_unit}
-                            onChange={setFieldValue}
+                            onChange={handleLeadTimeframeUnitChange}
                             keySelector={timeframeKeySelector}
                             labelSelector={stringValueSelector}
                             options={eapTimeframeOption}
diff --git a/cacheppuccino b/cacheppuccino
index 373b1659b5..7fe8c83449 160000
--- a/cacheppuccino
+++ b/cacheppuccino
@@ -1 +1 @@
-Subproject commit 373b1659b5f376cb6af9b05ce142a503ee23b085
+Subproject commit 7fe8c83449195f3df6dfbdebbdf60e11fedf19ca
diff --git a/translationMigrations/000087-1786348663165.json b/translationMigrations/000087-1786348663165.json
new file mode 100644
index 0000000000..829623427c
--- /dev/null
+++ b/translationMigrations/000087-1786348663165.json
@@ -0,0 +1,1031 @@
+{
+    "parent": "000086-1785533633747.json",
+    "actions": [
+        {
+            "action": "add",
+            "key": "textBadgeWordCountLabel",
+            "namespace": "common",
+            "value": "{wordCount} / {maxWords} words"
+        },
+        {
+            "action": "add",
+            "key": "confirmationCancelButton",
+            "namespace": "confirmationModal",
+            "value": "Cancel"
+        },
+        {
+            "action": "add",
+            "key": "confirmationConfirmButton",
+            "namespace": "confirmationModal",
+            "value": "Continue"
+        },
+        {
+            "action": "add",
+            "key": "confirmationHeading",
+            "namespace": "confirmationModal",
+            "value": "Are you sure?"
+        },
+        {
+            "action": "add",
+            "key": "eapApplicationVersion",
+            "namespace": "eapApplication",
+            "value": "EAP Application v{version}"
+        },
+        {
+            "action": "add",
+            "key": "eapApproved",
+            "namespace": "eapApplication",
+            "value": "Approved"
+        },
+        {
+            "action": "add",
+            "key": "eapDevelopmentRegistration",
+            "namespace": "eapApplication",
+            "value": "EAP Development Registration"
+        },
+        {
+            "action": "add",
+            "key": "eapProjectAgreementSigned",
+            "namespace": "eapApplication",
+            "value": "Project Agreement Signed"
+        },
+        {
+            "action": "add",
+            "key": "eapTechnicallyValidated",
+            "namespace": "eapApplication",
+            "value": "Technically Validated"
+        },
+        {
+            "action": "remove",
+            "key": "delegationFocalLabel",
+            "namespace": "eapFullExport"
+        },
+        {
+            "action": "remove",
+            "key": "delegationHeadLabel",
+            "namespace": "eapFullExport"
+        },
+        {
+            "action": "remove",
+            "key": "delegationLabel",
+            "namespace": "eapFullExport"
+        },
+        {
+            "action": "remove",
+            "key": "globalOpsLabel",
+            "namespace": "eapFullExport"
+        },
+        {
+            "action": "update",
+            "key": "mealHeading",
+            "namespace": "eapFullExport",
+            "newValue": "Monitoring, Evaluation, Accountability Learning (MEAL)"
+        },
+        {
+            "action": "update",
+            "key": "mealLabel",
+            "namespace": "eapFullExport",
+            "newValue": "MEAL"
+        },
+        {
+            "action": "add",
+            "key": "activationFilesCountLabel",
+            "namespace": "eapFullForm",
+            "value": "5 files max(optional)"
+        },
+        {
+            "action": "add",
+            "key": "activationSelectFilesLabel",
+            "namespace": "eapFullForm",
+            "value": "Select files"
+        },
+        {
+            "action": "add",
+            "key": "attachFilesSelectFilesLabel",
+            "namespace": "eapFullForm",
+            "value": "Select Files"
+        },
+        {
+            "action": "add",
+            "key": "enablingApproachRemoveConfirmation",
+            "namespace": "eapFullForm",
+            "value": "Removing this approach will delete all the data entered for it. Do you want to continue?"
+        },
+        {
+            "action": "add",
+            "key": "enablingApproachUnselectConfirmation",
+            "namespace": "eapFullForm",
+            "value": "Unselecting an approach will delete all the data entered for it. Do you want to continue?"
+        },
+        {
+            "action": "add",
+            "key": "overviewKeyActorsPartnerPlaceholder",
+            "namespace": "eapFullForm",
+            "value": "Enter partner"
+        },
+        {
+            "action": "add",
+            "key": "plannedOperationSectorRemoveConfirmation",
+            "namespace": "eapFullForm",
+            "value": "Removing this sector will delete all the data entered for it. Do you want to continue?"
+        },
+        {
+            "action": "add",
+            "key": "plannedOperationSectorUnselectConfirmation",
+            "namespace": "eapFullForm",
+            "value": "Unselecting a sector will delete all the data entered for it. Do you want to continue?"
+        },
+        {
+            "action": "add",
+            "key": "riskAnalysisFileCountLabel",
+            "namespace": "eapFullForm",
+            "value": "5 files max(optional)"
+        },
+        {
+            "action": "add",
+            "key": "selectionActionFilesCountLabel",
+            "namespace": "eapFullForm",
+            "value": "5 files max(optional)"
+        },
+        {
+            "action": "add",
+            "key": "selectionActionSelectFilesLabel",
+            "namespace": "eapFullForm",
+            "value": "Select files"
+        },
+        {
+            "action": "add",
+            "key": "theoryOfChangeTableDescription",
+            "namespace": "eapFullForm",
+            "value": "Show how the selected action aims to reduce the expected humanitarian impact, by filling out the Theory of Change (ToC) table"
+        },
+        {
+            "action": "add",
+            "key": "triggerModelFileCountLabel",
+            "namespace": "eapFullForm",
+            "value": "5 files max(optional)"
+        },
+        {
+            "action": "add",
+            "key": "triggerSelectFilesLabel",
+            "namespace": "eapFullForm",
+            "value": "Select files"
+        },
+        {
+            "action": "remove",
+            "key": "activationImageCountLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "activationSelectImagesLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "attachFilesSelectImagesLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "definitionJustificationDescription5",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "overviewKeyActorsSelectPartnerLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSDeleteButton",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSEmailLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSNameLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSPhoneNumberLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSTitleLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "riskAnalysisImagesCountLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "selectionActionImagesCountLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "selectionActionSelectImagesLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "triggerModelImagesCountLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "remove",
+            "key": "triggerSelectImagesLabel",
+            "namespace": "eapFullForm"
+        },
+        {
+            "action": "update",
+            "key": "actionsSectionCriteriaComment1",
+            "namespace": "eapFullForm",
+            "newValue": "The Anticipatory Action design process described in the Anticipatory Action Manual (chapter 4.2), should be followed and described in the EAP (it can be adapted to the respective context). If some disaster impacts are not addressed, an explanation should be provided and also indicate which actions were considered but not chosen"
+        },
+        {
+            "action": "update",
+            "key": "activationPeopleTargetedTitle",
+            "namespace": "eapFullForm",
+            "newValue": "Total people targeted"
+        },
+        {
+            "action": "update",
+            "key": "activationProcessDescription2",
+            "namespace": "eapFullForm",
+            "newValue": "Early Describe the step-by-step process from Day 1 to Day X for the implementation of the selected early actions. Indicate the day when the Stop Mechanism would occur. Include all critical and support tasks that are necessary for each of the steps. Each task should indicate the position of the person responsible (including when cash-based actions are planned liaison with the financial service provider)"
+        },
+        {
+            "action": "update",
+            "key": "activationProcessTooltip",
+            "namespace": "eapFullForm",
+            "newValue": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see Anticipatory Action Manual, Chapter 4.2 Select Early Actions."
+        },
+        {
+            "action": "update",
+            "key": "activationSectionCriteriaIntroduction1",
+            "namespace": "eapFullForm",
+            "newValue": "There is a mechanism in place to monitor the forecasts (ad /or trigger related indicators) and alert relevant actors as soon as a trigger is reached to initiate the early actions. This implies that the process to trigger the Anticipatory Action system is clearly understood by all the key staff of the NS and relevant partners."
+        },
+        {
+            "action": "update",
+            "key": "activationSelectionExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "Anticipatory Action aims to protect the most vulnerable from the impact of extreme weather events. Based on the analysis on vulnerability and exposure (in section 3) and on the described mechanism for identifying intervention areas/communities (in section 4- Intervention area), it needs to be clear, how vulnerability criteria and impact forecasts will be applied to determine who will be targeted."
+        },
+        {
+            "action": "update",
+            "key": "capacityHeadingTooltip",
+            "namespace": "eapFullForm",
+            "newValue": "Capacity to deliver early action is a key aspect of the Anticipatory Action system. To have access to the DREF the NS should describe why and how it will be able to implement the early actions proposed in this protocol within the lead time and reaching all of the targeted population. This section could make reference to NS’s experience with previous DREFs (types of disasters, quantity of operations, planned operations implemented, among others). If a National Society has already gone through a Preparedness for Effective Response (PER) assessment process the results of these assessments should be referred to in this section as they provide National Societies with systematic, evidence-based information on their ability to conduct timely early action (looking also at support areas)."
+        },
+        {
+            "action": "update",
+            "key": "capacityOperationalDescription2",
+            "namespace": "eapFullForm",
+            "newValue": "If a feasibility study on Anticipatory Action was conducted, indicate the findings in relation to the capacity of the NS to implement Anticipatory Action."
+        },
+        {
+            "action": "update",
+            "key": "capacityOperationalDescription3",
+            "namespace": "eapFullForm",
+            "newValue": "Indicate the number of staff and volunteers available for a potential activation. Explain how they have been trained on Anticipatory Action/ activation."
+        },
+        {
+            "action": "update",
+            "key": "definitionJustificationDescription4",
+            "namespace": "eapFullForm",
+            "newValue": "Explain how the return period was calculated"
+        },
+        {
+            "action": "update",
+            "key": "definitionJustificationExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "The DREF provides funding for early action for events of a strength that has caused significant humanitarian impact in the past. Explain how a certain magnitude was selected and how the impact level was defined (see guidance in the Anticipatory Action manual chapter 4.1 Set the Trigger (particularly Steps 6-8)). Define the relationship between impact (utilizing the prioritized impact/s section 3.3) and hazard magnitude to establish which impact can be expected given specific hazard magnitudes."
+        },
+        {
+            "action": "update",
+            "key": "exposeElementExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "An analysis of exposure is required to determine who and what is located in the area where the hazard might occur. This will help to determine who and what is likely to be impacted. In line with the impact-based forecasting logic, it is important to identify the main exposed elements on which the Anticipatory Action intervention will focus. For example, if the prioritized impact of floods is the mortality of children under 5 due to water-borne diseases, then the exposed element will be the population of children under 5: or if the most frequently recurring and largest impact due to tropical storms is the damage to houses built with light materials, then the exposed element will be houses built with light materials. A thorough understanding of the levels of vulnerability (of the exposed elements) will help identify the main risks and ensure that Forecast-based actions are well suited. For instance, if children under 5 are susceptible to death or sickness due to floods, describe the underlying causes of the problem. For more guidance see the Anticipatory Action Manual (Chapter 4.1 Set the Trigger)"
+        },
+        {
+            "action": "update",
+            "key": "feasibilityExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "In this section please describe why it is feasible to implement the selected actions, based on: time to implement the action, capacity of the National Society to implement, available resources (human, logistics, materials, etc.) and access considerations (see Anticipatory Action Manual Chapter 4.2 Select Early Actions on criteria.)"
+        },
+        {
+            "action": "update",
+            "key": "financeEapEndorsementExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "It should be ensured that at the point of the trigger being reached no further permissions are needed. Thus, the EAP should have prior approval from all relevant stakeholders. The EAP must be endorsed by the leadership of the submitting NS. The EAP should also be endorsed by other key relevant stakeholders, such as the NHMS and the respective DRM authorities. If technical working groups have been created for Anticipatory Action, their members should also endorse the final version of the EAP before submission."
+        },
+        {
+            "action": "update",
+            "key": "financeExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "The EAP budget consists of all the costs linked to the activation of the EAP as well as readiness and pre-positioning costs. The budget cannot include costs for the development of the EAP and the setting up of the Anticipatory Action system in a country (e.g. initial trainings of volunteers, etc.). This process should be financed by other sources of longer-term funding. The maximum amount of funding available for each EAP from the DREF is 500,000 Swiss francs. The budget will have to include the IFRC indirect costs of 6,5%. The National Society may include administrative costs as well in the EAP which should not be more than 5% of the early action budget. If the 5% rate is not used the National Society will need to list out the each of the admin cost individually. The M&E budget should be maximum 5% of overall the budget."
+        },
+        {
+            "action": "update",
+            "key": "financeReadinessCostExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "Readiness costs cover those costs related to the upkeep/maintenance of the Anticipatory Action system in-country, once it has been established and the EAP has been developed. This refers to the required costs to ensure that the NS is “ready” to implement the EAP at any point during the five-year lifecycle of the EAP. These could include, for example, costs for refresher trainings, warehouses, updating data, staff, costs for markets monitoring, costs for updating the cash transfer value etc. Readiness combined with pre-positioning costs are limited to 65% of the total EAP budget over the EAP’s lifecycle and are disbursed by the DREF on an annual basis through the IFRC Operational Plan for that specific country."
+        },
+        {
+            "action": "update",
+            "key": "hazardSelectionDescription1",
+            "namespace": "eapFullForm",
+            "newValue": "Provide a brief rationale about the selection of the hazard for the Anticipatory Action system."
+        },
+        {
+            "action": "update",
+            "key": "hazardSelectionExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "Which hazard needs to be addressed by Anticipatory Action in the country as a priority? Provide an explanation on the reasons that the selected hazard was chosen for this EAP and why it is a major problem in the country.The DREF allocates funding for EAPs to reduce the impacts of extreme events of a strength or magnitude that in the past have required humanitarian assistance. In order to demonstrate that the selected hazard has caused extreme humanitarian impacts in the past, information on the previous impacts of the selected hazard in the country should be provided. This can be gathered from interviews with RC or DRM authorities, archives, records, etc. Other potential sources of information could be National disaster registries, Post Disaster Needs Assessment databases, Desinventar, EMDat, PreventionWeb, etc. For more guidance see the Anticipatory Action Manual (Chapter 4.1 Set the Trigger)"
+        },
+        {
+            "action": "update",
+            "key": "hazardSelectionRequiredPoint1",
+            "namespace": "eapFullForm",
+            "newValue": "Provide a brief rationale about the selection of the hazard for the Anticipatory Action system."
+        },
+        {
+            "action": "update",
+            "key": "mealDescription1",
+            "namespace": "eapFullForm",
+            "newValue": "Following the guidance of the Anticipatory Action Manual, describe the M&E plan for this EAP. Including:"
+        },
+        {
+            "action": "update",
+            "key": "mealDescription3",
+            "namespace": "eapFullForm",
+            "newValue": "Describe how the Anticipatory Action M&E plan is linked to the existing PMER system of the National Society. If the NS does not have a PMER system, explain how the EAP will be used to strengthen this area prior to activation"
+        },
+        {
+            "action": "update",
+            "key": "mealExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "Building evidence about the impact of Anticipatory Action systems is a priority. Therefore, the EAP should include an M&E plan to 1) assess the impact of the early actions and the extreme event after each activation and 2) identify if all activities were carried out as planned and document how early actions were implemented 3) learn from the process to improve the system in the future. The chapters 4.3 Design M&E plan and 6. Activate, Monitor, Evaluate in the Anticipatory Action Manual, provide guidance on the set-up and implementation of the monitoring, evaluation, learning tools. Ideally, the M&E system should be set up to allow comparison of impacts between communities that received early actions and those that didn´t (please refer to Anticipatory Action manual for more information). This M&E plan should be harmonized with the existing IFRC PMER guidance and tools, available on FedNet."
+        },
+        {
+            "action": "update",
+            "key": "mealHeading",
+            "namespace": "eapFullForm",
+            "newValue": "Monitoring, Evaluation, Accountability Learning (MEAL)"
+        },
+        {
+            "action": "update",
+            "key": "mealSectionHeading",
+            "namespace": "eapFullForm",
+            "newValue": "Quality Criteria: MEAL"
+        },
+        {
+            "action": "update",
+            "key": "mealTabLabel",
+            "namespace": "eapFullForm",
+            "newValue": "MEAL"
+        },
+        {
+            "action": "update",
+            "key": "mealTitle",
+            "namespace": "eapFullForm",
+            "newValue": "MEAL"
+        },
+        {
+            "action": "update",
+            "key": "prioritisedImpactExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "Recognizing that an Anticipatory Action system will not be able to address all risks and potential impacts, based on the analysis of past impact, exposure and vulnerability (sections 3.1. to 3.2) and the results of the joint identification conducted with key stakeholders, indicate which disaster impacts were prioritized, explaining how and why they were prioritized. For more guidance see the Anticipatory Action Manual (Chapters 4.1 Set the Trigger and 4.2 Select Early Actions)"
+        },
+        {
+            "action": "update",
+            "key": "riskSectionCriteriaIntroduction1",
+            "namespace": "eapFullForm",
+            "newValue": "The EAP triggers are based on a combination of the analysis of risk factors and the forecast in line with the steps of the trigger methodology outlined in the Anticipatory Action manual. The EAP contains a clear trigger statement."
+        },
+        {
+            "action": "update",
+            "key": "selectionActionsTooltipDescription",
+            "namespace": "eapFullForm",
+            "newValue": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see Anticipatory Action Manual, Chapter 4.2 Select Early Actions."
+        },
+        {
+            "action": "update",
+            "key": "selectionProcessDescription4",
+            "namespace": "eapFullForm",
+            "newValue": "Does the Anticipatory Action activation intend to use government social protection systems? Other State institutions’ databases and/or sources? Provide an explanation of potential number of target population to be selected."
+        },
+        {
+            "action": "update",
+            "key": "selectionProcessExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "It is crucial to select early actions that have the most potential to reduce the identified risks(s) and are feasible to implement given the lead time of the forecast.  It is important to describe briefly: Who was involved? What data was consulted? Was research conducted? Were communities involved? For more guidance see Anticipatory Action Manual, Chapter 4.2 Select Early Actions."
+        },
+        {
+            "action": "update",
+            "key": "triggerModelTooltipDescription",
+            "namespace": "eapFullForm",
+            "newValue": "The work for the identification of triggers can be very technical and require expert resources. For this process, the National Society can get help from technical experts, Hydro-met services or specialist institutions. The chapter 4.1 Set the Trigger in the Anticipatory Action Manual can be used for guidance."
+        },
+        {
+            "action": "update",
+            "key": "triggerSectionCriteriaIntroduction1",
+            "namespace": "eapFullForm",
+            "newValue": "The EAP triggers are based on a combination of the analysis of risk factors and the forecast in line with the steps of the trigger methodology outlined in the Anticipatory Action manual. The EAP contains a clear trigger statement."
+        },
+        {
+            "action": "update",
+            "key": "triggerStatementExplanatoryNote",
+            "namespace": "eapFullForm",
+            "newValue": "The work for the identification of triggers can be very technical and require expert resources. For this process, the National Society can get help from technical experts, Hydro-met services or specialist institutions. The chapter 4.1 Set the Trigger in the Anticipatory Action Manual can be used for guidance."
+        },
+        {
+            "action": "update",
+            "key": "titleInputLabel",
+            "namespace": "eapIndicatorInput",
+            "newValue": "Indicator name"
+        },
+        {
+            "action": "add",
+            "key": "operationActivationLabel",
+            "namespace": "eapOperationActivityInput",
+            "value": "Activation"
+        },
+        {
+            "action": "add",
+            "key": "operationActivationOneLabel",
+            "namespace": "eapOperationActivityInput",
+            "value": "Activation 1"
+        },
+        {
+            "action": "add",
+            "key": "operationActivationTwoLabel",
+            "namespace": "eapOperationActivityInput",
+            "value": "Activation 2"
+        },
+        {
+            "action": "add",
+            "key": "operationTimeFrameLeadTimeHint",
+            "namespace": "eapOperationActivityInput",
+            "value": "Taken from the lead time in the trigger section. Change it there to update this."
+        },
+        {
+            "action": "update",
+            "key": "operationPriorityActionLabel",
+            "namespace": "eapOperationActivityInput",
+            "newValue": "Activities"
+        },
+        {
+            "action": "add",
+            "key": "earlyActionTitleDescription",
+            "namespace": "eapOperationActivityListInput",
+            "value": "Add activities and select when the specific activity will be implemented."
+        },
+        {
+            "action": "add",
+            "key": "prepositioningTitleDescription",
+            "namespace": "eapOperationActivityListInput",
+            "value": "Add activities and select when the specific activity will be implemented. Pre-positioning for Activation 1 should be done in year 1 and pre-positioning for Activation 2 – after Activation 1 is concluded."
+        },
+        {
+            "action": "add",
+            "key": "readinessTitleDescription",
+            "namespace": "eapOperationActivityListInput",
+            "value": "Add activities and select when the specific activity will be implemented."
+        },
+        {
+            "action": "remove",
+            "key": "earlyActionDatabaseLinkLabel",
+            "namespace": "eapOperationActivityListInput"
+        },
+        {
+            "action": "update",
+            "key": "earlyActionDescription",
+            "namespace": "eapOperationActivityListInput",
+            "newValue": "Early action activities are implemented once a trigger is reached and before the impact of the hazard. Early actions seek to reduce or mitigate the impact of the hazard. Consider selecting only a few early actions, especially for sudden onset events, as they will have to be implemented within a short timeframe. The early actions will be unique to each hazard and context, but may be activities such as evacuation of at-risk communities and/or livestock, early harvest of crops, cash transfer, shelter strengthening, provision of water treatment, hygiene kits or mosquito nets, etc. Start counting the timeframe after the trigger is reached: day 1 is the day the trigger is met."
+        },
+        {
+            "action": "add",
+            "key": "epidemicType",
+            "namespace": "eapRegistration",
+            "value": "Type of Epidemic"
+        },
+        {
+            "action": "add",
+            "key": "otherDisasterType",
+            "namespace": "eapRegistration",
+            "value": "Please Specify"
+        },
+        {
+            "action": "update",
+            "key": "ifrcContactDescription",
+            "namespace": "eapRegistration",
+            "newValue": "IFRC contact supporting the EAP process"
+        },
+        {
+            "action": "update",
+            "key": "registrationDescription",
+            "namespace": "eapRegistration",
+            "newValue": "The purpose of this form is for you to notify the IFRC team of the start of your EAP process. If you need assistance with the initiation of the process, {link}"
+        },
+        {
+            "action": "update",
+            "key": "registrationLink",
+            "namespace": "eapRegistration",
+            "newValue": "send us a message."
+        },
+        {
+            "action": "add",
+            "key": "enablingApproachRemoveConfirmation",
+            "namespace": "eapSimplifiedForm",
+            "value": "Removing this approach will delete all the data entered for it. Do you want to continue?"
+        },
+        {
+            "action": "add",
+            "key": "enablingApproachUnselectConfirmation",
+            "namespace": "eapSimplifiedForm",
+            "value": "Unselecting an approach will delete all the data entered for it. Do you want to continue?"
+        },
+        {
+            "action": "add",
+            "key": "epidemicType",
+            "namespace": "eapSimplifiedForm",
+            "value": "Type of Epidemic"
+        },
+        {
+            "action": "add",
+            "key": "otherDisasterType",
+            "namespace": "eapSimplifiedForm",
+            "value": "Other Disaster Type"
+        },
+        {
+            "action": "add",
+            "key": "plannedOperationsSectorRemoveConfirmation",
+            "namespace": "eapSimplifiedForm",
+            "value": "Removing this sector will delete all the data entered for it. Do you want to continue?"
+        },
+        {
+            "action": "add",
+            "key": "plannedOperationsSectorUnselectConfirmation",
+            "namespace": "eapSimplifiedForm",
+            "value": "Unselecting a sector will delete all the data entered for it. Do you want to continue?"
+        },
+        {
+            "action": "add",
+            "key": "rcrcClimateCenter",
+            "namespace": "eapSimplifiedForm",
+            "value": "RCRC Climate Center"
+        },
+        {
+            "action": "add",
+            "key": "selectFilesLabel",
+            "namespace": "eapSimplifiedForm",
+            "value": "Select files"
+        },
+        {
+            "action": "add",
+            "key": "uploadFileLabel",
+            "namespace": "eapSimplifiedForm",
+            "value": "Upload upto 5 files (optional)"
+        },
+        {
+            "action": "remove",
+            "key": "addPartnerNSContactButton",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "delegation",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "delegationHeader",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "focalPoint",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "nationalHeader",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNS",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSDeleteButton",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSDescription",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSEmailLabel",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNsEmptyMessage",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSNameLabel",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSPhoneNumberLabel",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSTitleLabel",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "regionalCoordinator",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "regionalHeader",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "remove",
+            "key": "uploadImageLabel",
+            "namespace": "eapSimplifiedForm"
+        },
+        {
+            "action": "update",
+            "key": "actionPeopleTargeted",
+            "namespace": "eapSimplifiedForm",
+            "newValue": "Total people targeted"
+        },
+        {
+            "action": "update",
+            "key": "actionsOperational",
+            "namespace": "eapSimplifiedForm",
+            "newValue": "Activation timeframe"
+        },
+        {
+            "action": "update",
+            "key": "actionsOperationalDescription",
+            "namespace": "eapSimplifiedForm",
+            "newValue": "The operational timeframe starts from the trigger date and includes the time it takes to implement the early action activities plus the time it takes to finalize the activation, including time to settle the finances, facilitate the lessons learned workshop and prepare the activation report. Normally the operational timeframe is 3 months for rapid onset disasters and 6 months for slow onset disasters."
+        },
+        {
+            "action": "update",
+            "key": "drefFocalPointDescription",
+            "namespace": "eapSimplifiedForm",
+            "newValue": "The DREF contact person for IFRC"
+        },
+        {
+            "action": "update",
+            "key": "earlyActionsLink",
+            "namespace": "eapSimplifiedForm",
+            "newValue": "the Anticipatory Action Practitioners Manual."
+        },
+        {
+            "action": "update",
+            "key": "practitionersManualLink",
+            "namespace": "eapSimplifiedForm",
+            "newValue": "Anticipatory Action Practitioner’s Manual"
+        },
+        {
+            "action": "update",
+            "key": "selectedEarlyActionDescription",
+            "namespace": "eapSimplifiedForm",
+            "newValue": "List the early actions and explain how they will address the risks and lead to the intended outcome. Explain how the early actions were selected and how they will mitigate the prioritized risk and bring about the intended outcome for the most vulnerable, at-risk individuals and communities."
+        },
+        {
+            "action": "remove",
+            "key": "delegationFocalPointLabel",
+            "namespace": "eapSimplilfiedExport"
+        },
+        {
+            "action": "remove",
+            "key": "delegationHeading",
+            "namespace": "eapSimplilfiedExport"
+        },
+        {
+            "action": "remove",
+            "key": "delegationHeadLabel",
+            "namespace": "eapSimplilfiedExport"
+        },
+        {
+            "action": "remove",
+            "key": "globalOpsCoordinator",
+            "namespace": "eapSimplilfiedExport"
+        },
+        {
+            "action": "add",
+            "key": "apCodeLabel",
+            "namespace": "eapSummaryExport",
+            "value": "AP Code"
+        },
+        {
+            "action": "add",
+            "key": "budgetHeading",
+            "namespace": "eapSummaryExport",
+            "value": "Budget"
+        },
+        {
+            "action": "add",
+            "key": "drefAllocationDescription",
+            "namespace": "eapSummaryExport",
+            "value": "The IFRC Disaster Response Emergency Fund (DREF) has approved a total of CHF {totalBudget} for the implementation of the {nationalSociety} {hazard} EAP. The approved amount consists of an allocation of CHF {readinessAndPrepositioningBudget} for readiness and pre-positioning and CHF {earlyActionBudget} allocated to implement early actions once the defined triggers are met."
+        },
+        {
+            "action": "add",
+            "key": "eapBudgetSummaryLabel",
+            "namespace": "eapSummaryExport",
+            "value": "EAP budget"
+        },
+        {
+            "action": "add",
+            "key": "earlyActionsStrategyHeading",
+            "namespace": "eapSummaryExport",
+            "value": "3. How the EAP will reduce the impact on the population - The Early Actions"
+        },
+        {
+            "action": "add",
+            "key": "earlyActionsSummaryLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Proposed Early Actions by based on the IFRC’s Planned Operation Matrix"
+        },
+        {
+            "action": "add",
+            "key": "hazardLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Hazard"
+        },
+        {
+            "action": "add",
+            "key": "houseHoldsSummaryLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Potential No. of households to be reached"
+        },
+        {
+            "action": "add",
+            "key": "nationalSocietyStrategyHeading",
+            "namespace": "eapSummaryExport",
+            "value": "1. Who will implement the EAP - The National Society"
+        },
+        {
+            "action": "add",
+            "key": "objectiveLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Objective"
+        },
+        {
+            "action": "add",
+            "key": "operationalStrategyHeading",
+            "namespace": "eapSummaryExport",
+            "value": "Operational Strategy"
+        },
+        {
+            "action": "add",
+            "key": "prioritizedImpactsSummaryLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Prioritized risks/impacts to be addressed by early actions"
+        },
+        {
+            "action": "add",
+            "key": "sourceForecastLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Sources of Forecast"
+        },
+        {
+            "action": "add",
+            "key": "summaryHeading",
+            "namespace": "eapSummaryExport",
+            "value": "Summary"
+        },
+        {
+            "action": "add",
+            "key": "totalBudgetLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Total Budget"
+        },
+        {
+            "action": "add",
+            "key": "totalEarlyActionsLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Total Early Actions"
+        },
+        {
+            "action": "add",
+            "key": "totalPrepositioningLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Total Pre-positioning"
+        },
+        {
+            "action": "add",
+            "key": "totalReadinessLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Total Readiness"
+        },
+        {
+            "action": "add",
+            "key": "triggerStatementLabel",
+            "namespace": "eapSummaryExport",
+            "value": "Trigger Statement"
+        },
+        {
+            "action": "add",
+            "key": "triggerStrategyHeading",
+            "namespace": "eapSummaryExport",
+            "value": "2. How the EAP will be activated - The Trigger"
+        },
+        {
+            "action": "remove",
+            "key": "delegationFocalLabel",
+            "namespace": "eapSummaryExport"
+        },
+        {
+            "action": "remove",
+            "key": "delegationHeadLabel",
+            "namespace": "eapSummaryExport"
+        },
+        {
+            "action": "remove",
+            "key": "delegationLabel",
+            "namespace": "eapSummaryExport"
+        },
+        {
+            "action": "remove",
+            "key": "downloadBudgetLabel",
+            "namespace": "eapSummaryExport"
+        },
+        {
+            "action": "remove",
+            "key": "globalOpsLabel",
+            "namespace": "eapSummaryExport"
+        },
+        {
+            "action": "update",
+            "key": "eapContentHeading",
+            "namespace": "earlyActionProtocols",
+            "newValue": "Early Action Protocols (EAPs) are a core mechanism of the IFRC's Forecast-based Financing (Anticipatory Action) approach, designed to ensure that humanitarian action happens before a disaster strikes, rather than only responding afterwards."
+        },
+        {
+            "action": "add",
+            "key": "epidemicType",
+            "namespace": "form",
+            "value": "Type of Epidemic"
+        },
+        {
+            "action": "add",
+            "key": "objectiveDescriptionExample",
+            "namespace": "form",
+            "value": "This EAP aims to reduce/minimize the impact of river flooding in X region by providing early warning dissemination and cash distribution to at risk families."
+        },
+        {
+            "action": "add",
+            "key": "otherDisasterType",
+            "namespace": "form",
+            "value": "Other Disaster Type"
+        },
+        {
+            "action": "add",
+            "key": "rcrcClimateCenter",
+            "namespace": "form",
+            "value": "RCRC Climate Center"
+        },
+        {
+            "action": "remove",
+            "key": "addPartnerNSContactButton",
+            "namespace": "form"
+        },
+        {
+            "action": "remove",
+            "key": "delegation",
+            "namespace": "form"
+        },
+        {
+            "action": "remove",
+            "key": "delegationHeader",
+            "namespace": "form"
+        },
+        {
+            "action": "remove",
+            "key": "formFocalPoint",
+            "namespace": "form"
+        },
+        {
+            "action": "remove",
+            "key": "nationalHeader",
+            "namespace": "form"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNS",
+            "namespace": "form"
+        },
+        {
+            "action": "remove",
+            "key": "partnerNSDescription",
+            "namespace": "form"
+        },
+        {
+            "action": "remove",
+            "key": "regionalCoordinator",
+            "namespace": "form"
+        },
+        {
+            "action": "remove",
+            "key": "regionalHeader",
+            "namespace": "form"
+        },
+        {
+            "action": "update",
+            "key": "drefFocalPointDescription",
+            "namespace": "form",
+            "newValue": "The DREF contact person for IFRC"
+        },
+        {
+            "action": "update",
+            "key": "objectiveDescription",
+            "namespace": "form",
+            "newValue": "Please provide an objective statement that describes the main goal of the intervention. Example: {exampleObjective}"
+        },
+        {
+            "action": "update",
+            "key": "overviewRequiredPoint2",
+            "namespace": "form",
+            "newValue": "In case there are technical working groups for the development of the Anticipatory Action system in country, indicate which organizations participate in these groups."
+        },
+        {
+            "action": "update",
+            "key": "technicalWorkingGroupDescription",
+            "namespace": "form",
+            "newValue": "In case there are technical working groups for the development of the Anticipatory Action system in country, indicate which organizations participate in these groups."
+        },
+        {
+            "action": "add",
+            "key": "acceptedFileFormatsDescription",
+            "namespace": "multiFileObjectInput",
+            "value": "Accepted file formats: {fileFormats}"
+        },
+        {
+            "action": "add",
+            "key": "captionInputPlaceholder",
+            "namespace": "multiFileObjectInput",
+            "value": "Enter caption"
+        },
+        {
+            "action": "add",
+            "key": "imageFilesLabel",
+            "namespace": "multiFileObjectInput",
+            "value": "Images"
+        },
+        {
+            "action": "add",
+            "key": "imagePreviewFallbackText",
+            "namespace": "multiFileObjectInput",
+            "value": "Preview not available"
+        },
+        {
+            "action": "add",
+            "key": "removeFileButtonTitle",
+            "namespace": "multiFileObjectInput",
+            "value": "Delete"
+        },
+        {
+            "action": "add",
+            "key": "activationOneLabel",
+            "namespace": "printableActivityOutput",
+            "value": "Activation 1"
+        },
+        {
+            "action": "add",
+            "key": "activationTwoLabel",
+            "namespace": "printableActivityOutput",
+            "value": "Activation 2"
+        }
+    ]
+}
\ No newline at end of file