Merge branch 'master' into contact-names

glific · Sep 24, 2024 · aaf02fa · aaf02fa
2 parents befb1f1 + 2c8b23d
commit aaf02fa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/containers/Form/FormLayout.tsx b/src/containers/Form/FormLayout.tsx
@@ -667,7 +667,10 @@ export const FormLayout = ({
         handleOk={() => {
           saveHandler(formik.values);
         }}
-        handleCancel={() => setShowConfirmationDialog(false)}
+        handleCancel={() => {
+          onSaveClick(false);
+          setShowConfirmationDialog(false);
+        }}
         colorOk="warning"
         alignButtons="center"
         contentAlign="center"

diff --git a/src/containers/SettingList/Providers/Providers.test.tsx b/src/containers/SettingList/Providers/Providers.test.tsx
@@ -186,7 +186,15 @@ describe('update credentials', () => {
     fireEvent.change(inputs[0], { target: { value: 'token2' } });
     fireEvent.change(inputs[1], { target: { value: 'product_id2' } });
 
-    fireEvent.click(screen.getByText('Save'));
+    fireEvent.click(screen.getByTestId('submitActionButton'));
+
+    await waitFor(() => {
+      expect(screen.getByTestId('dialogBox')).toBeInTheDocument();
+    });
+
+    // testing if it closes the dialog box
+    fireEvent.click(screen.getByTestId('cancel-button'));
+    fireEvent.click(screen.getByTestId('submitActionButton'));
 
     await waitFor(() => {
       expect(screen.getByTestId('dialogBox')).toBeInTheDocument();