diff --git a/src/app/components/PaymentSummary/index.tsx b/src/app/components/PaymentSummary/index.tsx index 15ae87942b..634350bc2b 100644 --- a/src/app/components/PaymentSummary/index.tsx +++ b/src/app/components/PaymentSummary/index.tsx @@ -4,50 +4,45 @@ import { useSettings } from "~/app/context/SettingsContext"; export type Props = { amount: string | number; - amountAlt?: string; description?: string | React.ReactNode; fiatAmount: string; }; -const PaymentSummary: FC = ({ - amount, - amountAlt, - description, - fiatAmount, -}) => { +const PaymentSummary: FC = ({ amount, description, fiatAmount }) => { const { t: tCommon } = useTranslation("common"); const { getFormattedSats } = useSettings(); return ( -
-
- {tCommon("amount")} -
-
-
{getFormattedSats(amount)}
- {!!fiatAmount && ( - - {" "} - (~{fiatAmount}) - - )} -
- {amountAlt &&
{amountAlt}
} +
+
+
{tCommon("amount")}
+
+
+
{getFormattedSats(amount)}
+ {!!fiatAmount && ( + ~{fiatAmount} + )} +
+
+
{!!description && ( - <> -
- {tCommon("description")} -
-
- {description} -
- +
+
{tCommon("description")}
+
{description}
+
)}
); }; +const Dt = ({ children }: { children: React.ReactNode }) => ( +
+ {children} +
+); + +const Dd = ({ children }: { children: React.ReactNode }) => ( +
{children}
+); + export default PaymentSummary; diff --git a/src/app/screens/ConfirmKeysend/index.test.tsx b/src/app/screens/ConfirmKeysend/index.test.tsx index e71af1aaa2..618399a1bf 100644 --- a/src/app/screens/ConfirmKeysend/index.test.tsx +++ b/src/app/screens/ConfirmKeysend/index.test.tsx @@ -1,4 +1,4 @@ -import { render, screen, act } from "@testing-library/react"; +import { act, render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import { MemoryRouter } from "react-router-dom"; import { settingsFixture as mockSettings } from "~/../tests/fixtures/settings"; @@ -86,7 +86,7 @@ describe("ConfirmKeysend", () => { }); expect(screen.getByText("21 sats")).toBeInTheDocument(); - expect(screen.getByText("(~$0.01)")).toBeInTheDocument(); + expect(screen.getByText("~$0.01")).toBeInTheDocument(); expect(screen.queryByText("~$0.05")).not.toBeInTheDocument(); await act(() => { diff --git a/src/app/screens/ConfirmPayment/index.test.tsx b/src/app/screens/ConfirmPayment/index.test.tsx index cdbc2ad214..36c3ca9a68 100644 --- a/src/app/screens/ConfirmPayment/index.test.tsx +++ b/src/app/screens/ConfirmPayment/index.test.tsx @@ -1,4 +1,4 @@ -import { render, screen, act } from "@testing-library/react"; +import { act, render, screen } from "@testing-library/react"; import userEvent from "@testing-library/user-event"; import lightningPayReq from "bolt11"; import { MemoryRouter } from "react-router-dom"; @@ -77,7 +77,7 @@ describe("ConfirmPayment", () => { expect(await screen.findByText("Amount")).toBeInTheDocument(); expect(await screen.findByText("Description")).toBeInTheDocument(); - expect(await screen.findByText("(~$0.01)")).toBeInTheDocument(); + expect(await screen.findByText("~$0.01")).toBeInTheDocument(); expect( await screen.findByLabelText("Remember and set a budget") ).toBeInTheDocument(); @@ -135,7 +135,7 @@ describe("ConfirmPayment", () => { expect(await screen.findByText("Amount")).toBeInTheDocument(); expect(await screen.findByText("Description")).toBeInTheDocument(); - expect(screen.getByText("(~$0.01)")).toBeInTheDocument(); + expect(screen.getByText("~$0.01")).toBeInTheDocument(); expect( await screen.queryByText("Remember and set a budget") ).not.toBeInTheDocument(); diff --git a/src/app/screens/ConfirmPaymentAsync/index.test.tsx b/src/app/screens/ConfirmPaymentAsync/index.test.tsx index dd525f0fed..d67accb558 100644 --- a/src/app/screens/ConfirmPaymentAsync/index.test.tsx +++ b/src/app/screens/ConfirmPaymentAsync/index.test.tsx @@ -75,6 +75,6 @@ describe("ConfirmPaymentAsync", () => { expect(await screen.findByText("Amount")).toBeInTheDocument(); expect(await screen.findByText("Description")).toBeInTheDocument(); - expect(await screen.findByText("(~$0.01)")).toBeInTheDocument(); + expect(await screen.findByText("~$0.01")).toBeInTheDocument(); }); });