varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

NTP-33778| Sidharth Bamba | arc issues resolved (#14791)

Browse Source
This commit is contained in:
Sidharth Bamba
2025-01-31 19:53:12 +05:30
committed by GitHub
parent a2ee43e680
commit 08a9ee04df
2 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreen.kt
View File

@@ -77,6 +77,7 @@ import com.navi.bbps.common.ui.SetStatusBarColor
import com.navi.bbps.common.utils.NaviBbpsCommonUtils
import com.navi.bbps.common.utils.NaviBbpsCommonUtils.isCreditCardCategory
import com.navi.bbps.common.utils.NaviBbpsCommonUtils.isUrlPathValidForSavedBills
import com.navi.bbps.common.utils.clearBackStackUpToAndNavigate
import com.navi.bbps.common.utils.getDisplayableAmount
import com.navi.bbps.customHide
import com.navi.bbps.entry.NaviBbpsActivity
@@ -85,6 +86,7 @@ import com.navi.bbps.feature.category.model.view.BillCategoryEntity
import com.navi.bbps.feature.contactlist.model.view.PhoneContactEntity
import com.navi.bbps.feature.customerinput.model.view.BillerAdditionalParamsEntity
import com.navi.bbps.feature.customerinput.model.view.BillerDetailsEntity
import com.navi.bbps.feature.destinations.BillCategoriesScreenV2Destination
import com.navi.bbps.feature.destinations.MyBillHistoryDetailsScreenDestination
import com.navi.bbps.feature.mybills.model.view.MyBillEntity
import com.navi.bbps.feature.paybill.PayBillViewModel
@@ -198,6 +200,26 @@ fun PayBillScreen(
}
}
LaunchedEffect(Unit) {
payBillViewModel.goToNextScreen.collectLatest { nextScreen ->
val direction = nextScreen.first
val clearBackStack = nextScreen.second
if (direction != null) {
if (clearBackStack) {
navigator.clearBackStackUpToAndNavigate(
destination = direction,
popUpTo = BillCategoriesScreenV2Destination,
inclusive = false,
)
} else {
navigator.navigate(direction = direction)
}
} else {
navigator.navigateUp()
}
}
}
LaunchedEffect(Unit) {
payBillViewModel.navigateToOrderDetailsScreen.collectLatest { navigateToOrderDetailsScreen
->

22
android/navi-bbps/src/main/kotlin/com/navi/bbps/feature/paybill/ui/PayBillScreenV2.kt
View File

@@ -104,6 +104,7 @@ import com.navi.bbps.common.utils.NaviBbpsCommonUtils.isCategoryOfTypeAmountChip
import com.navi.bbps.common.utils.NaviBbpsCommonUtils.isCreditCardCategory
import com.navi.bbps.common.utils.NaviBbpsCommonUtils.isRechargeCategory
import com.navi.bbps.common.utils.NaviBbpsCommonUtils.isUrlPathValidForSavedBills
import com.navi.bbps.common.utils.clearBackStackUpToAndNavigate
import com.navi.bbps.common.utils.getDisplayableAmount
import com.navi.bbps.customHide
import com.navi.bbps.entry.NaviBbpsActivity
@@ -113,6 +114,7 @@ import com.navi.bbps.feature.contactlist.model.view.PhoneContactEntity
import com.navi.bbps.feature.customerinput.model.view.BillDetailsEntity
import com.navi.bbps.feature.customerinput.model.view.BillerAdditionalParamsEntity
import com.navi.bbps.feature.customerinput.model.view.BillerDetailsEntity
import com.navi.bbps.feature.destinations.BillCategoriesScreenV2Destination
import com.navi.bbps.feature.destinations.MyBillHistoryDetailsScreenDestination
import com.navi.bbps.feature.mybills.model.view.MyBillEntity
import com.navi.bbps.feature.mybills.model.view.UnpaidBillDetails
@@ -402,6 +404,26 @@ fun PayBillScreenV2(
}
}
LaunchedEffect(Unit) {
payBillViewModelV2.goToNextScreen.collectLatest { nextScreen ->
val direction = nextScreen.first
val clearBackStack = nextScreen.second
if (direction != null) {
if (clearBackStack) {
navigator.clearBackStackUpToAndNavigate(
destination = direction,
popUpTo = BillCategoriesScreenV2Destination,
inclusive = false,
)
} else {
navigator.navigate(direction = direction)
}
} else {
navigator.navigateUp()
}
}
}
SetStatusBarColor(activity = naviBbpsActivity, colorResId = R.color.bbps_text_white)
val onBackClicked = {