lightsparkdev
diff --git a/‎.changeset/curvy-experts-fall.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/curvy-experts-fall.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.changeset/little-hands-sip.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/little-hands-sip.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.changeset/nice-pumas-rhyme.md‎
Lines changed: 5 additions & 0 deletions b/‎.changeset/nice-pumas-rhyme.md‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎.mise.toml‎
Lines changed: 1 addition & 1 deletion b/‎.mise.toml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎AGENTS.md‎
Lines changed: 1 addition & 0 deletions b/‎AGENTS.md‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/core/src/utils/currency.ts‎
Lines changed: 87 additions & 0 deletions b/‎packages/core/src/utils/currency.ts‎
Lines changed: 87 additions & 0 deletions
diff --git a/‎packages/core/src/utils/tests/currency.test.ts‎
Lines changed: 19 additions & 0 deletions b/‎packages/core/src/utils/tests/currency.test.ts‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎packages/lightspark-sdk/src/client.ts‎
Lines changed: 36 additions & 6 deletions b/‎packages/lightspark-sdk/src/client.ts‎
Lines changed: 36 additions & 6 deletions
diff --git a/‎packages/lightspark-sdk/src/graphql/FailHtlcs.ts‎
Lines changed: 19 additions & 0 deletions b/‎packages/lightspark-sdk/src/graphql/FailHtlcs.ts‎
Lines changed: 19 additions & 0 deletions
diff --git a/‎packages/lightspark-sdk/src/graphql/RequestWithdrawal.ts‎
Lines changed: 2 additions & 0 deletions b/‎packages/lightspark-sdk/src/graphql/RequestWithdrawal.ts‎
Lines changed: 2 additions & 0 deletions
@@ -0,0 +1,5 @@
+---
+"@lightsparkdev/core": patch
+---
+
+Adding currency support for XOF, XAF, MWK, RWF
@@ -0,0 +1,5 @@
+---
+"@lightsparkdev/ui": patch
+---
+
+UI updates and fixes for bank linking, kyc, 2fa, filters
@@ -0,0 +1,5 @@
+---
+"@lightsparkdev/lightspark-sdk": patch
+---
+
+Adding ability to fail HTLCs and add an idempotency key to requestWithdrawal
@@ -45,7 +45,7 @@ description = "Start ops frontend connected to minikube"
 run = "VITE_PROXY_TARGET=http://app.minikube.local yarn start ops"
 
 [tasks.site]
-description = "Start CN2 frontend connected to minikube"
+description = "Start CN2 frontend development server"
 run = "yarn start site"
 
 [tasks.site-minikube]
 
