Skip to content

refactor(web): adopt <DataState> in finyk Mono panels #1703

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

Merged
Skords-01 merged 1 commit into from
May 4, 2026
Merged

refactor(web): adopt <DataState> in finyk Mono panels #1703

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
185 changes: 101 additions & 84 deletions apps/web/src/modules/finyk/pages/Overview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,14 @@ import {
} from "@sergeant/finyk-domain/domain/budget";
import { filterStatTransactions } from "@sergeant/finyk-domain/domain/transactions";
import { Skeleton } from "@shared/components/ui/Skeleton";
import {
DataState,
type DataStateQueryLike,
} from "@shared/components/ui/DataState";
import { safeReadStringLS, safeWriteLS } from "@shared/lib/storage/storage";
import { THEME_HEX } from "@shared/lib/ui/themeHex";
import { SyncStatusBadge } from "../components/SyncStatusBadge";
import type { Transaction } from "@sergeant/finyk-domain/domain/types";

import { FirstInsightBanner } from "./overview/FirstInsightBanner";
import { HeroCard } from "./overview/HeroCard";
Expand Down Expand Up @@ -348,18 +353,26 @@ export function Overview({
[subscriptionFlows, debtOutFlows, debtInFlows, currentYear, currentMonth],
);

if (loadingTx && realTx.length === 0) {
return (
<div className="flex-1 overflow-y-auto">
<div className="px-4 pt-4 page-tabbar-pad space-y-4 max-w-4xl mx-auto">
<Skeleton className="h-[168px] rounded-3xl" />
<Skeleton className="h-[120px] opacity-80 rounded-2xl" />
<Skeleton className="h-[110px] opacity-60 rounded-2xl" />
<Skeleton className="h-[90px] opacity-40 rounded-2xl" />
</div>
// DataState contract: `data === undefined` triggers the skeleton slot.
// We treat the very first month load (no realTx yet) as loading;
// subsequent background refetches keep `data` defined so the page stays
// visible while a stale-revalidate happens. Mirrors the prior
// `if (loadingTx && realTx.length === 0)` early-return guard exactly.
const overviewQuery: DataStateQueryLike<readonly Transaction[]> = {
data: loadingTx && realTx.length === 0 ? undefined : realTx,
isLoading: loadingTx,
};

const overviewLoadingSkeleton = (
<div className="flex-1 overflow-y-auto">
<div className="px-4 pt-4 page-tabbar-pad space-y-4 max-w-4xl mx-auto">
<Skeleton className="h-[168px] rounded-3xl" />
<Skeleton className="h-[120px] opacity-80 rounded-2xl" />
<Skeleton className="h-[110px] opacity-60 rounded-2xl" />
<Skeleton className="h-[90px] opacity-40 rounded-2xl" />
</div>
);
}
</div>
);

const recurringOutThisMonth = monthFlows
.filter(
Expand Down Expand Up @@ -400,78 +413,82 @@ export function Overview({
});

return (
<div className="flex-1 overflow-y-auto overscroll-contain">
<div className="px-4 pt-4 page-tabbar-pad space-y-4 max-w-4xl mx-auto">
{(clientInfo ||
syncState?.status === "error" ||
syncState?.status === "loading" ||
monoError) && (
<SyncStatusBadge
syncState={syncState}
lastUpdated={lastUpdated}
error={monoError}
onRetry={monoRefresh}
loading={loadingTx}
/>
)}

{showFirstInsight && hasAnyData && (
<FirstInsightBanner
onSetBudget={handleSetBudgetFromInsight}
onDismiss={dismissFirstInsight}
/>
)}

<HeroCard
networth={networth}
monoTotal={monoTotal}
totalDebt={totalDebt}
daysInMonth={daysInMonth}
daysPassed={daysPassed}
dayBudget={dayBudget}
hasExpensePlan={hasExpensePlan}
spendPlanRatio={spendPlanRatio}
showBalance={showBalance}
/>

<MonthPulseCard
dateLabel={dateLabel}
daysPassed={daysPassed}
spent={spent}
income={income}
showBalance={showBalance}
showMonthForecast={showMonthForecast}
projectedSpend={projectedSpend}
hasExpensePlan={hasExpensePlan}
spendPlanRatio={spendPlanRatio}
planExpense={planExpense}
forecastTrendPct={forecastTrendPct}
forecastBarClass={forecastBarClass}
recurringOutThisMonth={recurringOutThisMonth}
recurringInThisMonth={recurringInThisMonth}
unknownOutCount={unknownOutCount}
/>

<NetworthSection networthHistory={networthHistory} />

<BudgetAlertsList
budgetAlerts={budgetAlerts}
statTx={statTx}
txCategories={txCategories}
txSplits={txSplits}
customCategories={customCategories}
/>

<PlannedFlowsCard
plannedFlows={plannedFlows}
onNavigate={onNavigate ?? (() => {})}
showBalance={showBalance}
/>

{loadingTx && (
<p className="text-center text-xs text-subtle py-4">Оновлення…</p>
)}
</div>
</div>
<DataState query={overviewQuery} skeleton={overviewLoadingSkeleton}>
{() => (
<div className="flex-1 overflow-y-auto overscroll-contain">
<div className="px-4 pt-4 page-tabbar-pad space-y-4 max-w-4xl mx-auto">
{(clientInfo ||
syncState?.status === "error" ||
syncState?.status === "loading" ||
monoError) && (
<SyncStatusBadge
syncState={syncState}
lastUpdated={lastUpdated}
error={monoError}
onRetry={monoRefresh}
loading={loadingTx}
/>
)}

{showFirstInsight && hasAnyData && (
<FirstInsightBanner
onSetBudget={handleSetBudgetFromInsight}
onDismiss={dismissFirstInsight}
/>
)}

<HeroCard
networth={networth}
monoTotal={monoTotal}
totalDebt={totalDebt}
daysInMonth={daysInMonth}
daysPassed={daysPassed}
dayBudget={dayBudget}
hasExpensePlan={hasExpensePlan}
spendPlanRatio={spendPlanRatio}
showBalance={showBalance}
/>

<MonthPulseCard
dateLabel={dateLabel}
daysPassed={daysPassed}
spent={spent}
income={income}
showBalance={showBalance}
showMonthForecast={showMonthForecast}
projectedSpend={projectedSpend}
hasExpensePlan={hasExpensePlan}
spendPlanRatio={spendPlanRatio}
planExpense={planExpense}
forecastTrendPct={forecastTrendPct}
forecastBarClass={forecastBarClass}
recurringOutThisMonth={recurringOutThisMonth}
recurringInThisMonth={recurringInThisMonth}
unknownOutCount={unknownOutCount}
/>

<NetworthSection networthHistory={networthHistory} />

<BudgetAlertsList
budgetAlerts={budgetAlerts}
statTx={statTx}
txCategories={txCategories}
txSplits={txSplits}
customCategories={customCategories}
/>

<PlannedFlowsCard
plannedFlows={plannedFlows}
onNavigate={onNavigate ?? (() => {})}
showBalance={showBalance}
/>

{loadingTx && (
<p className="text-center text-xs text-subtle py-4">Оновлення…</p>
)}
</div>
</div>
)}
</DataState>
);
}
Loading
Loading