chore: resolved conflicts

CHANGELOG.md

@@ -3,6 +3,45 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 1.13.0 (2023-12-20)
+
+### Features
+
+- New wasm changes ([#114](https://github.com/juspay/hyperswitch-control-center/pull/114)) ([`758f80d`](https://github.com/juspay/hyperswitch-control-center/commit/758f80d945bd558f7059b8ec40b2b373aaa2e77a))
+- Dropdown grouping added in routing ([#102](https://github.com/juspay/hyperswitch-control-center/pull/102)) ([`52933b4`](https://github.com/juspay/hyperswitch-control-center/commit/52933b434dd6920e821a465b51c5bbb46ced68cd))
+- Resend Invite Removal ([#121](https://github.com/juspay/hyperswitch-control-center/pull/121)) ([`3551622`](https://github.com/juspay/hyperswitch-control-center/commit/35516226ad3e784626812e4a3be09dcb165a867d))
+
+### Bug Fixes
+
+- Connector UI Issue. ([#113](https://github.com/juspay/hyperswitch-control-center/pull/113)) ([`ad28e1c`](https://github.com/juspay/hyperswitch-control-center/commit/ad28e1ca72f3d57407cb679a451e43ccd94ae2de))
+- Signout API removed. ([#116](https://github.com/juspay/hyperswitch-control-center/pull/116)) ([`af13892`](https://github.com/juspay/hyperswitch-control-center/commit/af13892017a5ca1e4bac8dcbe26d837a87467634))
+- Connector files changes for paypal onboarding ([#115](https://github.com/juspay/hyperswitch-control-center/pull/115)) ([`74f327c`](https://github.com/juspay/hyperswitch-control-center/commit/74f327c5067a17d44313492e0032422a70d8aa9d))
+- Metadata field issue fix ([#117](https://github.com/juspay/hyperswitch-control-center/pull/117)) ([`585674a`](https://github.com/juspay/hyperswitch-control-center/commit/585674a5fe324492c290c1e6ec32fd8b71822402))
+- Typos in readme - fix typos in Readme.md ([#105](https://github.com/juspay/hyperswitch-control-center/pull/105)) ([`c88dcd2`](https://github.com/juspay/hyperswitch-control-center/commit/c88dcd23a8c291fd538ba6c4631a15cdf28c502d))
+- Refunds reports end point change ([#119](https://github.com/juspay/hyperswitch-control-center/pull/119)) ([`ffc819e`](https://github.com/juspay/hyperswitch-control-center/commit/ffc819ef39c33f7a58e560cd3d1a1e7184ef4eba))
+
+**Full Changelog:** [`v1.12.0...v1.13.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.12.0...v1.13.0)
+
+- - -
+
+
+## 1.12.0 (2023-12-19)
+
+### Features
+
+- Group-drop-down-component-changes ([#97](https://github.com/juspay/hyperswitch-control-center/pull/97)) ([`adcd89e`](https://github.com/juspay/hyperswitch-control-center/commit/adcd89e58542a7b0e0a7941e8dd4bb8abbd620eb))
+- Add scrollbar and white space scrollable ([#111](https://github.com/juspay/hyperswitch-control-center/pull/111)) ([`a3bb4fe`](https://github.com/juspay/hyperswitch-control-center/commit/a3bb4feedb12fc6d3dcbc2cf845e90bb26fef7dd))
+- Added path and api method in audit logs ([#112](https://github.com/juspay/hyperswitch-control-center/pull/112)) ([`1005cc7`](https://github.com/juspay/hyperswitch-control-center/commit/1005cc7099bf4ed6d6fdadd9f843c1937b733fe2))
+
+### Bug Fixes
+
+- Oss build url change ([#87](https://github.com/juspay/hyperswitch-control-center/pull/87)) ([`82f5272`](https://github.com/juspay/hyperswitch-control-center/commit/82f5272aff3453afbbc5fcf7b0e3aee4eed32cb2))
+
+**Full Changelog:** [`v1.11.0...v1.12.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.11.0...v1.12.0)
+
+- - -
+
+
 ## 1.11.0 (2023-12-18)
 
 ### Features

README.md

@@ -7,7 +7,7 @@ Hyperswitch control center is an open source dashboard to easily view, manage an
 1. Connect to multiple payment processors like Stripe, Braintree, Adyen etc. in a few clicks
 2. View and manage payments (payments, refunds, disputes) processed through multiple processors
 3. Easily configure routing rules (volume-based, rule-based) to intelligently route your payments
-4. Advanced analytics to make sense of your payments data
+4. Advanced analytics to make sense of your payment data
 
 ---
 
@@ -64,11 +64,11 @@ Follow these simple steps to set up Hyperswitch on your local machine.
 
 ## Feature Flags
 
-Feature flags allows the users to enable or disable certain functionalities or flows in the control center.
+Feature flags allow the users to enable or disable certain functionalities or flows in the control center.
 
 ### Using feature flags
 
-The FeatureFlag.json file can be found under config/FeatueFlag.json. By default, all the feature flags is turned off (`False` value).
+The FeatureFlag.json file can be found under config/FeatueFlag.json. By default, all the feature flags are turned off (`False` value).
 
 ### Feature flag descriptions
 
@@ -94,7 +94,7 @@ The `feedback` feature flag enables the ability for users to provide direct prod
 
 #### Test Processors
 
-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.
+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 payment flows without touching live transactions or making processor API calls.
 
 #### User Management / Team
 
@@ -106,7 +106,7 @@ The `recon` feature flag enables access to reconciliation capabilities in the Hy
 
 #### Payout
 
-The `payout` feature flag enables the payouts functionality in the dashboard. When enabled, this allows users to configure payout profiles, manage recipient details, schedule disbursements, and process payout batches to pay out funds to third parties.
+The `payout` feature flag enables the payout functionality in the dashboard. When enabled, this allows users to configure payout profiles, manage recipient details, schedule disbursements, and process payout batches to pay out funds to third parties.
 
 #### FRM
 
@@ -150,7 +150,7 @@ The `production_access` feature flag enables a flow for users to request live pr
 
 #### Quick Start
 
-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.
+The `quick_start` feature flag enables the simplified onboarding flow for new users, where they connect to processors, configure payment routing and test a payment, all in one flow.
 
 ---
 
@@ -164,7 +164,7 @@ What you need to get started
 
 - An AWS account
 
-> P.S. You can directly start fron Step 3 if you have installed and configured AWS CLI.
+> P.S. You can directly start from Step 3 if you have installed and configured AWS CLI.
 
 #### Step 1 - Install or update the AWS CLI
 
@@ -225,7 +225,7 @@ which aws
 
 #### Step 2 - Configure the AWS CLI
 
-For this step you would need the following from you AWS account
+For this step you would need the following from your AWS account
 
 - Access key ID
 - Secret Access Key
@@ -255,7 +255,7 @@ Once the script is executed, you will receive a Public IP as the response (e.g.
 
 #### Clean Up
 
-If you want to delete the application from your account simply run the below clean up script. Ypu need to install JQ for this. For more information, [click here](https://jqlang.github.io/jq/download/)
+If you want to delete the application from your account simply run the below clean up script. You need to install JQ for this. For more information, [click here](https://jqlang.github.io/jq/download/)
 
 ```
 curl https://raw.githubusercontent.com/juspay/hyperswitch-control-center/main/aws/hyperswitch_control_center_cleanup_setup.sh | bash

public/hyperswitch/wasm/euclid.d.ts

@@ -104,10 +104,9 @@ export function getRequestPayload(input: any, response: any): any;
 */
 export function getResponsePayload(input: any): any;
 /**
-* @param {string} key
 * @returns {any}
 */
-export function getDescriptionCategory(key: string): any;
+export function getDescriptionCategory(): any;
 /**
 *
 * Function exposed as `wasm` function in js `parse`. Allowing use to extend the functionality and
@@ -138,7 +137,7 @@ export interface InitOutput {
   readonly getPayoutConnectorConfig: (a: number, b: number, c: number) => void;
   readonly getRequestPayload: (a: number, b: number, c: number) => void;
   readonly getResponsePayload: (a: number, b: number) => void;
-  readonly getDescriptionCategory: (a: number, b: number, c: number) => void;
+  readonly getDescriptionCategory: (a: number) => void;
   readonly parse: (a: number, b: number, c: number) => void;
   readonly parseToString: (a: number, b: number, c: number) => void;
   readonly __wbindgen_export_0: (a: number, b: number) => number;

public/hyperswitch/wasm/euclid.js

@@ -580,15 +580,12 @@ export function getResponsePayload(input) {
 }
 
 /**
-* @param {string} key
 * @returns {any}
 */
-export function getDescriptionCategory(key) {
+export function getDescriptionCategory() {
     try {
         const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
-        const ptr0 = passStringToWasm0(key, wasm.__wbindgen_export_0, wasm.__wbindgen_export_1);
-        const len0 = WASM_VECTOR_LEN;
-        wasm.getDescriptionCategory(retptr, ptr0, len0);
+        wasm.getDescriptionCategory(retptr);
         var r0 = getInt32Memory0()[retptr / 4 + 0];
         var r1 = getInt32Memory0()[retptr / 4 + 1];
         var r2 = getInt32Memory0()[retptr / 4 + 2];

public/hyperswitch/wasm/euclid_bg.wasm.d.ts

@@ -18,7 +18,7 @@ export function getConnectorConfig(a: number, b: number, c: number): void;
 export function getPayoutConnectorConfig(a: number, b: number, c: number): void;
 export function getRequestPayload(a: number, b: number, c: number): void;
 export function getResponsePayload(a: number, b: number): void;
-export function getDescriptionCategory(a: number, b: number, c: number): void;
+export function getDescriptionCategory(a: number): void;
 export function parse(a: number, b: number, c: number): void;
 export function parseToString(a: number, b: number, c: number): void;
 export function __wbindgen_export_0(a: number, b: number): number;

public/hyperswitch/wasm/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "euclid_wasm_vas",
+  "name": "euclid_wasm",
   "description": "WASM bindings for Euclid DSL",
   "version": "0.1.0",
   "files": [

src/components/HSwitchFeedBackModal.res

@@ -7,44 +7,38 @@ let make = (
   ~modalType: HSwitchFeedBackModalUtils.modalType=FeedBackModal,
 ) => {
   open HSwitchFeedBackModalUtils
+  open APIUtils
   let hyperswitchMixPanel = HSMixPanel.useSendEvent()
   let url = RescriptReactRouter.useUrl()
-  let fetchApi = APIUtils.useUpdateMethod()
   let showToast = ToastState.useShowToast()
+  let updateDetails = useUpdateMethod()
 
-  let onSubmit = (values, _) => {
-    let body = values->HSwitchUtils.getBodyForFeedBack(~modalType, ())
-
+  let onSubmit = async (values, _) => {
     let mixPanelAction = switch modalType {
     | FeedBackModal => "givefeedback"
     | RequestConnectorModal => "request_connector"
     }
-
     ["global", url.path->LogicUtils.getListHead]->Js.Array2.forEach(ele =>
       hyperswitchMixPanel(~pageName=ele, ~contextName=feedbackVia, ~actionName=mixPanelAction, ())
     )
 
-    open Promise
-
-    fetchApi(
-      APIUtils.getURL(~entityName=FEEDBACK, ~methodType=Post, ()),
-      body->Js.Json.object_,
-      Fetch.Post,
-    )
-    ->thenResolve(_ => {
+    try {
+      let url = getURL(~entityName=USERS, ~userType=#USER_DATA, ~methodType=Post, ())
+      let body =
+        [
+          ("Feedback", values->HSwitchUtils.getBodyForFeedBack(~modalType, ())->Js.Json.object_),
+        ]->LogicUtils.getJsonFromArrayOfJson
+      let _res = await updateDetails(url, body, Post)
       let successMessage = switch modalType {
       | FeedBackModal => "Thanks for feedback"
       | RequestConnectorModal => "Request submitted succesfully"
       }
       showToast(~toastType=ToastSuccess, ~message=successMessage, ~autoClose=false, ())
-    })
-    ->catch(_ => {
-      resolve()
-    })
-    ->ignore
-
+    } catch {
+    | _ => ()
+    }
     setShowModal(_ => false)
-    Js.Nullable.null->resolve
+    Js.Nullable.null
   }
 
   let showLabel = switch modalType {

src/components/InputFields.res

@@ -218,6 +218,7 @@ let selectInput = (
   ~ellipsisOnly=false,
   ~showBtnTextToolTip=false,
   ~dropdownClassName="",
+  ~descriptionOnHover=false,
   (),
 ) => {
   let accessHook = useGetAccessLevel()
@@ -252,6 +253,7 @@ let selectInput = (
     ellipsisOnly
     showBtnTextToolTip
     dropdownClassName
+    descriptionOnHover
   />
 }