From 8f7b74571ae8868d52b3b93eb11d07a1b2788f02 Mon Sep 17 00:00:00 2001
From: Riddhi Agrawal <riddhi.agrawal2112@gmail.com>
Date: Fri, 8 Dec 2023 16:07:54 +0530
Subject: [PATCH 1/4] fix: Added configure return url after business profile

---
 .../BusinessMapping/BusinessMappingUtils.res  |  2 +-
 .../BusinessMapping/BusinessProfile.res       | 67 ++++++++++++++++---
 2 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessMappingUtils.res b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessMappingUtils.res
index 6a21fd6cd..6d2cdafd2 100644
--- a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessMappingUtils.res
+++ b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessMappingUtils.res
@@ -17,7 +17,7 @@ let labelField = FormRenderer.makeFieldInfo(
   (),
 )
 
-type modalState = Loading | Edit
+type modalState = Loading | Edit | Successful
 
 let validateEmptyValue = (key, errors) => {
   switch key {
diff --git a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
index 4cea24ef1..0e4bd91ab 100644
--- a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
+++ b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
@@ -1,9 +1,21 @@
 module AddEntryBtn = {
   @react.component
-  let make = (~onSubmit, ~modalState, ~showModal, ~setShowModal, ~list, ~isFromSettings=true) => {
+  let make = (
+    ~onSubmit,
+    ~modalState,
+    ~showModal,
+    ~setShowModal,
+    ~list,
+    ~isFromSettings=true,
+    ~updatedProfileId,
+    ~setModalState,
+  ) => {
     open HSwitchUtils
     open BusinessMappingUtils
-    let initialValues = [("profile_name", "Default"->Js.Json.string)]->Js.Dict.fromArray
+    let initialValues =
+      [
+        ("profile_name", `default${list->Js.Array2.length->string_of_int}`->Js.Json.string),
+      ]->Js.Dict.fromArray
     let modalBody =
       <div>
         {switch modalState {
@@ -37,9 +49,31 @@ module AddEntryBtn = {
               </div>
             </LabelVisibilityContext>
           </Form>
+        | Successful =>
+          <div className="flex flex-col gap-6 justify-center items-end">
+            <p className="text-grey-700 opacity-50 ">
+              {"Business profile successfully created! Set up the return URL and webhooks for the newly created business profile."->React.string}
+            </p>
+            <Button
+              text={"Configure return url"}
+              buttonType=Primary
+              onClick={_ => {
+                if updatedProfileId->Js.String2.length > 0 {
+                  RescriptReactRouter.replace(`/payment-settings/${updatedProfileId}`)
+                  setModalState(_ => Edit)
+                }
+              }}
+              customButtonStyle="!w-1/3"
+            />
+          </div>
         }}
       </div>
 
+    let modalHeaderText = switch modalState {
+    | Edit | Loading => "Add Business Profile Name"
+    | Successful => "Configure webhooks and return url"
+    }
+
     <div>
       <UIUtils.RenderIf condition=isFromSettings>
         <Button
@@ -52,7 +86,7 @@ module AddEntryBtn = {
       </UIUtils.RenderIf>
       <Modal
         showModal
-        modalHeading="Add Business Profile Name"
+        modalHeading=modalHeaderText
         setShowModal
         closeOnOutsideClick=true
         modalClass="w-full max-w-2xl m-auto !bg-white dark:!bg-jp-gray-lightgray_background">
@@ -78,6 +112,7 @@ let make = (
   let (showModal, setShowModal) = React.useState(_ => false)
   let (modalState, setModalState) = React.useState(_ => Edit)
   let (screenState, setScreenState) = React.useState(_ => PageLoaderWrapper.Success)
+  let (updatedProfileId, setUpdatedProfileId) = React.useState(_ => "")
 
   let businessProfileValues =
     HyperswitchAtom.businessProfilesAtom
@@ -90,7 +125,10 @@ let make = (
     try {
       setScreenState(_ => PageLoaderWrapper.Loading)
       let url = getURL(~entityName=BUSINESS_PROFILE, ~methodType=Post, ())
-      let _ = await updateDetails(url, body, Post)
+      let response = await updateDetails(url, body, Post)
+      setUpdatedProfileId(_ =>
+        response->LogicUtils.getDictFromJsonObject->LogicUtils.getString("profile_id", "")
+      )
       fetchBusinessProfiles()->ignore
       showToast(~message="Your Entry added successfully", ~toastType=ToastState.ToastSuccess, ())
       if !isFromSettings {
@@ -100,9 +138,12 @@ let make = (
     } catch {
     | _ => setScreenState(_ => PageLoaderWrapper.Error(""))
     }
-    isFromSettings ? setShowModal(_ => false) : setShowModalFromOtherScreen(_ => false)
-    setModalState(_ => Edit)
-    setShowModal(_ => false)
+
+    if !isFromSettings {
+      setShowModalFromOtherScreen(_ => false)
+    }
+    setModalState(_ => Successful)
+
     Js.Nullable.null
   }
 
@@ -133,7 +174,15 @@ let make = (
             currrentFetchCount={businessProfileValues->Js.Array2.length}
           />
           <div className="absolute right-0 -top-3">
-            <AddEntryBtn onSubmit modalState showModal setShowModal list={businessProfileValues} />
+            <AddEntryBtn
+              onSubmit
+              modalState
+              showModal
+              setShowModal
+              list={businessProfileValues}
+              updatedProfileId
+              setModalState
+            />
           </div>
         </div>
       </div>
@@ -146,6 +195,8 @@ let make = (
         showModal={showModalFromOtherScreen}
         setShowModal={setShowModalFromOtherScreen}
         list={businessProfileValues}
+        updatedProfileId
+        setModalState
       />
     </UIUtils.RenderIf>
   </PageLoaderWrapper>

From 635015696558940b38c433adea01284bb13163ea Mon Sep 17 00:00:00 2001
From: Riddhi Agrawal <riddhi.agrawal2112@gmail.com>
Date: Mon, 11 Dec 2023 14:55:29 +0530
Subject: [PATCH 2/4] fix: copy changes

---
 config/FeatureFlag.json                                   | 2 +-
 .../Settings/BusinessMapping/BusinessProfile.res          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/FeatureFlag.json b/config/FeatureFlag.json
index 9d6e08029..deaef522e 100644
--- a/config/FeatureFlag.json
+++ b/config/FeatureFlag.json
@@ -16,7 +16,7 @@
   "feedback": false,
   "verify_connector": false,
   "mixpanel": false,
-  "business_profile": false,
+  "business_profile": true,
   "generate_report": false,
   "forgot_password": false,
   "oss_build": true
diff --git a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
index 0e4bd91ab..1adacb366 100644
--- a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
+++ b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
@@ -50,12 +50,12 @@ module AddEntryBtn = {
             </LabelVisibilityContext>
           </Form>
         | Successful =>
-          <div className="flex flex-col gap-6 justify-center items-end">
+          <div className="flex flex-col gap-6 justify-center items-end mx-4">
             <p className="text-grey-700 opacity-50 ">
-              {"Business profile successfully created! Set up the return URL and webhooks for the newly created business profile."->React.string}
+              {"Business Profile successfully created! Set up your payments settings like webhooks, return url for your new profile before trying a payment."->React.string}
             </p>
             <Button
-              text={"Configure return url"}
+              text={"Configure payment settings"}
               buttonType=Primary
               onClick={_ => {
                 if updatedProfileId->Js.String2.length > 0 {
@@ -71,7 +71,7 @@ module AddEntryBtn = {
 
     let modalHeaderText = switch modalState {
     | Edit | Loading => "Add Business Profile Name"
-    | Successful => "Configure webhooks and return url"
+    | Successful => "Configure payment settings"
     }
 
     <div>

From 12846178ed8db4d6a06c064f74de3fd249b0295c Mon Sep 17 00:00:00 2001
From: Riddhi Agrawal <riddhi.agrawal2112@gmail.com>
Date: Mon, 11 Dec 2023 15:16:43 +0530
Subject: [PATCH 3/4] fix: warning-added

---
 .../BusinessMapping/BusinessProfile.res       | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
index 1adacb366..ad54c171b 100644
--- a/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
+++ b/src/screens/HyperSwitch/Settings/BusinessMapping/BusinessProfile.res
@@ -1,3 +1,12 @@
+module WarningArea = {
+  @react.component
+  let make = (~warningText) => {
+    <h1 className="text-orange-950 bg-orange-100 border w-full py-2 px-4 rounded-md ">
+      <span className="text-orange-950 font-bold text-fs-14 mr-2"> {"NOTE:"->React.string} </span>
+      {warningText->React.string}
+    </h1>
+  }
+}
 module AddEntryBtn = {
   @react.component
   let make = (
@@ -51,7 +60,10 @@ module AddEntryBtn = {
           </Form>
         | Successful =>
           <div className="flex flex-col gap-6 justify-center items-end mx-4">
-            <p className="text-grey-700 opacity-50 ">
+            <WarningArea
+              warningText="Warning! Now that you've configured more than one profile, you must mandatorily pass 'profile_id' in payments API request every time"
+            />
+            <p className="text-grey-700">
               {"Business Profile successfully created! Set up your payments settings like webhooks, return url for your new profile before trying a payment."->React.string}
             </p>
             <Button
@@ -63,7 +75,7 @@ module AddEntryBtn = {
                   setModalState(_ => Edit)
                 }
               }}
-              customButtonStyle="!w-1/3"
+              customButtonStyle="!w-1/3 mt-6"
             />
           </div>
         }}
@@ -155,11 +167,16 @@ let make = (
   <PageLoaderWrapper screenState>
     <UIUtils.RenderIf condition=isFromSettings>
       <div className="relative h-full">
-        <div className="flex flex-col-reverse md:flex-col">
+        <div className="flex flex-col-reverse md:flex-col gap-2">
           <PageUtils.PageHeading
             title="Business Profiles"
             subTitle="Add and manage profiles to represent different businesses across countries."
           />
+          <UIUtils.RenderIf condition={businessProfileValues->Js.Array2.length > 1}>
+            <WarningArea
+              warningText="Warning! Now that you've configured more than one profile, you must mandatorily pass 'profile_id' in payments API request every time"
+            />
+          </UIUtils.RenderIf>
           <LoadedTable
             title="Business profiles"
             hideTitle=true

From 5f0a547dd75d8081d97daa9f40c640c5e267a633 Mon Sep 17 00:00:00 2001
From: Riddhi Agrawal <riddhi.agrawal2112@gmail.com>
Date: Mon, 11 Dec 2023 15:19:28 +0530
Subject: [PATCH 4/4] fix: reverted code for testing

---
 config/FeatureFlag.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/FeatureFlag.json b/config/FeatureFlag.json
index deaef522e..9d6e08029 100644
--- a/config/FeatureFlag.json
+++ b/config/FeatureFlag.json
@@ -16,7 +16,7 @@
   "feedback": false,
   "verify_connector": false,
   "mixpanel": false,
-  "business_profile": true,
+  "business_profile": false,
   "generate_report": false,
   "forgot_password": false,
   "oss_build": true