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,