Updated on 2026-08-14

app/src/main/java/com/tangem/tap/features/disclaimer/Disclaimer.kt

@@ -8,8 +8,8 @@ import android.net.Uri
 interface Disclaimer {
     fun type(): DisclaimerType
     fun getUri(): Uri
-    fun accept()
-    fun isAccepted(): Boolean
+    suspend fun accept()
+    suspend fun isAccepted(): Boolean
 }
 
 abstract class BaseDisclaimer(
@@ -18,32 +18,28 @@ abstract class BaseDisclaimer(
 
     val baseUrl = "https://tangem.com"
 
-    override fun accept() {
-        dataProvider.storage().accept(getPreferenceKey())
+    override suspend fun accept() {
+        dataProvider.accept()
     }
 
-    override fun isAccepted(): Boolean = dataProvider.storage().isAccepted(getPreferenceKey())
-
-    protected open fun getPreferenceKey(): String = type().name
+    override suspend fun isAccepted(): Boolean = dataProvider.isAccepted()
 }
 
 class DummyDisclaimer : Disclaimer {
     override fun type(): DisclaimerType = DisclaimerType.Tangem
     override fun getUri(): Uri = Uri.parse("https://tangem.com/tangem_tos.html")
-    override fun accept() {}
-    override fun isAccepted(): Boolean = false
+    override suspend fun accept() {}
+    override suspend fun isAccepted(): Boolean = false
 }
 
 class TangemDisclaimer(dataProvider: DisclaimerDataProvider) : BaseDisclaimer(dataProvider) {
     override fun type(): DisclaimerType = DisclaimerType.Tangem
     override fun getUri(): Uri = Uri.parse("$baseUrl/tangem_tos.html")
-    override fun getPreferenceKey(): String = "tangem_tos_accepted"
 }
 
 class Start2CoinDisclaimer(dataProvider: DisclaimerDataProvider) : BaseDisclaimer(dataProvider) {
     override fun type(): DisclaimerType = DisclaimerType.Start2Coin
     override fun getUri(): Uri = Uri.parse("$baseUrl/" + filename(dataProvider.getLanguage(), getRegion()))
-    override fun getPreferenceKey(): String = "start2Coin_tos_accepted_${getRegion()}"
 
     @Suppress("ComplexMethod")
     private fun filename(languageCode: String, regionCode: String?): String {

app/src/main/java/com/tangem/tap/features/disclaimer/DisclaimerDataProvider.kt

@@ -1,12 +1,11 @@
 package com.tangem.tap.features.disclaimer
 
-import com.tangem.data.source.preferences.storage.DisclaimerPrefStorage
-
 /**
 [REDACTED_AUTHOR]
  */
 interface DisclaimerDataProvider {
     fun getLanguage(): String
     fun getCardId(): String
-    fun storage(): DisclaimerPrefStorage
+    suspend fun accept()
+    suspend fun isAccepted(): Boolean
 }

app/src/main/java/com/tangem/tap/features/disclaimer/DisclaimerType.kt

@@ -2,8 +2,8 @@ package com.tangem.tap.features.disclaimer
 
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
 import com.tangem.domain.models.scan.CardDTO
-import com.tangem.data.source.preferences.storage.DisclaimerPrefStorage
-import com.tangem.tap.preferencesStorage
+import com.tangem.tap.proxy.redux.DaggerGraphState
+import com.tangem.tap.store
 import java.util.Locale
 
 /**
@@ -25,7 +25,7 @@ enum class DisclaimerType {
 }
 
 fun DisclaimerType.createDisclaimer(cardDTO: CardDTO): Disclaimer {
-    val dataProvider = provideDisclaimerDataProvider(cardDTO.cardId)
+    val dataProvider = provideDisclaimerDataProvider(cardDTO.cardId, this)
     return when (this) {
         DisclaimerType.Tangem -> TangemDisclaimer(dataProvider)
         DisclaimerType.Start2Coin -> Start2CoinDisclaimer(dataProvider)
@@ -34,10 +34,24 @@ fun DisclaimerType.createDisclaimer(cardDTO: CardDTO): Disclaimer {
 
 fun CardDTO.createDisclaimer(): Disclaimer = DisclaimerType.get(this).createDisclaimer(this)
 
-private fun provideDisclaimerDataProvider(cardId: String): DisclaimerDataProvider {
+private fun provideDisclaimerDataProvider(cardId: String, disclaimerType: DisclaimerType): DisclaimerDataProvider {
+    val cardRepository = store.state.daggerGraphState.get(DaggerGraphState::cardRepository)
     return object : DisclaimerDataProvider {
         override fun getLanguage(): String = Locale.getDefault().language
         override fun getCardId(): String = cardId
-        override fun storage(): DisclaimerPrefStorage = preferencesStorage.disclaimerPrefStorage
+
+        override suspend fun accept() {
+            when (disclaimerType) {
+                DisclaimerType.Tangem -> cardRepository.acceptTangemTOS()
+                DisclaimerType.Start2Coin -> cardRepository.acceptStart2CoinTOS(cardId)
+            }
+        }
+
+        override suspend fun isAccepted(): Boolean {
+            return when (disclaimerType) {
+                DisclaimerType.Tangem -> cardRepository.isTangemTOSAccepted()
+                DisclaimerType.Start2Coin -> cardRepository.isStart2CoinTOSAccepted(cardId)
+            }
+        }
     }
 }

app/src/main/java/com/tangem/tap/features/disclaimer/redux/DisclaimerMiddleware.kt

@@ -3,7 +3,9 @@ package com.tangem.tap.features.disclaimer.redux
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.tap.common.redux.AppState
+import com.tangem.tap.mainScope
 import com.tangem.tap.store
+import kotlinx.coroutines.launch
 import org.rekotlin.Action
 import org.rekotlin.Middleware
 
@@ -26,9 +28,11 @@ private fun handleDisclaimerMiddleware(action: Action, appState: AppState) {
             store.dispatch(NavigationAction.NavigateTo(AppScreen.Disclaimer))
         }
         is DisclaimerAction.AcceptDisclaimer -> {
-            state.disclaimer.accept()
-            store.dispatch(NavigationAction.PopBackTo())
-            state.callback?.onAccept?.invoke()
+            mainScope.launch {
+                state.disclaimer.accept()
+                store.dispatch(NavigationAction.PopBackTo())
+                state.callback?.onAccept?.invoke()
+            }
         }
         is DisclaimerAction.OnBackPressed -> {
             store.dispatch(NavigationAction.PopBackTo())

app/src/main/java/com/tangem/tap/features/disclaimer/ui/DisclaimerFragment.kt

@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.view.View.OVER_SCROLL_NEVER
 import android.webkit.WebView
+import androidx.lifecycle.lifecycleScope
 import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
 import com.tangem.core.navigation.AppScreen
@@ -21,6 +22,7 @@ import com.tangem.tap.features.disclaimer.redux.DisclaimerState
 import com.tangem.tap.store
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.FragmentDisclaimerBinding
+import kotlinx.coroutines.launch
 import org.rekotlin.StoreSubscriber
 
 class DisclaimerFragment : BaseFragment(R.layout.fragment_disclaimer), StoreSubscriber<DisclaimerState> {
@@ -92,10 +94,12 @@ class DisclaimerFragment : BaseFragment(R.layout.fragment_disclaimer), StoreSubs
         store.dispatch(DisclaimerAction.OnBackPressed)
     }
 
-    override fun newState(state: DisclaimerState) = with(binding) {
-        if (activity == null || view == null) return
+    override fun newState(state: DisclaimerState) {
+        return with(binding) {
+            if (activity == null || view == null) return
 
-        updateUiVisibility(state.disclaimer, state.progressState)
+            updateUiVisibility(state.disclaimer, state.progressState)
+        }
     }
 
     private fun updateUiVisibility(disclaimer: Disclaimer, progressState: ProgressState?) = with(binding) {
@@ -112,7 +116,9 @@ class DisclaimerFragment : BaseFragment(R.layout.fragment_disclaimer), StoreSubs
                 groupError.hide()
                 groupLoading.hide()
                 webView.show()
-                groupAccept.show(!disclaimer.isAccepted())
+                lifecycleScope.launch {
+                    groupAccept.show(!disclaimer.isAccepted())
+                }
             }
             ProgressState.Error -> {
                 root.beginDelayedTransition()