From 27b9d133fb4afdf266f961585fe2ac27e51ec915 Mon Sep 17 00:00:00 2001
From: Rafael <rafaelekol@gmail.com>
Date: Fri, 20 Sep 2024 12:29:00 +0600
Subject: [PATCH] Fix proposal validation for WalletConnect

---
 app/build.gradle                                    |  4 ++--
 .../io/horizontalsystems/bankwallet/core/App.kt     | 13 +------------
 .../walletconnect/session/WCSessionViewModel.kt     |  2 +-
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ade69a9963..438f67a22e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,8 @@ android {
         compileSdk compile_sdk_version
         minSdkVersion min_sdk_version
         targetSdkVersion compile_sdk_version
-        versionCode 114
-        versionName "0.39.4"
+        versionCode 115
+        versionName "0.39.5"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         ksp {
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/App.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/App.kt
index 48b56bce0e..1d21394b41 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/core/App.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/core/App.kt
@@ -112,7 +112,6 @@ import io.horizontalsystems.core.CoreApp
 import io.horizontalsystems.core.ICoreApp
 import io.horizontalsystems.core.security.EncryptionManager
 import io.horizontalsystems.core.security.KeyStoreManager
-import io.horizontalsystems.core.toHexString
 import io.horizontalsystems.ethereumkit.core.EthereumKit
 import io.horizontalsystems.hdwalletkit.Mnemonic
 import io.reactivex.plugins.RxJavaPlugins
@@ -518,17 +517,7 @@ class App : CoreApp(), WorkConfiguration.Provider, ImageLoaderFactory {
         localeAwareContext(this)
     }
 
-    override val isSwapEnabled: Boolean by lazy {
-        val signatures = listOf(
-            "b797339fb356afce5160fe49274ee17a1c1816db", // appcenter
-            "5afb2517b06caac7f108ba9d96ad826f1c4ba30c", // hs
-        )
-
-        val applicationSignatures = App.instance.getApplicationSignatures()
-        applicationSignatures.none {
-            signatures.contains(it.toHexString())
-        }
-    }
+    override val isSwapEnabled = true
 
     override fun getApplicationSignatures() = try {
         val signatureList = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/session/WCSessionViewModel.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/session/WCSessionViewModel.kt
index a068c2f8da..c600a96f82 100644
--- a/app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/session/WCSessionViewModel.kt
+++ b/app/src/main/java/io/horizontalsystems/bankwallet/modules/walletconnect/session/WCSessionViewModel.kt
@@ -69,7 +69,7 @@ class WCSessionViewModel(
         "wallet_switchEthereumChain"
     )
 
-    private val supportedEvents = listOf("chainChanged", "accountsChanged" /*"connect", "disconnect", "message"*/)
+    private val supportedEvents = listOf("chainChanged", "accountsChanged", "connect", "disconnect", "message")
 
     override fun createState() = WCSessionUiState(
         peerMeta = peerMeta,