NTP-24902 | Divyesh | arc tds design fixes (#14862)

android/navi-pay/src/main/kotlin/com/navi/pay/common/ui/NaviPayCommonView.kt

@@ -1852,18 +1852,19 @@ fun NaviPayCard(
     elevation: Dp = 2.dp,
     shadowElevation: Dp = 32.dp,
     borderStroke: BorderStroke? = null,
+    showShadow: Boolean = true,
     content: @Composable () -> Unit,
 ) {
     Card(
         modifier =
-            modifier
-                .fillMaxWidth()
-                .shadow(
+            modifier.fillMaxWidth().conditional(showShadow) {
+                shadow(
                     shape = RoundedCornerShape(cornerRadius),
                     elevation = shadowElevation,
                     ambientColor = ambientColor,
                     spotColor = spotColor,
-                ),
+                )
+            },
         shape = RoundedCornerShape(cornerRadius),
         elevation = elevation,
         border = borderStroke,

android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/bbps/BbpsOrderDetailsSummarySection.kt

@@ -372,6 +372,8 @@ fun RefundStatusCard(
     NaviPayCard(
         modifier = Modifier.fillMaxWidth().padding(start = 16.dp, end = 16.dp, top = 24.dp),
         borderStroke = BorderStroke(width = 1.dp, color = NaviPayColor.borderDefault),
+        showShadow = false,
+        elevation = 0.dp,
     ) {
         Row(
             modifier =

android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/OrderDetailsSummarySection.kt

@@ -148,8 +148,7 @@ internal fun OrderDetailsSummarySection(
     ) {
         Spacer(modifier = Modifier.height(24.dp))
 
-        if (orderEntity?.orderStatusOfView?.isPending().orFalse()) {
-
+        if (orderEntity?.paymentStatus?.isPending().orFalse()) {
             ElexNotifyWidget(
                 isSuccessState = notificationPermissionState.allPermissionsGranted,
                 mainText = notifyWidgetTextMessage.mainText,
@@ -168,6 +167,8 @@ internal fun OrderDetailsSummarySection(
         NaviPayCard(
             modifier = Modifier.fillMaxWidth(),
             borderStroke = BorderStroke(width = 1.dp, color = NaviPayColor.borderDefault),
+            showShadow = false,
+            elevation = 0.dp,
         ) {
             Column(modifier = Modifier.fillMaxWidth()) {
                 when (orderEntity?.productType) {

android/navi-pay/src/main/kotlin/com/navi/pay/tstore/details/ui/common/PaymentStatusSection.kt

@@ -33,6 +33,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.navi.base.utils.EMPTY
+import com.navi.base.utils.orFalse
 import com.navi.common.R as CommonR
 import com.navi.common.ui.compose.EquilateralTriangle
 import com.navi.common.utils.CommonUtils.capitalizeMeridiem
@@ -46,6 +47,7 @@ import com.navi.pay.common.ui.NaviPayLottieAnimation
 import com.navi.pay.tstore.details.model.view.OrderHistoryDetailItemProperty
 import com.navi.pay.tstore.details.model.view.OrderPaymentStatus
 import com.navi.pay.tstore.list.model.view.OrderEntity
+import com.navi.pay.tstore.list.model.view.OrderStatusOfView
 import com.navi.pay.utils.RUPEE_SYMBOL
 import com.navi.pay.utils.getDisplayableAmount
 
@@ -105,7 +107,10 @@ internal fun PaymentStatusSection(
                             fontSize = 14.sp,
                             lineHeight = 22.sp,
                             color =
-                                if (orderEntity?.paymentStatus == OrderPaymentStatus.SUCCESS) {
+                                if (
+                                    orderEntity?.paymentStatus?.isSuccess().orFalse() &&
+                                        orderEntity?.orderStatusOfView != OrderStatusOfView.Failed
+                                ) {
                                     NaviPayColor.bgSuccess
                                 } else {
                                     NaviPayColor.textTertiary
@@ -120,8 +125,9 @@ internal fun PaymentStatusSection(
                                     drawLine(
                                         color =
                                             if (
-                                                orderEntity?.paymentStatus ==
-                                                    OrderPaymentStatus.SUCCESS
+                                                orderEntity?.paymentStatus?.isSuccess().orFalse() &&
+                                                    orderEntity?.orderStatusOfView !=
+                                                        OrderStatusOfView.Failed
                                             ) {
                                                 NaviPayColor.bgSuccess
                                             } else {

android/navi-pay/src/main/res/values/strings.xml

@@ -633,7 +633,7 @@
     <string name="np_self_transfer_failed">Self transfer failed</string>
     <string name="np_bbps_navi_coins">Navi coins</string>
     <string name="np_bbps_coin_refund_message_in_progress">%s coins will be refunded if payment fails.</string>
-    <string name="np_bbps_coin_refund_message_failed">%s Navi coins have been refunded</string>
+    <string name="np_bbps_coin_refund_message_failed">%s have been refunded</string>
     <string name="np_phone_number_linked_successfully">%s linked\nsuccessfully to Navi</string>
     <string name="np_phone_number_linking_in_progress">Linking of %s\nto Navi in progress</string>
     <string name="np_currently_linked_to">"Currently linked to :\u0020"</string>