Updated on 2026-08-14
This commit is contained in:
commit
ebbce95832
12 changed files with 21 additions and 21 deletions
|
|
@ -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,
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ class GetOnrampTransactionUseCase(
|
|||
private val errorResolver: OnrampErrorResolver,
|
||||
) {
|
||||
|
||||
suspend operator fun invoke(externalTxId: String): Either<OnrampError, OnrampTransaction> {
|
||||
suspend operator fun invoke(txId: String): Either<OnrampError, OnrampTransaction> {
|
||||
return Either.catch {
|
||||
requireNotNull(
|
||||
onrampTransactionRepository.getTransactionById(externalTxId),
|
||||
onrampTransactionRepository.getTransactionById(txId),
|
||||
)
|
||||
}.mapLeft(errorResolver::resolve)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<Params, OnrampSuccessComponent>
|
||||
}
|
||||
|
|
@ -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())
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,5 +18,5 @@ internal interface InnerTokenDetailsRouter {
|
|||
|
||||
fun openStaking(userWalletId: UserWalletId, cryptoCurrency: CryptoCurrency, yieldId: String)
|
||||
|
||||
fun openOnrampSuccess(externalTxId: String)
|
||||
fun openOnrampSuccess(txId: String)
|
||||
}
|
||||
|
|
@ -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))
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue