fix: resolve conflict

.githooks/commit-msg

@@ -1,24 +1,47 @@
 #!/bin/sh
 
-echo "~~~~**** Commit hook started ****~~~~"
+echo "*****~~~~~ Commit hook initiated ~~~~~~*****"
 
 commit_msg_file=$1
 commit_msg=$(cat "$commit_msg_file")
 
-
 # For formatting your code
-npx prettier --write .
+echo
+echo "*****~~~~~ Formatting - Check for unformatted files ~~~~~~*****"
+
+# Check for unformatted JavaScript and JSON files using Prettier
+unformatted_js_files=$(git ls-files | grep '\.js\|\.json' | xargs npx prettier --list-different)
+
+# If there are unformatted JavaScript, TypeScript, or JSON files, print an error message and exit with a non-zero status code
+if [ -n "$unformatted_js_files" ]; then
+  echo "Error: Unformatted JavaScript, YML or JSON files found. Please run 'npx prettier --write .' for formatting whole repository or 'npx prettier --write' on the following files:"
+  echo "$unformatted_js_files"
+  exit 1
+fi
+
+# Check for unformatted ReScript files
 npm run re:format
 
-# Define your commit message convention (e.g., starts with "feature:", "fix:", etc.)
-commit_regex="^(Merge branch|feat|fix|chore|docs|style|refactor|test|enhancement).+"
+echo
+echo "*****~~~~~ All files are formatted. ~~~~~~*****"
+echo
+
+echo
+echo "*****~~~~~ Commit message validation! ~~~~~*****"
+echo
+# Define your commit message convention (e.g., starts with "feat:", "fix:", etc.)
+commit_regex="^(Merge branch|(feat|fix|chore|refactor|docs|test|style|enhancement):).+"
+
+
 
 if ! echo "$commit_msg" | grep -Ei "$commit_regex" ; then
     echo "Aborting commit. Your commit message does not follow the conventional format."
-    echo "Example - <feat>: <subject> - <description>"
+    echo "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>'"
     exit 1
 fi
 
 # If the commit message matches the convention, the script exits successfully.
-echo "~~~~**** Commit hook completed ****~~~~"
+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

.github/workflows/ci.yml

@@ -1,6 +1,7 @@
 name: CI
 
 on:
+  merge_group:
   pull_request:
 
 jobs:

.github/workflows/pr-title-spell-check.yml

@@ -1,6 +1,7 @@
 name: PR Title Spell Check
 
 on:
+  merge_group:
   pull_request:
     types:
       - opened

.github/workflows/release-new-version.yml

@@ -1,19 +1,19 @@
 name: Release a new hyperswitch version
 
-# on:
-#   schedule:
-#     - cron: "30 14 * * 0-4" # Run workflow at 8 PM IST every Sunday-Thursday
+on:
+  schedule:
+    - cron: "30 14 * * 0-4" # Run workflow at 8 PM IST every Sunday-Thursday
 
-#   workflow_dispatch:
+  workflow_dispatch:
 
-# concurrency:
-#   group: ${{ github.workflow }}-${{ github.ref }}
-#   cancel-in-progress: true
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
-on:
-  pull_request_target:
-    types:
-      - closed
+# on:
+#   pull_request_target:
+#     types:
+#       - closed
 
 env:
   # Allow more retries for network requests in cargo (downloading crates) and
@@ -30,9 +30,9 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
-        # with:
-        #   fetch-depth: 0
-        #   token: ${{ secrets.AUTO_RELEASE_PAT }}
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.AUTO_RELEASE_PAT }}
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master

.gitignore

@@ -20,4 +20,3 @@ yarn.lock
 user_data.sh
 *.pem
 .bsb.lock
-CHANGELOG.md

.prettierignore

@@ -0,0 +1,2 @@
+CHANGELOG.md
+*euclid*

CHANGELOG.md

@@ -3,14 +3,118 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
-## 1.1.0 (2023-11-29)
+## 1.5.0 (2023-12-11)
 
 ### Features
 
