diff --git a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/viewmodel/SendViewModel.kt b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/viewmodel/SendViewModel.kt index 2a17cfe57a..ed22f1435a 100644 --- a/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/viewmodel/SendViewModel.kt +++ b/features/send/impl/src/main/java/com/tangem/features/send/impl/presentation/viewmodel/SendViewModel.kt @@ -381,18 +381,19 @@ internal class SendViewModel @Inject constructor( feeCryptoCurrencyStatus = feeCurrencyStatus subscribeOnQRScannerResult() when { - uiState.sendState?.isSuccess != true -> { - uiState = stateFactory.getReadyState() - getWalletsAndRecent() - stateRouter.showRecipient() - updateNotifications() - } + uiState.sendState?.isSuccess == true -> return transactionId != null && amount != null && destinationAddress != null -> { loadFee() uiState = stateFactory.getReadyState(amount, destinationAddress, memo) stateRouter.showSend() updateNotifications() } + else -> { + uiState = stateFactory.getReadyState() + getWalletsAndRecent() + stateRouter.showRecipient() + updateNotifications() + } } }