diff --git a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt index 07eca76467..590d8bd92c 100644 --- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt +++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt @@ -99,8 +99,6 @@ class TapWalletManager { withContext(Dispatchers.Main) { store.dispatch(WalletAction.ResetState) store.dispatch(GlobalAction.SaveScanNoteResponse(data)) - store.dispatch(AddressPayIdActionUi.ChangePayIdState(configManager?.config?.isWalletPayIdEnabled - ?: false)) if (data.card.cardData?.productMask?.contains(Product.TwinCard) == true) { val secondCardId = TwinsHelper.getTwinsCardId(data.card.cardId) val cardNumber = TwinsHelper.getTwinCardNumber(data.card.cardId) diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt index 1c7db4b842..ecc52b09f3 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt @@ -39,6 +39,7 @@ val sendMiddleware: Middleware = { dispatch, appState -> is RequestFee -> RequestFeeMiddleware().handle(appState(), dispatch) is SendActionUi.SendAmountToRecipient -> verifyAndSendTransaction(action, appState(), dispatch) + is PrepareSendScreen -> setIfSendingToPayIdEnabled(appState(), dispatch) } nextDispatch(action) } @@ -185,3 +186,9 @@ fun createValidateTransactionError(errorList: EnumSet, walletM return TapError.ValidateTransactionErrors(tapErrors) { it.joinToString("\r\n") } } +private fun setIfSendingToPayIdEnabled(appState: AppState?, dispatch: (Action) -> Unit) { + val isSendingToPayIdEnabled = + appState?.globalState?.configManager?.config?.isSendingToPayIdEnabled ?: false + dispatch(AddressPayIdActionUi.ChangePayIdState(isSendingToPayIdEnabled)) +} +