Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: add proper handling of invoice #12

Merged
merged 1 commit into from
Jul 5, 2024
Merged

fix: add proper handling of invoice #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions frontend/src/screens/wallet/Send.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import { Label } from "src/components/ui/label";
import { LoadingButton } from "src/components/ui/loading-button";
import { useToast } from "src/components/ui/use-toast";
import { useBalances } from "src/hooks/useBalances";
import { useInfo } from "src/hooks/useInfo";
import { useCSRF } from "src/hooks/useCSRF";
import { useInfo } from "src/hooks/useInfo";
import { copyToClipboard } from "src/lib/clipboard";
import { PayInvoiceResponse } from "src/types";
import { request } from "src/utils/request";
Expand All @@ -39,6 +39,20 @@ export default function Send() {
return <Loading />;
}

const handleContinue = () => {
try {
new Invoice({ pr: invoice });
setShowConfirmation(true);
} catch (error) {
toast({
variant: "destructive",
title: "Invalid Payment Request",
});
console.error(error);
setInvoice("");
}
};

const handleSubmit = async (event: React.FormEvent<HTMLFormElement>) => {
event.preventDefault();
try {
Expand All @@ -47,7 +61,7 @@ export default function Send() {
}
setLoading(true);
const payInvoiceResponse = await request<PayInvoiceResponse>(
`/api/payments/${invoice.trim()}`,
`/api/payments/${invoice}`,
{
method: "POST",
headers: {
Expand All @@ -69,6 +83,8 @@ export default function Send() {
variant: "destructive",
title: "Failed to send: " + e,
});
setInvoice("");
setShowConfirmation(false);
console.error(e);
}
setLoading(false);
Expand All @@ -81,7 +97,7 @@ export default function Send() {

const paste = async () => {
const text = await navigator.clipboard.readText();
setInvoice(text);
setInvoice(text.trim());
};

return (
Expand Down Expand Up @@ -175,7 +191,7 @@ export default function Send() {
autoFocus
placeholder="Enter an invoice"
onChange={(e) => {
setInvoice(e.target.value);
setInvoice(e.target.value.trim());
}}
/>
<Button
Expand All @@ -189,10 +205,7 @@ export default function Send() {
</div>
</div>
<div>
<Button
onClick={() => setShowConfirmation(true)}
disabled={!invoice}
>
<Button onClick={handleContinue} disabled={!invoice}>
Continue
</Button>
</div>
Expand Down
Loading