Merge branch 'main' of github.com:RequestNetwork/web-components into 285-switch-network-button-disabled-when-it-should-be-enabled-and-vice-versa

Author: sstefdev

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

@@ -29,7 +29,8 @@
   export let handleNetworkChange: (chainId: string) => void;
   export let networks;
   export let defaultCurrencies: any = [];
-  export let filteredSettlementCurrencies: CurrencyTypes.CurrencyDefinition[] = [];
+  export let filteredSettlementCurrencies: CurrencyTypes.CurrencyDefinition[] =
+    [];
   export let cipherProvider: CipherProviderTypes.ICipherProvider | undefined;
 
   export let invoiceCurrencyDropdown;
@@ -161,7 +162,7 @@
 
   $: if (!formData.dueDate) {
     formData.dueDate = inputDateFormat(
-      new Date(new Date(formData.issuedOn).getTime() + 24 * 60 * 60 * 1000)
+      new Date(new Date(formData.issuedOn).getTime() + 30 * 24 * 60 * 60 * 1000)
     );
   }
 </script>
@@ -406,8 +407,7 @@
           <SearchableDropdown
             bind:this={invoiceCurrencyDropdown}
             getValue={(currency) => currency.value.symbol}
-            getDisplayValue={(currency) =>
-              `${currency.value.symbol}`}
+            getDisplayValue={(currency) => `${currency.value.symbol}`}
             placeholder="Invoice currency"
             items={defaultCurrencies
               ?.filter((curr) => curr)
@@ -419,7 +419,7 @@
             onSelect={handleInvoiceCurrencyChange}
           />
         </div>
-        <div class="searchable-dropdown-container"> 
+        <div class="searchable-dropdown-container">
           <SearchableDropdown
             bind:this={networkDropdown}
             items={networks

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

@@ -64,6 +64,7 @@
   let otherItems: any;
   let sellerInfo: SellerInfo[] = [];
   let buyerInfo: BuyerInfo[] = [];
+  let unknownCurrency = currency?.decimals === undefined;
   let isPayee = request?.payee?.value.toLowerCase() === address?.toLowerCase();
   let unsupportedNetwork = false;
   let hexStringChain = "0x" + account?.chainId?.toString(16);
@@ -155,7 +156,7 @@
   }
 
   $: {
-    if (account && network) {
+    if (account && network && !unknownCurrency) {
       checkBalance();
     }
   }
@@ -638,18 +639,18 @@
   <h3 class="invoice-info-payment">
     <span style="font-weight: 500;">Payment Chain:</span>
     {paymentCurrencies && paymentCurrencies.length > 0
-      ? paymentCurrencies[0]?.network || "-"
+      ? paymentCurrencies[0]?.network || "Unknown"
       : ""}
   </h3>
   <h3 class="invoice-info-payment">
     <span style="font-weight: 500;">Invoice Currency:</span>
-    {currency?.symbol || "-"}
+    {currency?.symbol || "Unknown"}
   </h3>
 
   <h3 class="invoice-info-payment">
     <span style="font-weight: 500;">Settlement Currency:</span>
     {paymentCurrencies && paymentCurrencies.length > 0
-      ? paymentCurrencies[0]?.symbol || "-"
+      ? paymentCurrencies[0]?.symbol || "Unknown"
       : ""}
   </h3>
 
@@ -675,27 +676,34 @@
                 <p class="truncate description-text">{item.name || "-"}</p>
               </th>
               <td>{item.quantity || "-"}</td>
-              <td
-                >{item.unitPrice
-                  ? formatUnits(item.unitPrice, currency?.decimals ?? 18)
-                  : "-"}</td
-              >
-              <td
-                >{item.discount
+              <td>
+                {#if unknownCurrency}
+                  Unknown
+                {:else}
+                  {item.unitPrice
+                    ? formatUnits(item.unitPrice, currency?.decimals ?? 18)
+                    : "-"}
+                {/if}
+              </td>
+              <td>
+                {item.discount
                   ? formatUnits(item.discount, currency?.decimals ?? 18)
-                  : "-"}</td
-              >
+                  : "-"}
+              </td>
               <td>{Number(item.tax.amount || "-")}</td>
-              <td
-                >{truncateNumberString(
-                  formatUnits(
-                    // @ts-expect-error
-                    calculateItemTotal(item),
-                    currency?.decimals ?? 18
-                  ),
-                  2
-                )}</td
-              >
+              <td>
+                {#if unknownCurrency}
+                  Unknown
+                {:else}
+                  {truncateNumberString(
+                    formatUnits(
+                      calculateItemTotal(item),
+                      currency?.decimals ?? 18
+                    ),
+                    2
+                  )}
+                {/if}
+              </td>
             </tr>
           {/each}
         </tbody>
@@ -724,27 +732,34 @@
                     </p>
                   </th>
                   <td>{item.quantity || "-"}</td>
-                  <td
-                    >{item.unitPrice
-                      ? formatUnits(item.unitPrice, currency?.decimals ?? 18)
-                      : "-"}</td
-                  >
-                  <td
-                    >{item.discount
+                  <td>
+                    {#if unknownCurrency}
+                      Unknown
+                    {:else}
+                      {item.unitPrice
+                        ? formatUnits(item.unitPrice, currency?.decimals ?? 18)
+                        : "-"}
+                    {/if}
+                  </td>
+                  <td>
+                    {item.discount
                       ? formatUnits(item.discount, currency?.decimals ?? 18)
-                      : "-"}</td
-                  >
+                      : "-"}
+                  </td>
                   <td>{Number(item.tax.amount || "-")}</td>
-                  <td
-                    >{truncateNumberString(
-                      formatUnits(
-                        // @ts-expect-error
-                        calculateItemTotal(item),
-                        currency?.decimals ?? 18
-                      ),
-                      2
-                    )}</td
-                  >
+                  <td>
+                    {#if unknownCurrency}
+                      Unknown
+                    {:else}
+                      {truncateNumberString(
+                        formatUnits(
+                          calculateItemTotal(item),
+                          currency?.decimals ?? 18
+                        ),
+                        2
+                      )}
+                    {/if}
+                  </td>
                 </tr>
               {/each}</tbody
             >
@@ -833,7 +848,7 @@
     </div>
   {/if}
   <div class="invoice-view-actions">
-    {#if !isPayee && !unsupportedNetwork && !isPaid && !isRequestPayed && !isSigningTransaction}
+    {#if !isPayee && !unsupportedNetwork && !isPaid && !isRequestPayed && !isSigningTransaction && !unknownCurrency}
       {#if !hasEnoughBalance && correctChain}
         <div class="balance-warning">
           Insufficient funds: {Number(userBalance).toFixed(4)}

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

@@ -119,7 +119,10 @@
     cipherProvider = undefined;
   };
 
-  const handleWalletChange = (account: GetAccountReturnType, previousAccount: GetAccountReturnType) => {
+  const handleWalletChange = (
+    account: GetAccountReturnType,
+    previousAccount: GetAccountReturnType
+  ) => {
     if (account?.address !== previousAccount?.address) {
       handleWalletDisconnection();
       handleWalletConnection();
@@ -132,7 +135,10 @@
 
   onMount(() => {
     unwatchAccount = watchAccount(wagmiConfig, {
-      onChange(account: GetAccountReturnType, previousAccount: GetAccountReturnType) {
+      onChange(
+        account: GetAccountReturnType,
+        previousAccount: GetAccountReturnType
+      ) {
         tick().then(() => {
           handleWalletChange(account, previousAccount);
         });
@@ -279,6 +285,11 @@
         currencyManager
       );
 
+      const formattedAmount =
+        currencyInfo?.decimals !== undefined
+          ? formatUnits(BigInt(request.expectedAmount), currencyInfo.decimals)
+          : "Unknown";
+
       let paymentNetworkExtension = getPaymentNetworkExtension(request);
       let paymentCurrencies: (
         | CurrencyTypes.ERC20Currency
@@ -328,11 +339,8 @@
 
       return {
         ...request,
-        formattedAmount: formatUnits(
-          BigInt(request.expectedAmount),
-          currencyInfo?.decimals ?? 18
-        ),
-        currencySymbol: currencyInfo?.symbol ?? "-",
+        formattedAmount,
+        currencySymbol: currencyInfo?.symbol ?? "",
         paymentCurrencies,
       };
     }
@@ -710,7 +718,13 @@
                   </td>
                 {/if}
                 <td>
-                  {#if request.formattedAmount.includes(".") && request.formattedAmount.split(".")[1].length > 5}
+                  {#if request.formattedAmount === "Unknown"}
+                    <Tooltip
+                      text="Cannot calculate the expected amount due to unknown decimals"
+                    >
+                      Unknown
+                    </Tooltip>
+                  {:else if request.formattedAmount.includes(".") && request.formattedAmount.split(".")[1].length > 5}
                     <Tooltip text={request.formattedAmount}>
                       {Number(request.formattedAmount).toFixed(5)}
                     </Tooltip>