github-such-software/xmrcheckout
1
0
Fork 0
mirror of https://github.com/Such-Software/xmrcheckout.git synced 2026-10-17 05:51:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoid false Monero outage states in UI

Browse Source
This commit is contained in:
xmrcheckout
2026-03-26 15:46:31 +00:00
parent 10011ffb8c
commit d039d5a984
3 changed files with 151 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/app/(app)/dashboard/page.tsx
+51 -19
View File
@@ -85,6 +85,51 @@ type SystemStatusSummary = {
last_reconcile_completed_at: string | null;
last_reconcile_error: string | null;
};
const walletRpcBadge = (systemStatus: SystemStatusSummary | null) => {
if (!systemStatus) {
return {
className: "bg-amber-100 text-amber-900",
label: "Wallet RPC unavailable",
};
}
if (systemStatus.wallet_rpc === "ok") {
return {
className: "bg-emerald-100 text-emerald-900",
label: "Wallet RPC ok",
};
}
return {
className: "bg-red-100 text-red-700",
label: "Wallet RPC down",
};
};
const daemonBadge = (systemStatus: SystemStatusSummary | null) => {
if (!systemStatus) {
return {
className: "bg-amber-100 text-amber-900",
label: "Daemon unavailable",
};
}
if (systemStatus.daemon === "ok") {
return {
className: "bg-emerald-100 text-emerald-900",
label: "Daemon connected",
};
}
if (systemStatus.daemon === "unknown") {
return {
className: "bg-amber-100 text-amber-900",
label: "Daemon not configured",
};
}
return {
className: "bg-red-100 text-red-700",
label: "Daemon down",
};
};
export default async function DashboardPage({
searchParams,
}: {
@@ -259,6 +304,8 @@ export default async function DashboardPage({
const confirmedCount = allInvoices.filter(
(invoice) => invoice.status === "confirmed"
).length;
const walletStatusBadge = walletRpcBadge(systemStatus);
const daemonStatusBadge = daemonBadge(systemStatus);
const lastReconcileCompleted = systemStatus?.last_reconcile_completed_at
? formatRelativeTime(systemStatus.last_reconcile_completed_at)
: null;
@@ -377,29 +424,14 @@ export default async function DashboardPage({
</p>
<div className="flex flex-wrap gap-2 text-[0.7rem] font-semibold uppercase tracking-[0.12em]">
<span
className={`rounded-full px-3 py-1 ${
systemStatus?.wallet_rpc === "ok"
? "bg-emerald-100 text-emerald-900"
: "bg-red-100 text-red-700"
}`}
className={`rounded-full px-3 py-1 ${walletStatusBadge.className}`}
>
Wallet RPC {systemStatus?.wallet_rpc === "ok" ? "ok" : "down"}
{walletStatusBadge.label}
</span>
<span
className={`rounded-full px-3 py-1 ${
systemStatus?.daemon === "ok"
? "bg-emerald-100 text-emerald-900"
: systemStatus?.daemon === "unknown"
? "bg-amber-100 text-amber-900"
: "bg-red-100 text-red-700"
}`}
className={`rounded-full px-3 py-1 ${daemonStatusBadge.className}`}
>
Daemon{" "}
{systemStatus?.daemon === "ok"
? "connected"
: systemStatus?.daemon === "unknown"
? "not configured"
: "down"}
{daemonStatusBadge.label}
</span>
</div>
</div>
ui/app/(marketing)/invoice/[invoiceId]/page.tsx
+50 -19
View File
@@ -47,6 +47,50 @@ type SystemStatusResponse = {
last_reconcile_error: string | null;
};
const walletRpcBadge = (systemStatus: SystemStatusResponse | null) => {
if (!systemStatus) {
return {
className: "bg-amber-100 text-amber-900",
label: "Wallet RPC unavailable",
};
}
if (systemStatus.wallet_rpc === "ok") {
return {
className: "bg-emerald-100 text-emerald-900",
label: "Wallet RPC ok",
};
}
return {
className: "bg-red-100 text-red-700",
label: "Wallet RPC down",
};
};
const daemonBadge = (systemStatus: SystemStatusResponse | null) => {
if (!systemStatus) {
return {
className: "bg-amber-100 text-amber-900",
label: "Daemon unavailable",
};
}
if (systemStatus.daemon === "ok") {
return {
className: "bg-emerald-100 text-emerald-900",
label: "Daemon connected",
};
}
if (systemStatus.daemon === "unknown") {
return {
className: "bg-amber-100 text-amber-900",
label: "Daemon not configured",
};
}
return {
className: "bg-red-100 text-red-700",
label: "Daemon down",
};
};
const formatStatus = (status: InvoiceStatus) => {
if (status === "payment_detected") {
return "Payment detected";
@@ -219,6 +263,8 @@ export default async function InvoiceStatusDetailPage({
const createdTimestamp = formatTimestamp(invoice.created_at);
const expiresTimestamp = formatTimestamp(invoice.expires_at);
const lastReconcileCompleted = formatTimestamp(systemStatus?.last_reconcile_completed_at ?? null);
const walletStatusBadge = walletRpcBadge(systemStatus);
const daemonStatusBadge = daemonBadge(systemStatus);
return (
<main className="px-[6vw] pb-20 pt-10 text-ink">
@@ -284,29 +330,14 @@ export default async function InvoiceStatusDetailPage({
</p>
<div className="flex flex-wrap gap-2 text-[0.7rem] font-semibold uppercase tracking-[0.12em]">
<span
className={`rounded-full px-3 py-1 ${
systemStatus?.wallet_rpc === "ok"
? "bg-emerald-100 text-emerald-900"
: "bg-red-100 text-red-700"
}`}
className={`rounded-full px-3 py-1 ${walletStatusBadge.className}`}
>
Wallet RPC {systemStatus?.wallet_rpc === "ok" ? "ok" : "down"}
{walletStatusBadge.label}
</span>
<span
className={`rounded-full px-3 py-1 ${
systemStatus?.daemon === "ok"
? "bg-emerald-100 text-emerald-900"
: systemStatus?.daemon === "unknown"
? "bg-amber-100 text-amber-900"
: "bg-red-100 text-red-700"
}`}
className={`rounded-full px-3 py-1 ${daemonStatusBadge.className}`}
>
Daemon{" "}
{systemStatus?.daemon === "ok"
? "connected"
: systemStatus?.daemon === "unknown"
? "not configured"
: "down"}
{daemonStatusBadge.label}
</span>
</div>
</div>
ui/app/i/[invoiceId]/page.tsx
+50 -19
View File
@@ -62,6 +62,50 @@ type SystemStatusResponse = {
last_reconcile_error: string | null;
};
const walletRpcBadge = (systemStatus: SystemStatusResponse | null) => {
if (!systemStatus) {
return {
className: "bg-amber-100 text-amber-900",
label: "Wallet RPC unavailable",
};
}
if (systemStatus.wallet_rpc === "ok") {
return {
className: "bg-emerald-100 text-emerald-900",
label: "Wallet RPC ok",
};
}
return {
className: "bg-red-100 text-red-700",
label: "Wallet RPC down",
};
};
const daemonBadge = (systemStatus: SystemStatusResponse | null) => {
if (!systemStatus) {
return {
className: "bg-amber-100 text-amber-900",
label: "Daemon unavailable",
};
}
if (systemStatus.daemon === "ok") {
return {
className: "bg-emerald-100 text-emerald-900",
label: "Daemon connected",
};
}
if (systemStatus.daemon === "unknown") {
return {
className: "bg-amber-100 text-amber-900",
label: "Daemon not configured",
};
}
return {
className: "bg-red-100 text-red-700",
label: "Daemon down",
};
};
const formatStatus = (status: InvoiceStatus) => {
if (status === "payment_detected") {
return "Payment detected";
@@ -161,6 +205,8 @@ export default async function BtcpayModalInvoicePage({
const createdTimestamp = formatTimestamp(invoice.created_at);
const expiresTimestamp = formatTimestamp(invoice.expires_at);
const lastReconcileCompleted = formatTimestamp(systemStatus?.last_reconcile_completed_at ?? null);
const walletStatusBadge = walletRpcBadge(systemStatus);
const daemonStatusBadge = daemonBadge(systemStatus);
const isBtcpayInvoice = Boolean(invoice.btcpay_amount && invoice.btcpay_currency);
const useClassicCheckout =
isBtcpayInvoice && invoice.btcpay_checkout_style === "btcpay_classic";
@@ -268,29 +314,14 @@ export default async function BtcpayModalInvoicePage({
</p>
<div className="flex flex-wrap gap-2 text-[0.7rem] font-semibold uppercase tracking-[0.12em]">
<span
className={`rounded-full px-3 py-1 ${
systemStatus?.wallet_rpc === "ok"
? "bg-emerald-100 text-emerald-900"
: "bg-red-100 text-red-700"
}`}
className={`rounded-full px-3 py-1 ${walletStatusBadge.className}`}
>
Wallet RPC {systemStatus?.wallet_rpc === "ok" ? "ok" : "down"}
{walletStatusBadge.label}
</span>
<span
className={`rounded-full px-3 py-1 ${
systemStatus?.daemon === "ok"
? "bg-emerald-100 text-emerald-900"
: systemStatus?.daemon === "unknown"
? "bg-amber-100 text-amber-900"
: "bg-red-100 text-red-700"
}`}
className={`rounded-full px-3 py-1 ${daemonStatusBadge.className}`}
>
Daemon{" "}
{systemStatus?.daemon === "ok"
? "connected"
: systemStatus?.daemon === "unknown"
? "not configured"
: "down"}
{daemonStatusBadge.label}
</span>
</div>
</div>