remove working income vs net income validation (#236)

Author: remy-mazerolle-esdc

frontend/app/.server/environment/estimator.ts

@@ -1,6 +1,5 @@
 import * as v from 'valibot';
 
-import { stringToBooleanSchema } from '../validation/string-to-boolean-schema';
 import { stringToIsoDateSchema } from '../validation/string-to-iso-date-schema';
 import { stringToNumberSchema } from '../validation/string-to-number-schema';
 import { stringToUrlSchema } from '../validation/string-to-url-schema';
@@ -28,7 +27,6 @@ export const defaults = {
   ESTIMATOR_YEARLY_MAX_BENEFITS: '2400',
   ESTIMATOR_BENEFIT_REDUCTION_RATE: '0.2',
   ESTIMATOR_SPLIT_BENEFIT_REDUCTION_RATE: '0.1',
-  ESTIMATOR_WORKING_INCOME_SPECIAL_VALIDATION_ENABLED: 'true',
 } as const;
 
 // Define schema for the environment variable
@@ -119,14 +117,6 @@ export const estimator = v.object({
    * Benefit reduction rate (split)
    */
   ESTIMATOR_SPLIT_BENEFIT_REDUCTION_RATE: v.optional(stringToNumberSchema(), defaults.ESTIMATOR_SPLIT_BENEFIT_REDUCTION_RATE),
-
-  /**
-   * Enable or disable working income < net income validation
-   */
-  ESTIMATOR_WORKING_INCOME_SPECIAL_VALIDATION_ENABLED: v.optional(
-    stringToBooleanSchema(),
-    defaults.ESTIMATOR_WORKING_INCOME_SPECIAL_VALIDATION_ENABLED,
-  ),
 });
 
 export type Estimator = Readonly<v.InferOutput<typeof estimator>>;

frontend/app/.server/locales/estimator-en.json

@@ -51,8 +51,7 @@
         "working-income": {
           "error": {
             "invalid": "Your partner's working income is invalid",
-            "required": "Your partner's working income is required",
-            "should-not-exceed-net-income": "Your partner's working income should not exceed their net income"
+            "required": "Your partner's working income is required"
           },
           "info-label": "How to calculate your partner's working income",
           "label": "Your partner's working income"
@@ -61,8 +60,7 @@
       "working-income": {
         "error": {
           "invalid": "Your working income is invalid",
-          "required": "Your working income is required",
-          "should-not-exceed-net-income": "Your working income should not exceed your net income"
+          "required": "Your working income is required"
         },
         "info-label": "How to calculate your working income",
         "label": "Your working income"

frontend/app/.server/locales/estimator-fr.json

@@ -51,8 +51,7 @@
         "working-income": {
           "error": {
             "invalid": "Le revenu d'empoi de votre partenaire est invalide",
-            "required": "Le revenu d'emploi de votre partenaire est requis",
-            "should-not-exceed-net-income": "Le revenu d'empoi de votre partenaire ne doit pas dépasser leur revenu net"
+            "required": "Le revenu d'emploi de votre partenaire est requis"
           },
           "info-label": "Comment calculer le revenu d'emploi de votre partenaire ?",
           "label": "Le revenu d'emploi de votre partenaire"
@@ -61,8 +60,7 @@
       "working-income": {
         "error": {
           "invalid": "Votre revenu d'emploi est invalide",
-          "required": "Votre revenu d'emploi est requis",
-          "should-not-exceed-net-income": "Votre revenu d'empoi ne doit pas dépasser votre revenu net"
+          "required": "Votre revenu d'emploi est requis"
         },
         "info-label": "Comment calculer votre revenu d'emploi ?",
         "label": "Votre revenu d'emploi"

frontend/app/routes/estimator/step-income.tsx

@@ -112,17 +112,6 @@ function processIncome(formData: FormData, isMarried: boolean, lang: Language) {
         v.minValue(0, 'claimed-repayment.error.invalid'),
       ),
     }),
-    v.forward(
-      v.partialCheck(
-        [['workingIncome'], ['netIncome']],
-        (input) =>
-          globalThis.__appEnvironment.ESTIMATOR_WORKING_INCOME_SPECIAL_VALIDATION_ENABLED
-            ? input.workingIncome <= input.netIncome
-            : true,
-        'working-income.error.should-not-exceed-net-income',
-      ),
-      ['workingIncome'],
-    ),
   );
 
   // Combined schema with variants for single and married