From f2ed28f6d9ea04a8b9b20ce40f48e92038959407 Mon Sep 17 00:00:00 2001
From: Sherfin Shamsudeen <sherfin94@gmail.com>
Date: Fri, 24 May 2024 21:40:46 +0530
Subject: [PATCH] Merge main back to develop (#9864)

* fix : form csa for onsubmit not getting triggered (#9862)

* Bump version to v2.50.0 (#9863)

---------

Co-authored-by: Kiran Ashok <stepinfwd@gmail.com>
---
 .version                                     |  2 +-
 frontend/.version                            |  2 +-
 frontend/src/Editor/Components/Form/Form.jsx | 23 +++++++++-----------
 server/.version                              |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.version b/.version
index e599014eab..9e29315acb 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.45.0
+2.50.0
diff --git a/frontend/.version b/frontend/.version
index e599014eab..9e29315acb 100644
--- a/frontend/.version
+++ b/frontend/.version
@@ -1 +1 @@
-2.45.0
+2.50.0
diff --git a/frontend/src/Editor/Components/Form/Form.jsx b/frontend/src/Editor/Components/Form/Form.jsx
index 6e3a11b114..fd86c8c61a 100644
--- a/frontend/src/Editor/Components/Form/Form.jsx
+++ b/frontend/src/Editor/Components/Form/Form.jsx
@@ -66,19 +66,16 @@ export const Form = function Form(props) {
   const mounted = useMounted();
 
   useEffect(() => {
-    const exposedVariables = {
-      resetForm: async function () {
-        resetComponent();
-      },
-      submitForm: async function () {
-        if (isValid) {
-          onEvent('onSubmit', formEvents).then(() => resetComponent());
-        } else {
-          fireEvent('onInvalid');
-        }
-      },
-    };
-    setExposedVariables(exposedVariables);
+    setExposedVariable('resetForm', async function () {
+      resetComponent();
+    });
+    setExposedVariable('submitForm', async function () {
+      if (isValid) {
+        onEvent('onSubmit', formEvents).then(() => resetComponent());
+      } else {
+        fireEvent('onInvalid');
+      }
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
diff --git a/server/.version b/server/.version
index e599014eab..9e29315acb 100644
--- a/server/.version
+++ b/server/.version
@@ -1 +1 @@
-2.45.0
+2.50.0