Merge branch 'main' of github.com:RequestNetwork/web-components into 319-invoice-dashboard-lit-protocol-sign-in-fails-when-switching-accounts-sometimes-lit-protocol-prompts-sign-in-infinite-loop

sstefdev · sstefdev · commit bda56f62c835 · 2025-02-13T16:12:05.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,14 +10,18 @@
   ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "clean": "find . -path './node_modules' -prune -o -name 'dist' -type d -exec rm -rf '{}' \\; -printf '%p deleted\\n' 2>/dev/null",
-    "deep-clean": "find . -name 'node_modules' -type d -prune -print -exec rm -rf '{}' \\;",
     "build": "turbo run build",
     "build:form": "turbo run build --filter=@requestnetwork/create-invoice-form",
     "build:dashboard": "turbo run build --filter=@requestnetwork/invoice-dashboard",
     "build:stakeholder": "turbo run build --filter=@requestnetwork/add-stakeholder",
     "build:payment-widget": "turbo run build --filter=@requestnetwork/payment-widget",
     "build:single-invoice": "turbo run build --filter=@requestnetwork/single-invoice",
+    "clean": "npm run clean:dist && npm run clean:sveltekit",
+    "clean:dist": "find . -path ./node_modules -prune -o -name 'dist' -type d -exec rm -rf '{}' + -exec echo '{}' deleted \\;",
+    "clean:sveltekit": "find . -name '.svelte-kit' -type d -exec rm -rf '{}' + -exec echo '{}' deleted \\;",
+    "deep-clean": "npm run clean && npm run deep-clean:turbo && npm run deep-clean:node-modules",
+    "deep-clean:turbo": "find . -name '.turbo' -type d -exec rm -rf '{}' + -exec echo '{}' deleted \\;",
+    "deep-clean:node-modules": "find . -name 'node_modules' -type d -exec rm -rf '{}' + -exec echo '{}' deleted \\;",
     "link:react": "npm link $npm_config_app_path/node_modules/react $npm_config_app_path/node_modules/react-dom",
     "link:all": "npm run link:react --app-path=$npm_config_app_path && for d in packages/*; do (cd $d && npm link); done",
     "unlink:all": "for d in packages/*; do (cd $d && npm unlink); done"
