From ba873ed73e4cf32e6e7b744ffa08af0325108b79 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 24 Sep 2020 11:39:58 +0300 Subject: [PATCH 1/4] Updated on 2026-08-14 --- .../features/send/redux/middlewares/AddressPayIdMiddleware.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt index c2bd4f286c..53b344603e 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt @@ -47,6 +47,7 @@ internal class AddressPayIdMiddleware { } private fun setAddressAndCheck(data: String, isUserInput: Boolean, dispatch: (Action) -> Unit) { + val data = data.toLowerCase() if (PayIdManager.isPayId(data)) { dispatch(SetPayIdWalletAddress(data, "", isUserInput)) } else { From 9964d5d04665d7ccbda7277a3c67ee8c45e58a31 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 24 Sep 2020 11:58:21 +0300 Subject: [PATCH 2/4] Updated on 2026-08-14 --- .../send/redux/middlewares/AddressPayIdMiddleware.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt index 53b344603e..1c9fe36424 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt @@ -47,9 +47,9 @@ internal class AddressPayIdMiddleware { } private fun setAddressAndCheck(data: String, isUserInput: Boolean, dispatch: (Action) -> Unit) { - val data = data.toLowerCase() - if (PayIdManager.isPayId(data)) { - dispatch(SetPayIdWalletAddress(data, "", isUserInput)) + val potentialPayId = data.toLowerCase() + if (PayIdManager.isPayId(potentialPayId)) { + dispatch(SetPayIdWalletAddress(potentialPayId, "", isUserInput)) } else { dispatch(SetWalletAddress(data, isUserInput)) } From 71e41e3049a016ab0a515b357689ddcf19917e4a Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 24 Sep 2020 13:03:32 +0300 Subject: [PATCH 3/4] Updated on 2026-08-14 --- .../send/redux/middlewares/RequestFeeMiddleware.kt | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt index 5ba0bc7bc2..a15380b5ee 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt @@ -1,7 +1,6 @@ package com.tangem.tap.features.send.redux.middlewares import com.tangem.blockchain.common.Amount -import com.tangem.blockchain.common.AmountType import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.TransactionSender import com.tangem.blockchain.extensions.Result @@ -34,15 +33,11 @@ class RequestFeeMiddleware { return } + val typedAmount = sendState.amountState.amountToExtract ?: return val recipientAddress = sendState.addressPayIdState.recipientWalletAddress!! - val amountState = sendState.amountState - val cryptoSendToRecipient = amountState.amountToSendCrypto - val recipientAmount = if (amountState.typeOfAmount == AmountType.Coin) { - Amount(cryptoSendToRecipient, walletManager.wallet.blockchain, type = AmountType.Coin) - } else { - Amount(cryptoSendToRecipient, walletManager.wallet.blockchain, recipientAddress, AmountType.Token) - } + val cryptoSendToRecipient = sendState.amountState.amountToSendCrypto + val recipientAmount = Amount(typedAmount, cryptoSendToRecipient) val txSender = walletManager as TransactionSender scope.launch { val feeResult = txSender.getFee(recipientAmount, recipientAddress) From 497eec25d46b5e15ca6bd2acdee17619f1452187 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 24 Sep 2020 13:25:13 +0300 Subject: [PATCH 4/4] Updated on 2026-08-14 --- .../features/send/redux/middlewares/AmountMiddleware.kt | 8 +++----- .../send/redux/middlewares/RequestFeeMiddleware.kt | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AmountMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AmountMiddleware.kt index c54d5f2dd1..d77bb638f0 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AmountMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AmountMiddleware.kt @@ -5,10 +5,7 @@ import com.tangem.blockchain.common.TransactionError import com.tangem.common.extensions.isZero import com.tangem.tap.common.redux.AppState import com.tangem.tap.domain.TapError -import com.tangem.tap.features.send.redux.AmountAction -import com.tangem.tap.features.send.redux.AmountActionUi -import com.tangem.tap.features.send.redux.ReceiptAction -import com.tangem.tap.features.send.redux.SendAction +import com.tangem.tap.features.send.redux.* import com.tangem.tap.features.send.redux.states.MainCurrencyType import org.rekotlin.Action import java.math.BigDecimal @@ -46,7 +43,7 @@ class AmountMiddleware { } dispatch(AmountAction.SetAmount(inputValueCrypto, true)) - dispatch(AmountActionUi.CheckAmountToSend) + dispatch(FeeAction.RequestFee) } private fun checkAmountToSend(appState: AppState?, dispatch: (Action) -> Unit) { @@ -89,6 +86,7 @@ class AmountMiddleware { val amountState = appState?.sendState?.amountState ?: return dispatch(AmountAction.SetAmount(amountState.balanceCrypto, false)) + dispatch(FeeAction.RequestFee) } private fun toggleMainCurrency(appState: AppState?, dispatch: (Action) -> Unit) { diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt index a15380b5ee..2b662e5852 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/RequestFeeMiddleware.kt @@ -6,6 +6,7 @@ import com.tangem.blockchain.common.TransactionSender import com.tangem.blockchain.extensions.Result import com.tangem.common.extensions.isZero import com.tangem.tap.common.redux.AppState +import com.tangem.tap.features.send.redux.AmountActionUi import com.tangem.tap.features.send.redux.FeeAction import com.tangem.tap.features.send.redux.ReceiptAction import com.tangem.tap.features.send.redux.SendAction @@ -63,8 +64,7 @@ class RequestFeeMiddleware { dispatch(FeeAction.ChangeLayoutVisibility(main = false, controls = false, chipGroup = false)) } } - dispatch(ReceiptAction.RefreshReceipt) - dispatch(SendAction.ChangeSendButtonState(sendState.getButtonState())) + dispatch(AmountActionUi.CheckAmountToSend) } }