From 0ec9a99b8be0389127ccd0e99089b6856dbe6093 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 7 Apr 2022 13:33:32 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/src/main/java/com/tangem/tap/WaitForMigration.kt | 7 +++++++ .../main/java/com/tangem/tap/common/redux/AppState.kt | 6 +++--- .../com/tangem/tap/common/redux/global/GlobalAction.kt | 2 +- .../tangem/tap/common/redux/global/GlobalMidlleware.kt | 8 +++++++- .../com/tangem/tap/common/redux/global/GlobalState.kt | 2 +- app/src/main/java/com/tangem/tap/domain/ProductType.kt | 9 --------- 6 files changed, 19 insertions(+), 15 deletions(-) create mode 100644 app/src/main/java/com/tangem/tap/WaitForMigration.kt delete mode 100644 app/src/main/java/com/tangem/tap/domain/ProductType.kt diff --git a/app/src/main/java/com/tangem/tap/WaitForMigration.kt b/app/src/main/java/com/tangem/tap/WaitForMigration.kt new file mode 100644 index 0000000000..536b9711eb --- /dev/null +++ b/app/src/main/java/com/tangem/tap/WaitForMigration.kt @@ -0,0 +1,7 @@ +package com.tangem.tap + +/** +[REDACTED_AUTHOR] + */ + +val DELAY_SDK_DIALOG_CLOSE = 1400L \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt index 02f3f9d19e..f7f061dc06 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt @@ -1,7 +1,7 @@ package com.tangem.tap.common.redux -import com.tangem.domain.store.DomainState -import com.tangem.domain.store.domainStore +import com.tangem.domain.restore.DomainState +import com.tangem.domain.restore.domainStore import com.tangem.tap.common.redux.global.GlobalMiddleware import com.tangem.tap.common.redux.global.GlobalState import com.tangem.tap.common.redux.navigation.NavigationState @@ -51,7 +51,7 @@ data class AppState( val shopState: ShopState = ShopState(), ) : StateType { - val featuresState: DomainState + val domainState: DomainState get() = domainStore.state companion object { diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt index 58684ac334..21fd824d71 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalAction.kt @@ -4,13 +4,13 @@ import com.tangem.blockchain.common.Blockchain import com.tangem.blockchain.common.WalletManager import com.tangem.common.CompletionResult import com.tangem.common.core.TangemError +import com.tangem.domain.common.ScanResponse import com.tangem.tap.common.analytics.GlobalAnalyticsHandler import com.tangem.tap.common.redux.* import com.tangem.tap.domain.TapError import com.tangem.tap.domain.configurable.config.ConfigManager import com.tangem.tap.domain.configurable.warningMessage.WarningMessage import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager -import com.tangem.tap.domain.tasks.product.ScanResponse import com.tangem.tap.features.details.redux.SecurityOption import com.tangem.tap.features.feedback.EmailData import com.tangem.tap.features.feedback.FeedbackManager diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt index aa2218101b..9407ceff77 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMidlleware.kt @@ -4,6 +4,8 @@ import com.tangem.common.CompletionResult import com.tangem.common.core.TangemSdkError import com.tangem.common.extensions.ifNotNull import com.tangem.domain.common.extensions.withMainContext +import com.tangem.domain.features.global.redux.DomainGlobalAction +import com.tangem.domain.restore.domainStore import com.tangem.tap.* import com.tangem.tap.common.extensions.dispatchDialogShow import com.tangem.tap.common.extensions.dispatchOnMain @@ -100,10 +102,14 @@ private val globalMiddlewareHandler: Middleware = { dispatch, appState store.dispatch(GlobalAction.ScanFailsCounter.ChooseBehavior(result)) when (result) { is CompletionResult.Success -> { + domainStore.dispatch(DomainGlobalAction.SetScanResponse(result.data)) tangemSdkManager.changeDisplayedCardIdNumbersCount(result.data) action.onSuccess?.invoke(result.data) } - is CompletionResult.Failure -> action.onFailure?.invoke(result.error) + is CompletionResult.Failure -> { + domainStore.dispatch(DomainGlobalAction.SetScanResponse(null)) + action.onFailure?.invoke(result.error) + } } } } diff --git a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt index ace0a06ae7..ef6ffeb391 100644 --- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt +++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalState.kt @@ -1,5 +1,6 @@ package com.tangem.tap.common.redux.global +import com.tangem.domain.common.ScanResponse import com.tangem.tap.common.analytics.AnalyticsHandler import com.tangem.tap.common.entities.TapCurrency.Companion.DEFAULT_FIAT_CURRENCY import com.tangem.tap.common.redux.StateDialog @@ -7,7 +8,6 @@ import com.tangem.tap.domain.PayIdManager import com.tangem.tap.domain.TapWalletManager import com.tangem.tap.domain.configurable.config.ConfigManager import com.tangem.tap.domain.configurable.warningMessage.WarningMessagesManager -import com.tangem.tap.domain.tasks.product.ScanResponse import com.tangem.tap.features.feedback.FeedbackManager import com.tangem.tap.features.onboarding.OnboardingManager import com.tangem.tap.network.coinmarketcap.CoinMarketCapService diff --git a/app/src/main/java/com/tangem/tap/domain/ProductType.kt b/app/src/main/java/com/tangem/tap/domain/ProductType.kt deleted file mode 100644 index 4f57e8949d..0000000000 --- a/app/src/main/java/com/tangem/tap/domain/ProductType.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.tangem.tap.domain - -/** -[REDACTED_AUTHOR] - */ -enum class ProductType { - Note, Twins, Wallet - -} \ No newline at end of file