Merge pull request #1814 from CruGlobal/MPDX-9650

MPDX-9650 - Improve validation in Savings Fund Transfer

Author: zweatshirt

src/components/HrTools/SavingsFundTransfer/TransferModal/TransferModal.test.tsx

@@ -189,10 +189,71 @@ describe('TransferModal', () => {
       userEvent.tab();
 
       expect(
-        await findByText('End date must be after transfer date'),
+        await findByText(
+          'End date must be at least one day after the transfer date',
+        ),
+      ).toBeInTheDocument();
+    });
+
+    it('should reject an end date equal to the transfer date for recurring transfers', async () => {
+      const { getByRole, findByLabelText, getByLabelText, findByText } = render(
+        <Components />,
+      );
+
+      userEvent.click(getByRole('radio', { name: /monthly/i }));
+      expect(getByRole('radio', { name: /monthly/i })).toBeChecked();
+
+      const transferDate = await findByLabelText(/transfer date/i);
+      const endDate = getByLabelText(/end date/i);
+
+      userEvent.clear(transferDate);
+      userEvent.type(transferDate, '12/01/2024');
+      userEvent.tab();
+
+      userEvent.clear(endDate);
+      userEvent.type(endDate, '12/01/2024');
+
+      userEvent.tab();
+
+      expect(
+        await findByText(
+          'End date must be at least one day after the transfer date',
+        ),
       ).toBeInTheDocument();
     });
 
+    it('should accept an end date one day after the transfer date for recurring transfers', async () => {
+      const { getByRole, findByLabelText, getByLabelText, queryByText } =
+        render(<Components />);
+
+      userEvent.click(getByRole('radio', { name: /monthly/i }));
+      expect(getByRole('radio', { name: /monthly/i })).toBeChecked();
+
+      expect(await findByLabelText(/end date/i)).toBeInTheDocument();
+
+      const transferDate = getByLabelText(/transfer date/i);
+      const endDate = getByLabelText(/end date/i);
+
+      userEvent.clear(transferDate);
+      userEvent.type(transferDate, '12/01/2024');
+      expect(transferDate).toHaveValue('12/01/2024');
+      userEvent.tab();
+
+      userEvent.clear(endDate);
+      userEvent.type(endDate, '12/02/2024');
+      expect(endDate).toHaveValue('12/02/2024');
+
+      userEvent.tab();
+
+      await waitFor(() =>
+        expect(
+          queryByText(
+            'End date must be at least one day after the transfer date',
+          ),
+        ).not.toBeInTheDocument(),
+      );
+    });
+
     it('should submit form with valid data', async () => {
       const { getByRole } = render(<Components />);
 
@@ -306,6 +367,18 @@ describe('TransferModal', () => {
       );
     });
 
+    it('should show descriptive helper text for the end date field', async () => {
+      const { getByRole, findByText } = render(<Components />);
+
+      userEvent.click(getByRole('radio', { name: /monthly/i }));
+
+      expect(
+        await findByText(
+          'The transfer will no longer recur after this date. If left blank, the transfer will recur indefinitely until manually stopped.',
+        ),
+      ).toBeInTheDocument();
+    });
+
     it('should show error message when monthly schedule is selected', async () => {
       const { getByRole, getByLabelText, findByText } = render(<Components />);
 

src/components/HrTools/SavingsFundTransfer/TransferModal/TransferModal.tsx

@@ -116,14 +116,14 @@ const transferSchema = (locale: string) =>
         is: (schedule: ScheduleEnum) => schedule !== ScheduleEnum.OneTime,
         then: (schema) =>
           schema.test(
-            'end>=start',
-            i18n.t('End date must be after transfer date'),
+            'end>start',
+            i18n.t('End date must be at least one day after the transfer date'),
             function (end) {
               const start = this.parent.transferDate as DateTime | null;
               if (!end || !start) {
                 return true;
               }
-              return end.toMillis() >= start.toMillis();
+              return end.startOf('day') > start.startOf('day');
             },
           ),
         otherwise: (schema) => schema.notRequired(),
@@ -468,7 +468,11 @@ export const TransferModal: React.FC<TransferModalProps> = ({
                             }}
                             error={touched.endDate && Boolean(errors.endDate)}
                             helperText={
-                              touched.endDate && (errors.endDate as string)
+                              touched.endDate && errors.endDate
+                                ? errors.endDate
+                                : t(
+                                    'The transfer will no longer recur after this date. If left blank, the transfer will recur indefinitely until manually stopped.',
+                                  )
                             }
                           />
                         </Grid>