Merge branch 'main' into feat/conversion

Author: MantisClone

package-lock.json

@@ -36,10 +36,12 @@
     "@requestnetwork/data-format": "0.19.1",
     "@requestnetwork/request-client.js": "0.50.0",
     "@wagmi/core": "^2.13.8",
+    "validator": "^13.12.0",
     "viem": "^2.9.15"
   },
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^2.5.2",
+    "@types/validator": "^13.12.2",
     "svelte": "^4.0.5",
     "svelte-check": "^3.6.0",
     "typescript": "^5.0.0",

packages/create-invoice-form/package.json

@@ -458,7 +458,7 @@
   }
 
   .invoice-note-content {
-    width: 620px;
+    max-width: 620px;
     word-break: break-all;
   }
 

packages/create-invoice-form/src/lib/invoice/form-view.svelte

@@ -19,6 +19,7 @@
   import { inputDateFormat } from "@requestnetwork/shared-utils/formatDate";
   import { Types } from "@requestnetwork/request-client.js";
   import { CurrencyTypes } from "@requestnetwork/types";
+  import isEmail from "validator/es/lib/isEmail";
 
   export let config: IConfig;
   export const invoiceNumber: number = 1;
@@ -55,8 +56,7 @@
   }
 
   const validateEmail = (email: string, type: "sellerInfo" | "buyerInfo") => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    validationErrors[`${type}`].email = !emailRegex.test(email);
+    validationErrors[`${type}`].email = !isEmail(email);
   };
 
   const checkPayeeAddress = () => {

packages/create-invoice-form/src/lib/invoice/form.svelte

@@ -1,6 +1,6 @@
+import { parseUnits, zeroAddress, getAddress } from "viem";
 import { Types, Utils } from "@requestnetwork/request-client.js";
 import type { CustomFormData } from "@requestnetwork/shared-types";
-import { parseUnits, zeroAddress } from "viem";
 import { CurrencyTypes } from "@requestnetwork/types";
 
 interface IRequestParams {
@@ -24,7 +24,7 @@ const getPaymentNetwork = (invoiceCurrency: CurrencyTypes.CurrencyDefinition, cu
       id: Types.Extension.PAYMENT_NETWORK_ID.ANY_TO_ETH_PROXY,
       parameters: {
         network: currency.network,
-        paymentAddress: formData.payeeAddress,
+        paymentAddress: getAddress(formData.payeeAddress),
         feeAddress: zeroAddress,
         feeAmount: "0",
       },
@@ -37,32 +37,34 @@ const getPaymentNetwork = (invoiceCurrency: CurrencyTypes.CurrencyDefinition, cu
       id: Types.Extension.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY,
       parameters: {
         network: currency.network,
-        paymentAddress: formData.payeeAddress,
+        paymentAddress: getAddress(formData.payeeAddress),
         feeAddress: zeroAddress,
         feeAmount: "0",
-        acceptedTokens: [currency.address],
+        acceptedTokens: [getAddress(currency.address)],
       },
     };
   } else if (currency.type === Types.RequestLogic.CURRENCY.ETH) {
     return {
       id: Types.Extension.PAYMENT_NETWORK_ID.ETH_FEE_PROXY_CONTRACT,
       parameters: {
         paymentNetworkName: currency.network,
-        paymentAddress: formData.payeeAddress,
+        paymentAddress: getAddress(formData.payeeAddress),
         feeAddress: zeroAddress,
         feeAmount: "0",
       },
     }
-  } else {
+  } else if (currency.type === Types.RequestLogic.CURRENCY.ERC20) {
     return {
       id: Types.Extension.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT,
       parameters: {
         paymentNetworkName: currency.network,
-        paymentAddress: formData.payeeAddress,
+        paymentAddress: getAddress(formData.payeeAddress),
         feeAddress: zeroAddress,
         feeAmount: "0",
       },
     }
+  } else {
+    throw new Error("Unsupported payment network");
   }
 };
 
@@ -88,16 +90,16 @@ export const prepareRequestParams = ({
       ).toString(),
       payee: {
         type: Types.Identity.TYPE.ETHEREUM_ADDRESS,
-        value: formData.creatorId,
+        value: getAddress(formData.creatorId),
       },
       payer: {
         type: Types.Identity.TYPE.ETHEREUM_ADDRESS,
-        value: formData.payerAddress,
+        value: getAddress(formData.payerAddress),
       },
       timestamp: Utils.getCurrentTimestampInSecond(),
     },
     paymentNetwork: getPaymentNetwork(invoiceCurrency, currency, formData),
-    paymentCurrency: isERC20 ? currency.address : currency.symbol,
+    paymentCurrency: isERC20 ? getAddress(currency.address) : currency.symbol,
     contentData: {
       meta: {
         format: "rnf_invoice",
@@ -170,7 +172,7 @@ export const prepareRequestParams = ({
     },
     signer: {
       type: Types.Identity.TYPE.ETHEREUM_ADDRESS,
-      value: address as string,
+      value: getAddress(address as string),
     },
   };
 };

packages/create-invoice-form/src/lib/utils/prepareRequest.ts

@@ -208,7 +208,7 @@
         undefined,
         paymentSettings
       );
-      await paymentTx.wait(2);
+      await paymentTx.wait();
 
       statuses = [...statuses, "Payment detected"];
       while (requestData.balance?.balance! < requestData.expectedAmount) {
@@ -261,7 +261,7 @@
         [Types.Extension.PAYMENT_NETWORK_ID.ERC20_FEE_PROXY_CONTRACT]:
           async () => {
             const approvalTx = await approveErc20(requestData!, signer);
-            await approvalTx.wait(2);
+            await approvalTx.wait();
             approved = true;
           },
         [Types.Extension.PAYMENT_NETWORK_ID.ANY_TO_ERC20_PROXY]: async () => {
@@ -270,7 +270,7 @@
             paymentCurrencies[0]?.address,
             signer
           );
-          await approvalTx.wait(2);
+          await approvalTx.wait();
           approved = true;
         },
       };

packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte

@@ -614,7 +614,13 @@
                     </td>
                   {/if}
                   <td>
-                    {request.formattedAmount}
+                    {#if request.formattedAmount.includes(".") && request.formattedAmount.split(".")[1].length > 5}
+                      <Tooltip text={request.formattedAmount}>
+                        {Number(request.formattedAmount).toFixed(5)}
+                      </Tooltip>
+                    {:else}
+                      {request.formattedAmount}
+                    {/if}
                     {request.currencySymbol}
                   </td>
                   <td> {checkStatus(request)}</td>

packages/invoice-dashboard/src/lib/view-requests.svelte

@@ -1,3 +1,4 @@
+import { getAddress } from "viem";
 import { checkAddress } from "@requestnetwork/shared-utils/checkEthAddress";
 
 export const formatAddress = (
@@ -9,5 +10,7 @@ export const formatAddress = (
     console.error("Invalid address!");
   }
 
-  return `${address.slice(0, first)}...${address.slice(-last)}`;
+  const checksumAddress = getAddress(address);
+
+  return `${checksumAddress.slice(0, first)}...${checksumAddress.slice(-last)}`;
 };