From c1935b59382dfbfdb7b9518f6999c85dc6054cf9 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 12 Jul 2023 22:52:06 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../walletconnect/WalletConnectSdkHelper.kt | 2 +- .../tangem/tap/features/demo/DemoHelper.kt | 4 ++-- .../redux/middlewares/RequestFeeMiddleware.kt | 2 +- .../send/redux/reducers/FeeReducer.kt | 7 +------ .../features/send/redux/states/FeeState.kt | 1 - .../wallet/ui/MultipleAddressUiHelper.kt | 19 +++++++++---------- .../wallet/ui/wallet/SingleWalletView.kt | 5 ++++- .../CurrencyExchangeManager.kt | 6 +++--- .../tap/proxy/TransactionManagerImpl.kt | 7 +++---- 9 files changed, 24 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt index b1a6774b38..6466ac2f85 100644 --- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt +++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt @@ -183,7 +183,7 @@ class WalletConnectSdkHelper { val dataToSign = EthereumUtils.buildTransactionToSign( transactionData = data.transaction, nonce = null, - blockchain = data.walletManager.wallet.blockchain + blockchain = data.walletManager.wallet.blockchain, ) ?: return null val command = SignHashCommand( diff --git a/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt b/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt index 83ea251268..ef011c6dc1 100644 --- a/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt +++ b/app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt @@ -92,8 +92,8 @@ class DemoTransactionSender(private val walletManager: WalletManager) : Transact TransactionFee.Choosable( minimum = Fee.Common(Amount(minimumFee, blockchain)), normal = Fee.Common(Amount(normalFee, blockchain)), - priority = Fee.Common(Amount(priorityFee, blockchain)) - ) + priority = Fee.Common(Amount(priorityFee, blockchain)), + ), ) } 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 1b6769f0a8..efdd59f799 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 @@ -54,7 +54,7 @@ class RequestFeeMiddleware { val result = feeResult.data // val result = FeeMock.getFee(walletManager.wallet.blockchain) dispatch(FeeAction.FeeCalculation.SetFeeResult(result)) - when(result) { + when (result) { is TransactionFee.Single -> { val fee = result.normal.amount.value ?: BigDecimal.ZERO if (fee.isZero()) { diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt index ba706cf281..7e2e65171e 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/reducers/FeeReducer.kt @@ -1,6 +1,5 @@ package com.tangem.tap.features.send.redux.reducers -import com.tangem.blockchain.common.Amount import com.tangem.blockchain.common.transaction.Fee import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.tap.features.send.redux.FeeAction @@ -9,7 +8,6 @@ import com.tangem.tap.features.send.redux.SendScreenAction import com.tangem.tap.features.send.redux.states.FeeState import com.tangem.tap.features.send.redux.states.FeeType import com.tangem.tap.features.send.redux.states.SendState -import com.tangem.tap.features.send.redux.states.TransactionExtrasState import com.tangem.tap.features.wallet.redux.ProgressState /** @@ -34,7 +32,7 @@ class FeeReducer : SendInternalReducer { } state.copy( selectedFeeType = action.feeType, - currentFee = currentFee + currentFee = currentFee, ) } is FeeActionUi.ChangeIncludeFee -> state.copy(feeIsIncluded = action.isIncluded) @@ -43,7 +41,6 @@ class FeeReducer : SendInternalReducer { } private fun handleAction(action: FeeAction, sendState: SendState, state: FeeState): SendState { - val result = when (action) { is FeeAction.RequestFee -> { state.copy(progressState = ProgressState.Loading) @@ -122,6 +119,4 @@ class FeeReducer : SendInternalReducer { private fun getCurrentFeeType(state: FeeState): FeeType { return if (state.selectedFeeType == FeeType.SINGLE) FeeType.NORMAL else state.selectedFeeType } - - } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/states/FeeState.kt b/app/src/main/java/com/tangem/tap/features/send/redux/states/FeeState.kt index 1ae163571a..f7a3a5e41b 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/states/FeeState.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/states/FeeState.kt @@ -1,6 +1,5 @@ package com.tangem.tap.features.send.redux.states -import com.tangem.blockchain.common.Amount import com.tangem.blockchain.common.transaction.Fee import com.tangem.blockchain.common.transaction.TransactionFee import com.tangem.tap.common.analytics.events.AnalyticsParam diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt index aa62852b75..c61cb57c3f 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/MultipleAddressUiHelper.kt @@ -7,6 +7,14 @@ import com.tangem.wallet.R object MultipleAddressUiHelper { + private val blockchainsSupportingSplit = listOf( + Blockchain.Bitcoin, + Blockchain.BitcoinTestnet, + Blockchain.Litecoin, + Blockchain.BitcoinCash, + Blockchain.CardanoShelley, + ) + fun typeToId(type: AddressType, blockchain: Blockchain): Int { return if (blockchain in blockchainsSupportingSplit) { if (type == AddressType.Legacy) { @@ -22,7 +30,7 @@ object MultipleAddressUiHelper { fun idToType(id: Int, blockchain: Blockchain): AddressType? { return when (blockchain) { in blockchainsSupportingSplit -> { - when(id) { + when (id) { R.id.chip_default -> AddressType.Default R.id.chip_legacy -> AddressType.Legacy else -> null @@ -31,13 +39,4 @@ object MultipleAddressUiHelper { else -> null } } - - private val blockchainsSupportingSplit = listOf( - Blockchain.Bitcoin, - Blockchain.BitcoinTestnet, - Blockchain.Litecoin, - Blockchain.BitcoinCash, - Blockchain.CardanoShelley - ) - } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt index b3ca7e7f2b..23a4645bb2 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/wallet/SingleWalletView.kt @@ -190,7 +190,10 @@ class SingleWalletView : WalletView() { (binding.lAddress.root as? ViewGroup)?.beginDelayedTransition() chipGroupAddressType.show() chipGroupAddressType.fitChipsByGroupWidth() - val checkedId = MultipleAddressUiHelper.typeToId(primaryWallet.walletAddresses.selectedAddress.type, primaryWallet.currency.blockchain) + val checkedId = MultipleAddressUiHelper.typeToId( + primaryWallet.walletAddresses.selectedAddress.type, + primaryWallet.currency.blockchain, + ) if (checkedId != View.NO_ID) chipGroupAddressType.check(checkedId) chipGroupAddressType.setOnCheckedChangeListener { group, checkedId -> diff --git a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt index b04348a966..d886b5873f 100644 --- a/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt +++ b/app/src/main/java/com/tangem/tap/network/exchangeServices/CurrencyExchangeManager.kt @@ -97,9 +97,9 @@ suspend fun CurrencyExchangeManager.buyErc20TestnetTokens( val destinationAddress = token.contractAddress val feeResult = walletManager.getFee( - amountToSend, - destinationAddress, - ) as? Result.Success ?: return + amountToSend, + destinationAddress, + ) as? Result.Success ?: return val fee = feeResult.data.minimum val coinValue = walletManager.wallet.amounts[AmountType.Coin]?.value ?: BigDecimal.ZERO diff --git a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt index 63664407ff..fe86122123 100644 --- a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt +++ b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt @@ -226,7 +226,7 @@ class TransactionManagerImpl( ProxyFees( minFee = singleFee, normalFee = singleFee, - priorityFee = singleFee + priorityFee = singleFee, ) } is TransactionFee.Choosable -> { @@ -243,11 +243,10 @@ class TransactionManagerImpl( priorityFee = ProxyFee( gasLimit = BigInteger.ZERO, fee = convertToProxyAmount(amount = choosableFee.priority.amount), - ) + ), ) } } - } is Result.Failure -> { error(fee.error.message ?: fee.error.customMessage) @@ -310,7 +309,7 @@ class TransactionManagerImpl( gasLimit = (choosableFee.priority as Fee.Ethereum).gasLimit, fee = convertToProxyAmount(amount = choosableFee.priority.amount), ) - + ProxyFees( minFee = minProxyFee, normalFee = normalProxyFee,