Updated on 2026-08-14

data/common/src/main/kotlin/com/tangem/data/common/currency/UserTokensSaver.kt

@@ -8,7 +8,10 @@ import com.tangem.datasource.local.token.UserTokensResponseStore
 import com.tangem.domain.account.featuretoggle.AccountsFeatureToggles
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.retryer.Retryer
+import com.tangem.utils.retryer.RetryerPool
 import kotlinx.coroutines.withContext
+import timber.log.Timber
 
 class UserTokensSaver(
     private val tangemTechApi: TangemTechApi,
@@ -16,6 +19,7 @@ class UserTokensSaver(
     private val dispatchers: CoroutineDispatcherProvider,
     private val addressesEnricher: UserTokensResponseAddressesEnricher,
     private val accountsFeatureToggles: AccountsFeatureToggles,
+    private val pushTokensRetryerPool: RetryerPool,
 ) {
     private val userTokensBackwardCompatibility = UserTokensBackwardCompatibility()
 
@@ -58,6 +62,23 @@ class UserTokensSaver(
         }
     }
 
+    suspend fun pushWithRetryer(
+        userWalletId: UserWalletId,
+        response: UserTokensResponse,
+        useEnricher: Boolean = true,
+        onFailSend: () -> Unit = {},
+    ) {
+        push(
+            userWalletId = userWalletId,
+            response = response,
+            useEnricher = useEnricher,
+            onFailSend = {
+                pushTokensRetryerPool + createPushTokensRetryer(userWalletId, response)
+                onFailSend()
+            },
+        )
+    }
+
     private fun UserTokensResponse.applyCompatibility(): UserTokensResponse {
         return userTokensBackwardCompatibility.applyCompatibilityAndGetUpdated(userTokensResponse = this)
     }
@@ -86,4 +107,24 @@ class UserTokensSaver(
     private fun UserTokensResponse.enrichByAccountId(userWalletId: UserWalletId): UserTokensResponse {
         return UserTokensResponseAccountIdEnricher(userWalletId = userWalletId, response = this)
     }
+
+    private fun createPushTokensRetryer(userWalletId: UserWalletId, response: UserTokensResponse): Retryer {
+        return Retryer(attempt = 3) { iteration ->
+            var isSuccess = true
+
+            push(
+                userWalletId = userWalletId,
+                response = response,
+                onFailSend = {
+                    Timber.e(
+                        "Retryer: Failed to push updated tokens on attempt ${iteration + 1} for $userWalletId",
+                    )
+
+                    isSuccess = false
+                },
+            )
+
+            isSuccess
+        }
+    }
 }

data/common/src/main/kotlin/com/tangem/data/common/di/DataCommonModule.kt

@@ -16,10 +16,13 @@ import com.tangem.domain.demo.models.DemoConfig
 import com.tangem.domain.networks.multi.MultiNetworkStatusSupplier
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.retryer.RetryerPool
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
 import javax.inject.Singleton
 
 @Module
@@ -76,6 +79,9 @@ internal object DataCommonModule {
             dispatchers = dispatchers,
             addressesEnricher = addressesEnricher,
             accountsFeatureToggles = accountsFeatureToggles,
+            pushTokensRetryerPool = RetryerPool(
+                coroutineScope = CoroutineScope(SupervisorJob() + dispatchers.default),
+            ),
         )
     }
 

data/common/src/test/kotlin/com/tangem/data/common/currency/UserTokensSaverTest.kt

@@ -30,6 +30,7 @@ class UserTokensSaverTest {
         dispatchers = TestingCoroutineDispatcherProvider(),
         addressesEnricher = enricher,
         accountsFeatureToggles = accountsFeatureToggles,
+        pushTokensRetryerPool = mockk(),
     )
 
     @BeforeEach