diff --git a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte index fadca9ae..21f8076f 100644 --- a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte +++ b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte @@ -15,6 +15,7 @@ import { CurrencyTypes } from "@requestnetwork/types"; import { getPaymentNetworkExtension } from "@requestnetwork/payment-detection"; // Components + import StatusLabel from "@requestnetwork/shared-components/status-label.svelte"; import Accordion from "@requestnetwork/shared-components/accordion.svelte"; import Button from "@requestnetwork/shared-components/button.svelte"; import Tooltip from "@requestnetwork/shared-components/tooltip.svelte"; @@ -371,9 +372,7 @@

Invoice #{request?.contentData?.invoiceNumber || "-"} -

- {status} -

+ { @@ -650,21 +649,6 @@ height: 13px; } - .invoice-status { - padding-left: 0.5rem; - padding-right: 0.5rem; - padding-top: 0.5rem; - padding-bottom: 0.5rem; - font-size: 14px; - font-weight: 500; - line-height: 1; - text-align: center; - border-radius: 8px; - color: #ffffff; - width: fit-content; - margin: 0; - } - .invoice-address { display: flex; flex-direction: column; diff --git a/packages/invoice-dashboard/src/lib/view-requests.svelte b/packages/invoice-dashboard/src/lib/view-requests.svelte index b3543388..25b09314 100644 --- a/packages/invoice-dashboard/src/lib/view-requests.svelte +++ b/packages/invoice-dashboard/src/lib/view-requests.svelte @@ -9,6 +9,7 @@ import Dropdown from "@requestnetwork/shared-components/dropdown.svelte"; import Input from "@requestnetwork/shared-components/input.svelte"; import PoweredBy from "@requestnetwork/shared-components/powered-by.svelte"; + import StatusLabel from "@requestnetwork/shared-components/status-label.svelte"; import Toaster from "@requestnetwork/shared-components/sonner.svelte"; import Tooltip from "@requestnetwork/shared-components/tooltip.svelte"; import TxType from "@requestnetwork/shared-components/tx-type.svelte"; @@ -32,7 +33,6 @@ import type { IConfig } from "@requestnetwork/shared-types"; import type { RequestNetwork } from "@requestnetwork/request-client.js"; // Utils - import { checkStatus } from "@requestnetwork/shared-utils/checkStatus"; import { config as defaultConfig } from "@requestnetwork/shared-utils/config"; import { initializeCurrencyManager } from "@requestnetwork/shared-utils/initCurrencyManager"; import { checkStatus } from "@requestnetwork/shared-utils/checkStatus"; @@ -648,7 +648,7 @@ type={signer === request.payer?.value ? "OUT" : "IN"} /> - {checkStatus(request)} + {#if request.paymentCurrencies.length > 0} diff --git a/shared/components/status-label.svelte b/shared/components/status-label.svelte new file mode 100644 index 00000000..3503b755 --- /dev/null +++ b/shared/components/status-label.svelte @@ -0,0 +1,103 @@ + + +
+ {capitalize(status)} +
+ +