GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2024-02-08 19:56:50 +03:00
parent 6e7b57a57d
commit 6f22bf53b2
4 changed files with 39 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/com/tangem/tap/features/onboarding/products/otherCards/redux/OnboardingOtherCardsMiddleware.kt
View file

@ -1,12 +1,15 @@
package com.tangem.tap.features.onboarding.products.otherCards.redux
import com.tangem.common.CompletionResult
import com.tangem.common.core.TangemSdkError
import com.tangem.core.analytics.Analytics
import com.tangem.domain.common.extensions.withMainContext
import com.tangem.tap.common.analytics.events.Onboarding
import com.tangem.tap.common.extensions.dispatchDialogShow
import com.tangem.tap.common.postUi
import com.tangem.tap.common.redux.AppState
import com.tangem.tap.common.redux.global.GlobalAction
import com.tangem.tap.features.onboarding.OnboardingDialog
import com.tangem.tap.features.onboarding.OnboardingHelper
import com.tangem.tap.scope
import com.tangem.tap.store
@ -72,7 +75,10 @@ private fun handleOtherCardsAction(action: Action) {
}
is OnboardingOtherCardsAction.CreateWallet -> {
scope.launch {
val result = tangemSdkManager.createProductWallet(onboardingManager.scanResponse)
val result = tangemSdkManager.createProductWallet(
scanResponse = onboardingManager.scanResponse,
shouldReset = globalState.onboardingState.shouldResetOnCreate,
)
withMainContext {
when (result) {
is CompletionResult.Success -> {
@ -87,7 +93,11 @@ private fun handleOtherCardsAction(action: Action) {
delay(DELAY_SDK_DIALOG_CLOSE)
store.dispatch(OnboardingOtherCardsAction.SetStepOfScreen(OnboardingOtherCardsStep.Done))
}
is CompletionResult.Failure -> Unit
is CompletionResult.Failure -> {
if (result.error is TangemSdkError.WalletAlreadyCreated) {
handleActivationError()
}
}
}
}
}
@ -101,4 +111,14 @@ private fun handleOtherCardsAction(action: Action) {
}
else -> Unit
}
}
private fun handleActivationError() {
store.dispatchDialogShow(
OnboardingDialog.WalletActivationError(
onConfirm = {
store.dispatch(GlobalAction.Onboarding.ShouldResetCardOnCreate(true))
},
),
)
}

9
app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt
View file

@ -129,7 +129,14 @@ internal class SaveWalletMiddleware {
}
store.dispatchOnMain(SaveWalletAction.Save.Success)
store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
store.dispatchOnMain(
if (store.state.navigationState.backStack.contains(AppScreen.Wallet)) {
NavigationAction.PopBackTo(AppScreen.Wallet)
} else {
NavigationAction.NavigateTo(AppScreen.Wallet)
},
)
}
}
}

2
domain/legacy/src/main/java/com/tangem/domain/common/configs/CardConfig.kt
View file

@ -22,7 +22,7 @@ sealed interface CardConfig {
) {
return MultiWalletCardConfig
}
return GenericCardConfig
return GenericCardConfig(cardDTO.settings.maxWalletsCount)
}
}
}

14
domain/legacy/src/main/java/com/tangem/domain/common/configs/GenericCardConfig.kt
View file

@ -4,12 +4,14 @@ import com.tangem.blockchain.common.Blockchain
import com.tangem.common.card.EllipticCurve
import timber.log.Timber
object GenericCardConfig : CardConfig {
override val mandatoryCurves: List<EllipticCurve>
get() = listOf(
EllipticCurve.Secp256k1,
EllipticCurve.Ed25519,
)
internal class GenericCardConfig(maxWalletCount: Int) : CardConfig {
override val mandatoryCurves: List<EllipticCurve> = buildList {
add(EllipticCurve.Secp256k1)
if (maxWalletCount > 1) {
add(EllipticCurve.Ed25519)
}
}
/**
* Old logic to determine primary curve for blockchain