From 648236f1870a9d247f85bea8c1173bc9dc848c75 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 9 Oct 2023 17:05:59 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../tokenreceive/TokenReceiveBottomSheet.kt      | 13 ++++++++-----
 .../presentation/router/DefaultWalletRouter.kt   |  2 +-
 gradle/dependencies.toml                         | 16 ++++++++--------
 .../plugin/configuration/model/AppConfig.kt      |  4 ++--
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt
index ce07dc5ba7..417b9fcb35 100644
--- a/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt
+++ b/core/ui/src/main/java/com/tangem/core/ui/components/bottomsheets/tokenreceive/TokenReceiveBottomSheet.kt
@@ -100,15 +100,18 @@ private fun TokenReceiveBottomSheetContent(content: TokenReceiveBottomSheetConfi
 @Composable
 private fun QrCodeContent(content: TokenReceiveBottomSheetConfig, onAddressChange: (AddressModel) -> Unit) {
     val qrCodes = rememberQrPainters(content.addresses.map(AddressModel::value))
-    val pagerState = rememberPagerState()
-    val pageCount = content.addresses.count()
+    val pagerState = rememberPagerState(
+        initialPage = 0,
+        initialPageOffsetFraction = 0f,
+    ) {
+        content.addresses.count()
+    }
 
     LaunchedEffect(key1 = pagerState.currentPage) {
         onAddressChange.invoke(content.addresses[pagerState.currentPage])
     }
 
     HorizontalPager(
-        pageCount = pageCount,
         state = pagerState,
     ) { currentPage ->
         Column(
@@ -142,7 +145,7 @@ private fun QrCodeContent(content: TokenReceiveBottomSheetConfig, onAddressChang
         }
     }
 
-    if (pageCount > 1) {
+    if (pagerState.pageCount > 1) {
         val indicatorState = rememberLazyListState()
         val selectedColor = TangemTheme.colors.icon.primary1
         val unselectedColor = TangemTheme.colors.icon.informative
@@ -153,7 +156,7 @@ private fun QrCodeContent(content: TokenReceiveBottomSheetConfig, onAddressChang
             horizontalArrangement = Arrangement.Center,
             verticalAlignment = Alignment.CenterVertically,
         ) {
-            repeat(pageCount) { iteration ->
+            repeat(pagerState.pageCount) { iteration ->
                 item(key = iteration) {
                     val color = if (pagerState.currentPage == iteration) {
                         selectedColor
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
index c481e57703..6ad00bcf52 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt
@@ -78,7 +78,7 @@ internal class DefaultWalletRouter(private val reduxNavController: ReduxNavContr
          * next element is wallet screen entry.
          * If backstack contains only NavGraph entry and wallet screen entry then we close the wallet fragment.
          */
-        if (navController.backQueue.size == BACKSTACK_ENTRY_COUNT_TO_CLOSE_WALLET_SCREEN) {
+        if (navController.currentBackStack.value.size == BACKSTACK_ENTRY_COUNT_TO_CLOSE_WALLET_SCREEN) {
             if (screen != null) {
                 reduxNavController.navigate(action = NavigationAction.PopBackTo(screen))
             } else {
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index f0b0c1d42f..a75f75bdfa 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -10,7 +10,7 @@ kotlin = "1.8.21"
 # endregion Classpath
 
 # region AndroidX
-androidxActivityCompose = "1.5.0"
+androidxActivityCompose = "1.8.0"
 androidxAppCompat = "1.5.1"
 androidxBrowser = "1.4.0"
 androidxConstraintLayout = "2.1.4"
@@ -24,16 +24,16 @@ androidx-palette = "1.0.0"
 
 # region Compose
 compose-compiler = "1.4.7"
-compose-runtime = "1.4.3"
-compose-foundation = "1.4.3"
-compose-material = "1.4.3"
-compose-material3 = "1.1.0"
+compose-runtime = "1.5.3"
+compose-foundation = "1.5.3"
+compose-material = "1.5.3"
+compose-material3 = "1.1.2"
 compose-constraint = "1.0.1"
-compose-navigation = "2.5.3"
+compose-navigation = "2.7.4"
 compose-accompanist = "0.30.1"
-compose-paging = "3.2.0"
+compose-paging = "3.2.1"
 compose-reorderable = "0.9.6"
-compoese-lifecycle-runtime = "2.6.1"
+compoese-lifecycle-runtime = "2.6.2"
 # endregion Compose
 
 # region Other libraries
diff --git a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt
index 39b4f01925..c8bfbff0f1 100644
--- a/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt
+++ b/plugins/configuration/src/main/kotlin/com/tangem/plugin/configuration/model/AppConfig.kt
@@ -5,6 +5,6 @@ internal object AppConfig {
     const val versionCode = 1
     const val versionName = "1.0.0-SNAPSHOT"
     const val minSdkVersion = 23
-    const val targetSdkVersion = 33
-    const val compileSdkVersion = 33
+    const val targetSdkVersion = 34
+    const val compileSdkVersion = 34
 }
\ No newline at end of file