Merge pull request #155 from code-payments/chore/dont-show-currency-prefix-when-not-a-symbol

bmc08gt · web-flow · commit e103389d3931 · 2024-02-08T12:05:48.000-05:00
chore: dont render currency abbrevation as symbol in amount area
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
@@ -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
@@ -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,

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ fun CurrencySelectionSheet(`
`97`	`97`	`composeScope.launch {`
`98`	`98`	`keyboardController?.hide()`
`99`	`99`	`delay(500)`
`100`		`- navigator.hideWithResult(it)`
	`100`	`+ navigator.popWithResult(it)`
`101`	`101`	`}`
`102`	`102`	`}.launchIn(this)`
`103`	`103`	`}`