From bcd10fbe27fdc732564dd6255097f37910058041 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 2 Apr 2025 15:09:12 +0700 Subject: [PATCH 1/4] Updated on 2026-08-14 --- .../com/tangem/tap/common/analytics/events/WalletConnect.kt | 1 + .../data/DefaultLegacyWalletConnectRepository.kt | 2 +- .../details/redux/walletconnect/WalletConnectAction.kt | 2 +- .../ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt b/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt index 1725eabaaa..60c649ba6e 100644 --- a/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt +++ b/app/src/main/java/com/tangem/tap/common/analytics/events/WalletConnect.kt @@ -19,6 +19,7 @@ internal sealed class WalletConnect( AnalyticsParam.SOURCE to when (source) { SourceType.QR -> "QR" SourceType.DEEPLINK -> "DeepLink" + SourceType.CLIPBOARD -> "Clipboard" SourceType.ETC -> "etc" }, ), diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt index bb03434cb0..ff5677c84e 100644 --- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt +++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt @@ -459,7 +459,7 @@ internal class DefaultLegacyWalletConnectRepository( val session = currentSessions.find { it.topic == requestData.topic } analyticsHandler.send( - WalletConnect.SignatureRequestHandled( + WalletConnect.SignatureRequestFailed( WalletConnect.RequestHandledParams( dAppName = session?.name ?: "", dAppUrl = session?.url ?: "", diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt index 3383203b41..2fb10581de 100644 --- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt +++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt @@ -17,7 +17,7 @@ sealed class WalletConnectAction : Action { val wcUri: String, val source: SourceType, ) : WalletConnectAction() { - enum class SourceType { QR, DEEPLINK, ETC } + enum class SourceType { QR, DEEPLINK, CLIPBOARD, ETC } } data class DisconnectSession(val topic: String) : WalletConnectAction() diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt index a6ac03c6c7..441777794f 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt @@ -17,7 +17,9 @@ object ClipboardOrScanQrDialog { setTitle(context.getString(R.string.common_select_action)) setMessage(context.getText(R.string.wallet_connect_clipboard_alert)) setPositiveButton(context.getText(R.string.wallet_connect_paste_from_clipboard)) { _, _ -> - store.dispatch(WalletConnectAction.OpenSession(wcUri, WalletConnectAction.OpenSession.SourceType.ETC)) + store.dispatch( + WalletConnectAction.OpenSession(wcUri, WalletConnectAction.OpenSession.SourceType.CLIPBOARD), + ) } setNegativeButton(context.getText(R.string.wallet_connect_scan_new_code)) { _, _ -> store.dispatchNavigationAction { From 7647ef2ee88f31c32000efd28322a0681231b101 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 3 Apr 2025 16:34:57 +0500 Subject: [PATCH 2/4] Updated on 2026-08-14 --- .../state/transformers/amount/AmountChangeStateTransformer.kt | 1 + .../transformers/amount/AmountMaxValueStateTransformer.kt | 1 + .../transformers/amount/AmountRequirementStateTransformer.kt | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountChangeStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountChangeStateTransformer.kt index 7ff0dc011e..e905b0b0a5 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountChangeStateTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountChangeStateTransformer.kt @@ -40,6 +40,7 @@ internal class AmountChangeStateTransformer( return prevState.copy( amountState = AmountRequirementStateTransformer( cryptoCurrencyStatus = cryptoCurrencyStatus, + maxAmount = maxEnterAmount, yield = yield, actionType = prevState.actionType, ).transform(updatedAmountState), diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountMaxValueStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountMaxValueStateTransformer.kt index aee3d92b78..318d0c6522 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountMaxValueStateTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountMaxValueStateTransformer.kt @@ -36,6 +36,7 @@ internal class AmountMaxValueStateTransformer( ).transform(prevState.amountState) return prevState.copy( amountState = AmountRequirementStateTransformer( + maxAmount = maxEnterAmount, cryptoCurrencyStatus = cryptoCurrencyStatus, yield = yield, actionType = prevState.actionType, diff --git a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountRequirementStateTransformer.kt b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountRequirementStateTransformer.kt index d8ab56f5a9..6bf5ef4134 100644 --- a/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountRequirementStateTransformer.kt +++ b/features/staking/impl/src/main/java/com/tangem/features/staking/impl/presentation/state/transformers/amount/AmountRequirementStateTransformer.kt @@ -4,6 +4,7 @@ import androidx.annotation.StringRes import androidx.compose.ui.text.input.ImeAction import com.tangem.common.extensions.isZero import com.tangem.common.ui.amountScreen.models.AmountState +import com.tangem.common.ui.amountScreen.models.EnterAmountBoundary import com.tangem.core.ui.extensions.TextReference import com.tangem.core.ui.extensions.resourceReference import com.tangem.core.ui.extensions.wrappedList @@ -24,6 +25,7 @@ import java.math.RoundingMode internal class AmountRequirementStateTransformer( private val cryptoCurrencyStatus: CryptoCurrencyStatus, + private val maxAmount: EnterAmountBoundary, private val yield: Yield, private val actionType: StakingActionCommonType, ) : Transformer { @@ -121,7 +123,7 @@ internal class AmountRequirementStateTransformer( val isExceedsMaxRequirement = if (maximum?.isPositive() == true) { maximum?.compareTo(amount) == -1 } else { - cryptoCurrencyStatus.value.amount?.compareTo(amount) == -1 + maxAmount.amount?.compareTo(amount) == -1 } val errorText = when { From 8029a97eda70792e459e5f3d4e26256718a62766 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 4 Apr 2025 11:06:15 +0500 Subject: [PATCH 3/4] Updated on 2026-08-14 --- .../send/impl/presentation/model/SendModel.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/model/SendModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/model/SendModel.kt index f2a909d245..c161cea93a 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/model/SendModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/model/SendModel.kt @@ -508,6 +508,20 @@ internal class SendModel @Inject constructor( override fun onNextClick(isFromEdit: Boolean) { val currentState = stateRouter.currentState.value + when (currentState.type) { + SendUiStateType.Fee, + SendUiStateType.EditFee, + -> if (uiState.value.feeState?.isPrimaryButtonEnabled == false) return + SendUiStateType.Amount, + SendUiStateType.EditAmount, + -> if (!uiState.value.amountState.isPrimaryButtonEnabled) return + SendUiStateType.Recipient, + SendUiStateType.EditRecipient, + -> if (uiState.value.recipientState?.isPrimaryButtonEnabled == false) return + SendUiStateType.Send -> if (uiState.value.sendState?.isPrimaryButtonEnabled == false) return + SendUiStateType.None -> return + } + uiState.value = stateFactory.syncEditStates(isFromEdit = isFromEdit) sendScreenAnalyticSender.send(currentState.type, uiState.value) when (currentState.type) { From 790086eeddacafb884f161d2537bc185ca459dc0 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 4 Apr 2025 06:28:13 +0000 Subject: [PATCH 4/4] Updated on 2026-08-14 --- gradle/tangem_dependencies.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/tangem_dependencies.toml b/gradle/tangem_dependencies.toml index 32be17375b..254de504ec 100644 --- a/gradle/tangem_dependencies.toml +++ b/gradle/tangem_dependencies.toml @@ -1,7 +1,7 @@ [versions] -tangemBlockchainSdk = "release-app_5.22-997" +tangemBlockchainSdk = "develop-1000" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "release-app_5.22-440" +tangemCardSdk = "develop-445" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^ tangemVico = "2.0.0-alpha.25-tangem-developments8" #tangemVico = "0.0.1" # Keep it! - used for local builds ^