Skip to content

Commit

Permalink
Merge pull request #1204 from soramitsu/staging
Browse files Browse the repository at this point in the history
staging
  • Loading branch information
PankraSerg authored Sep 17, 2024
2 parents cd73384 + 0c4e906 commit b8ff31b
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 8 deletions.
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ apply plugin: "org.sonarqube"
buildscript {
ext {
// App version
versionName = '3.7.2'
versionCode = 201
versionName = '3.7.3'
versionCode = 204

// SDK and tools
compileSdkVersion = 34
Expand Down Expand Up @@ -51,8 +51,8 @@ allprojects {
google()
mavenLocal()
maven { url "https://nexus.iroha.tech/repository/maven-soramitsu/" }
maven { url "https://jitpack.io" }
mavenCentral()
maven { url "https://jitpack.io" }

maven {
url = readSecret("PAY_WINGS_REPOSITORY_URL")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,10 @@ class NotEnoughResultedAmountToPayFeeException(resourceManager: ResourceManager)
explanation = resourceManager.getString(R.string.polkaswap_not_enough_result_to_pay_fee_message)
)

class DeadRecipientEthereumException(resourceManager: ResourceManager) : ValidationException(
class DeadRecipientEthereumException(resourceManager: ResourceManager) : ValidationWarning(
resourceManager.getString(R.string.common_warning),
resourceManager.getString(R.string.wallet_send_eth_dead_recipient_message)
resourceManager.getString(R.string.wallet_send_eth_dead_recipient_message),
resourceManager.getString(R.string.common_proceed),
resourceManager.getString(R.string.common_cancel),
null
)
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
package jp.co.soramitsu.wallet.impl.domain

import java.math.BigDecimal
import java.math.BigInteger
import jp.co.soramitsu.account.api.domain.interfaces.AccountRepository
import jp.co.soramitsu.account.api.domain.model.accountId
import jp.co.soramitsu.common.utils.formatCryptoDetail
Expand Down Expand Up @@ -36,6 +34,8 @@ import jp.co.soramitsu.wallet.impl.domain.interfaces.WalletRepository
import jp.co.soramitsu.wallet.impl.domain.model.Asset
import jp.co.soramitsu.wallet.impl.domain.model.planksFromAmount
import jp.co.soramitsu.wallet.impl.presentation.send.confirm.FEE_RESERVE_TOLERANCE
import java.math.BigDecimal
import java.math.BigInteger

class ValidateTransferUseCaseImpl(
private val existentialDepositUseCase: ExistentialDepositUseCase,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,9 @@ class SendSetupViewModel @Inject constructor(
confirmedValidations.add(validationResult)
if (validationResult.isExistentialDepositWarning) {
sendAllToggleState.value = ToggleState.CONFIRMED
return
}
onNextStep()
}

fun warningConfirmedSecond(validationResult: TransferValidationResult) {
Expand Down
5 changes: 4 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ wsVersion = "2.14"
xNetworking = "0.2.5-temp7"
zxingEmbeddedVersion = "4.3.0"
zxingVersion = "3.5.3"
jnrVersion = "1.0.2"

[libraries]
appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
Expand Down Expand Up @@ -179,6 +180,8 @@ walletconnectBomDep = { module = "com.walletconnect:android-bom", version.ref =
walletconnectCoreDep = { module = "com.walletconnect:android-core" }
walletconnectWeb3WalletDep = { module = "com.walletconnect:web3wallet" }

jnr-x86asm = { module = "com.github.jnr:jnr-x86asm", version.ref = "jnrVersion" }

[bundles]
compose = [
"compose-runtime", "compose-ui", "compose-runtimeLiveData", "compose-compiler",
Expand All @@ -190,4 +193,4 @@ compose = [
composeDebug = [
"compose-uiTooling", "customview", "customview-poolingcontainer"
]
coroutines = ["coroutines-core", "coroutines-android"]
coroutines = ["coroutines-core", "coroutines-android"]

0 comments on commit b8ff31b

Please sign in to comment.