diff --git 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.12.3",
+  "version": "0.13.0",
   "main": "./dist/web-component.umd.cjs",
   "scripts": {
     "dev": "vite dev",
@@ -33,8 +33,8 @@
     "!dist/**/*.spec.*"
   ],
   "dependencies": {
-    "@requestnetwork/data-format": "0.19.8",
-    "@requestnetwork/request-client.js": "0.57.0",
+    "@requestnetwork/data-format": "0.19.9",
+    "@requestnetwork/request-client.js": "0.58.0",
     "@wagmi/core": "^2.15.2",
     "validator": "^13.12.0",
     "viem": "^2.21.53"
diff --git a/packages/invoice-dashboard/package.json b/packages/invoice-dashboard/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@requestnetwork/invoice-dashboard",
-  "version": "0.15.0",
+  "version": "0.15.2",
   "main": "./dist/web-component.umd.cjs",
   "scripts": {
     "dev": "vite dev",
@@ -37,9 +37,9 @@
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
   "dependencies": {
-    "@requestnetwork/payment-detection": "0.52.0",
-    "@requestnetwork/payment-processor": "0.55.0",
-    "@requestnetwork/request-client.js": "0.57.0",
+    "@requestnetwork/payment-detection": "0.53.0",
+    "@requestnetwork/payment-processor": "0.56.0",
+    "@requestnetwork/request-client.js": "0.58.0",
     "@wagmi/connectors": "^5.5.3",
     "@wagmi/core": "^2.15.2",
     "ethers": "^5.7.2",
diff --git a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte
@@ -100,6 +100,10 @@
 
   let isSigningTransaction = false;
 
+  let initialPaymentCheck = false;
+
+  let showPaymentButton = true;
+
   const generateDetailParagraphs = (info: any) => {
     const fullName = [info?.firstName, info?.lastName]
       .filter(Boolean)
@@ -154,6 +158,12 @@
   $: {
     if (request?.requestId !== previousRequestId) {
       previousRequestId = request?.requestId;
+      initialPaymentCheck =
+        request?.state === "paid" ||
+        request?.state === "overpaid" ||
+        status === "paid" ||
+        status === "overpaid" ||
+        request?.balance?.balance >= request?.expectedAmount;
       checkInvoice();
     }
   }
@@ -345,6 +355,7 @@
       isPaid = true;
       status = checkStatus(requestData);
       isRequestPayed = true;
+      showPaymentButton = false; // Hide the button after successful payment
     } catch (err) {
       console.error("Something went wrong while paying : ", err);
 
@@ -857,7 +868,7 @@
       {/each}
     {/if}
   </div>
-  {#if !isPaid && !isPayee}
+  {#if !isPayee && !initialPaymentCheck}
     <div class="status-container">
       <div class="statuses">
         {#if statuses?.length > 0}
@@ -920,7 +931,7 @@
     </div>
   {/if}
   <div class="invoice-view-actions">
-    {#if !isPayee && !unsupportedNetwork && !isPaid && !isRequestPayed && !isSigningTransaction && !unknownCurrency}
+    {#if showPaymentButton && !isPayee && !unsupportedNetwork && !isSigningTransaction && !unknownCurrency && !initialPaymentCheck}
       {#if !hasEnoughBalance && correctChain}
         <div class="balance-warning">
           Insufficient funds: {Number(userBalance).toFixed(4)}
diff --git a/packages/invoice-dashboard/src/lib/view-requests.svelte b/packages/invoice-dashboard/src/lib/view-requests.svelte
@@ -452,6 +452,7 @@
     currentTab = tab;
     activeRequest = undefined;
     currentPage = 1;
+    getRequests(account, requestNetwork);
   };
 
   const handleColumnChange = (selectedOption: any) => {
diff --git a/packages/payment-widget/package.json b/packages/payment-widget/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@requestnetwork/payment-widget",
-  "version": "0.3.9",
+  "version": "0.3.10",
   "main": "./dist/web-component.umd.cjs",
   "scripts": {
     "dev": "vite dev",
@@ -56,9 +56,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@requestnetwork/payment-processor": "0.55.0",
-    "@requestnetwork/request-client.js": "0.57.0",
-    "@requestnetwork/web3-signature": "0.8.8",
+    "@requestnetwork/payment-processor": "0.56.0",
+    "@requestnetwork/request-client.js": "0.58.0",
+    "@requestnetwork/web3-signature": "0.8.9",
     "@web3modal/ethers5": "^5.0.11",
     "ethers": "^5.7.2",
     "vite-plugin-node-polyfills": "^0.22.0"
diff --git a/packages/single-invoice/package.json b/packages/single-invoice/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@requestnetwork/single-invoice",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "./dist/web-component.umd.cjs",
   "scripts": {
     "dev": "vite dev",
@@ -33,9 +33,9 @@
     "!dist/**/*.spec.*"
   ],
   "dependencies": {
-    "@requestnetwork/payment-detection": "0.52.0",
-    "@requestnetwork/payment-processor": "0.55.0",
-    "@requestnetwork/request-client.js": "0.57.0",
+    "@requestnetwork/payment-detection": "0.53.0",
+    "@requestnetwork/payment-processor": "0.56.0",
+    "@requestnetwork/request-client.js": "0.58.0",
     "@wagmi/core": "^2.15.2",
     "ethers": "^5.7.2",
     "viem": "^2.21.53",
diff --git a/shared/utils/generateInvoice.ts b/shared/utils/generateInvoice.ts
@@ -30,7 +30,11 @@ async function ensureHtml2PdfLoaded() {
 export const exportToPDF = async (
   invoice: Types.IRequestDataWithEvents,
   currency?: CurrencyTypes.CurrencyDefinition,
-  paymentCurrencies?: (CurrencyTypes.ERC20Currency | CurrencyTypes.NativeCurrency | undefined)[],
+  paymentCurrencies?: (
+    | CurrencyTypes.ERC20Currency
+    | CurrencyTypes.NativeCurrency
+    | undefined
+  )[],
   logo?: string
 ) => {
   await ensureHtml2PdfLoaded();
@@ -79,7 +83,7 @@ export const exportToPDF = async (
     <div id="invoice" style="max-width: 680px; margin: 0 auto; padding: 20px;">
       <div style="display: flex; justify-content: space-between; align-items: start;">
         ${logo && logo.length > 0 ? `<img src="${logo}" alt="Logo" style="width: 50px; height: 50px;">` : ""}
-        <div style="text-align: right;">
+        <div style="text-align: right; min-width: 150px; width: auto;">
           <p>Issued on ${formatDate(invoice.contentData?.creationDate)}</p>
           <p>Payment due by ${formatDate(invoice.contentData?.paymentTerms?.dueDate)}</p>
         </div>
@@ -198,11 +202,35 @@ export const exportToPDF = async (
     },
   };
 
+  // Create a hidden container
+  const container = document.createElement("div");
+  container.style.cssText = `
+    position: fixed;
+    left: -9999px;
+    top: -9999px;
+    height: 0;
+    overflow: hidden;
+    opacity: 0;
+    pointer-events: none;
+  `;
+
+  // Create the actual content element (this will be rendered in the PDF)
   const element = document.createElement("div");
   element.innerHTML = content;
-  document.body.appendChild(element);
 
-  await window.html2pdf().from(element).set(opt).save();
-
-  document.body.removeChild(element);
+  // Add the content element to the hidden container
+  container.appendChild(element);
+  document.body.appendChild(container);
+
+  try {
+    await window
+      .html2pdf()
+      .from(element) // Use the inner element for PDF generation
+      .set(opt)
+      .save();
+  } finally {
+    if (document.body.contains(container)) {
+      document.body.removeChild(container);
+    }
+  }
 };
diff --git a/shared/utils/initCurrencyManager.ts b/shared/utils/initCurrencyManager.ts
@@ -8,9 +8,6 @@ const defaultCurrencyIds = [
   "CNY",
   "GBP",
   "JPY",
-  "DAI-bsc",
-  "BUSD-bsc",
-  "ETH-base-base",
   "DAI-mainnet",
   "ETH-mainnet",
   "REQ-mainnet",
@@ -20,16 +17,10 @@ const defaultCurrencyIds = [
   "MATIC-matic",
   "USDC-matic",
   "USDT-matic",
-  "DAI-optimism",
-  "ETH-optimism-optimism",
-  "USDC-optimism",
-  "USDT-optimism",
   "FAU-sepolia",
   "ETH-sepolia-sepolia",
   "fUSDC-sepolia",
   "fUSDT-sepolia",
-  "USDC-xdai",
-  "USDC-base",
 ];
 
 const TOKEN_LIST_URL =
