Merge branch 'main' into fix/support-form-data

juspay · Jan 16, 2024 · e6f321f · e6f321f
2 parents ee3cc7d + 1fc2789
commit e6f321f
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,21 @@ All notable changes to this project will be documented in this file. See [conven
 
 - - -
 
+## 1.25.0 (2024-01-16)
+
+### Features
+
+- Cybersource enabled in Prod ([#256](https://github.com/juspay/hyperswitch-control-center/pull/256)) ([`93f202e`](https://github.com/juspay/hyperswitch-control-center/commit/93f202e4c0b76e29de7e515e3b405692a09e3e40))
+
+### Bug Fixes
+
+- Make tax_on_surcharge optional and add description ([#259](https://github.com/juspay/hyperswitch-control-center/pull/259)) ([`498437b`](https://github.com/juspay/hyperswitch-control-center/commit/498437b94fe6f69c42708baca19ba9132714f467))
+
+**Full Changelog:** [`v1.24.2...v1.25.0`](https://github.com/juspay/hyperswitch-control-center/compare/v1.24.2...v1.25.0)
+
+- - -
+
+
 ## 1.24.2 (2024-01-12)
 
 ### Bug Fixes

diff --git a/src/screens/HyperSwitch/Surcharge/Surcharge.res b/src/screens/HyperSwitch/Surcharge/Surcharge.res
@@ -246,7 +246,9 @@ let make = () => {
 
   <PageLoaderWrapper screenState>
     <div className="flex flex-col overflow-scroll gap-6">
-      <PageUtils.PageHeading title={"Surcharge"} subTitle="Add your surcharge" />
+      <PageUtils.PageHeading
+        title={"Surcharge"} subTitle="Configure advanced rules to apply surcharges"
+      />
       {switch pageView {
       | NEW =>
         <div className="w-full border p-8 bg-white rounded-md ">
@@ -274,10 +276,10 @@ let make = () => {
           <ActiveRulePreview initialRule />
           <div className="w-full border p-6 flex flex-col gap-6 bg-white rounded-md">
             <p className="text-base font-semibold text-grey-700">
-              {"Add Surcharge"->React.string}
+              {"Configure Surcharge"->React.string}
             </p>
             <p className="text-base font-normal text-grey-700 opacity-50">
-              {"Surcharge info description can come here"->React.string}
+              {"Create advanced rules using various payment parameters like amount, currency,payment method etc to enforce a surcharge on your payments"->React.string}
             </p>
             <Button
               text="Create New"

diff --git a/src/screens/HyperSwitch/Surcharge/SurchargeUtils.res b/src/screens/HyperSwitch/Surcharge/SurchargeUtils.res
@@ -106,9 +106,8 @@ let validateSurchargeRate = ruleDict => {
   } else {
     surchargeValueAmount == 0.0
   }
-  let taxOnSurcharge = surchargeType.tax_on_surcharge.percentage->Option.getWithDefault(0.0)
 
-  !(isSurchargeAmountValid || taxOnSurcharge == 0.0 || taxOnSurcharge > 100.0)
+  !isSurchargeAmountValid
 }
 
 let validateConditionsForSurcharge = dict => {