Claude review suggestions

Author: Katelyn Grimes

src/components/HrTools/MinisterHousingAllowance/MinisterHousingAllowance.graphql

@@ -95,6 +95,7 @@ mutation SubmitMinistryHousingAllowanceRequest(
 ) {
   submitMinistryHousingAllowanceRequest(input: $input) {
     ministryHousingAllowanceRequest {
+      id
       requestAttributes {
         ...RequestAttributes
       }

src/components/HrTools/MinisterHousingAllowance/Steps/StepThree/Calculation.tsx

@@ -131,43 +131,27 @@ export const Calculation: React.FC<CalculationProps> = ({
     });
 
   const transformNullValues = (values: CalculationFormValues) => {
-    const attributes = requestData?.requestAttributes;
-    const rent = attributes?.rentOrOwn === MhaRentOrOwnEnum.Rent;
+    const isOwn = rentOrOwn === MhaRentOrOwnEnum.Own;
 
-    if (rent) {
-      return updateMutation({
-        variables: {
-          input: {
-            requestId: requestData?.id ?? '',
-            requestAttributes: {
-              mortgageOrRentPayment: values.mortgageOrRentPayment ?? 0,
-              furnitureCostsTwo: values.furnitureCostsTwo ?? 0,
-              repairCosts: values.repairCosts ?? 0,
-              avgUtilityTwo: values.avgUtilityTwo ?? 0,
-              unexpectedExpenses: values.unexpectedExpenses ?? 0,
-            },
-          },
-        },
-      });
-    } else {
-      return updateMutation({
-        variables: {
-          input: {
-            requestId: requestData?.id ?? '',
-            requestAttributes: {
+    return updateMutation({
+      variables: {
+        input: {
+          requestId: requestData?.id ?? '',
+          requestAttributes: {
+            mortgageOrRentPayment: values.mortgageOrRentPayment ?? 0,
+            furnitureCostsTwo: values.furnitureCostsTwo ?? 0,
+            repairCosts: values.repairCosts ?? 0,
+            avgUtilityTwo: values.avgUtilityTwo ?? 0,
+            unexpectedExpenses: values.unexpectedExpenses ?? 0,
+            ...(isOwn && {
               rentalValue: values.rentalValue ?? 0,
               furnitureCostsOne: values.furnitureCostsOne ?? 0,
               avgUtilityOne: values.avgUtilityOne ?? 0,
-              mortgageOrRentPayment: values.mortgageOrRentPayment ?? 0,
-              furnitureCostsTwo: values.furnitureCostsTwo ?? 0,
-              repairCosts: values.repairCosts ?? 0,
-              avgUtilityTwo: values.avgUtilityTwo ?? 0,
-              unexpectedExpenses: values.unexpectedExpenses ?? 0,
-            },
+            }),
           },
         },
-      });
-    }
+      },
+    });
   };
 
   const request = requestData ? requestData.requestAttributes : null;
@@ -227,7 +211,7 @@ export const Calculation: React.FC<CalculationProps> = ({
         try {
           await transformNullValues(values);
 
-          submitMutation({
+          await submitMutation({
             variables: { input: { requestId: requestData?.id ?? '' } },
           });
           enqueueSnackbar(t('MHA request submitted successfully.'), {