-- Add-release-new-version-action ([`880a10e`](https://github.com/juspay/hyperswitch-control-center/commit/880a10e0695284bb76a6e4cf156774a8a6e0fb01))
-- Add change log template ([`9475c4a`](https://github.com/juspay/hyperswitch-control-center/commit/9475c4a2863c12110a4f8bf2826fa68cdba7ab09))
+- Refunds search based on refunds id ([#83](https://github.com/juspay/hyperswitch-control-center/pull/83)) ([`f5363b4`](https://github.com/juspay/hyperswitch-control-center/commit/f5363b4ac3547232bd637884bd8a9fad85056608))
+- Identity file changes in Codebase. ([#89](https://github.com/juspay/hyperswitch-control-center/pull/89)) ([`9e3aec7`](https://github.com/juspay/hyperswitch-control-center/commit/9e3aec7f7434cf4610db50a716653e73693aec94))
+- Webhook Section Update - In Connector Preview ([#90](https://github.com/juspay/hyperswitch-control-center/pull/90)) ([`07a2cf1`](https://github.com/juspay/hyperswitch-control-center/commit/07a2cf1d5f36541e69dcf701c38fce33697f0df0))
 
-**Full Changelog:** [`v1.0.2...v1.1.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.0.2...v1.1.0)
+### Bug Fixes
+
+- Recoil value for feature flag updated ([#85](https://github.com/juspay/hyperswitch-control-center/pull/85)) ([`d7bb46e`](https://github.com/juspay/hyperswitch-control-center/commit/d7bb46e26c766ab8b43488ff42c6a0ad4eb21864))
+- Added configure return url after business profile ([#82](https://github.com/juspay/hyperswitch-control-center/pull/82)) ([`ade63aa`](https://github.com/juspay/hyperswitch-control-center/commit/ade63aa8177d6269e02ac0db4f6e63867511b661))
+- SDK Processing - Go to payments not working fix ([#88](https://github.com/juspay/hyperswitch-control-center/pull/88)) ([`f45d8dd`](https://github.com/juspay/hyperswitch-control-center/commit/f45d8dd6016f859b76013364c83c0758e5a42114))
+
+### Refactors
+
+- Common file for all identity functions ([#86](https://github.com/juspay/hyperswitch-control-center/pull/86)) ([`6ad715f`](https://github.com/juspay/hyperswitch-control-center/commit/6ad715fb11da557f4f07ff35e8f616b69684ff0c))
+
+**Full Changelog:** [`v1.4.0...v1.5.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.4.0...v1.5.0)
+
+- - -
+
+
+## 1.4.0 (2023-12-08)
+
+### Features
+
+- New connector addition Helcim ([#80](https://github.com/juspay/hyperswitch-control-center/pull/80)) ([`0e59c4a`](https://github.com/juspay/hyperswitch-control-center/commit/0e59c4a6e80fe9d03c8f289810f7796e3da23cb1))
+
+### Bug Fixes
+
+- Hide connector sr ([#81](https://github.com/juspay/hyperswitch-control-center/pull/81)) ([`0880fd8`](https://github.com/juspay/hyperswitch-control-center/commit/0880fd8757f46236caff8783eb3154ec88b286c2))
+
+**Full Changelog:** [`v1.3.1...v1.4.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.3.1...v1.4.0)
+
+- - -
+
+
+## 1.3.1 (2023-12-07)
+
+### Bug Fixes
+
+- Euclid wasm minimum amount ([#78](https://github.com/juspay/hyperswitch-control-center/pull/78)) ([`2f730e0`](https://github.com/juspay/hyperswitch-control-center/commit/2f730e0602e49dd11a8e0790df91941b91e1577b))
+- Update wasm file to fix minimum amount ([`ea1b8fe`](https://github.com/juspay/hyperswitch-control-center/commit/ea1b8fefdf83a583d115467e78e10c68b4a1145e))
+
+**Full Changelog:** [`v1.3.0...v1.3.1`](https://github.com/juspay/hyperswitch-control-center/compare/v1.3.0...v1.3.1)
+
+- - -
+
+
+## 1.3.0 (2023-12-07)
+
+### Features
+
+- Profile id and profile name concat ([#73](https://github.com/juspay/hyperswitch-control-center/pull/73)) ([`8266a95`](https://github.com/juspay/hyperswitch-control-center/commit/8266a95ede73e2b66677d7d1046c4271c8fbd526))
+- New connector Icons and  Searchbar for connector ([#46](https://github.com/juspay/hyperswitch-control-center/pull/46)) ([`2717c0d`](https://github.com/juspay/hyperswitch-control-center/commit/2717c0d3f09807022f53929ddd244aed3c28034d))
+
+### Bug Fixes
+
+- Default card layout ([#70](https://github.com/juspay/hyperswitch-control-center/pull/70)) ([`b7690bc`](https://github.com/juspay/hyperswitch-control-center/commit/b7690bc569895ce0d92425314bcfc783f8d3365f))
+- Top 5 errors fix ([#60](https://github.com/juspay/hyperswitch-control-center/pull/60)) ([`d5b19d6`](https://github.com/juspay/hyperswitch-control-center/commit/d5b19d67ea6cc7e07153b0bfb58ca4beedf1a594))
+- SDK code refactoring and return URL addition ([#72](https://github.com/juspay/hyperswitch-control-center/pull/72)) ([`d77b875`](https://github.com/juspay/hyperswitch-control-center/commit/d77b875b9e1c872985678975d4651f6cc90ac364))
+- SDK Go to payment fix in Success Status ([#74](https://github.com/juspay/hyperswitch-control-center/pull/74)) ([`66ea60b`](https://github.com/juspay/hyperswitch-control-center/commit/66ea60b321bdd3efd7980a99e007135f29998951))
+- Payment settings added under developers ([#77](https://github.com/juspay/hyperswitch-control-center/pull/77)) ([`592ce41`](https://github.com/juspay/hyperswitch-control-center/commit/592ce413fb529847c1428197f18420e6f2a28d66))
+
+### Miscellaneous Tasks
+
+- Response warnings removed ([#68](https://github.com/juspay/hyperswitch-control-center/pull/68)) ([`7427f10`](https://github.com/juspay/hyperswitch-control-center/commit/7427f1051dc6e88258699a90cef3453f66fe5f98))
+- User Management File Changes ([#76](https://github.com/juspay/hyperswitch-control-center/pull/76)) ([`8807933`](https://github.com/juspay/hyperswitch-control-center/commit/8807933a676f8041eab5cbc5b833ed06e17a76eb))
+
+**Full Changelog:** [`v1.2.0...v1.3.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.2.0...v1.3.0)
+
+- - -
+
+
+## 1.2.0 (2023-12-06)
+
+### Features
+
+- Bankofamerica addition in prod ([#69](https://github.com/juspay/hyperswitch-control-center/pull/69)) ([`bf6bde8`](https://github.com/juspay/hyperswitch-control-center/commit/bf6bde89eaaf3c443e07c191b42d2a9293377130))
+- Support oss auth flow ([#64](https://github.com/juspay/hyperswitch-control-center/pull/64)) ([`59601ec`](https://github.com/juspay/hyperswitch-control-center/commit/59601ec4449505ff4fcd1e048d6ced78997062a9))
+
+### Bug Fixes
+
+- 3ds code refactor and bugfixes ([#61](https://github.com/juspay/hyperswitch-control-center/pull/61)) ([`9d4f503`](https://github.com/juspay/hyperswitch-control-center/commit/9d4f5036b458b671f4f1899619d891f74e936b8f))
+- Commit-msg file changes & README.md file updated. ([#65](https://github.com/juspay/hyperswitch-control-center/pull/65)) ([`96a81e0`](https://github.com/juspay/hyperswitch-control-center/commit/96a81e0363ade432fb288cc59a5dfb64ad029e48))
+- Update README.md ([#66](https://github.com/juspay/hyperswitch-control-center/pull/66)) ([`1930bd2`](https://github.com/juspay/hyperswitch-control-center/commit/1930bd294de22a962304c4389426b741429fd1dc))
+- Live Mode SDK Fixes. ([#67](https://github.com/juspay/hyperswitch-control-center/pull/67)) ([`844920b`](https://github.com/juspay/hyperswitch-control-center/commit/844920b6fd09aa07edbf33ba83ff2aaa394c7a78))
+
+**Full Changelog:** [`v1.1.0...v1.2.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.1.0...v1.2.0)
+
+- - -
+
+
+## 1.1.0 (2023-12-05)
+
+### Features
+
+- Business profile UI changes ([#51](https://github.com/juspay/hyperswitch-control-center/pull/51)) ([`7d2a443`](https://github.com/juspay/hyperswitch-control-center/commit/7d2a4430980539977a8e8ddfd9d959547549258a))
+
+### Bug Fixes
+
+- Warning icon added ([#59](https://github.com/juspay/hyperswitch-control-center/pull/59)) ([`4fbaee4`](https://github.com/juspay/hyperswitch-control-center/commit/4fbaee4bf0b1b65b08513bd9208e49f154911ae0))
+- Optional test live mode removal & typo fix ([#63](https://github.com/juspay/hyperswitch-control-center/pull/63)) ([`9466057`](https://github.com/juspay/hyperswitch-control-center/commit/94660575566729f1b6a8013e9d09e1a4bc8cff20))
+
+### Miscellaneous Tasks
+
+- Signed commit added. ([#62](https://github.com/juspay/hyperswitch-control-center/pull/62)) ([`4f69afe`](https://github.com/juspay/hyperswitch-control-center/commit/4f69afe1946bd431fb6e8a31ee621358ff28ad12))
+- Cleanup Configs ([#48](https://github.com/juspay/hyperswitch-control-center/pull/48)) ([`5bfae97`](https://github.com/juspay/hyperswitch-control-center/commit/5bfae972ac4cd2f367d26317c203b2c9d425535d))
+- Dead code removal ([#55](https://github.com/juspay/hyperswitch-control-center/pull/55)) ([`b220415`](https://github.com/juspay/hyperswitch-control-center/commit/b220415bc390a5129e82e1b59dc6115a35cb6f84))
+
+**Full Changelog:** [`v1.0.5...v1.1.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.0.5...v1.1.0)
 
 - - -
 

README.md

@@ -96,7 +96,7 @@ The `feedback` feature flag enables the ability for users to provide direct prod
 
 The `test_processors` feature flag allows enabling sandbox/test payment processors for testing purposes. When enabled, developers and testers can add test payment processors like Stripe Test or PayPal Test to trial payments flows without touching live transactions or making processor API calls.
 
-#### User Management
+#### User Management / Team
 
 The `user_management` feature flag enables user administration capabilities. When enabled, administrators can add, edit, and remove user accounts from the organization. They can also manage user roles and permissions that control access to different features and data.
 
@@ -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,18 +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.
 
-#### Stripe plus paypal
-
-The `stripe_plus_paypal` feature flag enables access to simplified multi-processor connectivity through Stripe and PayPal. When turned on, users are guided through a streamlined setup flow to connect both Stripe and PayPal accounts and experience it in a checkout page.
-
-#### Woocommerce
-
-The `woocommerce` feature flag controls the visibility of WooCommerce integration with Hyperswitch flow within the dashboard. When enabled, users will have access to the step-by-step guide to integrate the woocommerce plugin for hyperswitch.
-
-#### 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
@@ -275,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,13 +1,9 @@
 {
   "test_live_toggle": false,
-  "test_live_mode": false,
+  "is_live_mode": false,
   "magic_link": false,
   "production_access": false,
   "quick_start": false,
-  "stripe_plus_paypal": false,
-  "woocommerce": false,
-  "open_sdk": false,
-  "home_page": false,
   "switch_merchant": false,
   "audit_trail": false,
   "system_metrics": false,
@@ -21,5 +17,7 @@
   "verify_connector": false,
   "mixpanel": false,
   "business_profile": false,
-  "generate_report": false
+  "generate_report": false,
+  "forgot_password": false,
+  "oss_build": true
 }