diff --git a/app/src/utils/constants.ts b/app/src/utils/constants.ts index 532361b9b..b5e910192 100644 --- a/app/src/utils/constants.ts +++ b/app/src/utils/constants.ts @@ -84,8 +84,8 @@ export const FONT_FAMILY_HEADER = 'Montserrat'; // This should not be the same as OperationType. export type DrefStatus = components<'read'>['schemas']['DrefDrefStatusEnumKey']; export const DREF_STATUS_DRAFT = 1 satisfies DrefStatus; -export const DREF_STATUS_FINALIZED = 3 satisfies DrefStatus; -export const DREF_STATUS_APPROVED = 4 satisfies DrefStatus; +export const DREF_STATUS_FINALIZED = 2 satisfies DrefStatus; +export const DREF_STATUS_APPROVED = 3 satisfies DrefStatus; export type TypeOfDrefEnum = components<'read'>['schemas']['DrefDrefDrefTypeEnumKey']; export const DREF_TYPE_IMMINENT = 0 satisfies TypeOfDrefEnum; diff --git a/app/src/views/AccountMyFormsDref/CompletedDrefTable/index.tsx b/app/src/views/AccountMyFormsDref/CompletedDrefTable/index.tsx index 70becdd06..707d8dec1 100644 --- a/app/src/views/AccountMyFormsDref/CompletedDrefTable/index.tsx +++ b/app/src/views/AccountMyFormsDref/CompletedDrefTable/index.tsx @@ -201,6 +201,7 @@ function CompletedDrefTable(props: Props) { dref: datum.dref, glide_code: datum.glide_code, date_of_publication: datum.date_of_publication, + original_language: datum.original_language, }), ), { diff --git a/app/src/views/CountryNsOverviewActivities/NationalSocietyDevelopmentInitiatives/InitiativeCard/index.tsx b/app/src/views/CountryNsOverviewActivities/NationalSocietyDevelopmentInitiatives/InitiativeCard/index.tsx index 9bcc49965..6cb61645d 100644 --- a/app/src/views/CountryNsOverviewActivities/NationalSocietyDevelopmentInitiatives/InitiativeCard/index.tsx +++ b/app/src/views/CountryNsOverviewActivities/NationalSocietyDevelopmentInitiatives/InitiativeCard/index.tsx @@ -25,7 +25,7 @@ function InitiativeCard(props: Props) { } = props; const strings = useTranslation(i18n); - const categories = initiative.categories?.join(', '); + const { categories } = initiative; return ( - dskd {strings.drefFormSourceInformationAddButton} diff --git a/go-api b/go-api index 6745b93ae..703936d5f 160000 --- a/go-api +++ b/go-api @@ -1 +1 @@ -Subproject commit 6745b93aed93aff3d57751a91d6ee94c651f8112 +Subproject commit 703936d5f6b15d50fc33b388f38b5ce64861ea58 diff --git a/translationMigrations/000051-1758782876113.json b/translationMigrations/000052-1760421406280.json similarity index 96% rename from translationMigrations/000051-1758782876113.json rename to translationMigrations/000052-1760421406280.json index 70d3bb949..30fb06347 100644 --- a/translationMigrations/000051-1758782876113.json +++ b/translationMigrations/000052-1760421406280.json @@ -1,5 +1,5 @@ { - "parent": "000050-1758013961153.json", + "parent": "000051-1758354992698.json", "actions": [ { "action": "add", @@ -17,7 +17,7 @@ "action": "add", "key": "drefFinalizeSuccessTitle", "namespace": "accountMyFormsDref", - "value": "Successfully finalize the DREF!" + "value": "Successfully finalized the DREF!" }, { "action": "add",