fix: analytics minor bugs

src/components/DateRangeCompareFields.res

@@ -481,7 +481,7 @@ module Base = {
 
     let timeVisibilityClass = showTime ? "block" : "hidden"
 
-    let getDiffForPredefined = predefinedDay => {
+    let getPredefinedValues = predefinedDay => {
       let (stDate, enDate, stTime, enTime) = DateRangeUtils.getPredefinedStartAndEndDate(
         todayDayJsObj,
         isoStringToCustomTimeZone,
@@ -519,8 +519,21 @@ module Base = {
         endDateVal,
         "YYYY-MM-DDTHH:mm:00[Z]",
       )
-      let (startTimestamp, endTimestamp) = getDiffForPredefined(item)
-      (startTimestamp, endTimestamp) == (startDate, endDate)
+
+      let (startTimestamp, endTimestamp) = getPredefinedValues(item)
+
+      let prestartDate = convertTimeStamp(
+        ~isoStringToCustomTimeZone,
+        startTimestamp,
+        "YYYY-MM-DDTHH:mm:00[Z]",
+      )
+      let preendDate = convertTimeStamp(
+        ~isoStringToCustomTimeZone,
+        endTimestamp,
+        "YYYY-MM-DDTHH:mm:00[Z]",
+      )
+
+      startDate == prestartDate && endDate == preendDate
     })
 
     let buttonText = switch predefinedOptionSelected {
@@ -639,16 +652,6 @@ module Base = {
         </AddDataAttributes>
       </div>
     }
-    let isPrimaryPredefinedOptionSelected = getIsPredefinedOptionSelected(
-      predefinedDays,
-      startDateVal,
-      endDateVal,
-      isoStringToCustomTimeZone,
-      isoStringToCustomTimezoneInFloat,
-      customTimezoneToISOString,
-      disableFutureDates,
-      disablePastDates,
-    )
     let dropDownClass = `absolute ${dropdownPosition} z-20 max-h-min max-w-min overflow-auto bg-white dark:bg-jp-gray-950 rounded-lg shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none mt-2 right-0`
     <div ref={dateRangeRef->ReactDOM.Ref.domRef} className="daterangSelection relative">
       <DateSelectorButton
@@ -663,7 +666,7 @@ module Base = {
         showTime
         buttonText
         showSeconds
-        predefinedOptionSelected=isPrimaryPredefinedOptionSelected
+        predefinedOptionSelected
         disableFutureDates
         onClick={_ => handleDropdownClick()}
         buttonType

src/components/DateRangeField.res

@@ -587,6 +587,33 @@ module Base = {
       getStartEndDiff(startTimestamp, endTimestamp)
     }
 
+    let getPredefinedValues = predefinedDay => {
+      let (stDate, enDate, stTime, enTime) = DateRangeUtils.getPredefinedStartAndEndDate(
+        todayDayJsObj,
+        isoStringToCustomTimeZone,
+        isoStringToCustomTimezoneInFloat,
+        customTimezoneToISOString,
+        predefinedDay,
+        disableFutureDates,
+        disablePastDates,
+        todayDate,
+        todayTime,
+      )
+      let startTimestamp = changeTimeFormat(
+        ~date=stDate,
+        ~time=stTime,
+        ~customTimezoneToISOString,
+        ~format="YYYY-MM-DDTHH:mm:00[Z]",
+      )
+      let endTimestamp = changeTimeFormat(
+        ~date=enDate,
+        ~time=enTime,
+        ~customTimezoneToISOString,
+        ~format="YYYY-MM-DDTHH:mm:00[Z]",
+      )
+      (startTimestamp, endTimestamp)
+    }
+
     let predefinedOptionSelected = predefinedDays->Array.find(item => {
       let startDate = convertTimeStamp(
         ~isoStringToCustomTimeZone,
@@ -598,8 +625,21 @@ module Base = {
         endDateVal,
         "YYYY-MM-DDTHH:mm:00[Z]",
       )
-      let difference = getStartEndDiff(startDate, endDate)
-      getDiffForPredefined(item) === difference
+
+      let (startTimestamp, endTimestamp) = getPredefinedValues(item)
+
+      let prestartDate = convertTimeStamp(
+        ~isoStringToCustomTimeZone,
+        startTimestamp,
+        "YYYY-MM-DDTHH:mm:00[Z]",
+      )
+      let preendDate = convertTimeStamp(
+        ~isoStringToCustomTimeZone,
+        endTimestamp,
+        "YYYY-MM-DDTHH:mm:00[Z]",
+      )
+
+      startDate == prestartDate && endDate == preendDate
     })
 
     let buttonText = switch predefinedOptionSelected {

src/screens/NewAnalytics/PaymentAnalytics/PaymentsLifeCycle/PaymentsLifeCycleUtils.res

@@ -105,7 +105,7 @@ let paymentsLifeCycleMapper = (
     partialRefunded +
     (isSmartRetryEnabled ? data.smartRetriedSuccess : 0) +
     data.normalSuccess
-  let failure = data.normalFailure + (isSmartRetryEnabled ? data.smartRetriedFailure * 2 : 0)
+  let failure = data.normalFailure + (isSmartRetryEnabled ? data.smartRetriedFailure : 0)
   let pending = data.pending
   let cancelled = data.cancelled
   let dropoff =

src/screens/NewAnalytics/PaymentAnalytics/PaymentsProcessed/PaymentsProcessed.res

@@ -76,6 +76,7 @@ module PaymentsProcessedHeader = {
       ->getString("is_smart_retry_enabled", "true")
       ->getBoolFromString(true)
       ->getSmartRetryMetricType
+
     let primaryValue = getMetaDataValue(
       ~data,
       ~index=0,
@@ -214,7 +215,7 @@ let make = (
           let secondaryData =
             secondaryResponse->getDictFromJsonObject->getArrayFromDict("queryData", [])
           let secondaryMetaData =
-            primaryResponse->getDictFromJsonObject->getArrayFromDict("metaData", [])
+            secondaryResponse->getDictFromJsonObject->getArrayFromDict("metaData", [])
           let secondaryModifiedData = [secondaryData]->Array.map(data => {
             NewAnalyticsUtils.fillMissingDataPoints(
               ~data,

src/screens/NewAnalytics/PaymentAnalytics/PaymentsSuccessRate/PaymentsSuccessRate.res

@@ -126,7 +126,7 @@ let make = (
           let secondaryData =
             secondaryResponse->getDictFromJsonObject->getArrayFromDict("queryData", [])
           let secondaryMetaData =
-            primaryResponse->getDictFromJsonObject->getArrayFromDict("metaData", [])
+            secondaryResponse->getDictFromJsonObject->getArrayFromDict("metaData", [])
           let secondaryModifiedData = [secondaryData]->Array.map(data => {
             NewAnalyticsUtils.fillMissingDataPoints(
               ~data,