From 5204641957ad8c155e198747c4c1b95fc95ec67f Mon Sep 17 00:00:00 2001 From: sstefdev Date: Tue, 20 Aug 2024 20:29:36 +0200 Subject: [PATCH 1/2] fix: using deprecated method for retrieving currencies from currency manager --- .../src/lib/dashboard/invoice-view.svelte | 12 +++++++++-- .../src/lib/view-requests.svelte | 21 +++++++++++++------ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte index 9b7fa64d..ab4b30a7 100644 --- a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte +++ b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte @@ -39,7 +39,11 @@ export let isRequestPayed: boolean; let network = request?.currencyInfo?.network || "mainnet"; - let currency = currencyManager.fromAddress(request?.currencyInfo?.value); + // FIXME: Use a non deprecated function + let currency = currencyManager.fromStorageCurrency( + request?.currencyInfo.value, + request?.currencyInfo.network + ); let statuses: any = []; let isPaid = false; let loading = false; @@ -99,7 +103,11 @@ $: { wallet = wallet; network = request?.currencyInfo?.network || "mainnet"; - currency = currencyManager.fromAddress(request?.currencyInfo?.value); + // FIXME: Use a non deprecated function + currency = currencyManager.from( + request?.currencyInfo.value, + request?.currencyInfo.network + ); } const checkInvoice = async () => { diff --git a/packages/invoice-dashboard/src/lib/view-requests.svelte b/packages/invoice-dashboard/src/lib/view-requests.svelte index 894d74a0..b6a7f74f 100644 --- a/packages/invoice-dashboard/src/lib/view-requests.svelte +++ b/packages/invoice-dashboard/src/lib/view-requests.svelte @@ -86,6 +86,7 @@ type: Types.Identity.TYPE.ETHEREUM_ADDRESS, value: signer, }); + requests = requestsData ?.map((request) => request.getData()) .sort((a, b) => b.timestamp - a.timestamp); @@ -482,11 +483,17 @@ {formatUnits( BigInt(request.expectedAmount), - currencyManager.fromAddress(request.currencyInfo.value) - ?.decimals ?? 18 + // FIXME: Use a non deprecated function + currencyManager.from( + request.currencyInfo.value, + request.currencyInfo.network + )?.decimals ?? 18 )} - {currencyManager.fromAddress(request.currencyInfo.value) - ?.symbol} + + {currencyManager.from( + request.currencyInfo.value, + request.currencyInfo.network + )?.symbol} {checkStatus(request)} Date: Tue, 20 Aug 2024 15:16:05 -0400 Subject: [PATCH 2/2] fix: use `from` for consistency --- .../invoice-dashboard/src/lib/dashboard/invoice-view.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte index ab4b30a7..b9b9f974 100644 --- a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte +++ b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte @@ -40,7 +40,7 @@ let network = request?.currencyInfo?.network || "mainnet"; // FIXME: Use a non deprecated function - let currency = currencyManager.fromStorageCurrency( + let currency = currencyManager.from( request?.currencyInfo.value, request?.currencyInfo.network );