diff --git a/app/src/main/assets/tangem-app-config b/app/src/main/assets/tangem-app-config index 8c1c53b739..b84b1e1ab1 160000 --- a/app/src/main/assets/tangem-app-config +++ b/app/src/main/assets/tangem-app-config @@ -1 +1 @@ -Subproject commit 8c1c53b73950698d4acfa4d925b8c14bf6f0da63 +Subproject commit b84b1e1ab11b0eb0f6ca6e28f551f9e2ca6809fe diff --git a/app/src/main/java/com/tangem/tap/MainActivity.kt b/app/src/main/java/com/tangem/tap/MainActivity.kt index 0d64c958e4..429cbe3e57 100644 --- a/app/src/main/java/com/tangem/tap/MainActivity.kt +++ b/app/src/main/java/com/tangem/tap/MainActivity.kt @@ -215,6 +215,13 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac override fun onNewIntent(intent: Intent?) { super.onNewIntent(intent) + + /* + * FIXME: Test functionality. TangemSdk is null on some devices when HomeAction.Read is called + * inside IntentHandler. + */ + cardSdkLifecycleObserver.onCreate(context = this) + scope.launch { intentProcessor.handleIntent(intent) } diff --git a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt index c45f4e3490..7008747005 100644 --- a/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt +++ b/app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt @@ -4,6 +4,7 @@ import com.tangem.blockchain.blockchains.cardano.CardanoUtils import com.tangem.blockchain.common.Blockchain import com.tangem.common.CompletionResult import com.tangem.common.card.Card +import com.tangem.common.card.FirmwareVersion import com.tangem.common.core.CardSession import com.tangem.common.core.CardSessionRunnable import com.tangem.common.core.TangemError @@ -54,7 +55,7 @@ class ScanProductTask( } val cardDto = CardDTO(card) - val error = getErrorIfExcludedCard(cardDto) + val error = getErrorIfExcludedCard(cardDto, card) if (error != null) { callback(CompletionResult.Failure(error)) return @@ -84,9 +85,15 @@ class ScanProductTask( } } - private fun getErrorIfExcludedCard(cardDto: CardDTO): TangemError? { + private fun getErrorIfExcludedCard(cardDto: CardDTO, card: Card): TangemError? { if (cardDto.isExcluded) return TapSdkError.CardForDifferentApp if (cardDto.isNotSupportedInThatRelease) return TapSdkError.CardNotSupportedByRelease + // according ios decline card lower Ed25519Slip0010Available version and contains imported wallets + if (card.firmwareVersion < FirmwareVersion.Ed25519Slip0010Available && + card.wallets.any { it.isImported } + ) { + return TapSdkError.CardNotSupportedByRelease + } return null } } diff --git a/app/src/main/java/com/tangem/tap/features/BaseFragment.kt b/app/src/main/java/com/tangem/tap/features/BaseFragment.kt index cddf55cc07..cd6161868b 100644 --- a/app/src/main/java/com/tangem/tap/features/BaseFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/BaseFragment.kt @@ -5,7 +5,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.activity.OnBackPressedCallback +import androidx.activity.addCallback import androidx.appcompat.widget.Toolbar import androidx.core.view.MenuHost import androidx.core.view.MenuProvider @@ -71,13 +71,11 @@ interface FragmentOnBackPressedHandler { @SuppressLint("FragmentBackPressedCallback") fun Fragment.addBackPressHandler(handler: FragmentOnBackPressedHandler) { - activity?.onBackPressedDispatcher?.addCallback( - this, - object : OnBackPressedCallback(true) { - override fun handleOnBackPressed() { - handler.handleOnBackPressed() - } - }, - ) - view?.findViewById(R.id.toolbar)?.setNavigationOnClickListener { activity?.onBackPressed() } + requireActivity().onBackPressedDispatcher.addCallback { + handler.handleOnBackPressed() + } + + view?.findViewById(R.id.toolbar)?.setNavigationOnClickListener { + handler.handleOnBackPressed() + } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/CustomTokenRouter.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/CustomTokenRouter.kt index bcd32893fe..4444aeea64 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/CustomTokenRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/CustomTokenRouter.kt @@ -1,5 +1,7 @@ package com.tangem.tap.features.customtoken.impl.presentation.routers +import com.tangem.blockchain.common.Blockchain + /** * Custom token feature router * @@ -12,4 +14,10 @@ internal interface CustomTokenRouter { /** Open wallet (main) screen */ fun openWalletScreen() + + /** Open alert if solana network is unsupported + * + * @param blockchain blockchain to show alert + */ + fun openUnsupportedNetworkAlert(blockchain: Blockchain) } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/DefaultCustomTokenRouter.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/DefaultCustomTokenRouter.kt index 7afec7d5a5..af1ebb8795 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/DefaultCustomTokenRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/routers/DefaultCustomTokenRouter.kt @@ -1,8 +1,12 @@ package com.tangem.tap.features.customtoken.impl.presentation.routers +import com.tangem.blockchain.common.Blockchain import com.tangem.core.navigation.AppScreen import com.tangem.core.navigation.NavigationAction +import com.tangem.tap.common.extensions.dispatchDialogShow +import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.store +import com.tangem.wallet.R /** Default implementation of custom token feature router */ internal class DefaultCustomTokenRouter : CustomTokenRouter { @@ -14,4 +18,13 @@ internal class DefaultCustomTokenRouter : CustomTokenRouter { override fun openWalletScreen() { store.dispatch(NavigationAction.PopBackTo(screen = AppScreen.Wallet)) } + + override fun openUnsupportedNetworkAlert(blockchain: Blockchain) { + val alert = AppDialog.SimpleOkDialogRes( + headerId = R.string.common_warning, + messageId = R.string.alert_manage_tokens_unsupported_curve_message, + args = listOf(blockchain.fullName), + ) + store.dispatchDialogShow(alert) + } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt index 3b5e96c9e9..831823009f 100644 --- a/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/customtoken/impl/presentation/viewmodels/AddCustomTokenViewModel.kt @@ -12,11 +12,11 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.Token -import com.tangem.blockchain.common.derivation.DerivationStyle import com.tangem.core.analytics.api.AnalyticsEventHandler import com.tangem.crypto.hdWallet.DerivationPath import com.tangem.crypto.hdWallet.HDWalletError import com.tangem.domain.AddCustomTokenError +import com.tangem.domain.common.DerivationStyleProvider import com.tangem.domain.common.extensions.* import com.tangem.domain.common.util.cardTypesResolver import com.tangem.domain.common.util.derivationStyleProvider @@ -145,6 +145,7 @@ internal class AddCustomTokenViewModel @Inject constructor( fun createDerivationPathSelectorAdditionalItem( blockchain: Blockchain, type: DerivationPathSelectorType = DerivationPathSelectorType.BLOCKCHAIN, + derivationPath: String, ): SelectorItem.TitleWithSubtitle { return when (type) { DerivationPathSelectorType.DEFAULT -> SelectorItem.TitleWithSubtitle( @@ -160,8 +161,7 @@ internal class AddCustomTokenViewModel @Inject constructor( type = DerivationPathSelectorType.CUSTOM, ) DerivationPathSelectorType.BLOCKCHAIN -> SelectorItem.TitleWithSubtitle( - title = blockchain.derivationPath(DerivationStyle.LEGACY)?.rawPath?.let(TextReference::Str) - ?: TextReference.Res(R.string.custom_token_derivation_path_default), + title = TextReference.Str(derivationPath), subtitle = TextReference.Str(blockchain.fullName), blockchain = blockchain, ) @@ -208,10 +208,12 @@ internal class AddCustomTokenViewModel @Inject constructor( private fun getNetworkSelectorItems(): List { val defaultNetwork = createNetworkSelectorItem(blockchain = Blockchain.Unknown) val scanResponse = reduxStateHolder.scanResponse + val derivationStyle = scanResponse?.derivationStyleProvider?.getDerivationStyle() return listOf(defaultNetwork) + Blockchain.values() .filter { blockchain -> scanResponse?.card?.supportedBlockchains(scanResponse.cardTypesResolver) - ?.contains(blockchain) == true + ?.contains(blockchain) == true && + blockchain.derivationPath(derivationStyle)?.rawPath?.isNotEmpty() == true } .sortedBy(Blockchain::fullName) .map(::createNetworkSelectorItem) @@ -251,9 +253,11 @@ internal class AddCustomTokenViewModel @Inject constructor( } private fun createDerivationPathsSelectorField(): AddCustomTokenSelectorField.DerivationPath? { - if (reduxStateHolder.scanResponse?.card?.settings?.isHDWalletAllowed == false) return null + val scanResponse = reduxStateHolder.scanResponse + if (scanResponse?.card?.settings?.isHDWalletAllowed == false) return null - val selectorItems = getDerivationPathsSelectorItems() + val selectorItems = + getDerivationPathsSelectorItems(scanResponse?.derivationStyleProvider) return AddCustomTokenSelectorField.DerivationPath( label = TextReference.Res(R.string.custom_token_derivation_path_input_title), selectedItem = requireNotNull(selectorItems.firstOrNull()), @@ -263,22 +267,37 @@ internal class AddCustomTokenViewModel @Inject constructor( ) } - private fun getDerivationPathsSelectorItems(): List { + private fun getDerivationPathsSelectorItems( + derivationStyleProvider: DerivationStyleProvider?, + ): List { + val derivationStyle = derivationStyleProvider?.getDerivationStyle() return listOf( createDerivationPathSelectorAdditionalItem( blockchain = Blockchain.Unknown, type = DerivationPathSelectorType.DEFAULT, + derivationPath = "", ), createDerivationPathSelectorAdditionalItem( blockchain = Blockchain.Unknown, type = DerivationPathSelectorType.CUSTOM, + derivationPath = "", ), ) + Blockchain.values() .filter { blockchain -> blockchain.isSupportedInApp() && !blockchain.isTestnet() } .sortedBy(Blockchain::fullName) - .map(::createDerivationPathSelectorAdditionalItem) + .mapNotNull { + val derivationPath = it.derivationPath(derivationStyle)?.rawPath + if (derivationPath?.isNotEmpty() == true) { + createDerivationPathSelectorAdditionalItem( + blockchain = it, + derivationPath = derivationPath, + ) + } else { + null + } + } } private fun createDerivationPathInputField(): AddCustomTokenInputField.DerivationPath? { @@ -608,11 +627,8 @@ internal class AddCustomTokenViewModel @Inject constructor( private fun getDerivationPathForBlockchain(blockchain: Blockchain?): DerivationPath? { if (blockchain == null) return null - val derivationStyle = if (!isDerivationPathSelected()) { - reduxStateHolder.scanResponse?.derivationStyleProvider?.getDerivationStyle() - } else { - DerivationStyle.LEGACY - } + val derivationStyle = reduxStateHolder.scanResponse?.derivationStyleProvider?.getDerivationStyle() + val derivationNetwork = if (blockchain == Blockchain.Unknown) { uiState.form.networkSelectorField.selectedItem.blockchain } else { @@ -621,6 +637,15 @@ internal class AddCustomTokenViewModel @Inject constructor( return derivationNetwork.derivationPath(derivationStyle) } + private fun isUnsupportedBlockchain(blockchain: Blockchain): Boolean { + val scanResponse = reduxStateHolder.scanResponse + val canHandleToken = scanResponse?.card?.canHandleBlockchain( + blockchain = blockchain, + cardTypesResolver = scanResponse.cardTypesResolver, + ) ?: false + return !canHandleToken + } + private inner class ActionsHandler(private val featureRouter: CustomTokenRouter) { fun onBackButtonClick() { @@ -733,6 +758,11 @@ internal class AddCustomTokenViewModel @Inject constructor( fun onAddCustomTokenClick() { if (!isNetworkSelected()) return + val blockchain = uiState.form.networkSelectorField.selectedItem.blockchain + if (isUnsupportedBlockchain(blockchain)) { + featureRouter.openUnsupportedNetworkAlert(blockchain) + return + } val currency = when (getCustomTokenType()) { CustomTokenType.TOKEN -> { @@ -744,13 +774,13 @@ internal class AddCustomTokenViewModel @Inject constructor( decimals = requireNotNull(uiState.form.decimalsInputField.value.toIntOrNull()), id = foundToken?.id, ), - network = uiState.form.networkSelectorField.selectedItem.blockchain, + network = blockchain, derivationPath = getDerivationPath(), ) } CustomTokenType.BLOCKCHAIN -> { CustomCurrency.CustomBlockchain( - network = uiState.form.networkSelectorField.selectedItem.blockchain, + network = blockchain, derivationPath = getDerivationPath(), ) } @@ -782,6 +812,7 @@ internal class AddCustomTokenViewModel @Inject constructor( } fun onResetButtonClick() { + val scanResponse = reduxStateHolder.scanResponse with(uiState.form) { uiState = uiState.copySealed( form = uiState.form.copy( @@ -799,11 +830,11 @@ internal class AddCustomTokenViewModel @Inject constructor( decimalsInputField = decimalsInputField.copy(value = "", isEnabled = false), derivationPathSelectorField = derivationPathSelectorField?.copy( isEnabled = true, - selectedItem = formStateBuilder - .createDerivationPathSelectorAdditionalItem( - blockchain = Blockchain.Unknown, - type = DerivationPathSelectorType.DEFAULT, - ), + selectedItem = formStateBuilder.createDerivationPathSelectorAdditionalItem( + blockchain = Blockchain.Unknown, + type = DerivationPathSelectorType.DEFAULT, + derivationPath = "", + ), ), ), ) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt index 05eaf95d55..11f7664aa8 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingSeedPhraseStateHandler.kt @@ -59,7 +59,7 @@ internal class OnboardingSeedPhraseStateHandler( private fun setMainScreenToolbarTitle(walletFragment: OnboardingWalletFragment, subScreen: SeedPhraseScreen) { val titleResId = when (subScreen) { - SeedPhraseScreen.Intro, + SeedPhraseScreen.Intro -> R.string.wallet_title SeedPhraseScreen.AboutSeedPhrase, SeedPhraseScreen.YourSeedPhrase, SeedPhraseScreen.CheckSeedPhrase, diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt index 78f7d5bef0..50a7af5d2a 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/OnboardingWalletFragment.kt @@ -97,8 +97,7 @@ class OnboardingWalletFragment : (activity as? AppCompatActivity)?.setSupportActionBar(binding.toolbar) - binding.toolbar.setNavigationOnClickListener { activity?.onBackPressed() } - addBackPressHandler(this) + addBackPressHandler(handler = this) store.dispatch(OnboardingWallet2Action.Init(seedPhraseViewModel.maxProgress)) store.dispatch(OnboardingWalletAction.Init) diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt index 0632c6a120..0da9a7063a 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/ui/dialogs/ResetBackupCardDialog.kt @@ -10,12 +10,13 @@ import com.tangem.wallet.R object ResetBackupCardDialog { fun create(context: Context, cardId: String): AlertDialog { return AlertDialog.Builder(context).apply { - setTitle(R.string.common_warning) + setTitle(R.string.common_attention) setMessage(R.string.onboarding_linking_error_card_with_wallets) - setPositiveButton(R.string.common_continue) { _, _ -> - store.dispatch(BackupAction.ResetBackupCard(cardId)) + setPositiveButton(R.string.common_cancel) { _, _ -> + /* no-op */ } - setNegativeButton(R.string.common_cancel) { _, _ -> + setNegativeButton(R.string.common_reset) { _, _ -> + store.dispatch(BackupAction.ResetBackupCard(cardId)) } setOnDismissListener { store.dispatch(GlobalAction.HideDialog) diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt index 7c12e82496..6de86eba68 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt @@ -261,19 +261,34 @@ class SendStateSubscriber(fragment: BaseStoreFragment) : FragmentStateSubscriber } @Suppress("MagicNumber") - private fun handleFeeState(fg: SendFragment, state: FeeState) = with(fg.binding.clNetworkFee) { - fg.view?.findViewById(R.id.clNetworkFee)?.show(state.mainLayoutIsVisible) - flExpandCollapse.imvExpandCollapse.rotation = if (state.controlsLayoutIsVisible) 0f else 180f - llFeeControlsContainer.show(state.controlsLayoutIsVisible) - chipGroup.show(state.feeChipGroupIsVisible) + private fun handleFeeState(fg: SendFragment, state: FeeState) { + with(fg.binding.clNetworkFee) { + fg.view?.findViewById(R.id.clNetworkFee)?.show(state.mainLayoutIsVisible) + flExpandCollapse.imvExpandCollapse.rotation = if (state.controlsLayoutIsVisible) 0f else 180f + llFeeControlsContainer.show(state.controlsLayoutIsVisible) + chipGroup.show(state.feeChipGroupIsVisible) - swIncludeFee.isEnabled = state.includeFeeSwitcherIsEnabled - if (swIncludeFee.isChecked != state.feeIsIncluded) { - swIncludeFee.isChecked = state.feeIsIncluded + swIncludeFee.isEnabled = state.includeFeeSwitcherIsEnabled + if (swIncludeFee.isChecked != state.feeIsIncluded) { + swIncludeFee.isChecked = state.feeIsIncluded + } + + val chipId = FeeUiHelper.toId(state.selectedFeeType) + if (chipGroup.checkedChipId != chipId && chipId != View.NO_ID) chipGroup.check(chipId) + } + with(fg.binding.clReceiptContainer) { + when (state.progressState) { + ProgressState.Loading -> { + tvReceiptFeeValue.hide() + pbReceiptFee.show() + } + ProgressState.Done -> { + pbReceiptFee.hide() + tvReceiptFeeValue.show() + } + else -> {} + } } - - val chipId = FeeUiHelper.toId(state.selectedFeeType) - if (chipGroup.checkedChipId != chipId && chipId != View.NO_ID) chipGroup.check(chipId) } @Suppress("LongMethod", "ComplexMethod") diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/SupportTokensState.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/SupportTokensState.kt new file mode 100644 index 0000000000..e815d5d1e7 --- /dev/null +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/models/SupportTokensState.kt @@ -0,0 +1,11 @@ +package com.tangem.tap.features.tokens.impl.presentation.models + +/** + * State that shows is token support by given card + */ +sealed class SupportTokensState { + + object SolanaNetworkUnsupported : SupportTokensState() + object UnsupportedCurve : SupportTokensState() + object SupportedToken : SupportTokensState() +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt index a674196d0d..93ae4e1b17 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/DefaultTokensListRouter.kt @@ -51,20 +51,20 @@ internal class DefaultTokensListRouter( } override fun openUnsupportedNetworkAlert(blockchain: Blockchain) { - val alert = when (blockchain) { - Blockchain.Solana -> AppDialog.SimpleOkDialogRes( + val alert = AppDialog.SimpleOkDialogRes( + headerId = R.string.common_warning, + messageId = R.string.alert_manage_tokens_unsupported_curve_message, + args = listOf(blockchain.fullName), + ) + store.dispatchDialogShow(alert) + } + + override fun openSolanaTokensNotSupportAlert() { + store.dispatchDialogShow( + AppDialog.SimpleOkDialogRes( headerId = R.string.common_warning, messageId = R.string.alert_manage_tokens_unsupported_message, - ) - Blockchain.Chia, Blockchain.ChiaTestnet -> AppDialog.SimpleOkDialogRes( - headerId = R.string.common_warning, - messageId = R.string.alert_manage_tokens_unsupported_curve_message, - args = listOf(blockchain.fullName), - ) - else -> null // there's no alerts for other blockchains yer - } - if (alert != null) { - store.dispatchDialogShow(alert) - } + ), + ) } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt index b80e835962..ee87445d1d 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/router/TokensListRouter.kt @@ -35,4 +35,9 @@ internal interface TokensListRouter { * @param blockchain blockchain to show alert */ fun openUnsupportedNetworkAlert(blockchain: Blockchain) + + /** + * Open alert with Solana tokens error + */ + fun openSolanaTokensNotSupportAlert() } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt index 1e74d442a8..1cac67b7b2 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/viewmodels/TokensListViewModel.kt @@ -14,8 +14,10 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.core.analytics.api.AnalyticsEventHandler import com.tangem.core.ui.extensions.getActiveIconRes import com.tangem.domain.common.TapWorkarounds.useOldStyleDerivation +import com.tangem.domain.common.extensions.canHandleBlockchain import com.tangem.domain.common.extensions.canHandleToken import com.tangem.domain.common.extensions.fromNetworkId +import com.tangem.domain.common.extensions.supportedTokens import com.tangem.domain.common.util.cardTypesResolver import com.tangem.tap.common.extensions.fullNameWithoutTestnet import com.tangem.tap.common.extensions.getGreyedOutIconRes @@ -23,6 +25,7 @@ import com.tangem.tap.common.extensions.getNetworkName import com.tangem.tap.features.tokens.impl.domain.TokensListInteractor import com.tangem.tap.features.tokens.impl.domain.models.Token import com.tangem.tap.features.tokens.impl.domain.models.Token.Network +import com.tangem.tap.features.tokens.impl.presentation.models.SupportTokensState import com.tangem.tap.features.tokens.impl.presentation.models.TokensListArgs import com.tangem.tap.features.tokens.impl.presentation.router.TokensListRouter import com.tangem.tap.features.tokens.impl.presentation.states.NetworkItemState @@ -41,6 +44,7 @@ import kotlinx.collections.immutable.toImmutableList import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlinx.coroutines.plus +import timber.log.Timber import javax.inject.Inject import com.tangem.blockchain.common.Token as BlockchainToken @@ -309,7 +313,7 @@ internal class TokensListViewModel @Inject constructor( toggledNetwork.changeToggleState() } } else { - if (isUnsupportedToken(blockchain)) { + if (isUnsupportedBlockchain(blockchain)) { router.openUnsupportedNetworkAlert(blockchain) } else { analyticsSender.sendWhenBlockchainAdded(blockchain) @@ -354,20 +358,43 @@ internal class TokensListViewModel @Inject constructor( toggledNetwork.changeToggleState() } } else { - if (isUnsupportedToken(token.blockchain)) { - router.openUnsupportedNetworkAlert(token.blockchain) - } else { - analyticsSender.sendWhenTokenAdded(token.token) - changedTokensList.add(token) - toggledNetwork.changeToggleState() + when (isUnsupportedToken(token.blockchain)) { + SupportTokensState.SolanaNetworkUnsupported -> router.openSolanaTokensNotSupportAlert() + SupportTokensState.SupportedToken -> { + analyticsSender.sendWhenTokenAdded(token.token) + changedTokensList.add(token) + toggledNetwork.changeToggleState() + } + SupportTokensState.UnsupportedCurve -> router.openUnsupportedNetworkAlert(token.blockchain) + null -> Timber.e("Something went wrong in isUnsupportedToken (no scanResponse found)") } } } } - private fun isUnsupportedToken(blockchain: Blockchain): Boolean { + private fun isUnsupportedToken(blockchain: Blockchain): SupportTokensState? { val scanResponse = reduxStateHolder.scanResponse - val canHandleToken = scanResponse?.card?.canHandleToken( + val cardTypesResolver = scanResponse?.cardTypesResolver ?: return null + val supportedTokens = scanResponse.card.supportedTokens(cardTypesResolver) + + // refactor this later by moving all this logic in card config + if (!supportedTokens.contains(Blockchain.Solana)) { + return SupportTokensState.SolanaNetworkUnsupported + } + val canHandleToken = scanResponse.card.canHandleToken( + supportedTokens = supportedTokens, + blockchain = blockchain, + cardTypesResolver = cardTypesResolver, + ) + if (!canHandleToken) { + return SupportTokensState.UnsupportedCurve + } + return SupportTokensState.SupportedToken + } + + private fun isUnsupportedBlockchain(blockchain: Blockchain): Boolean { + val scanResponse = reduxStateHolder.scanResponse + val canHandleToken = scanResponse?.card?.canHandleBlockchain( blockchain = blockchain, cardTypesResolver = scanResponse.cardTypesResolver, ) ?: false diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt index 94e15e9e65..fe767bafda 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletDetailsFragment.kt @@ -424,6 +424,7 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), SafeSt is WalletDataModel.SameCurrencyTransactionInProgress, -> { lBalance.tvStatus.setVerifiedBalanceStatus(R.string.wallet_balance_verified) + showPendingTransactionsIfPresent(status.pendingTransactions) } is WalletDataModel.TransactionInProgress -> { diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt b/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt index 75b37e271f..493d6b2e9e 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/ConfigManagerImpl.kt @@ -97,6 +97,7 @@ internal class ConfigManagerImpl @Inject constructor() : ConfigManager { testnetApiKey = configValues.tonCenterKeys.testnet, ), chiaFireAcademyApiKey = configValues.chiaFireAcademyApiKey, + chiaTangemApiKey = configValues.chiaTangemApiKey, ), appsFlyerDevKey = configValues.appsFlyer.appsFlyerDevKey, amplitudeApiKey = configValues.amplitudeApiKey, diff --git a/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt b/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt index bcad6003db..83ffe5d09a 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/config/models/JsonModels.kt @@ -39,6 +39,7 @@ class ConfigValueModel( val walletConnectProjectId: String, val tangemComAuthorization: String?, val chiaFireAcademyApiKey: String?, + val chiaTangemApiKey: String?, ) data class AppsFlyer( diff --git a/core/res/src/main/res/values-ru/strings.xml b/core/res/src/main/res/values-ru/strings.xml index 95a129cac5..6277622e78 100644 --- a/core/res/src/main/res/values-ru/strings.xml +++ b/core/res/src/main/res/values-ru/strings.xml @@ -43,7 +43,6 @@ Использовать эту карту для сброса кода доступа на других картах в этом кошельке Отключить возможность сброса кода доступа на этой карте или других картах этого кошелька Восстановление кода доступа - Сбросить Вы уверены, что хотите это сделать? Смена кода доступа Код доступа будет изменен только на данной карте @@ -101,7 +100,7 @@ Сохранить изменения Искать Поиск токенов - Секретная фраза + Seed-фраза Выберите действие Продать Отправить @@ -252,18 +251,18 @@ Код доступа Подключиться Резервная копия - Прочитать о секретной фразе + Прочитать о seed-фразе Запишите эти 12 слов в порядке, указанном ниже, и сохраните их в надежном месте. - Ваша секретная фраза - Чтобы импортировать кошелек, введите секретную фразу в поле ниже - Cоздать секретную фразу + Ваша seed-фраза + Чтобы импортировать кошелек, введите seed-фразу в поле ниже + Создать seed-фразу Импорт кошелька - Секретная фраза — это набор слов, который дает возможность восстановить кошелек. В отличие от ключей, сгенерированных картой, seed-фраза не защищена и может быть скопирована и украдена. Используйте этот вариант на свой страх и риск. - Использовать секретную фразу - Неверная секретная фраза. Пожалуйста, проверьте порядок слов. - Неверная секретная фраза. Пожалуйста, проверьте орфографию. + Seed-фраза — это набор слов, который дает возможность восстановить кошелек. В отличие от ключей, сгенерированных картой, seed-фраза не защищена и может быть скопирована и украдена. Используйте этот вариант на свой страх и риск. + Использовать seed-фразу + Неверная seed-фраза. Пожалуйста, проверьте порядок слов. + Неверная seed-фраза. Пожалуйста, проверьте орфографию. Устаревший - Чтобы проверить, правильно ли вы записали секретную фразу, введите 2-е, 7-е и 11-е слова + Чтобы проверить, правильно ли вы записали seed-фразу, введите 2-е, 7-е и 11-е слова Итак, проверим Для начала работы просто запросите начисление wxDAI на свой кошелек Это займет несколько секунд @@ -345,7 +344,7 @@ Я понимаю, что после выполнения этого действия у меня больше не будет доступа к текущему кошельку Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек или использовать данную карту для восстановления кода доступа. Сброс к заводским настройкам приведет к полному удалению кошелька с выбранной карты. Вы не сможете восстановить текущий кошелек. - У вас есть карта банка другой страны или платежной системы UnionPay? + У вас есть карта банка другой страны, а также вид на жительство или регистрация вне РФ? Карты банков РФ в данный момент не принимаются Войдите в приложение и следите за своим балансом без сканирования карты Доступ в приложение @@ -573,6 +572,6 @@ Это необратимое действие Войти с %s Сканировать карту - Используйте %s или код доступа для входа в приложение + Используйте %s или отсканируйте карту для входа в приложение C возвращением! diff --git a/core/res/src/main/res/values-zh-rTW/strings.xml b/core/res/src/main/res/values-zh-rTW/strings.xml index 15209b8a9b..294f3413b7 100644 --- a/core/res/src/main/res/values-zh-rTW/strings.xml +++ b/core/res/src/main/res/values-zh-rTW/strings.xml @@ -38,7 +38,6 @@ 允許您使用此卡重置此錢包中其他卡上的訪問密碼 禁用重置此卡或此錢包中其他卡上的訪問密碼的功能 恢復訪問密碼 - 重置 您確定要這麼做嗎？ 更改訪問密碼 訪問密碼將僅在此卡上更改 @@ -217,16 +216,10 @@ 創建備份 閱讀更多關於助記詞的訊息 按照下面給出的順序寫下這 12 個單詞，並將它們存放在安全秘密的地方。 - 您的助記詞 - 要導入您的錢包，請在下面的字段中輸入您的助記詞 生成助記詞 導入錢包 - 註記詞是一系列能夠恢復錢包的單詞。與卡片生成的密鑰不同，助記詞不受保護，可以被複製和竊取。使用此選項需要您自擔風險。 使用助記詞 - 無效的助記詞。請檢查單詞順序。 - 助記詞無效。請檢查您的拼寫。 Legacy - 為了檢查您是否正確輸入了助記詞，請輸入第 2、7 和 11 個單詞 那麼，讓我們檢查一下 要開始，只需將 wxDAI 獲取到您的錢包 這會花上幾秒 diff --git a/core/res/src/main/res/values/strings.xml b/core/res/src/main/res/values/strings.xml index 86e75e5d4d..186b92d9ea 100644 --- a/core/res/src/main/res/values/strings.xml +++ b/core/res/src/main/res/values/strings.xml @@ -41,7 +41,6 @@ Allows you to use this card to reset access code on other cards in this wallet Disable the ability to reset the access code on this card or other cards in this wallet Access code recovery - Reset Are you sure you want to do this? Change Access Code Access code will be changed on this card only @@ -234,7 +233,7 @@ Skip for later How does it work? Let\'s generate all the keys on your card and create a secure wallet - Create wallet + Create a wallet Create a wallet Other options Your keys will be securely generated inside the card. There is no seed phrase, which means nobody can export or steal it. @@ -248,18 +247,18 @@ Pin code Connect Creating a backup - Read more about seed phrases + Read more about seed phrase Write these 12 words down in the order given below and store them in a safe and secret place. - Your secret phrase - To import your wallet, enter your secret phrase in the field below + Your seed phrase + To import your wallet, enter your seed phrase in the field below Generate seed phrase Import wallet - A secret phrase is a series of words that allows you to recover your wallet. Unlike the keys generated by the card, secret phrases are unprotected and can be copied and stolen. Use this option at your own risk. + A seed phrase is a series of words that allows you to recover your wallet. Unlike the keys generated by the card, seed phrases are unprotected and can be copied and stolen. Use this option at your own risk. Use seed phrase - Invalid secret phrase. Please check the word order. - Invalid secret phrase. Please check your spelling. + Invalid seed phrase. Please check the word order. + Invalid seed phrase. Please check your spelling. Legacy - To check whether you’ve written down your secret phrase correctly, please enter the 2nd, 7th and 11th words + To check whether you’ve written down your seed phrase correctly, please enter the 2nd, 7th and 11th words So, let’s check To get started, simply claim wxDAI to your wallet It will take a few seconds @@ -338,8 +337,8 @@ I understand that after performing this action, I will no longer have access to the current wallet Factory Reset will completely delete the wallet from the selected card. You will not be able to restore the current wallet or use the card to recover the access code. Factory Reset will completely delete the wallet from the selected card and remove it from the app. You will not be able to restore the current wallet. - Do you have a bank card of another country or a UnionPay card? - Russian bank cards are not accepted at the moment + Do you have a bank card from another country and a residence permit or registration outside the Russian Federation? + Russian bank cards are not currently accepted Log into the app and check your balance without scanning the card Access the app Allow to use biometrics diff --git a/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt b/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt index 522b4d2b9b..993a613c73 100644 --- a/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt +++ b/data/card/src/main/java/com/tangem/data/card/sdk/DefaultCardSdkProvider.kt @@ -24,7 +24,9 @@ internal class DefaultCardSdkProvider @Inject constructor() : CardSdkProvider, C private var _sdk: TangemSdk? = null override fun onCreate(context: Context) { - _sdk = TangemSdk.initWithBiometrics(activity = context as FragmentActivity, config = config) + if (_sdk == null) { + _sdk = TangemSdk.initWithBiometrics(activity = context as FragmentActivity, config = config) + } } override fun onDestroy() { diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/TwinsHelper.kt b/domain/legacy/src/main/java/com/tangem/domain/common/TwinsHelper.kt index 73c31f5a28..c30c02b77c 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/TwinsHelper.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/TwinsHelper.kt @@ -51,17 +51,19 @@ object TwinsHelper { * cb64 <-> cb65 */ fun isTwinsCompatible(firstCardId: String, secondCardId: String): Boolean { - if (firstCardId.startsWith(FIRST_CARD_FIRST_SERIES) && - secondCardId.startsWith(SECOND_CARD_FIRST_SERIES) - ) { - return true + return secondCardId.startsWith(getCompatibleTwinCardId(firstCardId)) + } + + private fun getCompatibleTwinCardId(cardId: String): String { + return when { + cardId.startsWith(FIRST_CARD_FIRST_SERIES) -> SECOND_CARD_FIRST_SERIES + cardId.startsWith(FIRST_CARD_SECOND_SERIES) -> SECOND_CARD_SECOND_SERIES + cardId.startsWith(SECOND_CARD_FIRST_SERIES) -> FIRST_CARD_FIRST_SERIES + cardId.startsWith(SECOND_CARD_SECOND_SERIES) -> FIRST_CARD_SECOND_SERIES + else -> { + "unknown" + } } - if (firstCardId.startsWith(FIRST_CARD_SECOND_SERIES) && - secondCardId.startsWith(SECOND_CARD_SECOND_SERIES) - ) { - return true - } - return false } } diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/configs/CardConfig.kt b/domain/legacy/src/main/java/com/tangem/domain/common/configs/CardConfig.kt index cb34af8d75..51ff7de9b3 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/configs/CardConfig.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/configs/CardConfig.kt @@ -20,7 +20,7 @@ sealed interface CardConfig { if (cardDTO.settings.isBackupAllowed && cardDTO.settings.isHDWalletAllowed && cardDTO.firmwareVersion >= FirmwareVersion.MultiWalletAvailable ) { - return GenericCardConfig + return MultiWalletCardConfig } return GenericCardConfig } diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/configs/GenericCardConfig.kt b/domain/legacy/src/main/java/com/tangem/domain/common/configs/GenericCardConfig.kt index 3a48e2d8ab..4955dbdb11 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/configs/GenericCardConfig.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/configs/GenericCardConfig.kt @@ -9,12 +9,10 @@ object GenericCardConfig : CardConfig { get() = listOf( EllipticCurve.Secp256k1, EllipticCurve.Ed25519, - EllipticCurve.Bip0340, - EllipticCurve.Bls12381G2Aug, ) /** - * Old logic to determine primary curve for blockchain in TangemWallet + * Old logic to determine primary curve for blockchain */ override fun primaryCurve(blockchain: Blockchain): EllipticCurve? { return when { diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/configs/MultiWalletCardConfig.kt b/domain/legacy/src/main/java/com/tangem/domain/common/configs/MultiWalletCardConfig.kt new file mode 100644 index 0000000000..414d7a528a --- /dev/null +++ b/domain/legacy/src/main/java/com/tangem/domain/common/configs/MultiWalletCardConfig.kt @@ -0,0 +1,35 @@ +package com.tangem.domain.common.configs + +import com.tangem.blockchain.common.Blockchain +import com.tangem.common.card.EllipticCurve +import timber.log.Timber + +object MultiWalletCardConfig : CardConfig { + override val mandatoryCurves: List + get() = listOf( + EllipticCurve.Secp256k1, + EllipticCurve.Ed25519, + EllipticCurve.Bls12381G2Aug, + ) + + /** + * Old logic to determine primary curve for blockchain in TangemWallet + */ + override fun primaryCurve(blockchain: Blockchain): EllipticCurve? { + return when { + blockchain.getSupportedCurves().contains(EllipticCurve.Secp256k1) -> { + EllipticCurve.Secp256k1 + } + blockchain.getSupportedCurves().contains(EllipticCurve.Ed25519) -> { + EllipticCurve.Ed25519 + } + blockchain.getSupportedCurves().contains(EllipticCurve.Bls12381G2Aug) -> { + EllipticCurve.Bls12381G2Aug + } + else -> { + Timber.e("Unsupported blockchain, curve not found") + null + } + } + } +} \ No newline at end of file diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt index 9085357e7e..0970e85d77 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/Blockchain.kt @@ -214,6 +214,4 @@ private val excludedBlockchains = listOf( Blockchain.Ducatus, Blockchain.Telos, // disable in 4.9 Blockchain.TelosTestnet, // disable in 4.9 - Blockchain.OctaSpace, - Blockchain.OctaSpaceTestnet, ) \ No newline at end of file diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt index f8e958583f..66d0a0f12d 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/CardSdk.kt @@ -5,6 +5,7 @@ import com.tangem.common.card.EllipticCurve import com.tangem.common.card.FirmwareVersion import com.tangem.domain.common.CardTypesResolver import com.tangem.domain.common.TapWorkarounds.isTestCard +import com.tangem.domain.common.configs.CardConfig import com.tangem.domain.models.scan.CardDTO /** @@ -20,6 +21,7 @@ fun CardDTO.supportedBlockchains(cardTypesResolver: CardTypesResolver): List, + blockchain: Blockchain, + cardTypesResolver: CardTypesResolver, +): Boolean { + val cardConfig = CardConfig.createConfig(this) + val primaryCurveForBlockchain = cardConfig.primaryCurve(blockchain) + val isContainsBlockchain = supportedTokens.contains(blockchain) + val isWalletForCurveExists = wallets.any { it.curve == primaryCurveForBlockchain } + // fixme: check for first wallets with 1 curve and remove condition + return if (cardTypesResolver.isTangemWallet() || cardTypesResolver.isWallet2()) { + // if there's no wallet on card for blockchain with given curve + isContainsBlockchain && isWalletForCurveExists + } else { + isContainsBlockchain + } +} + fun CardDTO.canHandleToken(blockchain: Blockchain, cardTypesResolver: CardTypesResolver): Boolean { - return this.supportedTokens(cardTypesResolver).contains(blockchain) + val cardConfig = CardConfig.createConfig(this) + val primaryCurveForBlockchain = cardConfig.primaryCurve(blockchain) + val isContainsBlockchain = this.supportedTokens(cardTypesResolver).contains(blockchain) + val isWalletForCurveExists = wallets.any { it.curve == primaryCurveForBlockchain } + // fixme: check for first wallets with 1 curve and remove condition + return if (cardTypesResolver.isTangemWallet() || cardTypesResolver.isWallet2()) { + // if there's no wallet on card for blockchain with given curve + isContainsBlockchain && isWalletForCurveExists + } else { + isContainsBlockchain + } +} + +fun CardDTO.canHandleBlockchain(blockchain: Blockchain, cardTypesResolver: CardTypesResolver): Boolean { + val cardConfig = CardConfig.createConfig(this) + val primaryCurveForBlockchain = cardConfig.primaryCurve(blockchain) + val isContainsBlockchain = this.supportedBlockchains(cardTypesResolver).contains(blockchain) + val isWalletForCurveExists = wallets.any { it.curve == primaryCurveForBlockchain } + // fixme: check for first wallets with 1 curve and remove condition + return if (cardTypesResolver.isTangemWallet() || cardTypesResolver.isWallet2()) { + // if there's no wallet on card for blockchain with given curve + isContainsBlockchain && isWalletForCurveExists + } else { + isContainsBlockchain + } } \ No newline at end of file diff --git a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/WalletManagerFactory.kt b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/WalletManagerFactory.kt index b46153ff06..7ed90d9d54 100644 --- a/domain/legacy/src/main/java/com/tangem/domain/common/extensions/WalletManagerFactory.kt +++ b/domain/legacy/src/main/java/com/tangem/domain/common/extensions/WalletManagerFactory.kt @@ -61,6 +61,7 @@ fun WalletManagerFactory.makeWalletManagerForApp( createWalletManager( blockchain = environmentBlockchain, publicKey = publicKey, + curve = wallet.curve, ) } else -> { diff --git a/domain/legacy/src/test/java/com/tangem/domain/common/TwinsHelperTest.kt b/domain/legacy/src/test/java/com/tangem/domain/common/TwinsHelperTest.kt new file mode 100644 index 0000000000..2fc624d9b8 --- /dev/null +++ b/domain/legacy/src/test/java/com/tangem/domain/common/TwinsHelperTest.kt @@ -0,0 +1,50 @@ +package com.tangem.domain.common + +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test + +class TwinsHelperTest { + + private val pack1Twins = listOf( + "CB610000021", + "CB620000031", + ) + + private val pack2Twins = listOf( + "CB640000012", + "CB650000011", + ) + + @Test + fun `twins compatibility pack 1 success`() { + assertTrue(TwinsHelper.isTwinsCompatible(pack1Twins[0], pack1Twins[1])) + assertTrue(TwinsHelper.isTwinsCompatible(pack1Twins[1], pack1Twins[0])) + } + + @Test + fun `twins compatibility pack 1 same cards`() { + assertFalse(TwinsHelper.isTwinsCompatible(pack1Twins[0], pack1Twins[0])) + assertFalse(TwinsHelper.isTwinsCompatible(pack1Twins[1], pack1Twins[1])) + } + + @Test + fun `twins compatibility pack 2 success`() { + assertTrue(TwinsHelper.isTwinsCompatible(pack2Twins[0], pack2Twins[1])) + assertTrue(TwinsHelper.isTwinsCompatible(pack2Twins[1], pack2Twins[0])) + } + + @Test + fun `twins compatibility pack 2 same cards`() { + assertFalse(TwinsHelper.isTwinsCompatible(pack2Twins[0], pack2Twins[0])) + assertFalse(TwinsHelper.isTwinsCompatible(pack2Twins[1], pack2Twins[1])) + } + + @Test + fun `twins compatibility false for different packs`() { + assertFalse(TwinsHelper.isTwinsCompatible(pack2Twins[0], pack1Twins[1])) + assertFalse(TwinsHelper.isTwinsCompatible(pack1Twins[1], pack2Twins[0])) + assertFalse(TwinsHelper.isTwinsCompatible(pack1Twins[0], pack2Twins[1])) + assertFalse(TwinsHelper.isTwinsCompatible(pack2Twins[1], pack1Twins[0])) + } +} \ No newline at end of file diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml index f1315b786c..178bbe880a 100644 --- a/gradle/dependencies.toml +++ b/gradle/dependencies.toml @@ -80,9 +80,9 @@ okHttp-prettyLogging = "3.1.0" # endregion Other libraries # region Tangem -tangemBlockchainSdk = "develop-331" +tangemBlockchainSdk = "develop-337" #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds -tangemCardSdk = "develop-289" +tangemCardSdk = "develop-293" #tangemCardSdk = "0.0.1" # Keep it! - used for local builds # endregion Tangem