diff --git a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt index 362ae78fb2..3eebff1081 100644 --- a/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt +++ b/app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt @@ -180,7 +180,7 @@ internal class ChildFactory @Inject constructor( is AppRoute.OnrampSuccess -> { createComponentChild( context = context, - params = OnrampSuccessComponent.Params(route.externalTxId), + params = OnrampSuccessComponent.Params(route.txId), componentFactory = onrampSuccessComponentFactory, ) } @@ -700,7 +700,7 @@ internal class ChildFactory @Inject constructor( is AppRoute.OnrampSuccess -> { route.asComponentChild( contextProvider = contextProvider(route, contextFactory), - params = OnrampSuccessComponent.Params(route.externalTxId), + params = OnrampSuccessComponent.Params(route.txId), componentFactory = onrampSuccessComponentFactory, ) } diff --git a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt index 508661dac0..2074653f5f 100644 --- a/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt +++ b/common/routing/src/main/kotlin/com/tangem/common/routing/AppRoute.kt @@ -233,8 +233,8 @@ sealed class AppRoute(val path: String) : Route { @Serializable data class OnrampSuccess( - val externalTxId: String, - ) : AppRoute(path = "/onramp/success/$externalTxId"), RouteBundleParams { + val txId: String, + ) : AppRoute(path = "/onramp/success/$txId"), RouteBundleParams { override fun getBundle(): Bundle = bundle(serializer()) } diff --git a/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt b/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt index 748afda798..458c57088f 100644 --- a/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt +++ b/core/deep-links/global/src/main/kotlin/com/tangem/core/deeplink/global/BuyCurrencyDeepLink.kt @@ -3,7 +3,7 @@ package com.tangem.core.deeplink.global import com.tangem.core.deeplink.DeepLink class BuyCurrencyDeepLink( - val onReceive: (externalTxId: String) -> Unit, + val onReceive: (txId: String) -> Unit, ) : DeepLink() { override val uri = BUY_REDIRECT_DEEPLINK diff --git a/domain/onramp/src/main/java/com/tangem/domain/onramp/GetOnrampTransactionUseCase.kt b/domain/onramp/src/main/java/com/tangem/domain/onramp/GetOnrampTransactionUseCase.kt index 32d3f258db..72ab25fe7c 100644 --- a/domain/onramp/src/main/java/com/tangem/domain/onramp/GetOnrampTransactionUseCase.kt +++ b/domain/onramp/src/main/java/com/tangem/domain/onramp/GetOnrampTransactionUseCase.kt @@ -11,10 +11,10 @@ class GetOnrampTransactionUseCase( private val errorResolver: OnrampErrorResolver, ) { - suspend operator fun invoke(externalTxId: String): Either { + suspend operator fun invoke(txId: String): Either { return Either.catch { requireNotNull( - onrampTransactionRepository.getTransactionById(externalTxId), + onrampTransactionRepository.getTransactionById(txId), ) }.mapLeft(errorResolver::resolve) } diff --git a/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/OnrampSuccessComponent.kt b/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/OnrampSuccessComponent.kt index 02280d517a..ceed88f9c5 100644 --- a/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/OnrampSuccessComponent.kt +++ b/features/onramp/api/src/main/kotlin/com/tangem/features/onramp/component/OnrampSuccessComponent.kt @@ -5,7 +5,7 @@ import com.tangem.core.ui.decompose.ComposableContentComponent interface OnrampSuccessComponent : ComposableContentComponent { - data class Params(val externalTxId: String) + data class Params(val txId: String) interface Factory : ComponentFactory } \ No newline at end of file diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/success/model/OnrampSuccessComponentModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/success/model/OnrampSuccessComponentModel.kt index 622c7055ba..4803e7f98e 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/success/model/OnrampSuccessComponentModel.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/success/model/OnrampSuccessComponentModel.kt @@ -67,7 +67,7 @@ internal class OnrampSuccessComponentModel @Inject constructor( private fun loadData() { modelScope.launch { - getOnrampTransactionUseCase(externalTxId = params.externalTxId) + getOnrampTransactionUseCase(txId = params.txId) .fold( ifLeft = { error -> Timber.e(error.toString()) diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/DefaultTokenDetailsRouter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/DefaultTokenDetailsRouter.kt index db52ac752e..b9ba7e893b 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/DefaultTokenDetailsRouter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/DefaultTokenDetailsRouter.kt @@ -47,13 +47,13 @@ internal class DefaultTokenDetailsRouter @Inject constructor( ) } - override fun openOnrampSuccess(externalTxId: String) { + override fun openOnrampSuccess(txId: String) { // finish current onramp flow and show onramp success screen val replaceOnrampScreens = router.stack .filterNot { it is AppRoute.Onramp } .toMutableList() - replaceOnrampScreens.add(AppRoute.OnrampSuccess(externalTxId)) + replaceOnrampScreens.add(AppRoute.OnrampSuccess(txId)) router.replaceAll(*replaceOnrampScreens.toTypedArray()) } diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/InnerTokenDetailsRouter.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/InnerTokenDetailsRouter.kt index c2555aa070..3a26bd9f59 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/InnerTokenDetailsRouter.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/router/InnerTokenDetailsRouter.kt @@ -18,5 +18,5 @@ internal interface InnerTokenDetailsRouter { fun openStaking(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency, yieldId: String) - fun openOnrampSuccess(externalTxId: String) + fun openOnrampSuccess(txId: String) } \ No newline at end of file diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsModel.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsModel.kt index 6ca825bee9..d70de8f364 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsModel.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/model/TokenDetailsModel.kt @@ -195,9 +195,9 @@ internal class TokenDetailsModel @Inject constructor( handleBalanceHiding() } - fun onBuyCurrencyDeepLink(externalTxId: String) { + fun onBuyCurrencyDeepLink(txId: String) { if (onrampFeatureToggles.isFeatureEnabled) { - router.openOnrampSuccess(externalTxId) + router.openOnrampSuccess(txId) } else { val currency = cryptoCurrencyStatus?.currency ?: return analyticsEventsHandler.send(TokenScreenAnalyticsEvent.Bought(currency.symbol)) diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt index 680e373b9b..9bb3ac509c 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletContentClickIntents.kt @@ -39,7 +39,7 @@ internal interface WalletContentClickIntents { fun onOrganizeTokensClick() - fun onOnrampSuccessClick(externalTxId: String) + fun onOnrampSuccessClick(txId: String) fun onDismissMarketsOnboarding() @@ -117,8 +117,8 @@ internal class WalletContentClickIntentsImplementor @Inject constructor( router.openOrganizeTokensScreen(userWalletId = stateHolder.getSelectedWalletId()) } - override fun onOnrampSuccessClick(externalTxId: String) { - router.openOnrampSuccessScreen(externalTxId = externalTxId) + override fun onOnrampSuccessClick(txId: String) { + router.openOnrampSuccessScreen(txId = txId) } override fun onDismissMarketsOnboarding() { diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt index 23ac155b8b..8028924122 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/DefaultWalletRouter.kt @@ -67,13 +67,13 @@ internal class DefaultWalletRouter @Inject constructor( } } - override fun openOnrampSuccessScreen(externalTxId: String) { + override fun openOnrampSuccessScreen(txId: String) { // finish current onramp flow and show onramp success screen val replaceOnrampScreens = router.stack .filterNot { it is AppRoute.Onramp } .toMutableList() - replaceOnrampScreens.add(AppRoute.OnrampSuccess(externalTxId)) + replaceOnrampScreens.add(AppRoute.OnrampSuccess(txId)) router.replaceAll(*replaceOnrampScreens.toTypedArray()) } diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt index ad25778b8a..7d9d61c701 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/router/InnerWalletRouter.kt @@ -33,8 +33,8 @@ internal interface InnerWalletRouter { /** Open onboarding screen */ fun openOnboardingScreen(scanResponse: ScanResponse, continueBackup: Boolean = false) - /** Open onramp success screen for [externalTxId] */ - fun openOnrampSuccessScreen(externalTxId: String) + /** Open onramp success screen for [txId] */ + fun openOnrampSuccessScreen(txId: String) /** Open transaction history website by [url] */ fun openUrl(url: String)