Merge pull request #1415 from novasamatech/rc/7.9.4

Rc/7.9.4
novasamatech · Mar 1, 2024 · 0325b52 · 0325b52
2 parents 5c98c0f + b1be9ff
commit 0325b52
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,8 @@
 buildscript {
     ext {
         // App version
-        versionName = '7.9.3'
-        versionCode = 121
+        versionName = '7.9.4'
+        versionCode = 122
 
         applicationId = "io.novafoundation.nova"
         releaseApplicationSuffix = "market"

diff --git a/common/src/main/res/values-ru/strings.xml b/common/src/main/res/values-ru/strings.xml
@@ -1360,7 +1360,7 @@
     <string name="wallet_search_empty_title">Убедитесь, что адрес\nиз правильной сети</string>
     <string name="wallet_search_empty_title_v2_2_0">Неверный формат адреса.\nУбедитесь, что адрес \nсоответствует сети</string>
     <string name="wallet_send_balance_minimal">Минимальный баланс</string>
-    <string name="wallet_send_cannot_dust_before_delivery_fee_message">Ваш доступный баланс %s, вам необходимо оставить минимум %s для доставки перевода и заплатить комиссию сети %s. Вы можете перевести не более %s</string>
+    <string name="wallet_send_cannot_dust_before_delivery_fee_message">Из-за межсетевых ограничений вы можете перевести не более %s</string>
     <string name="wallet_send_cannot_pay_cross_chain_fee" formatted="false">У вас недостаточно токенов для оплаты межсетевой комиссии в размере %s.\nОстаток баланса после перевода: %s</string>
     <string name="wallet_send_confirm_hint">Межсетевая комиссия добавляется к введенной сумме. Получатель может получить часть межсетевой комиссии</string>
     <string name="wallet_send_confirm_transfer">Подтвердить</string>

diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="TypographyEllipsis">
-    <string name="wallet_send_cannot_dust_before_delivery_fee_message">Your available balance is %s, you need to leave at least %s for transfer delivery and pay network fee of %s. You can transfer not more than %s</string>
+    <string name="wallet_send_cannot_dust_before_delivery_fee_message">Due to the cross-chain restrictions you can transfer not more than %s</string>
 
     <string name="common_too_small_balance_title">Your balance is too small</string>
     <string name="wallet_send_insufficient_balance_commission">You need to have at least %s to pay this transaction fee and stay above the minimum network balance. Your current balance is: %s. You need to add %s to your balance to perform this operation.</string>

diff --git a/.../novafoundation/nova/feature_assets/presentation/send/TransferAssetValidationFailureUi.kt b/.../novafoundation/nova/feature_assets/presentation/send/TransferAssetValidationFailureUi.kt
@@ -81,9 +81,6 @@ fun CoroutineScope.mapAssetTransferValidationFailureToUI(
             resourceManager.getString(R.string.common_not_enough_funds_title) to
                 resourceManager.getString(
                     R.string.wallet_send_cannot_dust_before_delivery_fee_message,
-                    reason.balanceCountedTowardsEd.formatPlanks(reason.chainAsset),
-                    reason.existentialDeposit.formatPlanks(reason.chainAsset),
-                    reason.networkFee.formatPlanks(reason.chainAsset),
                     reason.maxPossibleTransferAmount.formatPlanks(reason.chainAsset)
                 )
         )

diff --git a/...ova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransferValidations.kt b/...ova/feature_wallet_api/data/network/blockhain/assets/tranfers/AssetTransferValidations.kt
@@ -59,9 +59,6 @@ sealed class AssetTransferValidationFailure {
         ) : NotEnoughFunds()
 
         class ToStayAboveEdBeforePayingDeliveryFees(
-            val balanceCountedTowardsEd: Balance,
-            val existentialDeposit: Balance,
-            val networkFee: Balance,
             val maxPossibleTransferAmount: Balance,
             val chainAsset: Chain.Asset,
         ) : NotEnoughFunds()

diff --git a/...etwork/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxRouterSwapExtractor.kt b/...etwork/blockchain/assets/history/realtime/substrate/hydraDx/HydraDxRouterSwapExtractor.kt
@@ -20,6 +20,7 @@ class HydraDxRouterSwapExtractor(
 
     override fun ExtrinsicVisit.extractSwapArgs(): SwapArgs {
         val swapExecutedEvent = events.findEvent(Modules.ROUTER, "RouteExecuted")
+            ?: events.findEvent(Modules.ROUTER, "Executed")
 
         return when {
             // successful swap, extract from event

diff --git a/...data/network/crosschain/validations/CannotDropBelowEdBeforePayingDeliveryFeeValidation.kt b/...data/network/crosschain/validations/CannotDropBelowEdBeforePayingDeliveryFeeValidation.kt
@@ -32,7 +32,9 @@ class CannotDropBelowEdBeforePayingDeliveryFeeValidation(
         val paysDeliveryFee = deliveryFeePart.isPositive()
 
         val networkFeePlanks = value.originFee.networkFeePart().networkFee.amountByRequestedAccount
-        val sendingAmount = value.transfer.amountInPlanks + value.crossChainFee?.networkFee?.amountByRequestedAccount.orZero()
+        val crossChainFeePlanks = value.crossChainFee?.networkFee?.amountByRequestedAccount.orZero()
+
+        val sendingAmount = value.transfer.amountInPlanks + crossChainFeePlanks
         val requiredAmountBeforePayingDeliveryFee = sendingAmount + networkFeePlanks + existentialDeposit
 
         val balanceCountedTowardsEd = value.originUsedAsset.balanceCountedTowardsEDInPlanks
@@ -43,13 +45,10 @@ class CannotDropBelowEdBeforePayingDeliveryFeeValidation(
             requiredAmountBeforePayingDeliveryFee <= balanceCountedTowardsEd -> valid()
 
             else -> {
-                val availableBalance = (balanceCountedTowardsEd - networkFeePlanks - existentialDeposit).atLeastZero()
+                val availableBalance = (balanceCountedTowardsEd - networkFeePlanks - crossChainFeePlanks - existentialDeposit).atLeastZero()
 
                 validationError(
                     ToStayAboveEdBeforePayingDeliveryFees(
-                        balanceCountedTowardsEd = balanceCountedTowardsEd,
-                        existentialDeposit = existentialDeposit,
-                        networkFee = networkFeePlanks,
                         maxPossibleTransferAmount = availableBalance,
                         chainAsset = value.transfer.originChainAsset
                     )