NTP-1234 | Shivam | Arc Fixes (#14813)

This commit is contained in:
Shivam Goyal
2025-02-02 12:07:05 +05:30
committed by GitHub
parent d846d3f306
commit 0c2ce61b5d
2 changed files with 10 additions and 5 deletions

View File

@@ -98,6 +98,7 @@ import com.navi.bbps.common.ui.ThemeRoundedButtonWithImage
import com.navi.bbps.common.utils.NaviBbpsCommonUtils
import com.navi.bbps.common.utils.ShareImageUtils
import com.navi.bbps.common.utils.clearBackStackUpToAndNavigate
import com.navi.bbps.common.utils.getDisplayableAmount
import com.navi.bbps.entry.NaviBbpsActivity
import com.navi.bbps.entry.NaviBbpsRouter
import com.navi.bbps.feature.billhistorydetail.model.view.BillTransactionItemEntity
@@ -1340,7 +1341,9 @@ private fun CoinDiscountBanner(availableCoinsDiscount: String?, coinsUsed: Strin
.padding(start = 12.dp, top = 14.dp, bottom = 8.dp),
) {
val descriptionText =
coinDiscountBannerInfo(availableCoinsDiscount = availableCoinsDiscount)
coinDiscountBannerInfo(
availableCoinsDiscount = availableCoinsDiscount?.getDisplayableAmount()
)
NaviText(
text = descriptionText,
fontSize = 12.sp,
@@ -1357,7 +1360,7 @@ private fun CoinDiscountBanner(availableCoinsDiscount: String?, coinsUsed: Strin
)
Spacer(modifier = Modifier.width(2.dp))
NaviText(
text = coinsUsed,
text = coinsUsed.getDisplayableAmount(),
color = NaviBbpsColor.textWhite,
fontSize = 12.sp,
lineHeight = 16.sp,

View File

@@ -10,6 +10,7 @@ package com.navi.pay.tstore.details.ui.common
import com.navi.base.utils.DateUtils
import com.navi.base.utils.ResourceProvider
import com.navi.common.R as CommonR
import com.navi.common.utils.CommonUtils.capitalizeMeridiem
import com.navi.pay.R
import com.navi.pay.tstore.details.model.view.ArcStatusWidgetProperties
import com.navi.pay.tstore.details.model.view.OrderPaymentStatus
@@ -132,9 +133,10 @@ object ArcStatusWidgetUtils {
}
val arcThresholdTimestampFormatted =
DateUtils.getFormattedDateTimeAsStringFromDateTimeObject(
dateTime = orderTimestamp.plusDays(arcThresholdDays),
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME,
)
dateTime = orderTimestamp.plusDays(arcThresholdDays),
format = DATE_TIME_FORMAT_DATE_MONTH_NAME_AT_TIME,
)
.capitalizeMeridiem()
when (orderProductType) {
OrderProductType.UPI.name -> {