Skip to content

Commit 958275e

Browse files
authored
Merge pull request #1301 from WalletConnect/fix/w3m/navigation_backqueue_crash
[W3M] Remove restricted to navigation library BackQueue
2 parents 16d291a + 1f49852 commit 958275e

3 files changed

Lines changed: 4 additions & 3 deletions

File tree

ReadMe.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ WalletConnect v2 protocols for Android applications.
1111

1212
| BOM | [Core SDK](core/android) | [Sign SDK](protocol/sign) | [Auth SDK](protocol/auth) | [Chat SDK](protocol/chat) | [Notify SDK](protocol/notify) | [web3wallet](product/web3wallet) | [web3modal](product/web3modal) | [WalletConnectModal](product/walletconnectmodal) |
1313
|-----------------------------------------------------------------------------------------|--------------------------|---------------------------|---------------------------|---------------------------|:------------------------------|----------------------------------|--------------------------------|--------------------------------------------------|
14+
| 1.22.1 | 1.27.0 | 2.25.0 | 1.25.0 | 1.0.0.beta23 | 1.0.0 | 1.20.0 | 1.2.1 | 1.2.0 |
1415
| 1.22.0 | 1.27.0 | 2.25.0 | 1.25.0 | 1.0.0.beta23 | 1.0.0 | 1.20.0 | 1.2.0 | 1.2.0 |
1516
| 1.21.1 | 1.26.0 | 2.24.0 | 1.24.0 | 1.0.0.beta23 | 1.0.0-beta04 | 1.19.0 | 1.1.1 | 1.1.1 |
1617
| 1.21.0 | 1.26.0 | 2.24.0 | 1.24.0 | 1.0.0.beta23 | 1.0.0-beta04 | 1.19.0 | 1.1.0 | 1.1.0 |

buildSrc/src/main/kotlin/Versions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ const val KEY_PUBLISH_ARTIFACT_ID = "PUBLISH_ARTIFACT_ID"
55
const val KEY_SDK_NAME = "SDK_NAME"
66

77
//Latest versions
8-
const val BOM_VERSION = "1.22.0"
8+
const val BOM_VERSION = "1.22.1"
99
const val FOUNDATION_VERSION = "1.14.0"
1010
const val CORE_VERSION = "1.27.0"
1111
const val SIGN_VERSION = "2.25.0"
1212
const val AUTH_VERSION = "1.25.0"
1313
const val CHAT_VERSION = "1.0.0-beta24"
1414
const val NOTIFY_VERSION = "1.0.0"
1515
const val WEB_3_WALLET_VERSION = "1.20.0"
16-
const val WEB_3_MODAL_VERSION = "1.2.0"
16+
const val WEB_3_MODAL_VERSION = "1.2.1"
1717
const val WC_MODAL_VERSION = "1.2.0"
1818
const val MODAL_CORE_VERSION = "1.2.0"
1919

product/web3modal/src/main/kotlin/com/walletconnect/web3/modal/ui/components/internal/root/Web3ModalRootState.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ internal class Web3ModalRootState(
2929
get() = navController.currentBackStackEntryFlow
3030

3131
val canPopUp: Boolean
32-
get() = !topLevelDestinations.any { it.path == navController.currentDestination?.route } || navController.backQueue.size > 2
32+
get() = !topLevelDestinations.any { it.path == navController.currentDestination?.route } || navController.previousBackStackEntry != null
3333

3434
val title: Flow<String?> = currentDestinationFlow
3535
.map { it.getTitleArg() ?: it.destination.toTitle() }

0 commit comments

Comments
 (0)