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 59e91a7f6a..1c59ee5c55 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 @@ -1,11 +1,8 @@ package com.tangem.tap.domain.configurable.warningMessage -import com.tangem.TangemSdkError import com.tangem.blockchain.common.Blockchain import com.tangem.tangem_sdk_new.ui.animation.VoidCallback import com.tangem.tap.common.extensions.containsAny -import com.tangem.tap.features.wallet.redux.WalletAction -import com.tangem.tap.store import com.tangem.wallet.R /** @@ -68,6 +65,10 @@ class WarningMessagesManager( sortByPriority() } + fun removeWarnings(messageRes: Int) { + warningsList.removeIf { it.messageResId == messageRes } + } + private fun sortByPriority() { warningsList.sortBy { it.priority.ordinal } } 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 6ac2bcdf21..0ff512dc45 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 @@ -54,6 +54,10 @@ class WarningsMiddleware { if (action.remainingSignatures != null && action.remainingSignatures <= WarningMessagesManager.REMAINING_SIGNATURES_WARNING ) { + store.state.globalState.warningManager + ?.removeWarnings( + messageRes = R.string.warning_low_signatures_format + ) addWarningMessage( warning = WarningMessagesManager.remainingSignaturesNotEnough(action.remainingSignatures), @@ -102,10 +106,6 @@ class WarningsMiddleware { if (remainingSignatures != null && remainingSignatures <= WarningMessagesManager.REMAINING_SIGNATURES_WARNING ) { - getWarnings() - .find { it.messageResId == R.string.warning_low_signatures_format } - ?.let { previousWarning -> hideWarning(previousWarning) } - addWarningMessage( WarningMessagesManager.remainingSignaturesNotEnough( remainingSignatures @@ -115,7 +115,7 @@ class WarningsMiddleware { } private fun checkIfWarningNeeded( - card: Card + card: Card, ): WarningMessage? { if (card.isTwinCard()) return null @@ -196,8 +196,4 @@ class WarningsMiddleware { store.state.walletState.blockchains ) } - - private fun hideWarning(warning: WarningMessage) { - store.state.globalState.warningManager?.hideWarning(warning) - } } \ No newline at end of file