From 03c50973cf1abcf2d3411e82126290007e9a0e83 Mon Sep 17 00:00:00 2001 From: Brandon McAnsh Date: Thu, 8 Feb 2024 12:04:05 -0500 Subject: [PATCH] chore: dont render currency abbrevation as symbol in amount area Signed-off-by: Brandon McAnsh --- .../com/getcode/view/main/currency/CurrencySelectionSheet.kt | 2 +- .../getcode/view/main/giveKin/BaseAmountCurrencyViewModel.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt b/app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt index aefe4db36..b90288424 100644 --- a/app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt +++ b/app/src/main/java/com/getcode/view/main/currency/CurrencySelectionSheet.kt @@ -97,7 +97,7 @@ fun CurrencySelectionSheet( composeScope.launch { keyboardController?.hide() delay(500) - navigator.hideWithResult(it) + navigator.popWithResult(it) } }.launchIn(this) } diff --git a/app/src/main/java/com/getcode/view/main/giveKin/BaseAmountCurrencyViewModel.kt b/app/src/main/java/com/getcode/view/main/giveKin/BaseAmountCurrencyViewModel.kt index 5662f0bd5..62a71bf1e 100644 --- a/app/src/main/java/com/getcode/view/main/giveKin/BaseAmountCurrencyViewModel.kt +++ b/app/src/main/java/com/getcode/view/main/giveKin/BaseAmountCurrencyViewModel.kt @@ -205,7 +205,7 @@ abstract class BaseAmountCurrencyViewModel( amountText = formatAmount(amountText, selectedCurrency), amountDouble = amount, amountKin = amountKin, - amountPrefix = formatPrefix(selectedCurrency), + amountPrefix = formatPrefix(selectedCurrency).takeIf { it != selectedCurrency.code }.orEmpty(), amountSuffix = formatSuffix(selectedCurrency), captionText = formatCaption( selectedCurrency,