Merge branch 'main' into support-oss-auth-flow

.githooks/commit-msg

@@ -43,9 +43,12 @@ else
     echo "~~~~**** Error: Commit Signature Missing. ****~~~~"
     echo "Please make sure to sign your commits. You can sign your commit by using the '-S' option with 'git commit'."
     echo "Example: git commit -S -m 'Your commit message'"
+    echo "Signing commits is crucial for verifying contributions. Consult GitHub's documentation on commit signature verification for guidance: https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits"
     exit 1
 fi
 
 # If the commit message matches the convention, the script exits successfully.
+echo
 echo "*****~~~~~ Commit hook completed ~~~~~~*****"
+echo
 exit 0

.github/PULL_REQUEST_TEMPLATE.md

@@ -39,4 +39,3 @@ Or did you test this change manually (provide relevant screenshots)?
 - [ ] I ran `npm run re:build`
 - [ ] I reviewed submitted code
 - [ ] I added unit tests for my changes where possible
-- [ ] I added a [CHANGELOG](/CHANGELOG.md) entry if applicable

.gitignore

@@ -18,4 +18,5 @@ env-config.js
 yarn.lock
 #package-lock.json
 user_data.sh
-*.pem
+*.pem
+.bsb.lock

README.md

@@ -136,9 +136,9 @@ The `home_page` feature flag controls whether the dashboard home page is enabled
 
 The `test_live_toggle` feature flag enables users to toggle between test and live modes when signing in. When enabled, users will see an option during sign-in to actively switch between test and live environments.
 
-#### Test Live Mode
+#### Is Live Mode
 
-The `test_live_mode` feature flag enables displaying the current mode - test or live - that the user is accessing. When enabled, it will show a visual indicator within the dashboard signaling whether the user is currently in a test environment or live production environment.
+The `is_live_mode` feature flag enables the live mode - that the user is accessing. When enabled, it will show a visual indicator within the dashboard signaling whether the user is currently in a test environment or live production environment.
 
 #### Magic Link
 
@@ -152,10 +152,6 @@ The `production_access` feature flag enables a flow for users to request live pr
 
 The `quick_start` feature flag enables the simplified onboarding flow for new users, where he connects to processors, configure payment routing and testing a payment, all in one flow.
 
-#### Open SDK
-
-The `open_sdk` feature flag enables access to the Checkout Page web SDK from within the dashboard. When enabled, developers can preview the SDK from within the dashboard and make payments.
-
 ---
 
 ## Deployment
@@ -267,10 +263,82 @@ curl https://raw.githubusercontent.com/juspay/hyperswitch-control-center/main/aw
 
 ---
 
+## Versioning
+
+For a detailed list of changes made in each version, please refer to the [CHANGELOG](./CHANGELOG.md) file.
+
+---
+
 ## Contributing
 
 We welcome contributions from the community! If you would like to contribute to Hyperswitch, please follow our contribution guidelines.
 
