diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt index 351353cfe7..cec5b2338a 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/entity/factory/OnrampStateFactory.kt @@ -87,7 +87,6 @@ internal class OnrampStateFactory( topBarConfig = state.topBarConfig.copy(endButtonUM = endButton), buyButtonConfig = state.buyButtonConfig.copy(enabled = false), amountBlockState = state.amountBlockState.copy( - amountFieldModel = state.amountBlockState.amountFieldModel.copy(isError = true), secondaryFieldModel = OnrampAmountSecondaryFieldUM.Content(TextReference.EMPTY), ), providerBlockState = OnrampProviderBlockUM.Empty, diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt index 3b86caa30d..a3afe0f26f 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/model/OnrampMainComponentModel.kt @@ -335,6 +335,7 @@ internal class OnrampMainComponentModel @Inject constructor( (it as? OnrampMainComponentUM.Content)?.copy( errorNotification = null, providerBlockState = OnrampProviderBlockUM.Loading, + amountBlockState = it.amountBlockState.copy(secondaryFieldModel = OnrampAmountSecondaryFieldUM.Loading), ) ?: it } startLoadingQuotes() diff --git a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampAmountContent.kt b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampAmountContent.kt index 608587c822..eec3a23193 100644 --- a/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampAmountContent.kt +++ b/features/onramp/impl/src/main/kotlin/com/tangem/features/onramp/main/ui/OnrampAmountContent.kt @@ -42,13 +42,16 @@ internal fun OnrampAmountContent(state: OnrampAmountBlockUM, modifier: Modifier horizontalAlignment = Alignment.CenterHorizontally, ) { OnrampCurrencyIcon(currencyUM = state.currencyUM) - OnrampAmountField(amountField = state.amountFieldModel) + OnrampAmountField( + amountField = state.amountFieldModel, + isLoading = state.secondaryFieldModel is OnrampAmountSecondaryFieldUM.Loading, + ) OnrampAmountSecondary(state = state.secondaryFieldModel) } } @Composable -private fun OnrampAmountField(amountField: AmountFieldModel) { +private fun OnrampAmountField(amountField: AmountFieldModel, isLoading: Boolean) { val decimalFormat = rememberDecimalFormat() val requester = remember { FocusRequester() } AmountTextField( @@ -67,7 +70,7 @@ private fun OnrampAmountField(amountField: AmountFieldModel) { color = TangemTheme.colors.text.primary1, textAlign = TextAlign.Center, ), - isEnabled = !amountField.isError, + isEnabled = !amountField.isError && !isLoading, isAutoResize = true, isValuePasted = amountField.isValuePasted, onValuePastedTriggerDismiss = amountField.onValuePastedTriggerDismiss,