Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master #7688

Merged
merged 2 commits into from
Oct 2, 2024
Merged

Merge master #7688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27b9d13
Fix proposal validation for WalletConnect
rafaelekol Sep 20, 2024
40ddb05
Merge remote-tracking branch 'refs/remotes/origin/master' into versio…
abdrasulov Oct 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ android {
compileSdk compile_sdk_version
minSdkVersion min_sdk_version
targetSdkVersion compile_sdk_version
versionCode 115
versionCode 116
versionName "0.40.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

Expand Down
13 changes: 1 addition & 12 deletions app/src/main/java/io/horizontalsystems/bankwallet/core/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,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
Expand Down Expand Up @@ -531,17 +530,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) {
Expand Down
2 changes: 1 addition & 1 deletion .../java/io/horizontalsystems/bankwallet/modules/walletconnect/session/WCSessionViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading