Updated on 2026-08-14

app/src/main/java/com/tangem/tap/MainActivity.kt

@@ -170,7 +170,7 @@ class MainActivity : AppCompatActivity(), ActivityResultCallbackHolder {
     private val onActivityResultCallbacks = mutableListOf<OnActivityResultCallback>()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        TangemLogger.i("onCreate")
+        TangemLogger.i("onCreate: data=${intent?.data}, extras=${intent?.extras?.keySet()}")
         // We need to call it before onCreate to prevent unnecessary activity recreation
         installAppTheme()
 

app/src/main/java/com/tangem/tap/common/analytics/appsflyer/AppsFlyerDeepLinkListener.kt

@@ -14,12 +14,14 @@ class AppsFlyerDeepLinkListener @Inject constructor(
     override fun onDeepLinking(p0: DeepLinkResult) {
         when (p0.status) {
             DeepLinkResult.Status.FOUND -> {
-                referralParamsHandler.handle(deepLink = p0.deepLink)
+                referralParamsHandler.handleDeeplink(deepLink = p0.deepLink)
             }
             DeepLinkResult.Status.NOT_FOUND -> {
+                referralParamsHandler.handleNoDeeplink()
                 TangemLogger.i("No deep link found")
             }
             DeepLinkResult.Status.ERROR -> {
+                referralParamsHandler.handleNoDeeplink()
                 TangemLogger.e("Deep link error: ${p0.error}")
             }
         }

app/src/main/java/com/tangem/tap/common/analytics/appsflyer/AppsFlyerReferralParamsHandler.kt

@@ -7,6 +7,7 @@ import com.tangem.domain.wallets.models.AppsFlyerConversionData
 import com.tangem.feature.referral.domain.SetShouldShowMobileWalletPromoUseCase
 import com.tangem.utils.coroutines.AppCoroutineScope
 import com.tangem.utils.logging.TangemLogger
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
@@ -23,14 +24,7 @@ class AppsFlyerReferralParamsHandler @Inject constructor(
 ) {
 
     private val mutex = Mutex()
-
-    fun handle(deepLink: DeepLink) {
-        handle(
-            deepLinkValue = deepLink.deepLinkValue,
-            deepLinkSub1 = deepLink.getStringValue(DEEP_LINK_SUB_1),
-            deepLinkSub2 = deepLink.getStringValue(DEEP_LINK_SUB_2),
-        )
-    }
+    private val deepLinkDeferred = CompletableDeferred<String?>()
 
     fun handle(params: Map<String?, Any?>) {
         handle(
@@ -40,6 +34,31 @@ class AppsFlyerReferralParamsHandler @Inject constructor(
         )
     }
 
+    fun handleDeeplink(deepLink: DeepLink) {
+        handle(
+            deepLinkValue = deepLink.deepLinkValue,
+            deepLinkSub1 = deepLink.getStringValue(DEEP_LINK_SUB_1),
+            deepLinkSub2 = deepLink.getStringValue(DEEP_LINK_SUB_2),
+        )
+        deepLinkDeferred.complete(deepLink.deepLinkValue)
+    }
+
+    fun handleNoDeeplink() {
+        deepLinkDeferred.complete(null)
+    }
+
+    suspend fun waitForDeeplink(deeplinkSource: AppsFlyerDeeplinkSource): String? {
+        val deeplinkFromCache = appsFlyerStore.getDeeplink(deeplinkSource)
+        return if (deeplinkFromCache == null) {
+            val value = when (deeplinkSource) {
+                AppsFlyerDeeplinkSource.TangemPayHotWalletOnboarding -> TANGEM_PAY_HOT_WALLET_ONBOARDING_DEEP_LINK_VALUE
+            }
+            deepLinkDeferred.await().takeIf { it == value }
+        } else {
+            deeplinkFromCache
+        }
+    }
+
     private fun handle(deepLinkValue: String?, deepLinkSub1: String?, deepLinkSub2: String?) {
         TangemLogger.i("AppsFlyer deeplink received: value=$deepLinkValue")
         when (deepLinkValue) {

app/src/main/java/com/tangem/tap/routing/component/impl/DefaultRoutingComponent.kt

@@ -32,7 +32,6 @@ import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.EventMessageAction
 import com.tangem.core.ui.message.SnackbarMessage
 import com.tangem.datasource.local.appsflyer.AppsFlyerDeeplinkSource
-import com.tangem.datasource.local.appsflyer.AppsFlyerStore
 import com.tangem.domain.card.repository.CardRepository
 import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.models.scan.ScanResponse
@@ -54,6 +53,7 @@ import com.tangem.hot.sdk.TangemHotSdk
 import com.tangem.hot.sdk.android.create
 import com.tangem.sdk.api.BackupServiceHolder
 import com.tangem.tap.common.SnackbarHandler
+import com.tangem.tap.common.analytics.appsflyer.AppsFlyerReferralParamsHandler
 import com.tangem.tap.features.hot.TangemHotSDKProxy
 import com.tangem.tap.features.root.RootDetectedWarningComponent
 import com.tangem.tap.features.scanfails.ScanFailsComponent
@@ -70,6 +70,8 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withTimeoutOrNull
+import kotlin.time.Duration.Companion.seconds
 
 @Suppress("LongParameterList", "LargeClass")
 internal class DefaultRoutingComponent @AssistedInject constructor(
@@ -88,7 +90,7 @@ internal class DefaultRoutingComponent @AssistedInject constructor(
     private val userWalletsListRepository: UserWalletsListRepository,
     private val cardRepository: CardRepository,
     private val onboardingRepository: OnboardingRepository,
-    private val appsFlyerStore: AppsFlyerStore,
+    private val appsFlyerReferralParamsHandler: AppsFlyerReferralParamsHandler,
     private val trackingContextProxy: TrackingContextProxy,
     private val scanFailsComponentFactory: ScanFailsComponent.Factory,
     private val scanFailsRequesterProxy: ScanFailsRequesterProxy,
@@ -212,11 +214,10 @@ internal class DefaultRoutingComponent @AssistedInject constructor(
             FeatureToggles.AND_15101_TANGEM_PAY_HOT_WALLET_ONBOARDING,
         )
         TangemLogger.i("[TangemPay][HWO] Feature toggle enabled=$isHotWalletOnboardingEnabled")
-
         if (isHotWalletOnboardingEnabled) {
-            val tangemPayHotWalletOnboardingDeepLink = appsFlyerStore.getDeeplink(
-                AppsFlyerDeeplinkSource.TangemPayHotWalletOnboarding,
-            )
+            val tangemPayHotWalletOnboardingDeepLink = withTimeoutOrNull(2.seconds) {
+                appsFlyerReferralParamsHandler.waitForDeeplink(AppsFlyerDeeplinkSource.TangemPayHotWalletOnboarding)
+            }
             TangemLogger.i("[TangemPay][HWO] Deep link present=${tangemPayHotWalletOnboardingDeepLink != null}")
             if (tangemPayHotWalletOnboardingDeepLink != null) {
                 val hotWalletRoute = AppRoute.TangemPayHotWalletOnboarding