Updated on 2026-08-14

data/visa/src/main/kotlin/com/tangem/data/pay/converter/PaymentAccountStatusValueDMConverter.kt

@@ -39,11 +39,11 @@ internal class PaymentAccountStatusValueDMConverter @Inject constructor(
             is PaymentAccountStatusValue.IssuingCard -> PaymentAccountStatusValueDM.IssuingCard()
             is PaymentAccountStatusValue.Loaded -> PaymentAccountStatusValueDM.ActiveAccount(
                 customerId = value.customerId,
-                currencyCode = value.currencyCode,
+                currencyCode = value.balance.fiatBalance.currency,
                 depositAddress = value.depositAddress,
-                fiatBalance = value.fiatBalance.toDM(),
-                cryptoBalance = value.cryptoBalance.toDM(),
-                availableForWithdrawal = value.availableForWithdrawal,
+                fiatBalance = value.balance.fiatBalance.toDM(),
+                cryptoBalance = value.balance.cryptoBalance.toDM(),
+                availableForWithdrawal = value.balance.availableForWithdrawal,
                 fiatRate = value.fiatRate,
                 cards = value.cards.map { card ->
                     PaymentAccountStatusValueDM.TangemPayCard(
@@ -63,9 +63,11 @@ internal class PaymentAccountStatusValueDMConverter @Inject constructor(
             )
             is PaymentAccountStatusValue.Empty -> PaymentAccountStatusValueDM.Empty()
             is PaymentAccountStatusValue.Deactivated -> PaymentAccountStatusValueDM.DeactivatedAccount(
+                customerId = value.customerId,
                 fiatRate = value.fiatRate,
-                fiatBalance = value.fiatBalance.toDM(),
-                cryptoBalance = value.cryptoBalance.toDM(),
+                fiatBalance = value.balance.fiatBalance.toDM(),
+                cryptoBalance = value.balance.cryptoBalance.toDM(),
+                availableForWithdrawal = value.balance.availableForWithdrawal,
             )
             // Transient statuses are not persisted
             is PaymentAccountStatusValue.Loading,
@@ -90,11 +92,12 @@ internal class PaymentAccountStatusValueDMConverter @Inject constructor(
             is PaymentAccountStatusValueDM.ActiveAccount -> PaymentAccountStatusValue.Loaded(
                 source = StatusSource.CACHE,
                 customerId = value.customerId,
-                currencyCode = value.currencyCode,
                 depositAddress = value.depositAddress,
-                fiatBalance = value.fiatBalance.toDomain(),
-                cryptoBalance = value.cryptoBalance.toDomain(),
-                availableForWithdrawal = value.availableForWithdrawal,
+                balance = PaymentAccountStatusValue.Balance(
+                    fiatBalance = value.fiatBalance.toDomain(),
+                    cryptoBalance = value.cryptoBalance.toDomain(),
+                    availableForWithdrawal = value.availableForWithdrawal,
+                ),
                 cryptoCurrency = cryptoCurrency,
                 fiatRate = value.fiatRate,
                 cards = value.cards.map { card ->
@@ -123,8 +126,12 @@ internal class PaymentAccountStatusValueDMConverter @Inject constructor(
             )
             is PaymentAccountStatusValueDM.DeactivatedAccount -> PaymentAccountStatusValue.Deactivated(
                 source = StatusSource.CACHE,
-                fiatBalance = value.fiatBalance.toDomain(),
-                cryptoBalance = value.cryptoBalance.toDomain(),
+                customerId = value.customerId,
+                balance = PaymentAccountStatusValue.Balance(
+                    fiatBalance = value.fiatBalance.toDomain(),
+                    cryptoBalance = value.cryptoBalance.toDomain(),
+                    availableForWithdrawal = value.availableForWithdrawal,
+                ),
                 cryptoCurrency = cryptoCurrency,
                 fiatRate = value.fiatRate,
             )

data/visa/src/main/kotlin/com/tangem/data/pay/flow/DefaultPaymentAccountStatusFetcher.kt

@@ -33,6 +33,7 @@ import com.tangem.domain.pay.repository.TangemPayCloseCardRepository
 import com.tangem.security.DeviceSecurityInfoProvider
 import com.tangem.security.isSecurityExposed
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
+import com.tangem.utils.extensions.orZero
 import com.tangem.utils.logging.TangemLogger
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.delay
@@ -287,11 +288,16 @@ internal class DefaultPaymentAccountStatusFetcher @Inject constructor(
                     customerId = requireNotNull(customerId) { "CustomerId must not be null" },
                 )
             }
-            fiatBalance != null && cryptoBalance != null && (isDeactivated || isFormer) -> {
+            fiatBalance != null && cryptoBalance != null && !customerId.isNullOrEmpty() &&
+                (isDeactivated || isFormer) -> {
                 PaymentAccountStatusValue.Deactivated(
                     source = StatusSource.ACTUAL,
-                    fiatBalance = fiatBalance,
-                    cryptoBalance = cryptoBalance,
+                    customerId = requireNotNull(customerId) { "CustomerId must not be null" },
+                    balance = PaymentAccountStatusValue.Balance(
+                        fiatBalance = fiatBalance,
+                        cryptoBalance = cryptoBalance,
+                        availableForWithdrawal = availableForWithdrawal.orZero(),
+                    ),
                     cryptoCurrency = tangemPayCurrencyFactory.create(userWalletId),
                     fiatRate = quotesData?.fiatRate,
                 )
@@ -321,11 +327,12 @@ internal class DefaultPaymentAccountStatusFetcher @Inject constructor(
         return PaymentAccountStatusValue.Loaded(
             source = StatusSource.ACTUAL,
             customerId = customerId,
-            currencyCode = cardInfo.currencyCode,
             depositAddress = cardInfo.depositAddress,
-            fiatBalance = cardInfo.fiatBalance,
-            cryptoBalance = cardInfo.cryptoBalance,
-            availableForWithdrawal = cardInfo.availableForWithdrawal,
+            balance = PaymentAccountStatusValue.Balance(
+                fiatBalance = cardInfo.fiatBalance,
+                cryptoBalance = cardInfo.cryptoBalance,
+                availableForWithdrawal = cardInfo.availableForWithdrawal,
+            ),
             cryptoCurrency = cryptoCurrency,
             fiatRate = fiatRate,
             cards = listOf(

data/visa/src/main/kotlin/com/tangem/data/pay/util/CustomerInfoConverter.kt

@@ -65,6 +65,7 @@ internal object CustomerInfoConverter : Converter<CustomerMeResponse.Result, Cus
             state = CustomerInfo.State.fromString(value.state),
             fiatBalance = fiatBalance?.toDomain(),
             cryptoBalance = cryptoBalance?.toDomain(),
+            availableForWithdrawal = value.balance?.availableForWithdrawal?.amount,
         )
     }
 

data/visa/src/test/kotlin/com/tangem/data/pay/converter/PaymentAccountStatusValueDMConverterTest.kt

@@ -64,11 +64,15 @@ internal class PaymentAccountStatusValueDMConverterTest {
             // GIVEN
             val domain = PaymentAccountStatusValue.Deactivated(
                 source = StatusSource.ACTUAL,
-                fiatBalance = PaymentAccountStatusValue.FiatBalance(
-                    availableBalance = BigDecimal("100"),
-                    currency = "USD",
+                customerId = "customer-1",
+                balance = PaymentAccountStatusValue.Balance(
+                    fiatBalance = PaymentAccountStatusValue.FiatBalance(
+                        availableBalance = BigDecimal("100"),
+                        currency = "USD",
+                    ),
+                    cryptoBalance = cryptoBalance(),
+                    availableForWithdrawal = BigDecimal("7"),
                 ),
-                cryptoBalance = cryptoBalance(),
                 cryptoCurrency = cryptoCurrency,
                 fiatRate = BigDecimal("1.05"),
             )
@@ -79,8 +83,10 @@ internal class PaymentAccountStatusValueDMConverterTest {
             // THEN
             assertThat(result).isInstanceOf(PaymentAccountStatusValueDM.DeactivatedAccount::class.java)
             val dm = result as PaymentAccountStatusValueDM.DeactivatedAccount
+            assertThat(dm.customerId).isEqualTo("customer-1")
             assertThat(dm.fiatBalance.availableBalance).isEqualTo(BigDecimal("100"))
             assertThat(dm.fiatBalance.currency).isEqualTo("USD")
+            assertThat(dm.availableForWithdrawal).isEqualTo(BigDecimal("7"))
             assertThat(dm.fiatRate).isEqualTo(BigDecimal("1.05"))
         }
 
@@ -141,12 +147,14 @@ internal class PaymentAccountStatusValueDMConverterTest {
         fun `GIVEN DM DeactivatedAccount WHEN convertBack THEN returns domain Deactivated with CACHE source`() {
             // GIVEN
             val dm = PaymentAccountStatusValueDM.DeactivatedAccount(
+                customerId = "customer-2",
                 fiatBalance = PaymentAccountStatusValueDM.FiatBalanceDM(
                     availableBalance = BigDecimal("200"),
                     currency = "EUR",
                 ),
                 cryptoBalance = cryptoBalanceDM(),
                 fiatRate = BigDecimal("0.92"),
+                availableForWithdrawal = BigDecimal("5"),
             )
 
             // WHEN
@@ -156,8 +164,10 @@ internal class PaymentAccountStatusValueDMConverterTest {
             assertThat(result).isInstanceOf(PaymentAccountStatusValue.Deactivated::class.java)
             val deactivated = result as PaymentAccountStatusValue.Deactivated
             assertThat(deactivated.source).isEqualTo(StatusSource.CACHE)
-            assertThat(deactivated.fiatBalance.availableBalance).isEqualTo(BigDecimal("200"))
-            assertThat(deactivated.fiatBalance.currency).isEqualTo("EUR")
+            assertThat(deactivated.customerId).isEqualTo("customer-2")
+            assertThat(deactivated.balance.fiatBalance.availableBalance).isEqualTo(BigDecimal("200"))
+            assertThat(deactivated.balance.fiatBalance.currency).isEqualTo("EUR")
+            assertThat(deactivated.balance.availableForWithdrawal).isEqualTo(BigDecimal("5"))
             assertThat(deactivated.fiatRate).isEqualTo(BigDecimal("0.92"))
         }