Master → Development (#5024)

navi-insurance/src/main/java/com/navi/insurance/quoteredesign/QuoteActivity.kt

@@ -370,7 +370,7 @@ class QuoteActivity :
         } else if (
             shouldShowSurveyBottomSheet() &&
             supportFragmentManager.findFragmentByTag(QuoteOfferFragment.TAG)?.isVisible ==
-            true && supportFragmentManager.backStackEntryCount == 0 &&
+            true && supportFragmentManager.findFragmentByTag(PolicyBenefitsFragment.TAG) == null &&
             handleSubpageContent(
                 (surveyVM.surveyOtherScreenStateFlow.value as SurveyResponseState.Success)
                     .data
@@ -382,7 +382,7 @@ class QuoteActivity :
         } else if (
             backCtaData != null &&
             supportFragmentManager.findFragmentByTag(QuoteOfferFragment.TAG)?.isVisible == true
-            && supportFragmentManager.backStackEntryCount == 0
+            && (supportFragmentManager.findFragmentByTag(PolicyBenefitsFragment.TAG) == null)
         ) {
             quoteViewModel.performActionFromCta(backCtaData, this)
             return

navi-widgets/src/main/res/layout/action_button_widget_layout.xml

@@ -10,10 +10,6 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
-    <data>
-
-        <import type="com.navi.design.common.TextStyle" />
-    </data>
 
     <com.navi.naviwidgets.widgets.ActionButtonWidgetLayout
         android:id="@+id/container"
@@ -23,14 +19,14 @@
         android:paddingEnd="@dimen/dp_16">
 
         <com.navi.design.textview.NaviTextView
-            android:letterSpacing="0.02"
             android:id="@+id/tvAction"
-            android:textColor="@color/white"
-            app:textStyle="@{TextStyle.ROBOTO_BUTTON2}"
+            style="@style/Small_Bold_White"
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_48"
             android:background="@drawable/rounded_positive_button_bg"
             android:gravity="center"
+            android:letterSpacing="0.02"
+            android:textColor="@color/white"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"