diff --git a/app/src/main/java/com/tangem/tap/domain/extensions/MoonpayStatus.kt b/app/src/main/java/com/tangem/tap/domain/extensions/MoonpayStatus.kt index d204a2051d..bd4b7af891 100644 --- a/app/src/main/java/com/tangem/tap/domain/extensions/MoonpayStatus.kt +++ b/app/src/main/java/com/tangem/tap/domain/extensions/MoonpayStatus.kt @@ -14,10 +14,11 @@ fun MoonpayStatus.buyIsAllowed(currency: Currency): Boolean { return when (currency) { is Currency.Blockchain -> { - if (currency.blockchain == Blockchain.Unknown || currency.blockchain == Blockchain.BSC) { - false - } else { - availableToBuy.contains(currency.currencySymbol) + val blockchain = currency.blockchain + when { + blockchain.isTestnet() -> blockchain.getTestnetTopUpUrl() != null + blockchain == Blockchain.Unknown || blockchain == Blockchain.BSC -> false + else -> availableToBuy.contains(currency.currencySymbol) } } is Currency.Token -> false diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/AddressInfoBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/onboarding/AddressInfoBottomSheetDialog.kt index a7bafedba2..c747e1a745 100644 --- a/app/src/main/java/com/tangem/tap/features/onboarding/AddressInfoBottomSheetDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/onboarding/AddressInfoBottomSheetDialog.kt @@ -1,6 +1,7 @@ package com.tangem.tap.features.onboarding import android.content.Context +import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.tangem.tap.common.extensions.copyToClipboard import com.tangem.tap.common.extensions.dispatchDialogHide @@ -23,6 +24,7 @@ class AddressInfoBottomSheetDialog( init { this.setContentView(R.layout.dialog_onboarding_address_info) + behavior.state = BottomSheetBehavior.STATE_EXPANDED setOnCancelListener { store.dispatchDialogHide() } }