fix bug related to income field showing zero value

DTS-STN · Oct 7, 2024 · 36f6f57 · 36f6f57
1 parent 8240387
commit 36f6f57
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/components/FieldFactory.tsx b/components/FieldFactory.tsx
@@ -81,8 +81,10 @@ const FieldFactory: React.FC<FieldProps> = ({
           onChange={debounce((e) => handleOnChange(field, e.target.value), 100)}
           placeholder={field.config.placeholder ?? ''}
           value={
-            field.key === FieldKey.INCOME_WORK ||
-            field.key === FieldKey.PARTNER_INCOME_WORK
+            field.value
+              ? field.value
+              : field.key === FieldKey.INCOME_WORK ||
+                field.key === FieldKey.PARTNER_INCOME_WORK
               ? field.config.default
               : field.value
           }

diff --git a/components/StepperPage/index.tsx b/components/StepperPage/index.tsx
@@ -388,7 +388,7 @@ const StepperPage: React.FC = () => {
         title={
           tsln._language === 'en'
             ? `Step ${activeStep} of ${totalSteps}: ${steps[activeStep].title}`
-            : `Étape ${activeStep} de ${totalSteps}: ${steps[activeStep].title}`
+            : `Étape ${activeStep} de ${totalSteps} : ${steps[activeStep].title}`
         }
         previousProps={{
           id: 'previous',

diff --git a/i18n/api/en.ts b/i18n/api/en.ts
@@ -25,7 +25,7 @@ const en: Translations = {
     [FieldCategory.AGE]: 'Age',
     [FieldCategory.INCOME]: 'Income',
     [FieldCategory.LEGAL]: 'Legal status',
-    [FieldCategory.RESIDENCE]: 'Residence history',
+    [FieldCategory.RESIDENCE]: 'Residence',
     [FieldCategory.MARITAL]: 'Marital status',
   },
   result: {

diff --git a/i18n/api/fr.ts b/i18n/api/fr.ts
@@ -27,7 +27,7 @@ const fr: Translations = {
     [FieldCategory.AGE]: 'Âge',
     [FieldCategory.INCOME]: 'Revenu',
     [FieldCategory.LEGAL]: 'Statut légal',
-    [FieldCategory.RESIDENCE]: 'Historique de résidence',
+    [FieldCategory.RESIDENCE]: 'Résidence',
     [FieldCategory.MARITAL]: 'État matrimonial',
   },
   result: {