From 7282a83c7268a8348872f6cc959ef7181a6fddc8 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 13 Nov 2020 17:24:50 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt index 9dc11ee062..1ed82ff653 100644 --- a/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt +++ b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt @@ -1,10 +1,12 @@ package com.tangem.tap.domain import com.tangem.commands.Card +import java.util.* class TapWorkarounds(val card: Card) { - val isStart2Coin: Boolean = card.cardData?.issuerName == START_2_COIN_ISSUER + val isStart2Coin: Boolean = + card.cardData?.issuerName?.toLowerCase(Locale.US) == START_2_COIN_ISSUER fun isPayIdCreationEnabled(): Boolean { if (isStart2Coin) return false From e7a67488b1f67799b5f41c054b29a134dd769b41 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 13 Nov 2020 17:35:56 +0300 Subject: [PATCH 2/2] Updated on 2026-08-14 --- .../java/com/tangem/tap/domain/TapWalletManager.kt | 10 +++++----- .../main/java/com/tangem/tap/domain/TapWorkarounds.kt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt index 47ea2833f3..7334aecc0d 100644 --- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt @@ -168,12 +168,12 @@ class TapWalletManager { when (result) { is Result.Success -> { val payId = result.data + if (tapWorkarounds?.isPayIdEnabled() == false) { + store.dispatch(WalletAction.DisablePayId) + return@withContext + } if (payId == null) { - if (tapWorkarounds?.isPayIdCreationEnabled() == false) { - store.dispatch(WalletAction.DisablePayId) - } else { - store.dispatch(WalletAction.LoadPayId.NotCreated) - } + store.dispatch(WalletAction.LoadPayId.NotCreated) } else { store.dispatch(WalletAction.LoadPayId.Success(payId)) } diff --git a/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt index 1ed82ff653..b0bedc66be 100644 --- a/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt +++ b/app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt @@ -8,7 +8,7 @@ class TapWorkarounds(val card: Card) { val isStart2Coin: Boolean = card.cardData?.issuerName?.toLowerCase(Locale.US) == START_2_COIN_ISSUER - fun isPayIdCreationEnabled(): Boolean { + fun isPayIdEnabled(): Boolean { if (isStart2Coin) return false return true }