From 349596635dcef8e4502af1f34bca30c6d0a9424b Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 9 Aug 2022 12:48:47 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../redux/walletconnect/WalletConnectAction.kt | 2 +- .../walletconnect/WalletConnectMiddleware.kt | 17 ++++++++--------- .../redux/walletconnect/WalletConnectState.kt | 4 ++-- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt index fe1e16e326..0c852b3467 100644 --- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt +++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt @@ -27,7 +27,7 @@ sealed class WalletConnectAction : Action { ) : WalletConnectAction() data class SetNewSessionData( - val newSession: DataForNewSession, + val newSession: NewWcSessionData, ) : WalletConnectAction() object RefuseOpeningSession : WalletConnectAction() diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt index 11f1a35c7f..4694af35f2 100644 --- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt @@ -213,14 +213,15 @@ class WalletConnectMiddleware { private fun scanCard(session: WalletConnectSession, chainId: Int?) { val blockchain = WalletConnectNetworkUtils.parseBlockchain( - chainId = chainId, peer = session.peerMeta, + chainId = chainId, + peer = session.peerMeta, ) ?: Blockchain.Ethereum store.dispatch( GlobalAction.ScanCard( additionalBlockchainsToDerive = listOf(blockchain), onSuccess = { scanResponse -> - handleScanResponse(scanResponse, session, blockchain) + handleScanResponse(scanResponse = scanResponse, session = session, blockchain = blockchain) }, onFailure = { store.dispatchOnMain(WalletConnectAction.FailureEstablishingSession(null)) @@ -290,7 +291,9 @@ class WalletConnectMiddleware { } private fun handleScanResponse( - scanResponse: ScanResponse, session: WalletConnectSession, blockchain: Blockchain, + scanResponse: ScanResponse, + session: WalletConnectSession, + blockchain: Blockchain, ) { val card = scanResponse.card if (!card.isMultiwalletAllowed) { @@ -301,9 +304,7 @@ class WalletConnectMiddleware { val updatedSession = session.copy(wallet = session.wallet.copy(blockchain = blockchain)) store.dispatch( WalletConnectAction.SetNewSessionData( - DataForNewSession( - updatedSession, scanResponse, blockchain, - ), + NewWcSessionData(session = updatedSession, scanResponse = scanResponse, blockchain = blockchain), ), ) @@ -313,9 +314,7 @@ class WalletConnectMiddleware { withMainContext { store.dispatch( GlobalAction.ShowDialog( - WalletConnectDialog.ApproveWcSession( - updatedSession, blockchains, - ), + WalletConnectDialog.ApproveWcSession(session = updatedSession, networks = blockchains), ), ) } diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt index 2c6c6db95c..14181de2e6 100644 --- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt +++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt @@ -16,10 +16,10 @@ import com.trustwallet.walletconnect.models.session.WCSession data class WalletConnectState( val loading: Boolean = false, val sessions: List = listOf(), - val newSessionData: DataForNewSession? = null, + val newSessionData: NewWcSessionData? = null, ) -data class DataForNewSession( +data class NewWcSessionData( val session: WalletConnectSession, val scanResponse: ScanResponse, val blockchain: Blockchain?,