From 17efd7358bd8c8addb3b5cb03de20a91aafde905 Mon Sep 17 00:00:00 2001
From: rodrigopavezi <rodrigopavezi@gmail.com>
Date: Wed, 18 Dec 2024 22:03:48 -0300
Subject: [PATCH 1/2] refactor: Clean up imports and improve currency handling
 in invoice forms

- Reformatted import statements for better readability.
- Enhanced currency filtering logic to prevent duplicates and handle specific cases for ISO4217 currencies.
- Updated the invoice currency dropdown display to simplify the output.
- Added error handling in balance formatting to improve robustness.

These changes aim to streamline the invoice creation process and enhance user experience.
---
 .../src/lib/create-invoice-form.svelte        | 104 +++++++++---------
 .../src/lib/invoice/form.svelte               |   2 +-
 .../src/lib/dashboard/invoice-view.svelte     |  11 +-
 3 files changed, 62 insertions(+), 55 deletions(-)

diff --git a/packages/create-invoice-form/src/lib/create-invoice-form.svelte b/packages/create-invoice-form/src/lib/create-invoice-form.svelte
index 09d12456..59693696 100644
--- a/packages/create-invoice-form/src/lib/create-invoice-form.svelte
+++ b/packages/create-invoice-form/src/lib/create-invoice-form.svelte
@@ -1,7 +1,11 @@
 <svelte:options customElement="create-invoice-form" />
 
 <script lang="ts">
-  import { getAccount, watchAccount, WatchAccountReturnType } from "@wagmi/core";
+  import {
+    getAccount,
+    watchAccount,
+    WatchAccountReturnType,
+  } from "@wagmi/core";
   import { Config as WagmiConfig } from "wagmi";
   // Types
   import { type GetAccountReturnType } from "@wagmi/core";
@@ -24,7 +28,7 @@
   import Status from "@requestnetwork/shared-components/status.svelte";
   import Modal from "@requestnetwork/shared-components/modal.svelte";
   import { EncryptionTypes, CipherProviderTypes } from "@requestnetwork/types";
