diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt index 9f6d1d71c0..e3c134ee2d 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt @@ -14,7 +14,6 @@ import com.tangem.tap.common.extensions.dispatchOnMain import com.tangem.tap.common.extensions.dispatchWithMain import com.tangem.tap.common.redux.AppDialog import com.tangem.tap.common.redux.AppState -import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager import com.tangem.tap.features.send.redux.SendAction import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.network.exchangeServices.BuyExchangeService @@ -84,10 +83,10 @@ private fun handleAction(action: Action, appState: () -> AppState?, dispatch: Di is GlobalAction.HideWarningMessage -> { store.state.globalState.warningManager?.let { if (it.hideWarning(action.warning)) { - if (WarningMessagesManager.isAlreadySignedHashesWarning(action.warning)) { - // TODO: No appropriate warningMessage identification. Make it better later - store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId) - } + // if (WarningMessagesManager.isAlreadySignedHashesWarning()) { + // // TODO: No appropriate warningMessage identification. Make it better later + // store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId) + // } store.dispatch(WalletAction.Warnings.Update) store.dispatch(SendAction.Warnings.Update) diff --git a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt index 183ba76207..f1345d6989 100644 --- a/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/configurable/warningMessage/WarningMessagesManager.kt @@ -8,6 +8,8 @@ import java.util.concurrent.CopyOnWriteArrayList /** [REDACTED_AUTHOR] */ +// TODO: Delete with WalletFeatureToggles +@Deprecated(message = "Used only in old wallet screen") class WarningMessagesManager { private val warningsList = CopyOnWriteArrayList() @@ -73,7 +75,7 @@ class WarningMessagesManager { location = listOf(WarningMessage.Location.MainScreen), blockchains = null, titleResId = R.string.common_warning, - messageResId = R.string.alert_developer_card, + // messageResId = R.string.alert_developer_card, origin = WarningMessage.Origin.Local, ) @@ -85,7 +87,7 @@ class WarningMessagesManager { location = listOf(WarningMessage.Location.MainScreen), blockchains = null, titleResId = R.string.common_warning, - messageResId = R.string.alert_card_signed_transactions, + // messageResId = R.string.alert_card_signed_transactions, origin = WarningMessage.Origin.Local, ) @@ -96,8 +98,8 @@ class WarningMessagesManager { priority = WarningMessage.Priority.Info, location = listOf(WarningMessage.Location.MainScreen), blockchains = null, - titleResId = R.string.warning_important_security_info, - messageResId = R.string.warning_signed_tx_previously, + // titleResId = R.string.warning_important_security_info, + // messageResId = R.string.warning_signed_tx_previously, origin = WarningMessage.Origin.Local, buttonTextId = R.string.warning_button_learn_more, titleFormatArg = "\u26A0", @@ -147,7 +149,7 @@ class WarningMessagesManager { location = listOf(WarningMessage.Location.MainScreen), blockchains = null, titleResId = R.string.common_warning, - messageResId = R.string.alert_demo_message, + // messageResId = R.string.alert_demo_message, origin = WarningMessage.Origin.Local, ) @@ -160,14 +162,14 @@ class WarningMessagesManager { location = listOf(WarningMessage.Location.MainScreen), blockchains = null, titleResId = R.string.common_warning, - messageResId = R.string.warning_low_signatures_format, + // messageResId = R.string.warning_low_signatures_format, origin = WarningMessage.Origin.Local, messageFormatArg = remainingSignatures.toString(), ) } - fun isAlreadySignedHashesWarning(warning: WarningMessage): Boolean { - return warning.messageResId == R.string.alert_card_signed_transactions - } + // fun isAlreadySignedHashesWarning(warning: WarningMessage): Boolean { + // return warning.messageResId == R.string.alert_card_signed_transactions + // } } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt index 67d8066531..cf7f9c448b 100644 --- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt +++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt @@ -151,7 +151,7 @@ private fun DifferentAddressesWarning() { ), contentAlignment = Alignment.Center, ) { - val text = stringResource(id = R.string.alert_manage_tokens_addresses_message) + val text = stringResource(id = R.string.warning_manage_tokens_legacy_derivation_message) Text( text = text, modifier = Modifier.padding( diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt index e908e27b26..39e905255e 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WarningsMiddleware.kt @@ -19,11 +19,12 @@ import com.tangem.tap.preferencesStorage import com.tangem.tap.proxy.redux.DaggerGraphState import com.tangem.tap.scope import com.tangem.tap.store -import com.tangem.wallet.R import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +// TODO: Delete with WalletFeatureToggles +@Deprecated(message = "Used only in old wallet screen") class WarningsMiddleware { fun handle(action: WalletAction.Warnings, globalState: GlobalState?) { when (action) { @@ -49,7 +50,7 @@ class WarningsMiddleware { if (action.remainingSignatures != null && action.remainingSignatures <= WarningMessagesManager.REMAINING_SIGNATURES_WARNING ) { - store.state.globalState.warningManager?.removeWarnings(R.string.warning_low_signatures_format) + // store.state.globalState.warningManager?.removeWarnings(R.string.warning_low_signatures_format) addWarningMessage( warning = WarningMessagesManager.remainingSignaturesNotEnough(action.remainingSignatures), autoUpdate = true, diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt index 3cab6df274..eb7dfd7126 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/BalanceWidget.kt @@ -10,6 +10,8 @@ import com.tangem.tap.store import com.tangem.wallet.R import com.tangem.wallet.databinding.CardBalanceBinding +// TODO: Delete with WalletFeatureToggles +@Deprecated(message = "Used only in old wallet screen") class BalanceWidget( private val binding: CardBalanceBinding, private val fragment: WalletFragment, @@ -46,12 +48,11 @@ class BalanceWidget( val statusView = if (blockchainWalletData.status is WalletDataModel.VerifiedOnline) { R.id.tv_status_verified } else { - tvStatusError.text = - fragment.getText(R.string.wallet_balance_tx_in_progress) + // tvStatusError.text = fragment.getText(R.string.wallet_balance_tx_in_progress) R.id.group_error } showStatus(statusView) - tvStatusErrorMessage.hide() + // tvStatusErrorMessage.hide() if (tokenWalletData != null) { showBalanceWithToken(blockchainWalletData, true) @@ -70,12 +71,12 @@ class BalanceWidget( tvCurrency.text = currency tvAmount.text = "" - tvStatusErrorMessage.text = blockchainWalletData.status.errorMessage - tvStatusError.text = - fragment.getString(R.string.wallet_balance_blockchain_unreachable) + // tvStatusErrorMessage.text = blockchainWalletData.status.errorMessage + // TODO: Delete with WalletFeatureToggles + // tvStatusError.text = fragment.getString(R.string.wallet_balance_blockchain_unreachable) showStatus(R.id.group_error) - tvStatusErrorMessage.show(!blockchainWalletData.status.errorMessage.isNullOrBlank()) + // tvStatusErrorMessage.show(!blockchainWalletData.status.errorMessage.isNullOrBlank()) } is WalletDataModel.NoAccount -> with(binding.lBalanceError) { binding.lBalance.root.hide() @@ -93,7 +94,7 @@ class BalanceWidget( } private fun showStatus(@IdRes viewRes: Int) = with(binding.lBalance) { - groupError.show(viewRes == R.id.group_error) + // groupError.show(viewRes == R.id.group_error) tvStatusLoading.show(viewRes == R.id.tv_status_loading) tvStatusVerified.show(viewRes == R.id.tv_status_verified) } 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 9099193e8b..de08710457 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 @@ -62,7 +62,9 @@ import javax.inject.Inject /** * Wallet details fragment - use only for MultiWallet */ +// TODO: Delete with WalletFeatureToggles @Suppress("LargeClass", "MagicNumber") +@Deprecated(message = "Used only in old wallet screen") @AndroidEntryPoint class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), SafeStoreSubscriber { @@ -436,10 +438,11 @@ class WalletDetailsFragment : Fragment(R.layout.fragment_wallet_details), SafeSt lBalance.root.show() lBalance.groupBalance.hide() lBalance.tvError.show() - lBalance.tvError.setWarningStatus( - R.string.wallet_balance_blockchain_unreachable, - status.errorMessage, - ) + // TODO: Delete with WalletFeatureToggles + // lBalance.tvError.setWarningStatus( + // R.string.wallet_balance_blockchain_unreachable, + // status.errorMessage, + // ) } is WalletDataModel.NoAccount -> { lBalance.root.hide() diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt index afbf3bff5a..5f98692fca 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt @@ -9,43 +9,45 @@ import com.tangem.wallet.R /** [REDACTED_AUTHOR] */ +// TODO: Delete with WalletFeatureToggles +@Deprecated(message = "Used only in old wallet screen") class WalletWarningConverter( private val context: Context, ) : ModuleMessageConverter { override fun convert(message: WalletWarning): WalletWarningDescription { - val warningMessage = when (message) { - is WalletWarning.ExistentialDeposit -> { - context.getString( - R.string.warning_existential_deposit_message, - message.currencyName, - message.edStringValueWithSymbol, - ) - } - is WalletWarning.BalanceNotEnoughForFee -> { - context.getString( - R.string.token_details_send_blocked_fee_format, - message.currencyName, - message.blockchainFullName, - message.currencyName, - message.blockchainFullName, - message.blockchainSymbol, - ) - } - is WalletWarning.TransactionInProgress -> { - context.getString( - R.string.token_details_send_blocked_tx_format, - message.currencyName, - ) - } - is WalletWarning.Rent -> { - context.getString( - R.string.solana_rent_warning, - message.walletRent.rent, - message.walletRent.exemptionAmount, - ) - } - } - return WalletWarningDescription(context.getString(R.string.common_warning), warningMessage) + // val warningMessage = when (message) { + // is WalletWarning.ExistentialDeposit -> { + // context.getString( + // R.string.warning_existential_deposit_message, + // message.currencyName, + // message.edStringValueWithSymbol, + // ) + // } + // is WalletWarning.BalanceNotEnoughForFee -> { + // context.getString( + // R.string.token_details_send_blocked_fee_format, + // message.currencyName, + // message.blockchainFullName, + // message.currencyName, + // message.blockchainFullName, + // message.blockchainSymbol, + // ) + // } + // is WalletWarning.TransactionInProgress -> { + // context.getString( + // R.string.token_details_send_blocked_tx_format, + // message.currencyName, + // ) + // } + // is WalletWarning.Rent -> { + // context.getString( + // R.string.solana_rent_warning, + // message.walletRent.rent, + // message.walletRent.exemptionAmount, + // ) + // } + // } + return WalletWarningDescription(context.getString(R.string.common_warning), "") } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt index 3f511f7b65..0b1e671dab 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WalletAdapter.kt @@ -22,6 +22,8 @@ import com.tangem.tap.store import com.tangem.wallet.R import com.tangem.wallet.databinding.ItemCurrencyWalletBinding +// TODO: Delete with WalletFeatureToggles +@Deprecated(message = "Used only in old wallet screen") class WalletAdapter : ListAdapter(DiffUtilCallback) { override fun getItemId(position: Int): Long { @@ -59,7 +61,8 @@ class WalletAdapter : ListAdapter { - root.getString(R.string.wallet_balance_blockchain_unreachable) + // TODO: Delete with WalletFeatureToggles + // root.getString(R.string.wallet_balance_blockchain_unreachable) } is WalletDataModel.MissedDerivation -> { root.getString(R.string.wallet_balance_missing_derivation) @@ -86,7 +89,7 @@ class WalletAdapter : ListAdapter(DiffUtilCallback) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): WarningMessageVH { @@ -94,11 +91,11 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi val buttonAction = when (warning.titleResId) { - R.string.warning_important_security_info -> { - View.OnClickListener { - store.dispatch(WalletAction.DialogAction.SignedHashesMultiWalletDialog) - } - } + // R.string.warning_important_security_info -> { + // View.OnClickListener { + // store.dispatch(WalletAction.DialogAction.SignedHashesMultiWalletDialog) + // } + // } else -> { View.OnClickListener { store.dispatch(GlobalAction.HideWarningMessage(warning)) @@ -120,12 +117,12 @@ class WarningMessageVH(val binding: LayoutWarningCardActionBinding) : RecyclerVi store.dispatch(GlobalAction.HideWarningMessage(warning)) store.dispatch(WalletAction.Warnings.AppRating.RemindLater) } - binding.btnCanBeBetter.setOnClickListener { - Analytics.send(MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Disliked)) - store.dispatch(WalletAction.Warnings.AppRating.SetNeverToShow) - store.dispatch(GlobalAction.HideWarningMessage(warning)) - store.dispatch(GlobalAction.SendEmail(RateCanBeBetterEmail())) - } + // binding.btnCanBeBetter.setOnClickListener { + // Analytics.send(MainScreen.NoticeRateAppButton(AnalyticsParam.RateApp.Disliked)) + // store.dispatch(WalletAction.Warnings.AppRating.SetNeverToShow) + // store.dispatch(GlobalAction.HideWarningMessage(warning)) + // store.dispatch(GlobalAction.SendEmail(RateCanBeBetterEmail())) + // } binding.btnReallyCool.setOnClickListener { val activity = binding.root.context.getActivity() ?: return@setOnClickListener diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt index f4de1c7672..8ebbffeb54 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/SignedHashesWarningDialog.kt @@ -9,11 +9,13 @@ import com.tangem.tap.features.wallet.redux.WalletAction import com.tangem.tap.store import com.tangem.wallet.R +// TODO: Delete with WalletFeatureToggles +@Deprecated(message = "Used only in old wallet screen") object SignedHashesWarningDialog { fun create(context: Context): AlertDialog { return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply { - setTitle(context.getString(R.string.warning_important_security_info, "\u26A0")) - setMessage(R.string.alert_signed_hashes_message) + // setTitle(context.getString(R.string.warning_important_security_info, "\u26A0")) + // setMessage(R.string.alert_signed_hashes_message) setPositiveButton(R.string.common_understand) { _, _ -> store.dispatch(WalletAction.Warnings.CheckHashesCount.SaveCardId) store.dispatch( diff --git a/app/src/main/res/layout/layout_balance.xml b/app/src/main/res/layout/layout_balance.xml index 6addd2be86..4141bd7302 100644 --- a/app/src/main/res/layout/layout_balance.xml +++ b/app/src/main/res/layout/layout_balance.xml @@ -38,41 +38,40 @@ app:layout_constraintTop_toBottomOf="@id/tv_currency" tools:visibility="visible" /> - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:paddingBottom="4dp" + android:src="@drawable/img_warning_triangle_24" + android:scaleType="center" + android:background="@drawable/shape_ellipse" + android:backgroundTint="@color/buttonGray" + android:contentDescription="@null" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" /> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/layout_warning_card_action.xml b/app/src/main/res/layout/layout_warning_card_action.xml index e85e77d3e5..bbb58fab01 100644 --- a/app/src/main/res/layout/layout_warning_card_action.xml +++ b/app/src/main/res/layout/layout_warning_card_action.xml @@ -45,17 +45,18 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/warning_content_container" /> -