Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
APP_VERSION=2.5.6
APP_VERSION=2.5.7

APP_BUILD_NUMBER=433
APP_BUILD_NUMBER=434
1 change: 1 addition & 0 deletions fastlane/metadata/android/en-US/changelogs/434.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Minor improvements and optimizations
1 change: 1 addition & 0 deletions fastlane/metadata/android/fr-FR/changelogs/434.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- Améliorations et optimisations mineures
26 changes: 13 additions & 13 deletions src/screens/Invoice/Invoice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ export type InvoiceType = {
input: Input;
paymentDetails: PaymentDetail[];
device?: Device;
// paymentMethod: "lightning" | "onchain";
redirectUrl: `http://${string}`;
redirectAfterPaid?: `http://${string}`;
amlInfoStatus?: AmlInfoStatus;
};

Expand Down Expand Up @@ -213,7 +212,8 @@ export const Invoice = () => {
const [amlDecision, setAmlDescision] = useState(true);
const [invoiceFiatAmount, setInvoiceFiatAmount] = useState(0);
const [isInvalidInvoice, setIsInvalidInvoice] = useState(false);
const [redirectUrl, setRedirectUrl] = useState<`http://${string}`>();
const [redirectAfterPaid, setRedirectAfterPaid] =
useState<`http://${string}`>();
const [readingNfcData, setReadingNfcData] =
useState<Parameters<typeof readingNfcLoop>[0]>();

Expand Down Expand Up @@ -535,11 +535,11 @@ export const Invoice = () => {
(p) => p.paidAt
)?.network;

if (getInvoiceData.redirectUrl) {
setRedirectUrl(
getInvoiceData.redirectUrl.includes("://")
? getInvoiceData.redirectUrl
: `http://${getInvoiceData.redirectUrl}`
if (getInvoiceData.redirectAfterPaid) {
setRedirectAfterPaid(
getInvoiceData.redirectAfterPaid.includes("://")
? getInvoiceData.redirectAfterPaid
: `http://${getInvoiceData.redirectAfterPaid}`
);
}

Expand Down Expand Up @@ -687,12 +687,12 @@ export const Invoice = () => {
}
navigate("/");
};
} else if (redirectUrl) {
} else if (redirectAfterPaid) {
return () => {
void Linking.openURL(redirectUrl);
void Linking.openURL(redirectAfterPaid);
};
}
}, [isExternalInvoice, navigate, redirectUrl, toTerminalTimeout]);
}, [isExternalInvoice, navigate, redirectAfterPaid, toTerminalTimeout]);

const alreadyPaidAmount = useMemo(
() => onChainTxs?.reduce((result, o) => result + (o.amount || 0), 0) || 0,
Expand Down Expand Up @@ -1137,11 +1137,11 @@ export const Invoice = () => {
</>
)}
</>
{status === "settled" && redirectUrl && isInitialPaid && (
{status === "settled" && redirectAfterPaid && isInitialPaid && (
<Button
title={t("returnToWebsite")}
icon={faArrowUpRightFromSquare}
onPress={redirectUrl}
onPress={redirectAfterPaid}
/>
)}
{isAlive && isExternalInvoice && (
Expand Down
Loading