Fix styling for download with pga

Author: barshathakuri

app/src/components/domain/DrefExportModal/index.tsx

@@ -28,6 +28,7 @@ import {
 } from '#utils/restRequest';
 
 import i18n from './i18n.json';
+import styles from './styles.module.css';
 
 type ExportTypeEnum = components<'read'>['schemas']['ExportTypeEnum'];
 type ExportStatusEnum = components<'read'>['schemas']['ExportStatusEnum'];
@@ -225,35 +226,33 @@ function DrefExportModal(props: Props) {
                 || exportStatusResponse?.status === EXPORT_STATUS_PENDING)
                 && drefType === DREF_TYPE_IMMINENT
                 && !drefImminentExportError && (
-                <Message
-                    actions={
-                        exportStatusResponse?.pdf_file ? (
-                            <Message
-                                title={strings.drefExportSuccessfully}
-                                description={strings.drefClickDownloadLink}
-                                actions={(
-                                    <Link
-                                        variant="secondary"
-                                        href={exportStatusResponse?.pdf_file}
-                                        external
-                                    >
-                                        {strings.drefDownloadPDF}
-                                    </Link>
-                                )}
-                            />
-                        ) : (
-                            <Button
-                                variant="secondary"
-                                name={undefined}
-                                onClick={handleDrefImminent}
-                            >
-                                {isPga
-                                    ? strings.drefDownloadPDFWithPGA
-                                    : strings.drefDownloadPDFwithoutPGA}
-                            </Button>
-                        )
-                    }
-                />
+                <div className={styles.downloadButton}>
+                    {exportStatusResponse?.pdf_file ? (
+                        <Message
+                            title={strings.drefExportSuccessfully}
+                            description={strings.drefClickDownloadLink}
+                            actions={(
+                                <Link
+                                    variant="secondary"
+                                    href={exportStatusResponse?.pdf_file}
+                                    external
+                                >
+                                    {strings.drefDownloadPDF}
+                                </Link>
+                            )}
+                        />
+                    ) : (!exportStatusResponse && (
+                        <Button
+                            variant="secondary"
+                            name={undefined}
+                            onClick={handleDrefImminent}
+                        >
+                            {isPga
+                                ? strings.drefDownloadPDFWithPGA
+                                : strings.drefDownloadPDFwithoutPGA}
+                        </Button>
+                    ))}
+                </div>
             )}
             {isDefined(exportStatusResponse)
                 && exportStatusResponse.status === EXPORT_STATUS_COMPLETED

app/src/components/domain/DrefExportModal/styles.module.css

@@ -0,0 +1,6 @@
+.download-button {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    padding: var(--go-ui-spacing-sm);
+}

app/src/views/DrefApplicationForm/Operation/i18n.json

@@ -56,7 +56,7 @@
         "drefFormMen": "Men",
         "drefFormTotalTargeted": "Total targeted population is different from that in Operation Overview",
         "drefFormTotalTargetedPopulation": "Total targeted population is not equal to sum of other population fields",
-        "drefFormOperationUploadDocumentButtonLabel": "Upload any additional support document (Optional)",
+        "drefFormUploadDocumentButtonLabel": "Upload any additional support document (Optional)",
         "drefFormUploadTargetingDocumentButtonLabel": "Upload document",
         "drefFormProposedActionSelectBudgetNote": "Please note that if Surge Personnel are deployed, the Surge Deployment cost will be CHF 10,000, and the Indirect Costs will be CHF 5,800. Conversely, if Surge Personnel are not deployed, the Surge Deployment cost will not be applicable, and the Indirect Costs will be CHF 5,000.",
         "drefFormProposedActionSelectActivitiesLabel": "Select the activity",

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

@@ -473,7 +473,7 @@ function Operation(props: Props) {
                             clearable
                             disabled={disabled}
                         >
-                            {strings.drefFormUploadSupportingDocumentButtonLabel}
+                            {strings.drefFormUploadTargetingDocumentButtonLabel}
                         </GoSingleFileInput>
                     </InputSection>
                 </Container>
@@ -808,7 +808,7 @@ function Operation(props: Props) {
                 )}
                 {value.type_of_dref === TYPE_IMMINENT && (
                     <InputSection
-                        title={strings.drefFormUploadSupportingDocumentButtonLabel}
+                        title={strings.drefFormUploadDocumentButtonLabel}
                         description={strings.drefUploadSupportingDocumentTitle}
                     >
                         <GoSingleFileInput
@@ -823,7 +823,7 @@ function Operation(props: Props) {
                             clearable
                             disabled={disabled}
                         >
-                            {strings.drefFormOperationUploadDocumentButtonLabel}
+                            {strings.drefFormUploadSupportingDocumentButtonLabel}
                         </GoSingleFileInput>
                     </InputSection>
                 )}

translationMigrations/000014-1738732717583.json

@@ -0,0 +1,11 @@
+{
+    "parent": "000013-1738649630110.json",
+    "actions": [
+        {
+            "action": "update",
+            "key": "drefFormOperationUploadDocumentButtonLabel",
+            "newKey": "drefFormUploadDocumentButtonLabel",
+            "namespace": "drefApplicationForm"
+        }
+    ]
+}