bug fixes (#207)

* bug fixes

* chore

Author: sorokin0andrey

apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendViewModel.kt

@@ -971,6 +971,10 @@ class SendViewModel(
         transfer: TransferEntity,
     ): Coins {
         try {
+            if (transfer.token.isRequestMinting || transfer.token.customPayloadApiUri != null) {
+                return TransferEntity.POINT_ONE_TON
+            }
+
             val message = transfer.signForEstimation(
                 internalMessage = false, jettonTransferAmount = TransferEntity.ONE_TON
             )
@@ -1165,7 +1169,7 @@ class SendViewModel(
             val batteryCharges = getBatteryCharges()
             val batteryConfig = batteryRepository.getConfig(wallet.testnet)
             val txCharges = BatteryMapper.calculateChargesAmount(
-                fee.extra.toBigDecimal(),
+                Coins.of(abs(fee.extra)).value,
                 batteryConfig.chargeCost
             )
             if (txCharges > batteryCharges) {
@@ -1214,13 +1218,17 @@ class SendViewModel(
             is SendFee.Extra -> {
                 val extra = Coins.of(fee.extra)
                 when {
+                    transfer.token.isRequestMinting || transfer.token.customPayloadApiUri != null -> TransferEntity.POINT_ONE_TON
                     extra.isPositive -> TransferEntity.BASE_FORWARD_AMOUNT
                     extra.isZero -> TransferEntity.POINT_ONE_TON
-                    transfer.token.isRequestMinting || transfer.token.customPayloadApiUri != null -> TransferEntity.POINT_ONE_TON
                     else -> Coins.of(abs(fee.extra)) + TransferEntity.BASE_FORWARD_AMOUNT
                 }
             }
-
+            is SendFee.Ton -> when {
+                transfer.token.isRequestMinting || transfer.token.customPayloadApiUri != null -> TransferEntity.POINT_ONE_TON
+                fee.amount.isRefund -> TransferEntity.BASE_FORWARD_AMOUNT
+                else -> fee.amount.value + TransferEntity.BASE_FORWARD_AMOUNT
+            }
             else -> TransferEntity.POINT_ONE_TON
         }
 

apps/wallet/localization/src/main/res/values-ru/strings.xml

@@ -688,11 +688,11 @@
     <string name="mnemonic_match_error">Секретный ключ не подходит
к этому кошельку</string>
     <string name="cell_schema">Схема ячейки</string>
     <string name="cell_data">Данные ячейки</string>
-    <string name="installed_extensions">Установленные расширения</string>
+    <string name="installed_extensions">Расширения</string>
     <string name="disable">Отключить</string>
     <plurals name="legacy_subscriptions_alert_title">
         <item quantity="one">У вас есть %1$s устаревшая подписка от @donate</item>
-        <item quantity="few">У вас есть %1$s устаревших подписок от @donate</item>
+        <item quantity="few">У вас есть %1$s устаревшие подписки от @donate</item>
         <item quantity="many">У вас есть %1$s устаревших подписок от @donate</item>
         <item quantity="other">У вас есть %1$s устаревших подписок от @donate</item>
     </plurals>