fix: display amounts in non-three-letter currency codes correctly

cashubtc · Jan 21, 2025 · 04ac096 · 04ac096
1 parent e88d19d
commit 04ac096
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/src/boot/base.js b/src/boot/base.js
@@ -59,12 +59,17 @@ window.windowMixin = {
       if (currency == "msat") return this.fromMsat(value);
       if (currency == "usd") value = value / 100;
       if (currency == "eur") value = value / 100;
-      return new Intl.NumberFormat(window.LOCALE, {
-        style: "currency",
-        currency: currency,
-      }).format(value);
-      // + " " +
-      // currency.toUpperCase()
+
+      if (currency.length !== 3) {
+        return new Intl.NumberFormat(window.LOCALE).format(value);
+      } else {
+        return new Intl.NumberFormat(window.LOCALE, {
+          style: "currency",
+          currency: currency,
+        }).format(value);
+        // + " " +
+        // currency.toUpperCase()
+      }
     },
     formatSat: function (value) {
       // convert value to integer

diff --git a/src/stores/ui.ts b/src/stores/ui.ts
@@ -90,12 +90,17 @@ export const useUiStore = defineStore("ui", {
       if (currency == "msat") return this.fromMsat(value);
       if (currency == "usd") value = value / 100;
       if (currency == "eur") value = value / 100;
-      return new Intl.NumberFormat(navigator.language, {
-        style: "currency",
-        currency: currency,
-      }).format(value);
-      // + " " +
-      // currency.toUpperCase()
+
+      if (currency.length !== 3) {
+        return new Intl.NumberFormat(navigator.language).format(value);
+      } else {
+        return new Intl.NumberFormat(navigator.language, {
+          style: "currency",
+          currency: currency,
+        }).format(value);
+        // + " " +
+        // currency.toUpperCase()
+      }
     },
     toggleDebugConsole() {
       this.showDebugConsole = !this.showDebugConsole;