diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/converter/CurrencyConverter.kt b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/converter/CurrencyConverter.kt index 9e6df0ed22..445f24d3c8 100644 --- a/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/converter/CurrencyConverter.kt +++ b/app/src/main/java/com/tangem/tap/features/details/ui/appcurrency/converter/CurrencyConverter.kt @@ -7,7 +7,7 @@ import com.tangem.utils.converter.Converter internal class CurrencyConverter : Converter { override fun convert(value: AppCurrency): AppCurrencySelectorState.Currency { - val fullCurrencyName = with(value) { "$name ($code) - $symbol" } + val fullCurrencyName = with(value) { "$name ($code) — $symbol" } return AppCurrencySelectorState.Currency(value.code, fullCurrencyName) } diff --git a/data/app-currency/src/main/kotlin/com/tangem/data/appcurrency/DefaultAppCurrencyRepository.kt b/data/app-currency/src/main/kotlin/com/tangem/data/appcurrency/DefaultAppCurrencyRepository.kt index 91abb1d2a3..520be9c24d 100644 --- a/data/app-currency/src/main/kotlin/com/tangem/data/appcurrency/DefaultAppCurrencyRepository.kt +++ b/data/app-currency/src/main/kotlin/com/tangem/data/appcurrency/DefaultAppCurrencyRepository.kt @@ -34,7 +34,7 @@ internal class DefaultAppCurrencyRepository( .collect(::send) } - launch(dispatchers.io) { + withContext(dispatchers.io) { if (selectedAppCurrencyStore.isEmpty()) { fetchDefaultAppCurrency() } @@ -47,6 +47,7 @@ internal class DefaultAppCurrencyRepository( val currencies = availableAppCurrenciesStore.getAllSyncOrNull() ?.map(appCurrencyConverter::convert) + ?.sortedBy(AppCurrency::name) requireNotNull(currencies) { "No available currencies stored"