From 789d57631b55f83b176d8f851d2a9ecc38fcd24b Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 20 Apr 2022 13:03:53 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/tap/features/wallet/redux/WalletAction.kt | 2 ++ .../wallet/redux/middlewares/WarningsMiddleware.kt | 5 ++++- .../wallet/ui/adapters/WarningMessagesAdapter.kt | 1 + .../com/tangem/tap/persistence/PreferencesStorage.kt | 9 +++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt index 03c58d7f42..be4d9c7bab 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletAction.kt @@ -91,6 +91,8 @@ sealed class WalletAction : Action { } class CheckRemainingSignatures(val remainingSignatures: Int?) : Warnings() + + object RestoreFundsWarningClosed : Warnings() } data class LoadFiatRate( 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 2e361962ed..5197928d6e 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 @@ -66,6 +66,9 @@ class WarningsMiddleware { ) } } + is WalletAction.Warnings.RestoreFundsWarningClosed -> { + preferencesStorage.saveRestoreFundsWarningClosed() + } } } @@ -90,7 +93,7 @@ class WarningsMiddleware { addWarningMessage(WarningMessagesManager.testCardWarning(), autoUpdate = true) return@let } - if (card.useOldStyleDerivation) { + if (card.useOldStyleDerivation && !preferencesStorage.wasRestoreFundsWarningClosed()) { addWarningMessage(warning = WarningMessagesManager.restoreFundsWarning()) } diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt index 8dd0d76fc6..f3084472e8 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/adapters/WarningMessagesAdapter.kt @@ -96,6 +96,7 @@ class WarningMessageVH(val binding: LayoutWarningBinding) : RecyclerView.ViewHol binding.btnClose.show() binding.btnClose.setOnClickListener { store.dispatch(GlobalAction.HideWarningMessage(warning)) + store.dispatch(WalletAction.Warnings.RestoreFundsWarningClosed) } val locale = ConfigurationCompat .getLocales(Resources.getSystem().configuration) diff --git a/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt b/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt index 7bee7c8c6f..edc53e26fb 100644 --- a/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt +++ b/app/src/main/java/com/tangem/tap/persistence/PreferencesStorage.kt @@ -64,12 +64,21 @@ class PreferencesStorage(applicationContext: Application) { preferences.edit { putInt(APP_LAUNCH_COUNT_KEY, ++count) } } + fun wasRestoreFundsWarningClosed(): Boolean { + return preferences.getBoolean(RESTORE_FUNDS_CLOSED_KEY, false) + } + + fun saveRestoreFundsWarningClosed() { + preferences.edit { putBoolean(RESTORE_FUNDS_CLOSED_KEY, true) } + } + companion object { private const val PREFERENCES_NAME = "tapPrefs" private const val APP_CURRENCY_KEY = "appCurrency" private const val DISCLAIMER_ACCEPTED_KEY = "disclaimerAccepted" private const val TWINS_ONBOARDING_SHOWN_KEY = "twinsOnboardingShown" private const val APP_LAUNCH_COUNT_KEY = "launchCount" + private const val RESTORE_FUNDS_CLOSED_KEY = "restoreFundsClosed" } }