fix: theme based issue

juspay · Mar 12, 2024 · b0c88fe · b0c88fe
1 parent ab53eaf
commit b0c88fe
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 23 deletions.
diff --git a/src/BrutalTheme.res b/src/BrutalTheme.res
@@ -40,7 +40,7 @@ let brutal = {
   spacingGridRow: "20px",
   buttonBackgroundColor: "#f5fb1f",
   buttonHeight: "48px",
-  buttonWidth: "thin",
+  buttonWidth: "100%",
   buttonBorderRadius: "6px",
   buttonBorderColor: "#566186",
   buttonTextColor: "#000000",

diff --git a/src/CardTheme.res b/src/CardTheme.res
@@ -255,34 +255,34 @@ let getVariables = (str, dict, default, logger) => {
       buttonBackgroundColor: getWarningString(
         json,
         "buttonBackgroundColor",
-        default.spacingGridRow,
+        default.buttonBackgroundColor,
         ~logger,
       ),
-      buttonHeight: getWarningString(json, "buttonHeight", default.spacingGridRow, ~logger),
-      buttonWidth: getWarningString(json, "buttonWidth", default.spacingGridRow, ~logger),
+      buttonHeight: getWarningString(json, "buttonHeight", default.buttonHeight, ~logger),
+      buttonWidth: getWarningString(json, "buttonWidth", default.buttonWidth, ~logger),
       buttonBorderRadius: getWarningString(
         json,
         "buttonBorderRadius",
-        default.spacingGridRow,
+        default.buttonBorderRadius,
         ~logger,
       ),
       buttonBorderColor: getWarningString(
         json,
         "buttonBorderColor",
-        default.spacingGridRow,
+        default.buttonBorderColor,
         ~logger,
       ),
-      buttonTextColor: getWarningString(json, "buttonTextColor", default.spacingGridRow, ~logger),
+      buttonTextColor: getWarningString(json, "buttonTextColor", default.buttonTextColor, ~logger),
       buttonTextFontSize: getWarningString(
         json,
         "buttonTextFontSize",
-        default.spacingGridRow,
+        default.buttonTextFontSize,
         ~logger,
       ),
       buttonTextFontWeight: getWarningString(
         json,
         "buttonTextFontWeight",
-        default.spacingGridRow,
+        default.buttonTextFontWeight,
         ~logger,
       ),
     }

diff --git a/src/CharcoalTheme.res b/src/CharcoalTheme.res
@@ -40,7 +40,7 @@ let charcoal = {
   spacingGridRow: "20px",
   buttonBackgroundColor: "#000000",
   buttonHeight: "48px",
-  buttonWidth: "thin",
+  buttonWidth: "100%",
   buttonBorderRadius: "6px",
   buttonBorderColor: "#000000",
   buttonTextColor: "#ffffff",

diff --git a/src/DefaultTheme.res b/src/DefaultTheme.res
@@ -40,7 +40,7 @@ let default = {
   spacingGridRow: "20px",
   buttonBackgroundColor: "#006df9",
   buttonHeight: "48px",
-  buttonWidth: "thin",
+  buttonWidth: "100%",
   buttonBorderRadius: "6px",
   buttonBorderColor: "#ffffff",
   buttonTextColor: "#ffffff",

diff --git a/src/MidnightTheme.res b/src/MidnightTheme.res
@@ -40,7 +40,7 @@ let midnight = {
   spacingGridRow: "20px",
   buttonBackgroundColor: "#85d996",
   buttonHeight: "48px",
-  buttonWidth: "thin",
+  buttonWidth: "100%",
   buttonBorderRadius: "6px",
   buttonBorderColor: "#85d996",
   buttonTextColor: "#000000",

diff --git a/src/NoTheme.res b/src/NoTheme.res
@@ -41,7 +41,7 @@ let nakedValues = {
   spacingGridRow: "20px",
   buttonBackgroundColor: "",
   buttonHeight: "48px",
-  buttonWidth: "thin",
+  buttonWidth: "100%",
   buttonBorderRadius: "6px",
   buttonBorderColor: "",
   buttonTextColor: "",

diff --git a/src/Payments/CardPayment.res b/src/Payments/CardPayment.res
@@ -273,7 +273,7 @@ let make = (
           </RenderIf>
           <RenderIf
             condition={options.displaySavedPaymentMethods &&
-            savedMethods->Js.Array2.length > 0 &&
+            savedMethods->Array.length > 0 &&
             !isBancontact}>
             <div
               className="Label flex flex-row gap-3 items-end cursor-pointer"

diff --git a/src/SoftTheme.res b/src/SoftTheme.res
@@ -41,7 +41,7 @@ let soft = {
   spacingGridRow: "20px",
   buttonBackgroundColor: "#3c3d3e",
   buttonHeight: "48px",
-  buttonWidth: "thin",
+  buttonWidth: "100%",
   buttonBorderRadius: "6px",
   buttonBorderColor: "#7d8fff",
   buttonTextColor: "#7d8fff",

diff --git a/src/orca-loader/Elements.res b/src/orca-loader/Elements.res
@@ -219,7 +219,6 @@ let make = (
         mountedIframeRef,
         selectorString,
         sdkHandleOneClickConfirmPayment,
-        displaySavedPaymentMethods,
       ) => {
         open Promise
 

diff --git a/src/orca-loader/LoaderPaymentElement.res b/src/orca-loader/LoaderPaymentElement.res
@@ -22,12 +22,6 @@ let make = (componentType, options, setIframeRef, iframeRef, mountPostMessage) =
         true,
       )
 
-    let displaySavedPaymentMethods =
-      options->getDecodedBoolFromJson(
-        callbackFuncForExtractingValFromDict("displaySavedPaymentMethods"),
-        true,
-      )
-
     let on = (eventType, eventHandler) => {
       switch eventType->eventTypeMapper {
       | Escape =>
@@ -296,7 +290,6 @@ let make = (componentType, options, setIframeRef, iframeRef, mountPostMessage) =
             Window.querySelector(`#orca-payment-element-iframeRef-${localSelectorString}`),
             localSelectorString,
             sdkHandleOneClickConfirmPayment,
-            displaySavedPaymentMethods,
           )
         }
       }