From 66c614e214defa497fa5ae1aad0755ec1e69620c Mon Sep 17 00:00:00 2001
From: Akhilender <akhilenderb9@gmail.com>
Date: Wed, 31 Jan 2024 16:29:18 +0530
Subject: [PATCH] fix: Fixed custom field submission on Enter key press

- Resolves an issue where pressing the "Enter" key while adding a custom field in the settings was triggering an error.
- Modified the handling of form submission to ensure that the custom field is added successfully whether the "Submit" button
  is clicked or the "Enter" key is pressed.
- Ensured all the modified lines are covered by tests and no other functionality is affected.

Signed-off-by: Akhilender <akhilenderb9@gmail.com>
---
 .../OrgProfileFieldSettings.test.tsx                      | 6 ++++++
 .../OrgProfileFieldSettings/OrgProfileFieldSettings.tsx   | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/OrgProfileFieldSettings/OrgProfileFieldSettings.test.tsx b/src/components/OrgProfileFieldSettings/OrgProfileFieldSettings.test.tsx
index be6cf6740b..ddb02a0567 100644
--- a/src/components/OrgProfileFieldSettings/OrgProfileFieldSettings.test.tsx
+++ b/src/components/OrgProfileFieldSettings/OrgProfileFieldSettings.test.tsx
@@ -210,6 +210,12 @@ describe('Testing Save Button', () => {
     expect(
       screen.queryByText('Failed to add custom field')
     ).toBeInTheDocument();
+    await wait();
+    userEvent.type(screen.getByTestId('customFieldInput'), 'Age{enter}');
+    await wait();
+    expect(
+      screen.queryByText('Failed to add custom field')
+    ).toBeInTheDocument();
   });
 
   test('Testing Typing Organization Custom Field Name', async () => {
diff --git a/src/components/OrgProfileFieldSettings/OrgProfileFieldSettings.tsx b/src/components/OrgProfileFieldSettings/OrgProfileFieldSettings.tsx
index a3840921d9..b455f7436a 100644
--- a/src/components/OrgProfileFieldSettings/OrgProfileFieldSettings.tsx
+++ b/src/components/OrgProfileFieldSettings/OrgProfileFieldSettings.tsx
@@ -54,7 +54,7 @@ const OrgProfileFieldSettings = (): any => {
       setCustomFieldData({ type: '', name: '' });
       refetch();
     } catch (error) {
-      toast.success((error as Error).message);
+      toast.error((error as Error).message);
     }
   };
 
@@ -133,6 +133,12 @@ const OrgProfileFieldSettings = (): any => {
                       name: event.target.value,
                     });
                   }}
+                  onKeyDown={(event) => {
+                    if (event.key === 'Enter') {
+                      event.preventDefault();
+                      handleSave();
+                    }
+                  }}
                 />
               </div>