Merge pull request #1852 from IFRCGo/fix/hot-fix-dref-super-ticket

Hotfix: Dref superticket

Author: frozenhelium

.changeset/tame-peas-turn.md

@@ -0,0 +1,8 @@
+---
+"go-web-app": patch
+---
+
+Update DREF forms
+
+- Move Response strategy description from placeholder to below the input
+- Add DREF allocation field in event details for the Loan type Ops. update form

app/src/views/DrefApplicationForm/Operation/index.tsx

@@ -696,12 +696,12 @@ function Operation(props: Props) {
                     />
                 </InputSection>
                 <InputSection
-                    description={!plannedBudgetMatchRequestedAmount && (
+                    description={!plannedBudgetMatchRequestedAmount ? (
                         <div className={styles.warning}>
                             <ErrorWarningFillIcon className={styles.icon} />
                             {strings.drefFormResponseTotalAmountOfPlannedBudget}
                         </div>
-                    )}
+                    ) : <div />}
                 >
                     <div className={styles.interventionSelectionContainer}>
                         <SelectInput

app/src/views/DrefFinalReportForm/Operation/index.tsx

@@ -242,7 +242,7 @@ function Operation(props: Props) {
                         onChange={setFieldValue}
                         value={value.response_strategy}
                         error={error?.response_strategy}
-                        placeholder={strings.drefFormResponseRationalePlaceholder}
+                        hint={strings.drefFormResponseRationalePlaceholder}
                         disabled={disabled}
                     />
                 </InputSection>

app/src/views/DrefOperationalUpdateForm/EventDetail/i18n.json

@@ -7,6 +7,7 @@
         "drefOperationalUpdateSummaryAreYouChangingTargetPopulation": "Are you changing the target population of the operation",
         "drefOperationalUpdateSummaryAreYouChangingGeographicalLocation": "Are you changing the geographical location",
         "drefOperationalUpdateSummaryAreYouChangingBudget": "Are you making changes to the budget",
+        "drefOperationalUpdateAllocationSoFarForTypeLoan": "Budget Allocated so far",
         "drefOperationalUpdateSummaryRequestForSecondAllocation": "Are you requesting an additional allocation?",
         "drefOperationalUpdateEventMaterialize": "Has the forecasted event materialize?",
         "drefOperationalUpdateEventMaterializeExplain": "Please explain how is the operation is transitioning from Anticipatory to Response",

app/src/views/DrefOperationalUpdateForm/EventDetail/index.tsx

@@ -366,6 +366,21 @@ function EventDetail(props: Props) {
                     {/* NOTE: Empty div to preserve the layout */}
                     <div />
                 </InputSection>
+                {value.type_of_dref === TYPE_LOAN && (
+                    <Container>
+                        <InputSection
+                            title={strings.drefOperationalUpdateAllocationSoFarForTypeLoan}
+                        >
+                            <NumberInput
+                                name="total_dref_allocation"
+                                value={value?.total_dref_allocation}
+                                onChange={setFieldValue}
+                                error={error?.total_dref_allocation}
+                                disabled={disabled}
+                            />
+                        </InputSection>
+                    </Container>
+                )}
                 {value.type_of_dref !== TYPE_LOAN && (
                     <InputSection
                         title={

app/src/views/DrefOperationalUpdateForm/Operation/index.tsx

@@ -289,7 +289,7 @@ function Operation(props: Props) {
                         onChange={setFieldValue}
                         value={value.response_strategy}
                         error={error?.response_strategy}
-                        placeholder={strings.drefFormResponseRationalePlaceholder}
+                        hint={strings.drefFormResponseRationalePlaceholder}
                         disabled={disabled}
                     />
                 </InputSection>

translationMigrations/000034-1749016435785.json

@@ -0,0 +1,11 @@
+{
+    "parent": "000033-1748942208005.json",
+    "actions": [
+        {
+            "action": "add",
+            "key": "drefOperationalUpdateAllocationSoFarForTypeLoan",
+            "namespace": "drefOperationalUpdateForm",
+            "value": "Budget Allocated so far"
+        }
+    ]
+}