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 2023-08-31 15:56:42 +03:00
parent 6d57fc4c5f
commit 2f4d234943
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt
View file

@ -199,7 +199,6 @@ class OnboardingWalletFragment :
OnboardingWalletStep.CreateWallet -> setupCreateWalletState() OnboardingWalletStep.CreateWallet -> setupCreateWalletState()
OnboardingWalletStep.Backup -> setBackupState( OnboardingWalletStep.Backup -> setBackupState(
state = state.backupState, state = state.backupState,
isWallet2 = state.wallet2State != null,
) )
else -> {} else -> {}
@ -222,9 +221,9 @@ class OnboardingWalletFragment :
animator.setupCreateWalletState() animator.setupCreateWalletState()
} }
private fun setBackupState(state: BackupState, isWallet2: Boolean) { private fun setBackupState(state: BackupState) {
when (state.backupStep) { when (state.backupStep) {
BackupStep.InitBackup -> showBackupIntro(state, isWallet2) BackupStep.InitBackup -> showBackupIntro(state)
BackupStep.ScanOriginCard -> showScanOriginCard() BackupStep.ScanOriginCard -> showScanOriginCard()
BackupStep.AddBackupCards -> showAddBackupCards(state) BackupStep.AddBackupCards -> showAddBackupCards(state)
BackupStep.SetAccessCode -> showSetAccessCode() BackupStep.SetAccessCode -> showSetAccessCode()
@ -236,7 +235,7 @@ class OnboardingWalletFragment :
} }
} }
private fun showBackupIntro(state: BackupState, isWallet2: Boolean) = with(binding) { private fun showBackupIntro(state: BackupState) = with(binding) {
imvFirstBackupCard.show() imvFirstBackupCard.show()
imvSecondBackupCard.show() imvSecondBackupCard.show()
@ -251,7 +250,7 @@ class OnboardingWalletFragment :
btnWalletAlternativeAction.text = getText(R.string.onboarding_button_skip_backup) btnWalletAlternativeAction.text = getText(R.string.onboarding_button_skip_backup)
btnWalletAlternativeAction.setOnClickListener { store.dispatch(BackupAction.SkipBackup) } btnWalletAlternativeAction.setOnClickListener { store.dispatch(BackupAction.SkipBackup) }
btnWalletAlternativeAction.show(state.canSkipBackup && !isWallet2) btnWalletAlternativeAction.show(state.canSkipBackup)
} }
animator.showBackupIntro(state) animator.showBackupIntro(state)
} }

2
domain/demo/src/main/java/com/tangem/domain/demo/DemoConfig.kt
View file

@ -412,7 +412,7 @@ class DemoConfig {
"FB20000000000186", // Note ETH "FB20000000000186", // Note ETH
"FB10000000000196", // Note BTC "FB10000000000196", // Note BTC
"FB30000000000176", // Wallet "FB30000000000176", // Wallet
"FB40000000120060", // Wallet 2 "FB04000000000152", // Wallet 2
) )
@Suppress("ClassOrdering") @Suppress("ClassOrdering")

4
domain/legacy/src/main/java/com/tangem/domain/common/TapWorkarounds.kt
View file

@ -3,6 +3,7 @@ package com.tangem.domain.common
import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.Blockchain
import com.tangem.common.card.Card import com.tangem.common.card.Card
import com.tangem.common.card.FirmwareVersion import com.tangem.common.card.FirmwareVersion
import com.tangem.domain.demo.DemoConfig
import com.tangem.domain.models.scan.CardDTO import com.tangem.domain.models.scan.CardDTO
import java.util.* import java.util.*
@ -14,6 +15,7 @@ object TapWorkarounds {
private const val TEST_CARD_BATCH = "99FF" private const val TEST_CARD_BATCH = "99FF"
private const val TEST_CARD_ID_STARTS_WITH = "FF99" private const val TEST_CARD_ID_STARTS_WITH = "FF99"
private val backupRequiredFirmwareVersion = FirmwareVersion(major = 6, minor = 21) private val backupRequiredFirmwareVersion = FirmwareVersion(major = 6, minor = 21)
private val demoConfig = DemoConfig()
val CardDTO.isTangemTwins: Boolean val CardDTO.isTangemTwins: Boolean
get() = TwinsHelper.getTwinCardNumber(cardId) != null get() = TwinsHelper.getTwinCardNumber(cardId) != null
@ -26,7 +28,7 @@ object TapWorkarounds {
// for cards 6.21 and higher backup is not skippable // for cards 6.21 and higher backup is not skippable
val CardDTO.canSkipBackup: Boolean val CardDTO.canSkipBackup: Boolean
get() = this.firmwareVersion < backupRequiredFirmwareVersion get() = this.firmwareVersion < backupRequiredFirmwareVersion || demoConfig.isDemoCardId(cardId)
val CardDTO.useOldStyleDerivation: Boolean val CardDTO.useOldStyleDerivation: Boolean
get() = batchId == "AC01" || batchId == "AC02" || batchId == "CB95" get() = batchId == "AC01" || batchId == "AC02" || batchId == "CB95"