fix jettonTransferAmount

tonkeeper · Dec 20, 2024 · 7aeb02e · 7aeb02e
1 parent 0f770a0
commit 7aeb02e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/TransferEntity.kt b/apps/wallet/instance/app/src/main/java/com/tonapps/tonkeeper/core/entities/TransferEntity.kt
@@ -392,7 +392,7 @@ data class TransferEntity(
     companion object {
 
         val BASE_FORWARD_AMOUNT = Coins.of(0.05, 9)
-        val ONE_TON = Coins.of(1, 9)
+        val ONE_TON = Coins.ONE
         val POINT_ONE_TON = Coins.of(0.1, 9)
 
         fun newWalletQueryId(): BigInteger {

diff --git a/...let/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendViewModel.kt b/...let/instance/app/src/main/java/com/tonapps/tonkeeper/ui/screen/send/main/SendViewModel.kt
@@ -743,7 +743,8 @@ class SendViewModel(
         val emulated = api.emulate(
             cell = message,
             testnet = transfer.wallet.testnet,
-            balance = Coins.of(2).toLong(),
+            address = transfer.wallet.accountId,
+            balance = (Coins.ONE + Coins.ONE).toLong(),
             safeModeEnabled = settingsRepository.isSafeModeEnabled(api)
         )
         val extra = emulated?.event?.extra ?: 0
@@ -935,8 +936,8 @@ class SendViewModel(
         val token = selectedTokenFlow.value
 
         val jettonTransferAmount = when {
-            sendTransferType is SendTransferType.Gasless || extra.multiply(BigDecimal(-1)).isNegative -> TransferEntity.BASE_FORWARD_AMOUNT
-            fee.isZero -> TransferEntity.BASE_FORWARD_AMOUNT
+            sendTransferType is SendTransferType.Gasless || extra.isPositive -> TransferEntity.BASE_FORWARD_AMOUNT
+            fee.isZero -> TransferEntity.POINT_ONE_TON
             token.isRequestMinting || token.customPayloadApiUri != null -> TransferEntity.POINT_ONE_TON
             else -> fee + TransferEntity.BASE_FORWARD_AMOUNT
         }