Skip to content

Commit ee7019e

Browse files
committed
AYS-283: fix status localization
1 parent cae8702 commit ee7019e

File tree

2 files changed

+11
-5
lines changed
  • src
    • app/(private)/emergency-evacuation-applications/[id]
    • modules/emergencyEvacuationApplications/components

2 files changed

+11
-5
lines changed

src/app/(private)/emergency-evacuation-applications/[id]/page.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import { FormSchema } from '@/modules/emergencyEvacuationApplications/constants/
2323
import { EmergencyEvacuationApplication } from '@/modules/emergencyEvacuationApplications/constants/types'
2424
import { getEmergencyEvacuationApplication } from '@/modules/emergencyEvacuationApplications/service'
2525
import { Checkbox } from '@/components/ui/checkbox'
26+
import { getStatusLabel } from '@/modules/emergencyEvacuationApplications/components/status'
2627

2728
const Page = ({ params }: { params: { slug: string; id: string } }) => {
2829
const { t } = useTranslation()
@@ -159,7 +160,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
159160
control={control}
160161
name="isInPerson"
161162
render={({ field }) => (
162-
<FormItem className="sm:col-span-3">
163+
<FormItem className="sm:col-span-3 mb-6">
163164
<div className="flex items-center">
164165
<FormLabel className="mr-2">
165166
{t('emergencyEvacuationApplications.isInPerson')}
@@ -179,7 +180,7 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
179180
/>
180181
</div>
181182
{!emergencyEvacuationApplicationDetails.isInPerson && (
182-
<div className="grid grid-cols-1 gap-y-6 sm:grid-cols-2 sm:gap-x-6 my-6">
183+
<div className="grid grid-cols-1 gap-y-6 sm:grid-cols-2 sm:gap-x-6 mb-6">
183184
<FormField
184185
control={control}
185186
name="applicantNameSurname"
@@ -375,9 +376,9 @@ const Page = ({ params }: { params: { slug: string; id: string } }) => {
375376
{...field}
376377
disabled
377378
value={
378-
t(
379-
emergencyEvacuationApplicationDetails.status.toLowerCase(),
380-
) ?? ''
379+
emergencyEvacuationApplicationDetails.status
380+
? t(getStatusLabel(emergencyEvacuationApplicationDetails.status))
381+
: ''
381382
}
382383
/>
383384
</FormControl>

src/modules/emergencyEvacuationApplications/components/status.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,8 @@ const Status = ({ status }: StatusProps) => {
3535
}
3636

3737
export default Status
38+
39+
export const getStatusLabel = (status: string) => {
40+
const statusItem = StatusData.find((item) => item.value === status)
41+
return statusItem ? statusItem.label : ''
42+
}

0 commit comments

Comments
 (0)