Skip to content

Commit b8ff31b

Browse files
authored
Merge pull request #1204 from soramitsu/staging
staging
2 parents cd73384 + 0c4e906 commit b8ff31b

File tree

5 files changed

+16
-8
lines changed

5 files changed

+16
-8
lines changed

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
55
buildscript {
66
ext {
77
// App version
8-
versionName = '3.7.2'
9-
versionCode = 201
8+
versionName = '3.7.3'
9+
versionCode = 204
1010

1111
// SDK and tools
1212
compileSdkVersion = 34
@@ -51,8 +51,8 @@ allprojects {
5151
google()
5252
mavenLocal()
5353
maven { url "https://nexus.iroha.tech/repository/maven-soramitsu/" }
54-
maven { url "https://jitpack.io" }
5554
mavenCentral()
55+
maven { url "https://jitpack.io" }
5656

5757
maven {
5858
url = readSecret("PAY_WINGS_REPOSITORY_URL")

common/src/main/java/jp/co/soramitsu/common/validation/Exceptions.kt

+5-2
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ class NotEnoughResultedAmountToPayFeeException(resourceManager: ResourceManager)
9999
explanation = resourceManager.getString(R.string.polkaswap_not_enough_result_to_pay_fee_message)
100100
)
101101

102-
class DeadRecipientEthereumException(resourceManager: ResourceManager) : ValidationException(
102+
class DeadRecipientEthereumException(resourceManager: ResourceManager) : ValidationWarning(
103103
resourceManager.getString(R.string.common_warning),
104-
resourceManager.getString(R.string.wallet_send_eth_dead_recipient_message)
104+
resourceManager.getString(R.string.wallet_send_eth_dead_recipient_message),
105+
resourceManager.getString(R.string.common_proceed),
106+
resourceManager.getString(R.string.common_cancel),
107+
null
105108
)

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/domain/ValidateTransferUseCaseImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package jp.co.soramitsu.wallet.impl.domain
22

3-
import java.math.BigDecimal
4-
import java.math.BigInteger
53
import jp.co.soramitsu.account.api.domain.interfaces.AccountRepository
64
import jp.co.soramitsu.account.api.domain.model.accountId
75
import jp.co.soramitsu.common.utils.formatCryptoDetail
@@ -36,6 +34,8 @@ import jp.co.soramitsu.wallet.impl.domain.interfaces.WalletRepository
3634
import jp.co.soramitsu.wallet.impl.domain.model.Asset
3735
import jp.co.soramitsu.wallet.impl.domain.model.planksFromAmount
3836
import jp.co.soramitsu.wallet.impl.presentation.send.confirm.FEE_RESERVE_TOLERANCE
37+
import java.math.BigDecimal
38+
import java.math.BigInteger
3939

4040
class ValidateTransferUseCaseImpl(
4141
private val existentialDepositUseCase: ExistentialDepositUseCase,

feature-wallet-impl/src/main/java/jp/co/soramitsu/wallet/impl/presentation/send/setup/SendSetupViewModel.kt

+2
Original file line numberDiff line numberDiff line change
@@ -868,7 +868,9 @@ class SendSetupViewModel @Inject constructor(
868868
confirmedValidations.add(validationResult)
869869
if (validationResult.isExistentialDepositWarning) {
870870
sendAllToggleState.value = ToggleState.CONFIRMED
871+
return
871872
}
873+
onNextStep()
872874
}
873875

874876
fun warningConfirmedSecond(validationResult: TransferValidationResult) {

gradle/libs.versions.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ wsVersion = "2.14"
6161
xNetworking = "0.2.5-temp7"
6262
zxingEmbeddedVersion = "4.3.0"
6363
zxingVersion = "3.5.3"
64+
jnrVersion = "1.0.2"
6465

6566
[libraries]
6667
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
@@ -179,6 +180,8 @@ walletconnectBomDep = { module = "com.walletconnect:android-bom", version.ref =
179180
walletconnectCoreDep = { module = "com.walletconnect:android-core" }
180181
walletconnectWeb3WalletDep = { module = "com.walletconnect:web3wallet" }
181182

183+
jnr-x86asm = { module = "com.github.jnr:jnr-x86asm", version.ref = "jnrVersion" }
184+
182185
[bundles]
183186
compose = [
184187
"compose-runtime", "compose-ui", "compose-runtimeLiveData", "compose-compiler",
@@ -190,4 +193,4 @@ compose = [
190193
composeDebug = [
191194
"compose-uiTooling", "customview", "customview-poolingcontainer"
192195
]
193-
coroutines = ["coroutines-core", "coroutines-android"]
196+
coroutines = ["coroutines-core", "coroutines-android"]

0 commit comments

Comments
 (0)