From 21d70dce7cc301c2f42bb456aedaf2a10aa5f96f Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 4 Oct 2023 13:32:04 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../wallet/state/WalletAlertState.kt | 3 --- .../presentation/wallet/state/WalletEvent.kt | 2 -- .../presentation/wallet/ui/WalletAlert.kt | 20 ----------------- .../wallet/ui/WalletEventEffect.kt | 5 ----- .../wallet/viewmodels/WalletClickIntents.kt | 2 -- .../WalletNotificationsListFactory.kt | 22 ------------------- .../wallet/viewmodels/WalletViewModel.kt | 18 --------------- 7 files changed, 72 deletions(-) diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletAlertState.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletAlertState.kt index 7e6692060a..be52fb2220 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletAlertState.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletAlertState.kt @@ -5,9 +5,6 @@ import com.tangem.core.ui.extensions.TextReference @Immutable internal sealed class WalletAlertState { - - data class WalletAlreadySignedHashes(val onUnderstandClick: () -> Unit) : WalletAlertState() - data class DefaultAlert( val title: TextReference, val message: TextReference, diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletEvent.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletEvent.kt index 99a30916b8..6102887cd0 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletEvent.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/WalletEvent.kt @@ -20,7 +20,5 @@ internal sealed class WalletEvent { data class CopyAddress(val address: String) : WalletEvent() - data class ShowWalletAlreadySignedHashesMessage(val onUnderstandClick: () -> Unit) : WalletEvent() - data class RateApp(val onDismissClick: () -> Unit) : WalletEvent() } \ No newline at end of file diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt index 74582e01c7..77374812d7 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletAlert.kt @@ -11,32 +11,12 @@ import com.tangem.feature.wallet.presentation.wallet.state.WalletAlertState @Composable internal fun WalletAlert(config: WalletAlertState, onDismiss: () -> Unit) { when (config) { - is WalletAlertState.WalletAlreadySignedHashes -> { - WalletAlreadySignedHashesAlert(config = config, onDismiss = onDismiss) - } is WalletAlertState.DefaultAlert -> { DefaultAlert(config = config, onDismiss = onDismiss) } } } -@Composable -private fun WalletAlreadySignedHashesAlert(config: WalletAlertState.WalletAlreadySignedHashes, onDismiss: () -> Unit) { - BasicDialog( - message = stringResource(id = R.string.alert_signed_hashes_message), - confirmButton = DialogButton( - title = stringResource(id = R.string.common_understand), - onClick = { - config.onUnderstandClick() - onDismiss() - }, - ), - onDismissDialog = onDismiss, - title = stringResource(id = R.string.warning_important_security_info, "\u26A0"), - dismissButton = DialogButton(title = stringResource(id = R.string.common_cancel), onClick = onDismiss), - ) -} - @Composable private fun DefaultAlert(config: WalletAlertState.DefaultAlert, onDismiss: () -> Unit) { val confirmButton: DialogButton diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt index 7eebc553dd..7924d2a655 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletEventEffect.kt @@ -47,11 +47,6 @@ internal fun WalletEventEffect( is WalletEvent.CopyAddress -> { clipboardManager.setText(AnnotatedString(value.address)) } - is WalletEvent.ShowWalletAlreadySignedHashesMessage -> { - onAlertConfigSet( - WalletAlertState.WalletAlreadySignedHashes(onUnderstandClick = value.onUnderstandClick), - ) - } is WalletEvent.ShowAlert -> { onAlertConfigSet( WalletAlertState.DefaultAlert( diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletClickIntents.kt index d7c3ac8444..4e9831d070 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletClickIntents.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletClickIntents.kt @@ -17,8 +17,6 @@ internal interface WalletClickIntents { fun onBackupCardClick() - fun onMultiWalletSignedHashesNotificationClick() - fun onLikeAppClick() fun onDislikeAppClick() diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt index 8c0fa79e8d..40dbab847b 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletNotificationsListFactory.kt @@ -137,28 +137,6 @@ internal class WalletNotificationsListFactory( element = WalletNotification.Warning.SomeNetworksUnreachable, condition = cryptoCurrencyList.hasUnreachableNetworks(), ) - - if (cardTypesResolver.isBackupForbidden()) { - addIf( - element = WalletNotification.Warning.NumberOfSignedHashesIncorrect, - condition = checkSignedHashes( - cardTypesResolver = cardTypesResolver, - isDemo = isDemo, - wasCardScanned, - ), - ) - } else { - addIf( - element = WalletNotification.Warning.MultiWalletSignedHashesIncorrect( - onClick = clickIntents::onMultiWalletSignedHashesNotificationClick, - ), - condition = checkSignedHashes( - cardTypesResolver = cardTypesResolver, - isDemo = isDemo, - wasCardScanned, - ), - ) - } } else { addIf( element = WalletNotification.Warning.NetworksUnreachable, diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt index 8d6d27d709..35fd1201e5 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/viewmodels/WalletViewModel.kt @@ -406,24 +406,6 @@ internal class WalletViewModel @Inject constructor( router.openOnboardingScreen() } - override fun onMultiWalletSignedHashesNotificationClick() { - val state = uiState as? WalletState.ContentState ?: return - - uiState = stateFactory.getStateAndTriggerEvent( - state = uiState, - event = WalletEvent.ShowWalletAlreadySignedHashesMessage( - onUnderstandClick = { - viewModelScope.launch(dispatchers.main) { - setCardWasScannedUseCase( - cardId = getWallet(index = state.walletsListConfig.selectedWalletIndex).cardId, - ) - } - }, - ), - setUiState = { uiState = it }, - ) - } - override fun onLikeAppClick() { analyticsEventsHandler.send(WalletScreenAnalyticsEvent.NoticeRateAppButton(AnalyticsParam.RateApp.Liked)) uiState = stateFactory.getStateAndTriggerEvent(