fix: onChange move from ConnectorLabel to

ProfileId change
juspay · Dec 11, 2023 · 1e14e92 · 1e14e92
1 parent a1b26b1
commit 1e14e92
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 24 deletions.
diff --git a/src/screens/HyperSwitch/Connectors/ConnectorAccountDetails.res b/src/screens/HyperSwitch/Connectors/ConnectorAccountDetails.res
@@ -1,5 +1,6 @@
 external formEventToBool: ReactEvent.Form.t => bool = "%identity"
 external formEventToStr: ReactEvent.Form.t => string = "%identity"
+external strToFormEvent: Js.String.t => ReactEvent.Form.t = "%identity"
 
 let connectorsWithIntegrationSteps: array<ConnectorTypes.connectorName> = [
   ADYEN,
@@ -33,8 +34,9 @@ module BusinessProfileRender = {
     let hyperswitchMixPanel = HSMixPanel.useSendEvent()
     let {setDashboardPageState} = React.useContext(GlobalProvider.defaultContext)
     let businessProfiles = Recoil.useRecoilValueFromAtom(HyperswitchAtom.businessProfilesAtom)
-
     let arrayOfBusinessProfile = businessProfiles->MerchantAccountUtils.getArrayOfBusinessProfile
+    let defaultBusinessProfile = businessProfiles->MerchantAccountUtils.getValueFromBusinessProfile
+    let connectorLabelOnChange = ReactFinalForm.useField(`connector_label`).input.onChange
 
     let (showModalFromOtherScreen, setShowModalFromOtherScreen) = React.useState(_ => false)
 
@@ -67,6 +69,14 @@ module BusinessProfileRender = {
                 ...input,
                 onChange: {
                   ev => {
+                    let profileName = (
+                      arrayOfBusinessProfile
+                      ->Js.Array2.find((ele: HSwitchSettingTypes.profileEntity) =>
+                        ele.profile_id === ev->formEventToStr
+                      )
+                      ->Belt.Option.getWithDefault(defaultBusinessProfile)
+                    ).profile_name
+                    connectorLabelOnChange(`${selectedConnector}_${profileName}`->strToFormEvent)
                     input.onChange(ev)
                     mixpanelEventWrapper(
                       ~url,
@@ -280,10 +290,12 @@ let make = (
 
   let updatedInitialVal = React.useMemo1(() => {
     let initialValuesToDict = initialValues->LogicUtils.getDictFromJsonObject
-    initialValuesToDict->Js.Dict.set(
-      "connector_label",
-      `${connector}_${activeBusinessProfile.profile_name}`->Js.Json.string,
-    )
+    if !isUpdateFlow {
+      initialValuesToDict->Js.Dict.set(
+        "connector_label",
+        `${connector}_${activeBusinessProfile.profile_name}`->Js.Json.string,
+      )
+    }
     if (
       connector
       ->getConnectorNameTypeFromString

diff --git a/src/screens/HyperSwitch/Connectors/ConnectorAccountDetailsHelper.res b/src/screens/HyperSwitch/Connectors/ConnectorAccountDetailsHelper.res
@@ -67,25 +67,6 @@ let inputFieldForConnectorLabel = (
   ~checkRequiredFields,
   ~disabled,
 ) => {
-  open MerchantAccountUtils
-  let businessProfiles = HyperswitchAtom.businessProfilesAtom->Recoil.useRecoilValueFromAtom
-  let defaultBusinessProfile = businessProfiles->getValueFromBusinessProfile
-  let arrayOfBusinessProfile = businessProfiles->getArrayOfBusinessProfile
-  let connectorName = connector->ConnectorUtils.getConnectorNameString
-  let profileId =
-    ReactFinalForm.useField(`profile_id`).input.value->LogicUtils.getStringFromJson("")
-  let profileName = (
-    arrayOfBusinessProfile
-    ->Js.Array2.find((ele: HSwitchSettingTypes.profileEntity) => ele.profile_id === profileId)
-    ->Belt.Option.getWithDefault(defaultBusinessProfile)
-  ).profile_name
-  let connectorLabelOnChange = ReactFinalForm.useField(`connector_label`).input.onChange
-
-  React.useEffect1(() => {
-    connectorLabelOnChange(`${connectorName}_${profileName}`->strToFormEvent)
-    None
-  }, [profileId])
-
   FormRenderer.makeFieldInfo(
     ~label,
     ~isRequired=switch checkRequiredFields {