@@ -0,0 +1 @@
+CLAUDE.md
@@ -39,6 +39,10 @@ export const CurrencyUnit = {
   TZS: "TZS",
   UGX: "UGX",
   BWP: "BWP",
+  XOF: "XOF",
+  XAF: "XAF",
+  MWK: "MWK",
+  RWF: "RWF",
   USDT: "USDT",
   USDC: "USDC",
 
@@ -102,6 +106,10 @@ const standardUnitConversionObj = {
   [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,
 };
@@ -149,6 +157,10 @@ const CONVERSION_MAP = {
     [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,
   },
@@ -180,6 +192,10 @@ const CONVERSION_MAP = {
     [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,
   },
@@ -211,6 +227,10 @@ const CONVERSION_MAP = {
     [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,
   },
@@ -242,6 +262,10 @@ const CONVERSION_MAP = {
     [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,
   },
@@ -273,6 +297,10 @@ const CONVERSION_MAP = {
     [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,
   },
@@ -304,6 +332,10 @@ const CONVERSION_MAP = {
     [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,
   },
@@ -328,6 +360,10 @@ const CONVERSION_MAP = {
   [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,
 };
@@ -412,6 +448,10 @@ export type CurrencyMap = {
   [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;
@@ -446,6 +486,10 @@ export type CurrencyMap = {
     [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;
@@ -661,6 +705,10 @@ function convertCurrencyAmountValues(
     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,
@@ -740,6 +788,10 @@ export function mapCurrencyAmount(
     tzs,
     ugx,
     bwp,
+    xof,
+    xaf,
+    mwk,
+    rwf,
     usdt,
     usdc,
   } = convertCurrencyAmountValues(unit, value, unitsPerBtc, conversionOverride);
@@ -769,6 +821,10 @@ export function mapCurrencyAmount(
     [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,
@@ -884,6 +940,22 @@ export function mapCurrencyAmount(
         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,
@@ -1006,6 +1078,14 @@ export const abbrCurrencyUnit = (unit: CurrencyUnitType) => {
       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";
 };
@@ -1175,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 += ` ${
 
@@ -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);
+});
@@ -45,6 +45,7 @@ import { CreateUmaInvitationWithPayment } from "./graphql/CreateUmaInvitationWit
 import { CreateUmaInvoice } from "./graphql/CreateUmaInvoice.js";
 import { DecodeInvoice } from "./graphql/DecodeInvoice.js";
 import { DeleteApiToken } from "./graphql/DeleteApiToken.js";
+import { FailHtlcs } from "./graphql/FailHtlcs.js";
 import { FetchUmaInvitation } from "./graphql/FetchUmaInvitation.js";
 import { FundNode } from "./graphql/FundNode.js";
 import { IncomingPaymentsForInvoice } from "./graphql/IncomingPaymentsForInvoice.js";
@@ -76,6 +77,8 @@ import type ComplianceProvider from "./objects/ComplianceProvider.js";
 import type CreateApiTokenOutput from "./objects/CreateApiTokenOutput.js";
 import type CurrencyAmount from "./objects/CurrencyAmount.js";
 import { CurrencyAmountFromJson } from "./objects/CurrencyAmount.js";
+import type FailHtlcsOutput from "./objects/FailHtlcsOutput.js";
+import { FailHtlcsOutputFromJson } from "./objects/FailHtlcsOutput.js";
 import type FeeEstimate from "./objects/FeeEstimate.js";
 import { FeeEstimateFromJson } from "./objects/FeeEstimate.js";
 import type IncomingPayment from "./objects/IncomingPayment.js";
@@ -736,6 +739,28 @@ class LightsparkClient {
     return InvoiceFromJson(invoiceJson);
   }
 
+  /**
+   * Fails all pending HTLCs (Hash Time Locked Contracts) for a given invoice.
+   *
+   * @param invoiceId The ID of the invoice for which to fail HTLCs.
+   * @param cancelInvoice Whether to also cancel the invoice after failing the HTLCs.
+   * @returns The output containing the invoice ID, or undefined if the operation failed.
+   */
+  public async failHtlcs(
+    invoiceId: string,
+    cancelInvoice: boolean,
+  ): Promise<FailHtlcsOutput | undefined> {
+    const response = await this.requester.makeRawRequest(FailHtlcs, {
+      invoice_id: invoiceId,
+      cancel_invoice: cancelInvoice,
+    });
+    const output = response.fail_htlcs;
+    if (!output) {
+      return undefined;
+    }
+    return FailHtlcsOutputFromJson(output);
+  }
+
   /**
    * Decodes an encoded lightning invoice string.
    *
@@ -1206,15 +1231,20 @@ class LightsparkClient {
     amountSats: number,
     bitcoinAddress: string,
     mode: WithdrawalMode,
+    idempotencyKey: string | undefined = undefined,
   ): Promise<WithdrawalRequest> {
+    const variables: Record<string, string | number> = {
+      node_id: nodeId,
+      amount_sats: amountSats,
+      bitcoin_address: bitcoinAddress,
+      withdrawal_mode: mode,
+    };
+    if (idempotencyKey !== undefined) {
+      variables.idempotency_key = idempotencyKey;
+    }
     const response = await this.requester.makeRawRequest(
       RequestWithdrawal,
-      {
-        node_id: nodeId,
-        amount_sats: amountSats,
-        bitcoin_address: bitcoinAddress,
-        withdrawal_mode: mode,
-      },
+      variables,
       nodeId,
     );
     return WithdrawalRequestFromJson(response.request_withdrawal.request);
 
@@ -0,0 +1,19 @@
+// Copyright ©, 2023-present, Lightspark Group, Inc. - All Rights Reserved
+
+import { FRAGMENT as FailHtlcsOutputFragment } from "../objects/FailHtlcsOutput.js";
+
+export const FailHtlcs = `
+  mutation FailHtlcs(
+    $invoice_id: ID!,
+    $cancel_invoice: Boolean!
+  ) {
+    fail_htlcs(input: {
+      invoice_id: $invoice_id,
+      cancel_invoice: $cancel_invoice
+    }) {
+      ...FailHtlcsOutputFragment
+    }
+  }
+
+${FailHtlcsOutputFragment}
+`;
@@ -8,12 +8,14 @@ export const RequestWithdrawal = `
     $bitcoin_address: String!
     $amount_sats: Long!
     $withdrawal_mode: WithdrawalMode!
+    $idempotency_key: String
   ) {
     request_withdrawal(input: {
       node_id: $node_id
       bitcoin_address: $bitcoin_address
       amount_sats: $amount_sats
       withdrawal_mode: $withdrawal_mode
+      idempotency_key: $idempotency_key
     }) {
         request {
             ...WithdrawalRequestFragment
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"@lightsparkdev/core": patch
 +---
++
 +Adding currency support for XOF, XAF, MWK, RWF