Merge branch 'main' into WAL-1589-remove-spaceseven

Author: zaiatsartem

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Not responding to WalletConnect requests after switching wallets 
+
 ## [1.18.0] - 2026-02-11
 
 ### Added

app/src/main/java/com/concordium/wallet/ui/walletconnect/WalletConnectViewModel.kt

@@ -31,7 +31,6 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import org.koin.core.component.KoinComponent
@@ -110,7 +109,6 @@ private constructor(
     private lateinit var sessionRequestAccount: Account
     private lateinit var sessionRequestAppMetadata: AppMetadata
     private val handledRequests = mutableSetOf<Long>()
-    private val connectionAvailabilityFlow = MutableStateFlow(false)
 
     enum class ProofProvableState {
         Provable,
@@ -357,11 +355,6 @@ private constructor(
         }
     }
 
-    override fun onConnectionStateChange(state: Sign.Model.ConnectionState) {
-        defaultWalletDelegate.onConnectionStateChange(state)
-        connectionAvailabilityFlow.tryEmit(state.isAvailable)
-    }
-
     override fun onSessionProposal(
         sessionProposal: Sign.Model.SessionProposal,
         verifyContext: Sign.Model.VerifyContext,
@@ -1029,7 +1022,7 @@ private constructor(
 
             State.WaitingForSessionProposal,
             State.WaitingForSessionRequest,
-            -> {
+                -> {
                 mutableStateFlow.tryEmit(State.Idle)
             }
 
@@ -1098,17 +1091,14 @@ private constructor(
     private fun respondSuccess(result: String) = viewModelScope.launch {
         handledRequests += sessionRequestId
 
-        // Await the connection.
-        connectionAvailabilityFlow.first { it }
-
         SignClient.respond(
             Sign.Params.Response(
                 sessionTopic = sessionRequestTopic,
                 jsonRpcResponse = Sign.Model.JsonRpcResponse.JsonRpcResult(
                     id = sessionRequestId,
                     result = result,
                 )
-            )
+            ),
         ) { error ->
             Log.e("failed_responding_success", error.throwable)
 
@@ -1127,9 +1117,6 @@ private constructor(
     ) = viewModelScope.launch {
         handledRequests += sessionRequestId
 
-        // Await the connection.
-        connectionAvailabilityFlow.first { it }
-
         SignClient.respond(
             Sign.Params.Response(
                 sessionTopic = sessionRequestTopic,