diff --git a/package-lock.json b/package-lock.json index 5589f23a..3413044c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14273,7 +14273,7 @@ }, "packages/create-invoice-form": { "name": "@requestnetwork/create-invoice-form", - "version": "0.7.0", + "version": "0.8.1", "license": "MIT", "dependencies": { "@requestnetwork/request-client.js": "0.47.1-next.2043", @@ -14289,7 +14289,7 @@ }, "packages/invoice-dashboard": { "name": "@requestnetwork/invoice-dashboard", - "version": "0.6.1", + "version": "0.7.1", "license": "MIT", "dependencies": { "@requestnetwork/payment-detection": "0.43.1-next.2043", @@ -14321,7 +14321,7 @@ }, "packages/payment-widget": { "name": "@requestnetwork/payment-widget", - "version": "0.1.1", + "version": "0.1.4", "license": "MIT", "dependencies": { "@requestnetwork/payment-processor": "^0.47.0", diff --git a/packages/invoice-dashboard/src/lib/view-requests.svelte b/packages/invoice-dashboard/src/lib/view-requests.svelte index d190f750..c61c5c27 100644 --- a/packages/invoice-dashboard/src/lib/view-requests.svelte +++ b/packages/invoice-dashboard/src/lib/view-requests.svelte @@ -31,7 +31,7 @@ import { Types } from "@requestnetwork/request-client.js"; import { onMount } from "svelte"; import { formatUnits } from "viem"; - import { debounce, exportToPDF, formatAddress } from "../utils"; + import { capitalize, debounce, exportToPDF, formatAddress } from "../utils"; import { getCurrencyFromManager } from "../utils/getCurrency"; import { Drawer, InvoiceView } from "./dashboard"; @@ -276,11 +276,13 @@ }; const checkStatus = (request: any) => { - switch (request?.balance?.balance >= request?.expectedAmount) { + switch (request?.balance?.balance > 0) { case true: - return "Paid"; + return request?.balance?.balance >= request?.expectedAmount + ? "Paid" + : "Partially Paid"; default: - return "Created"; + return capitalize(request?.state); } }; diff --git a/packages/invoice-dashboard/src/utils/capitalize.ts b/packages/invoice-dashboard/src/utils/capitalize.ts new file mode 100644 index 00000000..ac21f51c --- /dev/null +++ b/packages/invoice-dashboard/src/utils/capitalize.ts @@ -0,0 +1 @@ +export const capitalize = (str: string) => (str && str[0].toUpperCase() + str.slice(1)) || "" diff --git a/packages/invoice-dashboard/src/utils/index.ts b/packages/invoice-dashboard/src/utils/index.ts index 22b91dac..8c51d54e 100644 --- a/packages/invoice-dashboard/src/utils/index.ts +++ b/packages/invoice-dashboard/src/utils/index.ts @@ -2,3 +2,4 @@ export { debounce } from "./debounce"; export { formatAddress } from "./formatAddress"; export { exportToPDF } from "./generateInvoice"; export { publicClientToProvider, walletClientToSigner } from "./wallet-utils"; +export { capitalize } from "./capitalize";