@lightsparkdev/core 1.4.6 → 1.4.8

package/src/utils/currency.ts

@@ -33,7 +33,18 @@ export const CurrencyUnit = {
   SGD: "SGD",
   THB: "THB",
   VND: "VND",
+  NGN: "NGN",
+  ZAR: "ZAR",
+  KES: "KES",
+  TZS: "TZS",
+  UGX: "UGX",
+  BWP: "BWP",
+  XOF: "XOF",
+  XAF: "XAF",
+  MWK: "MWK",
+  RWF: "RWF",
   USDT: "USDT",
+  USDC: "USDC",
 
   Bitcoin: "BITCOIN",
   Microbitcoin: "MICROBITCOIN",
@@ -48,6 +59,7 @@ export const CurrencyUnit = {
   Inr: "INR",
   Brl: "BRL",
   Usdt: "USDT",
+  Usdc: "USDC",
 } as const;
 
 export type CurrencyUnitType = (typeof CurrencyUnit)[keyof typeof CurrencyUnit];
@@ -88,7 +100,18 @@ const standardUnitConversionObj = {
   [CurrencyUnit.SGD]: (v: number) => v,
   [CurrencyUnit.THB]: (v: number) => v,
   [CurrencyUnit.VND]: (v: number) => v,
+  [CurrencyUnit.NGN]: (v: number) => v,
+  [CurrencyUnit.ZAR]: (v: number) => v,
+  [CurrencyUnit.KES]: (v: number) => v,
+  [CurrencyUnit.TZS]: (v: number) => v,
+  [CurrencyUnit.UGX]: (v: number) => v,
+  [CurrencyUnit.BWP]: (v: number) => v,
+  [CurrencyUnit.XOF]: (v: number) => v,
+  [CurrencyUnit.XAF]: (v: number) => v,
+  [CurrencyUnit.MWK]: (v: number) => v,
+  [CurrencyUnit.RWF]: (v: number) => v,
   [CurrencyUnit.USDT]: (v: number) => v,
+  [CurrencyUnit.USDC]: (v: number) => v,
 };
 
 /* Round without decimals since we're returning cents: */
@@ -128,7 +151,18 @@ const CONVERSION_MAP = {
     [CurrencyUnit.SGD]: toBitcoinConversion,
     [CurrencyUnit.THB]: toBitcoinConversion,
     [CurrencyUnit.VND]: toBitcoinConversion,
+    [CurrencyUnit.NGN]: toBitcoinConversion,
+    [CurrencyUnit.ZAR]: toBitcoinConversion,
+    [CurrencyUnit.KES]: toBitcoinConversion,
+    [CurrencyUnit.TZS]: toBitcoinConversion,
+    [CurrencyUnit.UGX]: toBitcoinConversion,
+    [CurrencyUnit.BWP]: toBitcoinConversion,
+    [CurrencyUnit.XOF]: toBitcoinConversion,
+    [CurrencyUnit.XAF]: toBitcoinConversion,
+    [CurrencyUnit.MWK]: toBitcoinConversion,
+    [CurrencyUnit.RWF]: toBitcoinConversion,
     [CurrencyUnit.USDT]: toBitcoinConversion,
+    [CurrencyUnit.USDC]: toBitcoinConversion,
   },
   [CurrencyUnit.MICROBITCOIN]: {
     [CurrencyUnit.BITCOIN]: (v: number) => v / 1_000_000,
@@ -152,7 +186,18 @@ const CONVERSION_MAP = {
     [CurrencyUnit.SGD]: toMicrobitcoinConversion,
     [CurrencyUnit.THB]: toMicrobitcoinConversion,
     [CurrencyUnit.VND]: toMicrobitcoinConversion,
+    [CurrencyUnit.NGN]: toMicrobitcoinConversion,
+    [CurrencyUnit.ZAR]: toMicrobitcoinConversion,
+    [CurrencyUnit.KES]: toMicrobitcoinConversion,
+    [CurrencyUnit.TZS]: toMicrobitcoinConversion,
+    [CurrencyUnit.UGX]: toMicrobitcoinConversion,
+    [CurrencyUnit.BWP]: toMicrobitcoinConversion,
+    [CurrencyUnit.XOF]: toMicrobitcoinConversion,
+    [CurrencyUnit.XAF]: toMicrobitcoinConversion,
+    [CurrencyUnit.MWK]: toMicrobitcoinConversion,
+    [CurrencyUnit.RWF]: toMicrobitcoinConversion,
     [CurrencyUnit.USDT]: toMicrobitcoinConversion,
+    [CurrencyUnit.USDC]: toMicrobitcoinConversion,
   },
   [CurrencyUnit.MILLIBITCOIN]: {
     [CurrencyUnit.BITCOIN]: (v: number) => v / 1_000,
@@ -176,7 +221,18 @@ const CONVERSION_MAP = {
     [CurrencyUnit.SGD]: toMillibitcoinConversion,
     [CurrencyUnit.THB]: toMillibitcoinConversion,
     [CurrencyUnit.VND]: toMillibitcoinConversion,
+    [CurrencyUnit.NGN]: toMillibitcoinConversion,
+    [CurrencyUnit.ZAR]: toMillibitcoinConversion,
+    [CurrencyUnit.KES]: toMillibitcoinConversion,
+    [CurrencyUnit.TZS]: toMillibitcoinConversion,
+    [CurrencyUnit.UGX]: toMillibitcoinConversion,
+    [CurrencyUnit.BWP]: toMillibitcoinConversion,
+    [CurrencyUnit.XOF]: toMillibitcoinConversion,
+    [CurrencyUnit.XAF]: toMillibitcoinConversion,
+    [CurrencyUnit.MWK]: toMillibitcoinConversion,
+    [CurrencyUnit.RWF]: toMillibitcoinConversion,
     [CurrencyUnit.USDT]: toMillibitcoinConversion,
+    [CurrencyUnit.USDC]: toMillibitcoinConversion,
   },
   [CurrencyUnit.MILLISATOSHI]: {
     [CurrencyUnit.BITCOIN]: (v: number) => v / 100_000_000_000,
@@ -200,7 +256,18 @@ const CONVERSION_MAP = {
     [CurrencyUnit.SGD]: toMillisatoshiConversion,
     [CurrencyUnit.THB]: toMillisatoshiConversion,
     [CurrencyUnit.VND]: toMillisatoshiConversion,
+    [CurrencyUnit.NGN]: toMillisatoshiConversion,
+    [CurrencyUnit.ZAR]: toMillisatoshiConversion,
+    [CurrencyUnit.KES]: toMillisatoshiConversion,
+    [CurrencyUnit.TZS]: toMillisatoshiConversion,
+    [CurrencyUnit.UGX]: toMillisatoshiConversion,
+    [CurrencyUnit.BWP]: toMillisatoshiConversion,
+    [CurrencyUnit.XOF]: toMillisatoshiConversion,
+    [CurrencyUnit.XAF]: toMillisatoshiConversion,
+    [CurrencyUnit.MWK]: toMillisatoshiConversion,
+    [CurrencyUnit.RWF]: toMillisatoshiConversion,
     [CurrencyUnit.USDT]: toMillisatoshiConversion,
+    [CurrencyUnit.USDC]: toMillisatoshiConversion,
   },
   [CurrencyUnit.NANOBITCOIN]: {
     [CurrencyUnit.BITCOIN]: (v: number) => v / 1_000_000_000,
@@ -224,7 +291,18 @@ const CONVERSION_MAP = {
     [CurrencyUnit.SGD]: toNanobitcoinConversion,
     [CurrencyUnit.THB]: toNanobitcoinConversion,
     [CurrencyUnit.VND]: toNanobitcoinConversion,
+    [CurrencyUnit.NGN]: toNanobitcoinConversion,
+    [CurrencyUnit.ZAR]: toNanobitcoinConversion,
+    [CurrencyUnit.KES]: toNanobitcoinConversion,
+    [CurrencyUnit.TZS]: toNanobitcoinConversion,
+    [CurrencyUnit.UGX]: toNanobitcoinConversion,
+    [CurrencyUnit.BWP]: toNanobitcoinConversion,
+    [CurrencyUnit.XOF]: toNanobitcoinConversion,
+    [CurrencyUnit.XAF]: toNanobitcoinConversion,
+    [CurrencyUnit.MWK]: toNanobitcoinConversion,
+    [CurrencyUnit.RWF]: toNanobitcoinConversion,
     [CurrencyUnit.USDT]: toNanobitcoinConversion,
+    [CurrencyUnit.USDC]: toNanobitcoinConversion,
   },
   [CurrencyUnit.SATOSHI]: {
     [CurrencyUnit.BITCOIN]: (v: number) => v / 100_000_000,
@@ -248,7 +326,18 @@ const CONVERSION_MAP = {
     [CurrencyUnit.SGD]: toSatoshiConversion,
     [CurrencyUnit.THB]: toSatoshiConversion,
     [CurrencyUnit.VND]: toSatoshiConversion,
+    [CurrencyUnit.NGN]: toSatoshiConversion,
+    [CurrencyUnit.ZAR]: toSatoshiConversion,
+    [CurrencyUnit.KES]: toSatoshiConversion,
+    [CurrencyUnit.TZS]: toSatoshiConversion,
+    [CurrencyUnit.UGX]: toSatoshiConversion,
+    [CurrencyUnit.BWP]: toSatoshiConversion,
+    [CurrencyUnit.XOF]: toSatoshiConversion,
+    [CurrencyUnit.XAF]: toSatoshiConversion,
+    [CurrencyUnit.MWK]: toSatoshiConversion,
+    [CurrencyUnit.RWF]: toSatoshiConversion,
     [CurrencyUnit.USDT]: toSatoshiConversion,
+    [CurrencyUnit.USDC]: toSatoshiConversion,
   },
   [CurrencyUnit.USD]: standardUnitConversionObj,
   [CurrencyUnit.MXN]: standardUnitConversionObj,
@@ -265,7 +354,18 @@ const CONVERSION_MAP = {
   [CurrencyUnit.SGD]: standardUnitConversionObj,
   [CurrencyUnit.THB]: standardUnitConversionObj,
   [CurrencyUnit.VND]: standardUnitConversionObj,
+  [CurrencyUnit.NGN]: standardUnitConversionObj,
+  [CurrencyUnit.ZAR]: standardUnitConversionObj,
+  [CurrencyUnit.KES]: standardUnitConversionObj,
+  [CurrencyUnit.TZS]: standardUnitConversionObj,
+  [CurrencyUnit.UGX]: standardUnitConversionObj,
+  [CurrencyUnit.BWP]: standardUnitConversionObj,
+  [CurrencyUnit.XOF]: standardUnitConversionObj,
+  [CurrencyUnit.XAF]: standardUnitConversionObj,
+  [CurrencyUnit.MWK]: standardUnitConversionObj,
+  [CurrencyUnit.RWF]: standardUnitConversionObj,
   [CurrencyUnit.USDT]: standardUnitConversionObj,
+  [CurrencyUnit.USDC]: standardUnitConversionObj,
 };
 
 export function convertCurrencyAmountValue(
@@ -342,7 +442,18 @@ export type CurrencyMap = {
   [CurrencyUnit.SGD]: number;
   [CurrencyUnit.THB]: number;
   [CurrencyUnit.VND]: number;
+  [CurrencyUnit.NGN]: number;
+  [CurrencyUnit.ZAR]: number;
+  [CurrencyUnit.KES]: number;
+  [CurrencyUnit.TZS]: number;
+  [CurrencyUnit.UGX]: number;
+  [CurrencyUnit.BWP]: number;
+  [CurrencyUnit.XOF]: number;
+  [CurrencyUnit.XAF]: number;
+  [CurrencyUnit.MWK]: number;
+  [CurrencyUnit.RWF]: number;
   [CurrencyUnit.USDT]: number;
+  [CurrencyUnit.USDC]: number;
   [CurrencyUnit.FUTURE_VALUE]: number;
   formatted: {
     sats: string;
@@ -369,7 +480,18 @@ export type CurrencyMap = {
     [CurrencyUnit.SGD]: string;
     [CurrencyUnit.THB]: string;
     [CurrencyUnit.VND]: string;
+    [CurrencyUnit.NGN]: string;
+    [CurrencyUnit.ZAR]: string;
+    [CurrencyUnit.KES]: string;
+    [CurrencyUnit.TZS]: string;
+    [CurrencyUnit.UGX]: string;
+    [CurrencyUnit.BWP]: string;
+    [CurrencyUnit.XOF]: string;
+    [CurrencyUnit.XAF]: string;
+    [CurrencyUnit.MWK]: string;
+    [CurrencyUnit.RWF]: string;
     [CurrencyUnit.USDT]: string;
+    [CurrencyUnit.USDC]: string;
     [CurrencyUnit.FUTURE_VALUE]: string;
   };
   isZero: boolean;
@@ -577,10 +699,21 @@ function convertCurrencyAmountValues(
     sgd: CurrencyUnit.SGD,
     thb: CurrencyUnit.THB,
     vnd: CurrencyUnit.VND,
+    ngn: CurrencyUnit.NGN,
+    zar: CurrencyUnit.ZAR,
+    kes: CurrencyUnit.KES,
+    tzs: CurrencyUnit.TZS,
+    ugx: CurrencyUnit.UGX,
+    bwp: CurrencyUnit.BWP,
+    xof: CurrencyUnit.XOF,
+    xaf: CurrencyUnit.XAF,
+    mwk: CurrencyUnit.MWK,
+    rwf: CurrencyUnit.RWF,
     mibtc: CurrencyUnit.MICROBITCOIN,
     mlbtc: CurrencyUnit.MILLIBITCOIN,
     nbtc: CurrencyUnit.NANOBITCOIN,
     usdt: CurrencyUnit.USDT,
+    usdc: CurrencyUnit.USDC,
   };
   return Object.entries(namesToUnits).reduce(
     (acc, [name, unit]) => {
@@ -649,7 +782,18 @@ export function mapCurrencyAmount(
     sgd,
     thb,
     vnd,
+    ngn,
+    zar,
+    kes,
+    tzs,
+    ugx,
+    bwp,
+    xof,
+    xaf,
+    mwk,
+    rwf,
     usdt,
+    usdc,
   } = convertCurrencyAmountValues(unit, value, unitsPerBtc, conversionOverride);
 
   const mapWithCurrencyUnits = {
@@ -671,10 +815,21 @@ export function mapCurrencyAmount(
     [CurrencyUnit.SGD]: sgd,
     [CurrencyUnit.THB]: thb,
     [CurrencyUnit.VND]: vnd,
+    [CurrencyUnit.NGN]: ngn,
+    [CurrencyUnit.ZAR]: zar,
+    [CurrencyUnit.KES]: kes,
+    [CurrencyUnit.TZS]: tzs,
+    [CurrencyUnit.UGX]: ugx,
+    [CurrencyUnit.BWP]: bwp,
+    [CurrencyUnit.XOF]: xof,
+    [CurrencyUnit.XAF]: xaf,
+    [CurrencyUnit.MWK]: mwk,
+    [CurrencyUnit.RWF]: rwf,
     [CurrencyUnit.MICROBITCOIN]: mibtc,
     [CurrencyUnit.MILLIBITCOIN]: mlbtc,
     [CurrencyUnit.NANOBITCOIN]: nbtc,
     [CurrencyUnit.USDT]: usdt,
+    [CurrencyUnit.USDC]: usdc,
     [CurrencyUnit.FUTURE_VALUE]: NaN,
     formatted: {
       [CurrencyUnit.BITCOIN]: formatCurrencyStr({
@@ -761,10 +916,54 @@ export function mapCurrencyAmount(
         value: vnd,
         unit: CurrencyUnit.VND,
       }),
+      [CurrencyUnit.NGN]: formatCurrencyStr({
+        value: ngn,
+        unit: CurrencyUnit.NGN,
+      }),
+      [CurrencyUnit.ZAR]: formatCurrencyStr({
+        value: zar,
+        unit: CurrencyUnit.ZAR,
+      }),
+      [CurrencyUnit.KES]: formatCurrencyStr({
+        value: kes,
+        unit: CurrencyUnit.KES,
+      }),
+      [CurrencyUnit.TZS]: formatCurrencyStr({
+        value: tzs,
+        unit: CurrencyUnit.TZS,
+      }),
+      [CurrencyUnit.UGX]: formatCurrencyStr({
+        value: ugx,
+        unit: CurrencyUnit.UGX,
+      }),
+      [CurrencyUnit.BWP]: formatCurrencyStr({
+        value: bwp,
+        unit: CurrencyUnit.BWP,
+      }),
+      [CurrencyUnit.XOF]: formatCurrencyStr({
+        value: xof,
+        unit: CurrencyUnit.XOF,
+      }),
+      [CurrencyUnit.XAF]: formatCurrencyStr({
+        value: xaf,
+        unit: CurrencyUnit.XAF,
+      }),
+      [CurrencyUnit.MWK]: formatCurrencyStr({
+        value: mwk,
+        unit: CurrencyUnit.MWK,
+      }),
+      [CurrencyUnit.RWF]: formatCurrencyStr({
+        value: rwf,
+        unit: CurrencyUnit.RWF,
+      }),
       [CurrencyUnit.USDT]: formatCurrencyStr({
         value: usdt,
         unit: CurrencyUnit.USDT,
       }),
+      [CurrencyUnit.USDC]: formatCurrencyStr({
+        value: usdc,
+        unit: CurrencyUnit.USDC,
+      }),
       [CurrencyUnit.FUTURE_VALUE]: "-",
     },
   };
@@ -847,6 +1046,8 @@ export const abbrCurrencyUnit = (unit: CurrencyUnitType) => {
       return "INR";
     case CurrencyUnit.USDT:
       return "USDT";
+    case CurrencyUnit.USDC:
+      return "USDC";
     case CurrencyUnit.BRL:
       return "BRL";
     case CurrencyUnit.CAD:
@@ -865,6 +1066,26 @@ export const abbrCurrencyUnit = (unit: CurrencyUnitType) => {
       return "THB";
     case CurrencyUnit.VND:
       return "VND";
+    case CurrencyUnit.NGN:
+      return "NGN";
+    case CurrencyUnit.ZAR:
+      return "ZAR";
+    case CurrencyUnit.KES:
+      return "KES";
+    case CurrencyUnit.TZS:
+      return "TZS";
+    case CurrencyUnit.UGX:
+      return "UGX";
+    case CurrencyUnit.BWP:
+      return "BWP";
+    case CurrencyUnit.XOF:
+      return "XOF";
+    case CurrencyUnit.XAF:
+      return "XAF";
+    case CurrencyUnit.MWK:
+      return "MWK";
+    case CurrencyUnit.RWF:
+      return "RWF";
   }
   return "Unsupported CurrencyUnit";
 };
@@ -921,6 +1142,13 @@ export function formatCurrencyStr(
       CurrencyUnit.EUR,
       CurrencyUnit.GBP,
       CurrencyUnit.INR,
+      CurrencyUnit.BRL,
+      CurrencyUnit.NGN,
+      CurrencyUnit.ZAR,
+      CurrencyUnit.KES,
+      CurrencyUnit.TZS,
+      CurrencyUnit.UGX,
+      CurrencyUnit.BWP,
     ] as string[];
     /* centCurrencies are always provided in the smallest unit, e.g. cents for USD. These should be
      * divided by 100 for proper display format: */
@@ -1027,6 +1255,13 @@ export function formatCurrencyStr(
     const unitStr = isUmaCurrencyAmount(amount)
       ? amount.currency.code
       : abbrCurrencyUnit(unit as CurrencyUnitType);
+
+    // Skip appending if the formatted string already contains the currency code
+    // This happens for currencies like XOF where Intl.NumberFormat uses the code as the symbol
+    if (formattedStr.includes(unitStr)) {
+      return formattedStr;
+    }
+
     const unitSuffix = options?.appendUnits?.plural && num > 1 ? "s" : "";
     const unitStrWithSuffix = `${unitStr}${unitSuffix}`;
     formattedStr += ` ${

package/src/utils/tests/currency.test.ts

@@ -436,3 +436,22 @@ describe("formatCurrencyStr", () => {
     ).toBe("$1,000.12 MXN");
   });
 });
+
+it("should not append XOF if it's already in the formatted string", () => {
+  /* This test verifies the fix for PQA-394 where XOF was appearing twice.
+   * If Intl.NumberFormat formats with currencyDisplay: 'code', it will include
+   * XOF in the output, and we shouldn't append it again. */
+  const formatted = formatCurrencyStr(
+    { value: 221900, unit: CurrencyUnit.XOF },
+    { appendUnits: { plural: false, lowercase: false } },
+  );
+
+  /* Count occurrences of 'XOF' or 'CFA' in the result */
+  const xofCount = (formatted.match(/XOF/g) || []).length;
+  const cfaCount = (formatted.match(/CFA/g) || []).length;
+
+  /* Should have either XOF or CFA, but not both, and only once */
+  expect(xofCount + cfaCount).toBeGreaterThan(0);
+  expect(xofCount).toBeLessThanOrEqual(1);
+  expect(cfaCount).toBeLessThanOrEqual(1);
+});