-    import { onDestroy, onMount, tick } from "svelte";
+  import { onDestroy, onMount, tick } from "svelte";
 
   interface CipherProvider extends CipherProviderTypes.ICipherProvider {
     disconnectWallet: () => void;
@@ -36,32 +40,19 @@
   export let currencies: CurrencyTypes.CurrencyInput[] = [];
   let cipherProvider: CipherProvider | undefined;
 
-  let account: GetAccountReturnType | undefined = wagmiConfig && getAccount(wagmiConfig);
+  let account: GetAccountReturnType | undefined =
+    wagmiConfig && getAccount(wagmiConfig);
   let isTimeout = false;
   let activeConfig = config ? config : defaultConfig;
   let mainColor = activeConfig.colors.main;
   let secondaryColor = activeConfig.colors.secondary;
   let currencyManager = initializeCurrencyManager(currencies);
 
-  let invoiceCurrencyDropdown: { clear: () => void; };
-  let networkDropdown: { clear: () => void; };
-  let currencyDropdown: { clear: () => void; };
-
-  const extractUniqueNetworkNames = (): string[] => {
-    const networkSet = new Set<string>();
-
-    currencyManager.knownCurrencies.forEach(
-      (currency: CurrencyTypes.CurrencyDefinition) => {
-        if (currency.network) {
-          networkSet.add(currency.network);
-        }
-      }
-    );
-
-    return Array.from(networkSet);
-  };
-
-  let networks: string[] = extractUniqueNetworkNames();
+  let invoiceCurrencyDropdown: { clear: () => void };
+  let networkDropdown: { clear: () => void };
+  let currencyDropdown: { clear: () => void };
+  let filteredSettlementCurrencies: CurrencyTypes.CurrencyDefinition[] = [];
+  let networks: string[] = [];
 
   let network: string | undefined = undefined;
   let currency: CurrencyTypes.CurrencyDefinition | undefined = undefined;
@@ -70,32 +61,36 @@
   const handleNetworkChange = (newNetwork: string) => {
     if (newNetwork) {
       currencyDropdown.clear();
+      invoiceCurrency = invoiceCurrency?.type !== Types.RequestLogic.CURRENCY.ISO4217 ? currencyManager.knownCurrencies.find(currency => invoiceCurrency?.symbol === currency.symbol && currency.network === newNetwork) : invoiceCurrency;
       network = newNetwork;
-
       currency = undefined;
 
-      filteredSettlementCurrencies = currencyManager.knownCurrencies.filter((currency: CurrencyTypes.CurrencyDefinition) => {
-      if (!invoiceCurrency) {
-        return false;
-      }
-
-      // For ISO4217 currencies (like EUR)
-      if (invoiceCurrency.type === Types.RequestLogic.CURRENCY.ISO4217) {
-        const hasValidPath =
-          currencyManager?.getConversionPath(
-            invoiceCurrency,
-            currency,
-            currency?.network
-          )?.length > 0;
-
-        return (
-          currency.type !== Types.RequestLogic.CURRENCY.ISO4217 && hasValidPath
-        );
-      }
-
-      // For other currency types (like ERC20)
-      return invoiceCurrency.hash === currency?.hash;
-    });;
+      filteredSettlementCurrencies = currencyManager.knownCurrencies.filter(
+        (currency: CurrencyTypes.CurrencyDefinition) => {
+          if (!invoiceCurrency) {
+            return false;
+          }
+
+          // For ISO4217 currencies (like EUR)
+          if (invoiceCurrency.type === Types.RequestLogic.CURRENCY.ISO4217) {
+            const hasValidPath =
+              currencyManager?.getConversionPath(
+                invoiceCurrency,
+                currency,
+                currency?.network,
+              )?.length > 0;
+
+            return (
+              currency.type !== Types.RequestLogic.CURRENCY.ISO4217 &&
+              hasValidPath &&
+              currency.network === newNetwork
+            );
+          }
+
+          // For other currency types (like ERC20)
+          return invoiceCurrency.hash === currency?.hash;
+        },
+      );
     }
   };
 
@@ -103,11 +98,18 @@
   let canSubmit = false;
   let appStatus: APP_STATUS[] = [];
   let formData = getInitialFormData();
-  let defaultCurrencies = currencyManager.knownCurrencies;
-  let filteredSettlementCurrencies: CurrencyTypes.CurrencyDefinition[] = [];
+  // Remove duplicate currencies and filter out currencies with '-' in the symbol
+  let defaultCurrencies = Object.values(currencyManager.knownCurrencies.reduce(
+    (unique: { [x: string]: any; }, currency: { symbol: string | number; }) => {
+      if (!unique[currency.symbol] && !currency.symbol.includes('-')) unique[currency.symbol] = currency;
+
+      return unique;
+    },
+    {},
+  ));
 
   const handleInvoiceCurrencyChange = (
-    value: CurrencyTypes.CurrencyDefinition
+    value: CurrencyTypes.CurrencyDefinition,
   ) => {
     if (value !== invoiceCurrency) {
       networkDropdown.clear();
@@ -122,10 +124,10 @@
       if (invoiceCurrency.type === Types.RequestLogic.CURRENCY.ISO4217) {
         networks = (getCurrencySupportedNetworksForConversion(
           invoiceCurrency.hash,
-          currencyManager
+          currencyManager,
         ) ?? []) as string[];
       } else {
-        networks = extractUniqueNetworkNames();
+        networks = currencyManager.knownCurrencies.filter(currency => currency.symbol === invoiceCurrency?.symbol).map(currency => currency.network);
       }
     }
   };
@@ -257,7 +259,7 @@
               paymentNetwork: requestCreateParameters.paymentNetwork,
               contentData: requestCreateParameters.contentData,
             },
