diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayDetailsStateFactory.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayDetailsStateFactory.kt index 44b0b79cb1..0036f7c5ba 100644 --- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayDetailsStateFactory.kt +++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/entity/TangemPayDetailsStateFactory.kt @@ -41,7 +41,6 @@ internal class TangemPayDetailsStateFactory( ), ) } - return TangemPayDetailsUM( topBarConfig = TangemPayDetailsTopBarConfig( onBackClick = onBack, diff --git a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayFreezeUnfreezeStateTransformer.kt b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayFreezeUnfreezeStateTransformer.kt index c6dc60c3d9..7fb2efcb5e 100644 --- a/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayFreezeUnfreezeStateTransformer.kt +++ b/features/tangempay/details/impl/src/main/kotlin/com/tangem/features/tangempay/model/transformers/TangemPayFreezeUnfreezeStateTransformer.kt @@ -6,6 +6,7 @@ import com.tangem.core.ui.extensions.themedColor import com.tangem.core.ui.res.TangemTheme import com.tangem.domain.visa.model.TangemPayCardFrozenState import com.tangem.features.tangempay.details.impl.R +import com.tangem.features.tangempay.entity.TangemPayDetailsBalanceBlockState import com.tangem.features.tangempay.entity.TangemPayDetailsTopBarMenuItem import com.tangem.features.tangempay.entity.TangemPayDetailsTopBarMenuItemType.FreezeCard import com.tangem.features.tangempay.entity.TangemPayDetailsTopBarMenuItemType.UnfreezeCard @@ -31,9 +32,20 @@ internal class TangemPayFreezeUnfreezeStateTransformer( it.type == FreezeCard || it.type == UnfreezeCard } val dropdownMenuItems = createUpdatedMenuItems(filteredItems?.toPersistentList()) + val balanceBlockState = if (prevState.balanceBlockState is TangemPayDetailsBalanceBlockState.Content) { + val actionButtons = prevState.balanceBlockState.actionButtons.map { + it.copy(isEnabled = cardFrozenState == TangemPayCardFrozenState.Unfrozen) + } + prevState.balanceBlockState.copy( + actionButtons = actionButtons.toPersistentList(), + ) + } else { + prevState.balanceBlockState + } return prevState.copy( topBarConfig = prevState.topBarConfig.copy(items = dropdownMenuItems), cardFrozenState = converter.convert(cardFrozenState), + balanceBlockState = balanceBlockState, ) } diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/TangemPayMainSubscriber.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/TangemPayMainSubscriber.kt index 5f74c8d01a..4ba4c3e8f1 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/TangemPayMainSubscriber.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/subscribers/TangemPayMainSubscriber.kt @@ -46,7 +46,6 @@ internal class TangemPayMainSubscriber @AssistedInject constructor( .distinctUntilChanged() .onEach { data -> val userWalletId = userWallet.walletId - Timber.tag("scan===").e("onEach $userWalletId $data") val mainInfoData = data[userWalletId] ?: return@onEach mainInfoData.onLeft { tangemPayError -> when (tangemPayError) {