fix(fa): Removing tax from children aid (#15143)

* adding sortable feature * Revert "adding sortable feature" This reverts commit d9691c5. * adding more detail for api * removing white space break just adding html element to the db * adding children to api * not taking tax from children aid * removing other changes * removing more that is not in this pr * removing more * adding minus --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Jun 7, 2024 · e0f4b99 · e0f4b99
1 parent f883da9
commit e0f4b99
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/apps/financial-aid/web-veita/src/components/ModalTypes/AcceptModal.tsx b/apps/financial-aid/web-veita/src/components/ModalTypes/AcceptModal.tsx
@@ -104,11 +104,7 @@ const AcceptModal = ({
 
   const checkingValue = (element?: number) => (element ? element : 0)
 
-  const amount =
-    (state.amount || 0) +
-    (state.childrenAidAmount || 0) -
-    checkingValue(state.income) -
-    sumValues
+  const amount = (state.amount || 0) - checkingValue(state.income) - sumValues
 
   const taxAmountWithPersonalTax = calculateFinalTaxAmount(
     amount,
@@ -119,6 +115,7 @@ const AcceptModal = ({
   const finalAmount = calculateAcceptedAidFinalAmount(
     amount,
     taxAmountWithPersonalTax,
+    state.childrenAidAmount || 0,
   )
 
   const taxAmount = calculateTaxOfAmount(amount)
@@ -178,6 +175,9 @@ const AcceptModal = ({
 
       {hasChildrenAid && (
         <Box marginBottom={3}>
+          <Text variant="small" fontWeight="semiBold" marginBottom={1}>
+            ATH. ekki er tekinn skattur af styrk barna
+          </Text>
           <NumberInput
             label="Styrkur vegna barna"
             placeholder="Sláðu inn upphæð"

diff --git a/libs/financial-aid/shared/src/lib/taxCalculator.spec.ts b/libs/financial-aid/shared/src/lib/taxCalculator.spec.ts
@@ -131,14 +131,24 @@ describe('Tax calculator', () => {
       const acceptedAidFinalAmount = calculateAcceptedAidFinalAmount(
         100000,
         100,
+        0,
       )
       expect(acceptedAidFinalAmount).toEqual(99900)
     })
+    test('should return accepted final amount with 100% personal and 100% spouse credit, adding children aid', () => {
+      const acceptedAidFinalAmount = calculateAcceptedAidFinalAmount(
+        100000,
+        100,
+        40000,
+      )
+      expect(acceptedAidFinalAmount).toEqual(139900)
+    })
 
     test('should return accepted final amount with 10% personal and 30% spouse credit', () => {
       const acceptedAidFinalAmount = calculateAcceptedAidFinalAmount(
         300000,
         64926,
+        0,
       )
       expect(acceptedAidFinalAmount).toEqual(235074)
     })
@@ -147,9 +157,19 @@ describe('Tax calculator', () => {
       const acceptedAidFinalAmount = calculateAcceptedAidFinalAmount(
         150000,
         50000,
+        0,
       )
       expect(acceptedAidFinalAmount).toEqual(100000)
     })
+
+    test('should return accepted final amount with 10% personal and 30% spouse credit, adding children aid', () => {
+      const acceptedAidFinalAmount = calculateAcceptedAidFinalAmount(
+        150000,
+        50000,
+        50000,
+      )
+      expect(acceptedAidFinalAmount).toEqual(150000)
+    })
   })
 
   describe('calculateFinalTaxAmount', () => {

diff --git a/libs/financial-aid/shared/src/lib/taxCalculator.ts b/libs/financial-aid/shared/src/lib/taxCalculator.ts
@@ -111,8 +111,9 @@ export const calculatePersonalTaxAllowanceFromAmount = (
 export const calculateAcceptedAidFinalAmount = (
   amount: number,
   finalTaxAmount: number,
+  childrenAid: number,
 ): number => {
-  return amount - finalTaxAmount
+  return amount - finalTaxAmount + childrenAid
 }
 
 export const calculateFinalTaxAmount = (