From b6e5c3d82228f121569e842e48e5a8fc32e775a0 Mon Sep 17 00:00:00 2001
From: Sidharth Bamba <sidharth.bamba@navi.com>
Date: Wed, 29 May 2024 19:36:36 +0530
Subject: [PATCH] TP-65797 | Sidharth Bamba | issue fixes (#11061)

Co-authored-by: Shaurya Rehan <shaurya.rehan@navi.com>
---
 .../BbpsEngagementBannerProvider.kt           |  2 +-
 .../ui/BbpsPostPaymentScreen.kt               | 50 ++++++++++---------
 .../ui/BbpsTransactionDetailsScreenV2.kt      |  2 +-
 3 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/BbpsEngagementBannerProvider.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/BbpsEngagementBannerProvider.kt
index 248c9533fc..dfaf78a661 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/BbpsEngagementBannerProvider.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/BbpsEngagementBannerProvider.kt
@@ -126,7 +126,7 @@ constructor(private val myBillsRepository: MyBillsRepository) {
                 ),
                 EngagementBannerEntity(
                     categoryId = CATEGORY_ID_LPG_GAS,
-                    title = "LPG Gas",
+                    title = "LPG gas",
                     description = "Book your LPG gas cylinder directly from Navi",
                     ctaText = "Book now",
                     iconUrl =
diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreen.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreen.kt
index 532ee7fe99..363d034c69 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreen.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetails/ui/BbpsPostPaymentScreen.kt
@@ -520,7 +520,7 @@ private fun TransactionInfoCard(
 
         Row(
             modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.Bottom
         ) {
             Column(modifier = Modifier.weight(1f)) {
                 NaviText(
@@ -548,29 +548,32 @@ private fun TransactionInfoCard(
 
             Spacer(modifier = Modifier.width(16.dp))
 
-            NaviText(
-                modifier =
-                    Modifier.clickable(
-                            interactionSource = remember { MutableInteractionSource() },
-                            indication = rememberRipple(color = NaviBbpsColor.ctaPrimary)
-                        ) {
-                            onCtaClicked.invoke()
-                        }
-                        .align(Alignment.Bottom),
-                text = stringResource(id = R.string.bbps_view_details),
-                fontFamily = ttComposeFontFamily,
-                fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD),
-                fontSize = 14.sp,
-                color = transactionHistoryDetailItemProperty.bannerTextColor
-            )
+            Row(
+                Modifier.clickable(
+                        interactionSource = remember { MutableInteractionSource() },
+                        indication = rememberRipple(color = NaviBbpsColor.ctaPrimary)
+                    ) {
+                        onCtaClicked.invoke()
+                    }
+                    .padding(start = 4.dp),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                NaviText(
+                    text = stringResource(id = R.string.bbps_view_details),
+                    fontFamily = ttComposeFontFamily,
+                    fontWeight = getFontWeight(FontWeightEnum.NAVI_BODY_DEMI_BOLD),
+                    fontSize = 14.sp,
+                    color = transactionHistoryDetailItemProperty.bannerTextColor
+                )
 
-            Spacer(modifier = Modifier.width(2.dp))
+                Spacer(modifier = Modifier.width(2.dp))
 
-            Image(
-                modifier = Modifier.size(16.dp).align(Alignment.Bottom).padding(bottom = 2.dp),
-                painter = painterResource(id = R.drawable.ic_bbps_chevron_right),
-                contentDescription = ""
-            )
+                Image(
+                    modifier = Modifier.size(16.dp),
+                    painter = painterResource(id = R.drawable.ic_bbps_chevron_right),
+                    contentDescription = ""
+                )
+            }
         }
 
         Spacer(modifier = Modifier.height(24.dp))
@@ -1138,7 +1141,8 @@ fun PaymentStatusDescription(billEntity: MyBillEntity) {
     ) {
         Image(
             painter = painterResource(id = R.drawable.ic_bbps_info_circle),
-            contentDescription = ""
+            contentDescription = "",
+            modifier = Modifier.size(16.dp)
         )
         Spacer(modifier = Modifier.width(12.dp))
 
diff --git a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetailsv2/ui/BbpsTransactionDetailsScreenV2.kt b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetailsv2/ui/BbpsTransactionDetailsScreenV2.kt
index b793591129..2e11da2337 100644
--- a/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetailsv2/ui/BbpsTransactionDetailsScreenV2.kt
+++ b/android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/transactiondetailsv2/ui/BbpsTransactionDetailsScreenV2.kt
@@ -467,7 +467,7 @@ private fun ColumnScope.PaymentDetailsHiddenSection(
             if (!transactionEntity?.transactionDetails?.bbpsTransactionId.isNullOrBlank()) {
                 KeyValueWithCopySection(
                     modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp),
-                    key = stringResource(id = R.string.bbps_bbps_transaction_id),
+                    key = stringResource(id = R.string.bbps_biller_reference_id),
                     value = transactionEntity?.transactionDetails?.bbpsTransactionId.orEmpty(),
                     iconId = R.drawable.ic_copy,
                     onCopyIconClicked = {