+### Commit Conventions
+
+We follow the [Conventional Commits](https://www.conventionalcommits.org/) specification for our commit messages. Each commit message should have a structured format:
+
+`<type>(<subject>): <description>`
+
+The commit message should begin with one of the following keywords followed by a colon: 'feat', 'fix', 'chore', 'refactor', 'docs', 'test' or 'style'. For example, it should be formatted like this: `feat: <subject> - <description>`
+
+### Signing Commits
+
+All commits should be signed to verify the authenticity of contributors. Follow the steps below to sign your commits:
+
+1.  Generate a GPG key if you haven't already:
+
+    ```bash
+    gpg --gen-key
+    ```
+
+2.  List your GPG keys and copy the GPG key ID::
+
+    ```bash
+    gpg --list-secret-keys --keyid-format LONG
+    ```
+
+    #### Identify the GPG key you want to add to your GitHub account.
+
+    a. Run the following command to export your GPG public key in ASCII-armored format:
+
+    ```bash
+      gpg --armor --export <GPG_KEY_ID>
+      Replace <GPG_KEY_ID> with the actual key ID.
+    ```
+
+    b. Copy the entire output, including the lines that start with "-----BEGIN PGP PUBLIC KEY BLOCK-----" and "-----END PGP PUBLIC KEY BLOCK-----".
+
+    c. Go to your GitHub Settings.
+
+    d. Click on "SSH and GPG keys" in the left sidebar.
+
+    e. Click the "New GPG key" button.
+
+    f. Paste your GPG public key into the provided text box.
+
+    g. Click the "Add GPG key" button.
+
+    h. Now your GPG public key is associated with your GitHub account, and you can sign your commits for added security.
+
+3.  Configure Git to use your GPG key:
+
+    ```bash
+    git config --global user.signingkey <GPG_KEY_ID>
+    ```
+
+4.  Set Git to sign all your commits by default:
+
+    ```bash
+    git config --global commit.gpgSign true
+    ```
+
+5.  Commit your changes with the -S option to sign the commit:
+    ```bash
+    git commit -S -m "your commit message"
+    ```
+
+For further assistance, please refer to the [GitHub documentation on signing commits](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).
+
 ---
 
 ## License

config/FeatureFlag.json

@@ -1,10 +1,9 @@
 {
   "test_live_toggle": false,
-  "test_live_mode": false,
+  "is_live_mode": false,
   "magic_link": false,
   "production_access": false,
   "quick_start": false,
-  "open_sdk": false,
   "switch_merchant": false,
   "audit_trail": false,
   "system_metrics": false,

src/entryPoints/hyperswitch/EntryPointUtils.res

@@ -37,7 +37,7 @@ module ContextWrapper = {
   }
 }
 
-let renderDashboardApp = (~uiConfig=UIConfig.defaultUIConfig, children) => {
+let renderDashboardApp = (~uiConfig, children) => {
   switch ReactDOM.querySelector("#app") {
   | Some(container) =>
     open ReactDOM.Client

src/entryPoints/hyperswitch/FeatureFlagUtils.res

@@ -4,9 +4,8 @@ type featureFlag = {
   testLiveToggle: bool,
   magicLink: bool,
   quickStart: bool,
-  openSDK: bool,
   switchMerchant: bool,
-  testLiveMode: bool,
+  isLiveMode: bool,
   auditTrail: bool,
   systemMetrics: bool,
   sampleData: bool,
@@ -33,9 +32,8 @@ let featureFlagType = (featureFlags: Js.Json.t) => {
     testLiveToggle: dict->getBool("test_live_toggle", false),
     magicLink: dict->getBool("magic_link", false),
     quickStart: dict->getBool("quick_start", false),
-    openSDK: dict->getBool("open_sdk", false),
     switchMerchant: dict->getBool("switch_merchant", false),
-    testLiveMode: dict->getBool("test_live_mode", false),
+    isLiveMode: dict->getBool("is_live_mode", false),
     auditTrail: dict->getBool("audit_trail", false),
     systemMetrics: dict->getBool("system_metrics", false),
     sampleData: dict->getBool("sample_data", false),

src/entryPoints/hyperswitch/HyperSwitchApp.res

@@ -50,10 +50,10 @@ let make = () => {
   let getEnumDetails = EnumVariantHook.useFetchEnumDetails()
   let verificationDays = getFromMerchantDetails("verification")->LogicUtils.getIntFromString(-1)
   let userRole = getFromUserDetails("user_role")
-  let modeText = featureFlagDetails.testLiveMode ? "Live Mode" : "Test Mode"
+  let modeText = featureFlagDetails.isLiveMode ? "Live Mode" : "Test Mode"
   let titleComingSoonMessage = "Coming Soon!"
   let subtitleComingSoonMessage = "We are currently working on this page."
-  let modeStyles = featureFlagDetails.testLiveMode
+  let modeStyles = featureFlagDetails.isLiveMode
     ? "bg-hyperswitch_green_trans border-hyperswitch_green_trans text-hyperswitch_green"
     : "bg-orange-600/80 border-orange-500 text-grey-700"
 
@@ -125,7 +125,7 @@ let make = () => {
         let _featureFlag = await fetchInitialEnums()
       }
 
-      if featureFlagDetails.testLiveMode {
+      if featureFlagDetails.isLiveMode {
         getAgreementEnum()->ignore
       } else {
         setDashboardPageState(_ => #HOME)
@@ -331,7 +331,7 @@ let make = () => {
                           <Recon />
                         </FeatureFlagEnabledComponent>
                       | list{"sdk"} =>
-                        <FeatureFlagEnabledComponent isEnabled=featureFlagDetails.openSDK>
+                        <FeatureFlagEnabledComponent isEnabled={!featureFlagDetails.isLiveMode}>
                           <SDKPage />
                         </FeatureFlagEnabledComponent>
                       | list{"3ds"} => <HSwitchThreeDS />

src/entryPoints/hyperswitch/HyperSwitchEntry.res

@@ -43,7 +43,7 @@ module HyperSwitchEntryComponent = {
 
     let setPageName = pageTitle => {
       let page = pageTitle->LogicUtils.snakeToTitle
-      let title = featureFlagDetails.testLiveMode
+      let title = featureFlagDetails.isLiveMode
         ? `${page} - Dashboard`
         : `${page} - Dashboard [Test]`
       DOMUtils.document.title = title

src/entryPoints/hyperswitch/Provider/GlobalProvider.res

@@ -8,8 +8,6 @@ let defaultValue = {
   setShowProdIntentForm: _ => (),
   integrationDetails: defaultIntegrationValue,
   setIntegrationDetails: _ => (),
-  tabIndexForDevelopers: 0,
-  setTabIndexForDevelopers: _ => (),
   dashboardPageState: #DEFAULT,
   setDashboardPageState: _ => (),
   permissionInfo: [],
@@ -23,19 +21,13 @@ let defaultValue = {
 let defaultContext = React.createContext(defaultValue)
 
 module Provider = {
-  let makeProps = (~value, ~children, ()) =>
-    {
-      "value": value,
-      "children": children,
-    }
   let make = React.Context.provider(defaultContext)
 }
 
 @react.component
 let make = (~children) => {
   let (showFeedbackModal, setShowFeedbackModal) = React.useState(_ => false)
   let (showProdIntentForm, setShowProdIntentForm) = React.useState(_ => false)
-  let (tabIndexForDevelopers, setTabIndexForDevelopers) = React.useState(_ => 0)
   let (dashboardPageState, setDashboardPageState) = React.useState(_ => #DEFAULT)
   let (permissionInfo, setPermissionInfo) = React.useState(_ => [])
   let (isProdIntentCompleted, setIsProdIntentCompleted) = React.useState(_ => false)
@@ -56,8 +48,6 @@ let make = (~children) => {
       integrationDetails,
       showProdIntentForm,
       setShowProdIntentForm,
-      tabIndexForDevelopers,
-      setTabIndexForDevelopers,
       dashboardPageState,
       setDashboardPageState,
       permissionInfo,

src/entryPoints/hyperswitch/Provider/ProviderHelper.res

@@ -47,18 +47,6 @@ let itemToObjMapperForGetInfo = dict => {
   }
 }
 
-let getDefaultValueOfGetInfo = {
-  module_: "",
-  description: "",
-  permissions: [
-    {
-      enum_name: "",
-      description: "",
-      isPermissionAllowed: false,
-    },
-  ],
-}
-
 let getDefaultValueOfEnum = {
   {
     enum_name: "",

src/entryPoints/hyperswitch/Provider/ProviderTypes.res

@@ -38,8 +38,6 @@ type contextType = {
   setShowFeedbackModal: (bool => bool) => unit,
   showProdIntentForm: bool,
   setShowProdIntentForm: (bool => bool) => unit,
-  tabIndexForDevelopers: int,
-  setTabIndexForDevelopers: (int => int) => unit,
   dashboardPageState: dashboardPageStateTypes,
   setDashboardPageState: (dashboardPageStateTypes => dashboardPageStateTypes) => unit,
   integrationDetails: integrationDetailsType,

src/screens/HyperSwitch/Connectors/ConnectorAccountDetails.res

@@ -343,7 +343,7 @@ let make = (
         ~connector,
         ~bodyType,
         ~isPayoutFlow,
-        ~isLiveMode={featureFlagDetails.testLiveMode},
+        ~isLiveMode={featureFlagDetails.isLiveMode},
         (),
       )
       setScreenState(_ => Loading)
@@ -396,7 +396,7 @@ let make = (
           ~connector,
           ~bodyType,
           ~isPayoutFlow,
-          ~isLiveMode={featureFlagDetails.testLiveMode},
+          ~isLiveMode={featureFlagDetails.isLiveMode},
           (),
         )->ignoreFields(connectorID, verifyConnectorIgnoreField)
 

src/screens/HyperSwitch/Connectors/ConnectorAccountDetailsHelper.res

@@ -132,7 +132,7 @@ module RenderConnectorInputFields = {
               ~selectedConnector,
               ~dict=details,
               ~fieldName=formName,
-              ~isLiveMode={featureFlagDetails.testLiveMode},
+              ~isLiveMode={featureFlagDetails.isLiveMode},
             )}
           />
         </div>

src/screens/HyperSwitch/Connectors/ConnectorList.res

@@ -11,7 +11,7 @@ module NewProcessorCards = {
       ->LogicUtils.safeParse
       ->FeatureFlagUtils.featureFlagType
 
-    let connectorsAvailableForIntegration = featureFlagDetails.testLiveMode
+    let connectorsAvailableForIntegration = featureFlagDetails.isLiveMode
       ? ConnectorUtils.connectorListForLive
       : isPayoutFlow
       ? ConnectorUtils.payoutConnectorList