Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt

@@ -14,6 +14,7 @@ import com.tangem.tap.domain.config.ConfigManager
 import com.tangem.tap.domain.extensions.amountToCreateAccount
 import com.tangem.tap.domain.extensions.isNoAccountError
 import com.tangem.tap.domain.tasks.ScanNoteResponse
+import com.tangem.tap.features.send.redux.AddressPayIdActionUi
 import com.tangem.tap.features.wallet.redux.WalletAction
 import com.tangem.tap.network.NetworkConnectivity
 import com.tangem.tap.network.coinmarketcap.CoinMarketCapService
@@ -26,7 +27,6 @@ import java.math.BigDecimal
 class TapWalletManager {
     private val payIdManager = PayIdManager()
     private val coinMarketCapService = CoinMarketCapService()
-    private var tapWorkarounds: TapWorkarounds? = null
 
     suspend fun loadWalletData() {
         val walletManager = store.state.globalState.scanNoteResponse?.walletManager
@@ -84,17 +84,19 @@ class TapWalletManager {
         if (addAnalyticsEvent) {
             FirebaseAnalyticsHandler.triggerEvent(AnalyticsEvent.CARD_IS_SCANNED, data.card)
         }
-        tapWorkarounds = TapWorkarounds(data.card)
-        if (tapWorkarounds!!.isStart2Coin) {
-            store.state.globalState.configManager?.turnOff(ConfigManager.isWalletPayIdEnabled)
-            store.state.globalState.configManager?.turnOff(ConfigManager.isTopUpEnabled)
+        TapWorkarounds.updateCard(data.card)
+        val configManager = store.state.globalState.configManager
+        if (TapWorkarounds.isStart2Coin) {
+            configManager?.turnOff(ConfigManager.isWalletPayIdEnabled)
+            configManager?.turnOff(ConfigManager.isTopUpEnabled)
         } else {
-            store.state.globalState.configManager?.resetToDefault(ConfigManager.isWalletPayIdEnabled)
-            store.state.globalState.configManager?.resetToDefault(ConfigManager.isTopUpEnabled)
+            configManager?.resetToDefault(ConfigManager.isWalletPayIdEnabled)
+            configManager?.resetToDefault(ConfigManager.isTopUpEnabled)
         }
         withContext(Dispatchers.Main) {
             store.dispatch(WalletAction.ResetState)
             store.dispatch(GlobalAction.SaveScanNoteResponse(data))
+            store.dispatch(AddressPayIdActionUi.ChangePayIdState(configManager?.config?.isWalletPayIdEnabled ?: false))
             loadData(data)
         }
     }

app/src/main/java/com/tangem/tap/domain/TapWorkarounds.kt

@@ -12,10 +12,5 @@ object TapWorkarounds {
         isStart2Coin = card.cardData?.issuerName?.toLowerCase(Locale.US) == START_2_COIN_ISSUER
     }
 
-    fun isPayIdEnabled(): Boolean {
-        if (isStart2Coin) return false
-        return true
-    }
-
     const val START_2_COIN_ISSUER = "start2coin"
 }

app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt

@@ -33,6 +33,7 @@ sealed class AddressPayIdActionUi : SendScreenActionUi {
     object CheckAddressPayId : AddressPayIdActionUi()
     data class SetTruncateHandler(val handler: (String) -> String) : AddressPayIdActionUi()
     data class TruncateOrRestore(val truncate: Boolean) : AddressPayIdActionUi()
+    data class ChangePayIdState(val walletPayIdEnabled: Boolean): AddressPayIdActionUi()
 }
 
 sealed class AddressPayIdVerifyAction : SendScreenAction {

app/src/main/java/com/tangem/tap/features/send/redux/middlewares/AddressPayIdMiddleware.kt

@@ -4,7 +4,6 @@ import com.tangem.blockchain.common.Wallet
 import com.tangem.commands.common.network.Result
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.domain.PayIdManager
-import com.tangem.tap.domain.TapWorkarounds
 import com.tangem.tap.domain.isPayIdSupported
 import com.tangem.tap.features.send.redux.AddressPayIdActionUi
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction
@@ -15,6 +14,7 @@ import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.PayIdVerifica
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.PayIdVerification.SetPayIdWalletAddress
 import com.tangem.tap.features.send.redux.FeeAction
 import com.tangem.tap.scope
+import com.tangem.tap.store
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -49,7 +49,7 @@ internal class AddressPayIdMiddleware {
 
     private fun setAddressAndCheck(data: String, isUserInput: Boolean, dispatch: (Action) -> Unit) {
         val potentialPayId = data.toLowerCase()
-        if (PayIdManager.isPayId(potentialPayId) && TapWorkarounds.isPayIdEnabled()) {
+        if (PayIdManager.isPayId(potentialPayId) && isPayIdEnabled()) {
             dispatch(SetPayIdWalletAddress(potentialPayId, "", isUserInput))
         } else {
             dispatch(SetWalletAddress(data, isUserInput))
@@ -63,7 +63,7 @@ internal class AddressPayIdMiddleware {
         val addressPayId = sendState.addressPayIdState.normalFieldValue ?: return
         val isUserInput = sendState.addressPayIdState.viewFieldValue.isFromUserInput
 
-        if (PayIdManager.isPayId(addressPayId) && TapWorkarounds.isPayIdEnabled()) {
+        if (PayIdManager.isPayId(addressPayId) && isPayIdEnabled()) {
             verifyPayId(addressPayId, wallet, isUserInput, dispatch)
         } else {
             verifyAddress(addressPayId, wallet, isUserInput, dispatch)
@@ -152,10 +152,14 @@ internal class AddressPayIdMiddleware {
             }
         }
 
-        if (PayIdManager.isPayId(addressPayId) && TapWorkarounds.isPayIdEnabled()) {
+        if (PayIdManager.isPayId(addressPayId) && isPayIdEnabled()) {
             verifyPayId(addressPayId, wallet, false, internalDispatcher)
         } else {
             verifyAddress(addressPayId, wallet, false, internalDispatcher)
         }
     }
+
+    private fun isPayIdEnabled(): Boolean {
+        return store.state.globalState.configManager?.config?.isWalletPayIdEnabled ?: false
+    }
 }

app/src/main/java/com/tangem/tap/features/send/redux/reducers/AddressPayIdReducer.kt

@@ -30,6 +30,7 @@ class AddressPayIdReducer : SendInternalReducer {
             is AddressPayIdActionUi.PasteAddressPayId -> return sendState
             is AddressPayIdActionUi.CheckClipboard -> return sendState
             is AddressPayIdActionUi.CheckAddressPayId -> return sendState
+            is AddressPayIdActionUi.ChangePayIdState -> state.copy(walletPayIdEnabled = action.walletPayIdEnabled)
         }
         return updateLastState(sendState.copy(addressPayIdState = result), result)
     }

app/src/main/java/com/tangem/tap/features/send/redux/states/AddressPayIdState.kt

@@ -9,6 +9,7 @@ data class AddressPayIdState(
         val recipientWalletAddress: String? = null,
         val error: AddressPayIdVerifyAction.Error? = null,
         val truncateHandler: ((String) -> String)? = null,
+        val walletPayIdEnabled: Boolean = false,
         val pasteIsEnabled: Boolean = false
 ) : SendScreenState {
 

app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt

@@ -10,7 +10,6 @@ import com.tangem.tap.common.redux.getMessageString
 import com.tangem.tap.common.text.DecimalDigitsInputFilter
 import com.tangem.tap.common.toggleWidget.ProgressState
 import com.tangem.tap.domain.MultiMessageError
-import com.tangem.tap.domain.TapWorkarounds
 import com.tangem.tap.domain.assembleErrors
 import com.tangem.tap.features.send.BaseStoreFragment
 import com.tangem.tap.features.send.redux.AddressPayIdVerifyAction.Error
@@ -104,7 +103,7 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber
         val til = fg.tilAddressOrPayId
         val parsedError = parseError(til.context, state.error)
 
-        val hintResId = if (TapWorkarounds.isPayIdEnabled()) {
+        val hintResId = if (state.walletPayIdEnabled) {
             R.string.send_destination_hint_address_payid
         }else {
             R.string.send_destination_hint_address