-            [payeeEncryptionParams, payerEncryptionParams]
+            [payeeEncryptionParams, payerEncryptionParams],
           );
         } else {
           request = await requestNetwork.createRequest({
diff --git a/packages/create-invoice-form/src/lib/invoice/form.svelte b/packages/create-invoice-form/src/lib/invoice/form.svelte
index 5421a790..ed403cf8 100644
--- a/packages/create-invoice-form/src/lib/invoice/form.svelte
+++ b/packages/create-invoice-form/src/lib/invoice/form.svelte
@@ -407,7 +407,7 @@
             bind:this={invoiceCurrencyDropdown}
             getValue={(currency) => currency.value.symbol}
             getDisplayValue={(currency) =>
-              `${currency.value.symbol} ${currency.value.network ? `(${currency.value.network})` : ""}`}
+              `${currency.value.symbol}`}
             placeholder="Invoice currency"
             items={defaultCurrencies
               ?.filter((curr) => curr)
diff --git a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte
index 00cc6b28..b279bc6b 100644
--- a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte
+++ b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte
@@ -480,9 +480,14 @@
   }
 
   function formatBalance(value: number, maxDecimals: number = 4): string {
-    return Number.isInteger(value)
-      ? value.toString()
-      : value.toFixed(maxDecimals);
+    try {
+      return Number.isInteger(value)
+        ? value.toString()
+        : value.toFixed(maxDecimals);
+    } catch (error) {
+      console.error("Error formatting balance:", error);
+      return "-";
+    }
   }
 
   async function checkBalance() {

From a0be7925240b36f10dca6644e4de47ca21cdc9bd Mon Sep 17 00:00:00 2001
From: rodrigopavezi <rodrigopavezi@gmail.com>
Date: Wed, 18 Dec 2024 22:04:49 -0300
Subject: [PATCH 2/2] chore: update package versions for create-invoice-form,
 invoice-dashboard, and payment-widget

- Bumped version of @requestnetwork/create-invoice-form from 0.11.14 to 0.11.15.
- Bumped version of @requestnetwork/invoice-dashboard from 0.11.12 to 0.11.13.
- Bumped version of @requestnetwork/payment-widget from 0.3.6 to 0.3.7.

These updates ensure compatibility with the latest features and fixes.
---
 package-lock.json                         | 6 +++---
 packages/create-invoice-form/package.json | 2 +-
 packages/invoice-dashboard/package.json   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d7234103..1ee9f1d2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11354,7 +11354,7 @@
     },
     "packages/create-invoice-form": {
       "name": "@requestnetwork/create-invoice-form",
-      "version": "0.11.10",
+      "version": "0.11.15",
       "license": "MIT",
       "dependencies": {
         "@requestnetwork/data-format": "0.19.5",
@@ -11374,7 +11374,7 @@
     },
     "packages/invoice-dashboard": {
       "name": "@requestnetwork/invoice-dashboard",
-      "version": "0.11.8",
+      "version": "0.11.13",
       "license": "MIT",
       "dependencies": {
         "@requestnetwork/payment-detection": "0.49.0",
@@ -11409,7 +11409,7 @@
     },
     "packages/payment-widget": {
       "name": "@requestnetwork/payment-widget",
-      "version": "0.3.6",
+      "version": "0.3.7",
       "license": "MIT",
       "dependencies": {
         "@requestnetwork/payment-processor": "0.52.0",
diff --git a/packages/create-invoice-form/package.json b/packages/create-invoice-form/package.json
index 258af872..009eabda 100644
--- a/packages/create-invoice-form/package.json
+++ b/packages/create-invoice-form/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@requestnetwork/create-invoice-form",
-  "version": "0.11.14",
+  "version": "0.11.15",
   "main": "./dist/web-component.umd.cjs",
   "scripts": {
     "dev": "vite dev",
diff --git a/packages/invoice-dashboard/package.json b/packages/invoice-dashboard/package.json
index 6d3c3502..cba5b3bf 100644
--- a/packages/invoice-dashboard/package.json
+++ b/packages/invoice-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@requestnetwork/invoice-dashboard",
-  "version": "0.11.12",
+  "version": "0.11.13",
   "main": "./dist/web-component.umd.cjs",
   "scripts": {
     "dev": "vite dev",