Skip to content

Fix: 2 issues (#881, #883) #949

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

Open
Novastrum1 wants to merge 1 commit into
base: main
Choose a base branch
from
+2,461 −88
Open

Fix: 2 issues (#881, #883) #949

Show file tree
Hide file tree
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
50 changes: 50 additions & 0 deletions src/app/analytics/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { getFreighterPublicKey } from "@/lib/freighter";
import { generateCsv, type CsvRow } from "@/lib/csvExport";
import type { Invoice } from "@stellar-split/sdk";
import ChartBuilder, { type ChartBuilderDataPoint } from "@/components/analytics/ChartBuilder";
import AnalyticsPanel from "@/components/subscriptions/AnalyticsPanel";
import { loadSubscriptions, type Subscription } from "@/lib/subscriptions";

const STROOPS = 10_000_000;

Expand Down Expand Up @@ -119,6 +121,10 @@ export default function AnalyticsPage() {
const [error, setError] = useState<string | null>(null);
const [dateFrom, setDateFrom] = useState("");
const [dateTo, setDateTo] = useState("");
const [subscriptions, setSubscriptions] = useState<Subscription[]>([]);
const [activeTab, setActiveTab] = useState<"invoices" | "subscriptions">(
"invoices"
);

useEffect(() => {
getFreighterPublicKey()
Expand Down Expand Up @@ -155,6 +161,17 @@ export default function AnalyticsPage() {
fetchInvoices();
}, [publicKey]);

useEffect(() => {
if (!publicKey) return;
try {
setSubscriptions(loadSubscriptions(publicKey));
} catch (err) {
setError(
err instanceof Error ? err.message : "Failed to load subscriptions"
);
}
}, [publicKey]);

const filtered = useMemo(() => {
return invoices.filter((inv) => {
const ts = inv.createdAt ?? inv.deadline - 7 * 86400;
Expand Down Expand Up @@ -397,6 +414,37 @@ export default function AnalyticsPage() {
</div>
</div>

<div className="flex gap-1 mb-6 border-b border-gray-800">
<button
type="button"
onClick={() => setActiveTab("invoices")}
className={`px-4 py-2 text-sm font-medium border-b-2 -mb-px transition-colors ${
activeTab === "invoices"
? "border-indigo-500 text-white"
: "border-transparent text-gray-400 hover:text-gray-200"
}`}
>
Invoices
</button>
<button
type="button"
onClick={() => setActiveTab("subscriptions")}
className={`px-4 py-2 text-sm font-medium border-b-2 -mb-px transition-colors ${
activeTab === "subscriptions"
? "border-indigo-500 text-white"
: "border-transparent text-gray-400 hover:text-gray-200"
}`}
>
Subscriptions
</button>
</div>

{activeTab === "subscriptions" ? (
<div className="mb-8">
<AnalyticsPanel subscriptions={subscriptions} />
</div>
) : (
<>
<div className="grid grid-cols-2 lg:grid-cols-4 gap-4 mb-8">
<KpiCard
label="Total Raised"
Expand Down Expand Up @@ -504,6 +552,8 @@ export default function AnalyticsPage() {
</div>
)}
</div>
</>
)}

<Link
href="/dashboard"
Expand Down
92 changes: 91 additions & 1 deletion src/components/AnalyticsPanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ import { useI18n } from "@/components/I18nProvider";
import type { Invoice } from "@stellar-split/sdk";
import { BarChart, Bar, XAxis, YAxis, CartesianGrid, Tooltip, Legend, ResponsiveContainer } from "recharts";
import { Skeleton } from "@/components/Skeleton";
import {
aggregateSubscriptionAnalytics,
type Subscription,
} from "@/lib/subscriptions";

interface Props {
invoices: Invoice[];
subscriptions?: Subscription[];
}

type RangePreset = "7d" | "30d" | "3m" | "custom";
Expand All @@ -26,7 +31,7 @@ const RANGE_OPTIONS: RangeOption[] = [
{ key: "custom", label: "Custom", days: null },
];

export default function AnalyticsPanel({ invoices }: Props) {
export default function AnalyticsPanel({ invoices, subscriptions = [] }: Props) {
const { t } = useI18n();
const [isOpen, setIsOpen] = useState(false);
const [range, setRange] = useState<RangePreset>("30d");
Expand Down Expand Up @@ -96,6 +101,20 @@ export default function AnalyticsPanel({ invoices }: Props) {
.sort(([a], [b]) => a.localeCompare(b))
.map(([week, count]) => ({ week, invoices: count }));

// Subscription analytics (scoped to the same date window as invoices).
const subscriptionAnalytics = useMemo(
() => aggregateSubscriptionAnalytics(subscriptions, from, to),
[subscriptions, from, to]
);

const cancellationReasonData = useMemo(
() =>
Object.entries(subscriptionAnalytics.cancellationReasons)
.sort(([, a], [, b]) => b - a)
.map(([reason, count]) => ({ reason, count })),
[subscriptionAnalytics.cancellationReasons]
);

return (
<div className="bg-gray-900 rounded-xl p-4 sm:p-5 mb-6">
<button
Expand Down Expand Up @@ -203,6 +222,77 @@ export default function AnalyticsPanel({ invoices }: Props) {
</div>
</div>

{/* Subscription Analytics */}
<div className="space-y-3">
<p className="text-sm text-gray-400">{t("dashboard.subscriptions")}</p>
<div className="grid grid-cols-1 sm:grid-cols-3 gap-3">
<div className="bg-green-500/10 border border-green-500/20 rounded-lg p-4">
<p className="text-xs text-green-300 mb-1">{t("dashboard.activeSubscriptions")}</p>
<p className="text-lg font-semibold text-green-300">
{subscriptionAnalytics.active}
</p>
</div>
<div className="bg-yellow-500/10 border border-yellow-500/20 rounded-lg p-4">
<p className="text-xs text-yellow-300 mb-1">{t("dashboard.pausedSubscriptions")}</p>
<p className="text-lg font-semibold text-yellow-300">
{subscriptionAnalytics.paused}
</p>
</div>
<div className="bg-gray-700/50 border border-gray-600 rounded-lg p-4">
<p className="text-xs text-gray-400 mb-1">{t("dashboard.cancelledSubscriptions")}</p>
<p className="text-lg font-semibold text-gray-400">
{subscriptionAnalytics.cancelled}
</p>
</div>
</div>
<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
<div className="bg-gray-800 rounded-lg p-4">
<p className="text-xs text-gray-400 mb-1">{t("dashboard.mrr")}</p>
<p className="text-lg font-semibold">
{formatAmount(subscriptionAnalytics.mrr)}
</p>
</div>
<div className="bg-gray-800 rounded-lg p-4">
<p className="text-xs text-gray-400 mb-1">{t("dashboard.churnRate")}</p>
<p className="text-lg font-semibold">
{(subscriptionAnalytics.churnRate * 100).toFixed(1)}%
</p>
</div>
</div>

{cancellationReasonData.length > 0 && (
<div className="bg-gray-800 rounded-lg p-4 overflow-x-auto">
<p className="text-sm text-gray-400 mb-3">
{t("dashboard.cancellationReasons")}
</p>
<ResponsiveContainer width="100%" height={200}>
<BarChart
data={cancellationReasonData}
margin={{ top: 20, right: 30, left: 0, bottom: 50 }}
>
<CartesianGrid strokeDasharray="3 3" stroke="#374151" />
<XAxis
dataKey="reason"
tick={{ fontSize: 12 }}
angle={-45}
textAnchor="end"
height={80}
/>
<YAxis tick={{ fontSize: 12 }} allowDecimals={false} />
<Tooltip
contentStyle={{
backgroundColor: "#1f2937",
border: "1px solid #374151",
borderRadius: "8px",
}}
/>
<Bar dataKey="count" fill="#f59e0b" />
</BarChart>
</ResponsiveContainer>
</div>
)}
</div>

{/* Weekly Chart */}
{chartData.length > 0 && (
<div className="bg-gray-800 rounded-lg p-4 overflow-x-auto">
Expand Down
97 changes: 92 additions & 5 deletions src/components/CancelModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,33 @@ import { useRouter } from "next/navigation";
import FocusTrap from "./FocusTrap";
import type { Payment } from "@stellar-split/sdk";

export interface CancelReasonOption {
value: string;
label: string;
}

export interface CancelModalProps {
invoiceId: string;
invoiceTitle?: string;
payments?: Payment[];
onConfirm: () => Promise<void>;
onConfirm: (reason?: string, note?: string) => Promise<void>;
onClose: () => void;
onSuccess?: () => void;
/** When true, a reason-capture step is shown before the destructive-action gate. */
requireReason?: boolean;
/** Options for the reason select. Defaults to a generic set when omitted. */
reasons?: CancelReasonOption[];
}

export type CancelModalStep = "warn" | "confirm_gate" | "loading" | "success";
export type CancelModalStep = "warn" | "reason" | "confirm_gate" | "loading" | "success";

const DEFAULT_REASONS: CancelReasonOption[] = [
{ value: "no_longer_needed", label: "No longer needed" },
{ value: "too_expensive", label: "Too expensive" },
{ value: "missing_features", label: "Missing features" },
{ value: "switching_provider", label: "Switching to another provider" },
{ value: "other", label: "Other" },
];

/**
* Multi-step invoice cancellation confirmation modal.
Expand All @@ -30,22 +47,31 @@ export default function CancelModal({
onConfirm,
onClose,
onSuccess,
requireReason = false,
reasons,
}: CancelModalProps) {
const router = useRouter();
const [step, setStep] = useState<CancelModalStep>("warn");
const [confirmText, setConfirmText] = useState("");
const [reason, setReason] = useState("");
const [note, setNote] = useState("");
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);

const expectedTitle = (invoiceTitle || `Invoice #${invoiceId}`).trim();
const isMatch = confirmText.trim().toLowerCase() === expectedTitle.toLowerCase();
const reasonOptions = reasons && reasons.length > 0 ? reasons : DEFAULT_REASONS;
const isReasonValid = !requireReason || reason.trim().length > 0;

const handleStartCancellation = async () => {
setStep("loading");
setLoading(true);
setError(null);
try {
await onConfirm();
await onConfirm(
requireReason ? reason || undefined : undefined,
requireReason && note.trim() ? note.trim() : undefined
);
setLoading(false);
setStep("success");
} catch (err) {
Expand Down Expand Up @@ -131,7 +157,7 @@ export default function CancelModal({
</button>
<button
type="button"
onClick={() => setStep("confirm_gate")}
onClick={() => setStep(requireReason ? "reason" : "confirm_gate")}
className="flex-1 px-4 py-2 rounded-lg bg-red-600 hover:bg-red-500 text-sm font-semibold text-white transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500"
>
Continue
Expand All @@ -140,6 +166,67 @@ export default function CancelModal({
</div>
)}

{/* Step 1.5: Reason Capture (optional) */}
{step === "reason" && (
<div data-testid="step-reason">
<p className="text-sm text-gray-300 mb-3">
Please tell us why you are cancelling. This helps us improve.
</p>

<div className="mb-3">
<label htmlFor="cancel-reason-select" className="block text-xs text-gray-400 mb-1">
Reason <span className="text-red-400">*</span>
</label>
<select
id="cancel-reason-select"
autoFocus
value={reason}
onChange={(e) => setReason(e.target.value)}
className="w-full bg-gray-800 border border-gray-700 rounded-lg px-3 py-2 text-sm text-white focus:outline-none focus:ring-2 focus:ring-red-500"
>
<option value="">Select a reason...</option>
{reasonOptions.map((opt) => (
<option key={opt.value} value={opt.value}>
{opt.label}
</option>
))}
</select>
</div>

<div className="mb-6">
<label htmlFor="cancel-reason-note" className="block text-xs text-gray-400 mb-1">
Additional details (optional)
</label>
<textarea
id="cancel-reason-note"
value={note}
onChange={(e) => setNote(e.target.value)}
rows={3}
placeholder="Anything else you'd like to share?"
className="w-full bg-gray-800 border border-gray-700 rounded-lg px-3 py-2 text-sm text-white resize-none focus:outline-none focus:ring-2 focus:ring-red-500"
/>
</div>

<div className="flex gap-3">
<button
type="button"
onClick={() => setStep("warn")}
className="flex-1 px-4 py-2 rounded-lg bg-gray-700 hover:bg-gray-600 text-sm font-semibold text-gray-200 transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500"
>
Back
</button>
<button
type="button"
disabled={!isReasonValid}
onClick={() => setStep("confirm_gate")}
className="flex-1 px-4 py-2 rounded-lg bg-red-600 hover:bg-red-500 text-sm font-semibold text-white transition-colors disabled:opacity-40 disabled:cursor-not-allowed focus:outline-none focus-visible:ring-2 focus-visible:ring-red-500"
>
Continue
</button>
</div>
</div>
)}

{/* Step 2: Destructive Action Gate */}
{step === "confirm_gate" && (
<div data-testid="step-confirm-gate">
Expand Down Expand Up @@ -168,7 +255,7 @@ export default function CancelModal({
<div className="flex gap-3">
<button
type="button"
onClick={() => setStep("warn")}
onClick={() => setStep(requireReason ? "reason" : "warn")}
className="flex-1 px-4 py-2 rounded-lg bg-gray-700 hover:bg-gray-600 text-sm font-semibold text-gray-200 transition-colors focus:outline-none focus-visible:ring-2 focus-visible:ring-indigo-500"
>
Back
Expand Down
Loading