From edecedf446002e0fb3bd1359aaf57a6054c3ba4b Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 14 Dec 2020 17:34:52 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../send/redux/middlewares/RequestFeeMiddleware.kt | 8 +++----- .../features/send/redux/middlewares/SendMiddleware.kt | 10 +++++----- .../send/redux/reducers/AddressPayIdReducer.kt | 8 ++++---- .../features/send/redux/states/AddressPayIdState.kt | 6 +++--- .../send/ui/stateSubscribers/SendStateSubscriber.kt | 2 +- 5 files changed, 16 insertions(+), 18 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 2b662e5852..49b02cfea8 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 @@ -33,15 +33,13 @@ class RequestFeeMiddleware { dispatch(SendAction.ChangeSendButtonState(sendState.getButtonState())) return } - val typedAmount = sendState.amountState.amountToExtract ?: return - val recipientAddress = sendState.addressPayIdState.recipientWalletAddress!! - val cryptoSendToRecipient = sendState.amountState.amountToSendCrypto - val recipientAmount = Amount(typedAmount, cryptoSendToRecipient) + val destinationAddress = sendState.addressPayIdState.destinationWalletAddress!! + val destinationAmount = Amount(typedAmount, sendState.amountState.amountToSendCrypto) val txSender = walletManager as TransactionSender scope.launch { - val feeResult = txSender.getFee(recipientAmount, recipientAddress) + val feeResult = txSender.getFee(destinationAmount, destinationAddress) withContext(Dispatchers.Main) { when (feeResult) { is Result.Success -> { diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt index 1c7db4b842..9c61d7dab9 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt @@ -51,7 +51,7 @@ private fun verifyAndSendTransaction( val sendState = appState?.sendState ?: return val walletManager = appState.globalState.scanNoteResponse?.walletManager ?: return val card = appState.globalState.scanNoteResponse.card - val recipientAddress = sendState.addressPayIdState.recipientWalletAddress ?: return + val destinationAddress = sendState.addressPayIdState.destinationWalletAddress ?: return val typedAmount = sendState.amountState.amountToExtract ?: return val feeAmount = sendState.feeState.currentFee ?: return @@ -66,14 +66,14 @@ private fun verifyAndSendTransaction( dispatch(AmountAction.SetAmount(typedAmount.value!!.minus(reduceAmount), false)) dispatch(AmountActionUi.CheckAmountToSend) }, sendAllCallback = { - sendTransaction(action, walletManager, amountToSend, feeAmount, recipientAddress, card, dispatch) + sendTransaction(action, walletManager, amountToSend, feeAmount, destinationAddress, card, dispatch) }, reduceAmount)) } transactionErrors.isNotEmpty() -> { dispatch(SendAction.SendError(createValidateTransactionError(transactionErrors, walletManager))) } else -> { - sendTransaction(action, walletManager, amountToSend, feeAmount, recipientAddress, card, dispatch) + sendTransaction(action, walletManager, amountToSend, feeAmount, destinationAddress, card, dispatch) } } } @@ -83,12 +83,12 @@ private fun sendTransaction( walletManager: WalletManager, amountToSend: Amount, feeAmount: Amount, - recipientAddress: String, + destinationAddress: String, card: Card, dispatch: (Action) -> Unit ) { dispatch(SendAction.ChangeSendButtonState(SendButtonState.PROGRESS)) - val txData = walletManager.createTransaction(amountToSend, feeAmount, recipientAddress) + val txData = walletManager.createTransaction(amountToSend, feeAmount, destinationAddress) scope.launch { walletManager.update() val isLinkedTerminal = tangemSdk.config.linkedTerminal diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AddressPayIdReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AddressPayIdReducer.kt index d7a1c97f10..3402e48d71 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AddressPayIdReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/AddressPayIdReducer.kt @@ -42,7 +42,7 @@ class AddressPayIdReducer : SendInternalReducer { viewFieldValue = InputViewValue(action.payId, action.isUserInput), normalFieldValue = action.payId, truncatedFieldValue = state.truncate(action.payId), - recipientWalletAddress = action.payIdWalletAddress, + destinationWalletAddress = action.payIdWalletAddress, error = null ) } @@ -51,13 +51,13 @@ class AddressPayIdReducer : SendInternalReducer { viewFieldValue = InputViewValue(action.address, action.isUserInput), normalFieldValue = action.address, truncatedFieldValue = state.truncate(action.address), - recipientWalletAddress = action.address, + destinationWalletAddress = action.address, error = null ) } is AddressPayIdVerifyAction.ChangePasteBtnEnableState -> state.copy(pasteIsEnabled = action.isEnabled) - is AddressVerification.SetAddressError -> state.copy(error = action.error, recipientWalletAddress = null) - is PayIdVerification.SetPayIdError -> state.copy(error = action.error, recipientWalletAddress = null) + is AddressVerification.SetAddressError -> state.copy(error = action.error, destinationWalletAddress = null) + is PayIdVerification.SetPayIdError -> state.copy(error = action.error, destinationWalletAddress = null) } return updateLastState(sendState.copy(addressPayIdState = result), result) } diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt b/app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt index b7a1622789..9307694212 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt @@ -6,7 +6,7 @@ data class AddressPayIdState( val viewFieldValue: InputViewValue = InputViewValue(""), val normalFieldValue: String? = null, val truncatedFieldValue: String? = null, - val recipientWalletAddress: String? = null, + val destinationWalletAddress: String? = null, val error: AddressPayIdVerifyAction.Error? = null, val truncateHandler: ((String) -> String)? = null, val walletPayIdEnabled: Boolean = false, @@ -17,7 +17,7 @@ data class AddressPayIdState( fun truncate(value: String): String = truncateHandler?.invoke(value) ?: value - fun isReady(): Boolean = error == null && recipientWalletAddress?.isNotEmpty() ?: false + fun isReady(): Boolean = error == null && destinationWalletAddress?.isNotEmpty() ?: false - fun isPayIdState(): Boolean = recipientWalletAddress != null && recipientWalletAddress != normalFieldValue + fun isPayIdState(): Boolean = destinationWalletAddress != null && destinationWalletAddress != normalFieldValue } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt index c68dc9f200..07ddffa598 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt @@ -113,7 +113,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber til.parent?.parent?.beginDelayedTransition() til.error = parsedError til.isErrorEnabled = parsedError != null - til.helperText = state.recipientWalletAddress + til.helperText = state.destinationWalletAddress til.isHelperTextEnabled = state.isPayIdState() && parsedError == null if (!state.viewFieldValue.isFromUserInput) et.update(state.viewFieldValue.value)