7 Commits
Author SHA1 Message Date
ksv741 2abbb3e329 feat(account): add Result tab with return vs Moscow Exchange index (WealthLedger/main#54)
Frontend verify / commits (pull_request) Successful in 37s
Frontend verify / commits (pull_request) Failing after 34s
Frontend verify / security (pull_request) Skipped
Frontend verify / verify (pull_request) Skipped
2026-11-08 14:21:01 +03:00
ksv741 21383852d9 feat(performance): consume investment performance API contract (WealthLedger/main#54) 2026-11-08 14:20:56 +03:00
ksv741 010e3ab8af feat(shared): add signed percent and percentage-point formatters (WealthLedger/main#54) 2026-11-08 14:20:49 +03:00
codex-bot d910d624d6 test: remove timing races from screen-sync and route transition tests (#138) (#166)
Frontend verify / commits (push) Skipped
Frontend verify / security (push) Successful in 13s
Frontend verify / verify (push) Failing after 9m3s
2026-11-07 18:44:44 +03:00
codex-bot cc45352243 feat: clarify grouped coupon payouts (#162) (#165)
Frontend verify / commits (push) Skipped
Frontend verify / security (push) Successful in 11s
Frontend verify / verify (push) Failing after 7m26s
2026-11-07 11:18:07 +03:00
codex-bot ed0b5388ab fix: unify history and upcoming events labels (#161) (#163)
Frontend verify / commits (push) Skipped
Frontend verify / security (push) Successful in 12s
Frontend verify / verify (push) Failing after 7m18s
2026-11-07 10:50:51 +03:00
codex-bot 134c951178 fix: polish accounts portfolio summary (#159)
Frontend verify / commits (push) Skipped
Frontend verify / security (push) Successful in 10s
Frontend verify / verify (push) Failing after 7m26s
2026-11-06 15:17:27 +03:00
39 changed files with 1805 additions and 919 deletions
@@ -227,9 +227,9 @@ beforeEach(() => {
describe("All accounts routes", () => {
it.each([
["/accounts/all", "Все счета"],
["/accounts/all/operations", "Журнал операций"],
["/accounts/all/operations", "История операций"],
["/accounts/all/income?from=2026-08-01&to=2026-08-31", "Пассивный доход"],
["/accounts/all/events", "Будущие события"],
["/accounts/all/events", "Предстоящие события"],
])("opens %s directly", async (path, title) => {
renderPage(path);
expect(
@@ -311,9 +311,9 @@ describe("All accounts routes", () => {
);
for (const [suffix, tab] of [
["operations", "Операции"],
["operations", "История операций"],
["income", "Доход"],
["events", "События"],
["events", "Предстоящие события"],
]) {
fireEvent.click(screen.getByRole("tab", { name: tab }));
expect(screen.getByRole("link", { name: "Подробнее" }))
@@ -55,9 +55,9 @@ describe("AppBreadcrumbs", () => {
});
it.each([
["operations", "Операции"],
["OPERATIONS", "Операции"],
["events", "Будущие события"],
["operations", "История операций"],
["OPERATIONS", "История операций"],
["events", "Предстоящие события"],
["income", "Пассивный доход"],
])("links to the account hierarchy from %s", (section, title) => {
renderBreadcrumbs(`/accounts/account-1/${section}`, [
@@ -49,6 +49,10 @@ function entryLabelKey(operation: BrokerageOperation): string {
return `ledger.category.${operation.category}`;
}
function isCouponPayment(operation: BrokerageOperation): boolean {
return isOperationType(operation.type, OperationType.Coupon);
}
function isIncomePayment(operation: BrokerageOperation): boolean {
return [OperationType.Coupon, OperationType.Dividend].some(type =>
isOperationType(operation.type, type),
@@ -131,6 +135,7 @@ function paymentPresentation(
export {
brokerageOperationGroupKey,
entryLabelKey,
isCouponPayment,
isIncomePayment,
isZeroDecimal,
operationLabelKey,
@@ -55,23 +55,27 @@ function renderGroup(
}
describe("OperationGroup", () => {
it("shows the header, exact total and separate card rows per account", () => {
it("shows the received coupon and positive totals in flat account rows", () => {
renderGroup([
operation("1", { id: "broker", name: "Брокерский" }, "0.1"),
{ ...operation("1", { id: "broker", name: "Брокерский" }, "0.1"), description: "Выплата купонов СФО ВТБ РКС Эталон 04" },
operation("2", { id: "iis", name: "ИИС" }, "0.2"),
]);
expect(screen.getByText("Купон · BOND")).toBeInTheDocument();
expect(screen.getByText("Выплата купонов СФО ВТБ РКС Эталон 04")).toBeInTheDocument();
expect(screen.getByText("+0,3 ₽")).toBeInTheDocument();
const accounts = within(screen.getByRole("list", {
name: /Купон · BOND, Исполнено 14\.08\.2026.*, \+0,3 ₽/,
name: /Выплата купонов СФО ВТБ РКС Эталон 04, Исполнено 14\.08\.2026.*, \+0,3 ₽/,
}));
expect(accounts.getByRole("listitem", { name: "Брокерский, +0,1 ₽" }))
.toHaveTextContent("Купон");
expect(accounts.getByText("+0,1 ₽")).toHaveClass(/positive/);
expect(accounts.getByRole("listitem", { name: "ИИС, +0,2 ₽" }))
.toHaveTextContent("Купон");
expect(accounts.getByText("+0,2 ₽")).toHaveClass(/positive/);
expect(accounts.getByRole("listitem", { name: "ИИС, +0,2 ₽" }))
.not.toHaveClass("EntryGroup_accountCardRow");
expect(accounts.queryByText(/Исполнено/)).not.toBeInTheDocument();
expect(accounts.queryByRole("link")).not.toBeInTheDocument();
});
@@ -83,8 +87,10 @@ describe("OperationGroup", () => {
]);
expect(screen.getByRole("list", {
name: /Купон · BOND, Исполнено .*Итог недоступен/,
name: /Выплата купонов BOND, Исполнено .*Итог недоступен/,
})).toBeInTheDocument();
expect(screen.getByText("Итог недоступен")).toBeInTheDocument();
expect(screen.getByText("—")).not.toHaveClass(/positive/);
});
it.each(["0", "0.000"])(
@@ -114,6 +120,7 @@ describe("OperationGroup", () => {
operation("2", { id: "iis", name: "ИИС" }, "-100"),
]);
expect(screen.getByText("0 ₽")).toBeInTheDocument();
expect(screen.getByText("−100 ₽")).toHaveClass(/negative/);
});
it("renders repeated ids inside one group as separate rows", () => {
@@ -123,7 +130,7 @@ describe("OperationGroup", () => {
]);
expect(screen.getByText("+30 ₽")).toBeInTheDocument();
const accounts = within(screen.getByRole("list", { name: /Купон/ }));
const accounts = within(screen.getByRole("list", { name: /Выплата купонов/ }));
expect(accounts.getAllByText("Брокерский")).toHaveLength(1);
expect(accounts.getAllByText("ИИС")).toHaveLength(1);
expect(accounts.getAllByRole("listitem")).toHaveLength(2);
@@ -9,12 +9,13 @@ import {
sumMoney,
totalText,
} from "@/shared/lib";
import { AccountCardRow, EntryGroup, EntryGroupTotal } from "@/shared/ui";
import { AccountCardRow, AccountRow, EntryGroup, EntryGroupTotal } from "@/shared/ui";
import type { BrokerageOperation } from "../api/useBrokerageOperations";
import {
entryLabelKey,
isCouponPayment,
isZeroDecimal,
operationLabelKey,
paymentPresentation,
@@ -37,6 +38,8 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
? entryLabelKey(first)
: operationLabelKey(first.type));
const isCoupon = isCouponPayment(first);
const instrument
= first.ticker ?? first.instrumentType ?? t("ledger.noInstrument");
@@ -52,9 +55,21 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
: null;
const date = formatSnapshotDay(first.occurredAt);
const title = `${typeLabel} · ${instrument}`;
const description = first.description.trim();
let title = `${typeLabel} · ${instrument}`;
if (isCoupon) {
title = description && description.toLocaleLowerCase() !== "купон"
? description
: t("ledger.couponPayment", { instrument });
}
const totalsText = totalText(totals, true);
const totalTone = isCoupon && totals?.length && totals.every(total => !isZeroDecimal(total.value) && !total.value.startsWith("-"))
? "positive"
: "neutral";
const accessibleName = [
title,
t("payout.executedAt", { date }),
@@ -63,13 +78,14 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
return (
<EntryGroup
flat={isCoupon}
header={(
<EntryCard
imageSrc={instrumentLogoUrl(first.logoName)}
initial={(first.ticker?.trim()[0] ?? "?").toUpperCase()}
metadata={t("payout.executedAt", { date })}
title={title}
tone="neutral"
tone={totalTone}
value={<EntryGroupTotal isSigned totals={totals} />}
valueLabel={typeLabel}
wrap
@@ -80,14 +96,15 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
{props.entries.map(({ key, operation }) => {
const payment = paymentPresentation(operation);
return (
<AccountCardRow
accountName={operation.account?.name ?? "—"}
key={key}
value={payment.amount}
valueLabel={t(payment.label)}
/>
);
const accountRowProps = {
accountName: operation.account?.name ?? "—",
value: payment.amount,
valueLabel: t(payment.label),
};
return isCoupon
? <AccountRow key={key} {...accountRowProps} tone={payment.tone} />
: <AccountCardRow key={key} {...accountRowProps} />;
})}
</EntryGroup>
);
@@ -65,18 +65,32 @@
.summary {
font-variant-numeric: tabular-nums lining-nums;
white-space: nowrap;
align-items: flex-end;
}
.currencySummary {
min-width: 0;
}
.total {
color: var(--wl-color-text);
font-size: var(--mantine-font-size-lg);
line-height: var(--mantine-line-height-lg);
overflow-wrap: anywhere;
}
.return,
.cashValue {
font-variant-numeric: tabular-nums lining-nums;
}
.return {
justify-content: flex-end;
min-width: 0;
overflow-wrap: anywhere;
}
.cashValue {
white-space: nowrap;
}
@@ -138,7 +152,11 @@
text-align: left;
}
.balance > div {
.summary {
align-items: flex-start;
}
.return {
justify-content: flex-start;
}
}
@@ -119,25 +119,26 @@ describe("BrokerageAccountList", () => {
expect(within(link).getByText("123 456 789 012 345 678 902,00 ₽"))
.toBeInTheDocument();
expect(within(link).getByText("Еще 1 валюта")).toBeInTheDocument();
expect(within(link).getByText("+12,40 %")).toBeInTheDocument();
expect(within(link).getByText("+12,4 %")).toBeInTheDocument();
expect(within(link).getByText("+136 900 ₽")).toBeInTheDocument();
expect(within(link).getByText("−3,05 %")).toBeInTheDocument();
expect(within(link).getByText("−4,2 USD")).toBeInTheDocument();
expect(within(link).getByText("−3,1 %")).toBeInTheDocument();
expect(within(link).getByText("−4,2 $")).toBeInTheDocument();
const nullReturnLink = screen.getByRole("link", { name: /Без доходности/ });
expect(within(nullReturnLink).getByText("—")).toBeInTheDocument();
expect(within(link).getByText("частично")).toBeInTheDocument();
expect(within(link).getByText("82 500,50 ₽")).toBeInTheDocument();
expect(within(link).getAllByText("20,00 USD")).not.toHaveLength(0);
expect(within(link).getAllByText("20,00 $")).not.toHaveLength(0);
expect(within(link).getByText("17 позиций")).toBeInTheDocument();
expect(screen.getByRole("img", {
name: "Структура в RUB: Акции 50 %; Облигации 30 %; "
+ "Другие активы 0 %; Свободные деньги 20 %",
name: "Структура в RUB: Акции 50,0 %; Облигации 30,0 %; "
+ "Другие активы 0,0 %; Свободные деньги 20,0 %",
})).toBeInTheDocument();
const stockLegend = within(link).getByText(/Акции 50 %/);
expect(stockLegend).toHaveTextContent("● Акции 50 %");
const stockLegend = within(link).getByText(/Акции 50,0 %/);
expect(stockLegend).toHaveTextContent("● Акции 50,0 %");
// eslint-disable-next-line testing-library/no-node-access -- The legend is aria-hidden, so only DOM traversal reaches its container.
expect(stockLegend.parentElement).toHaveAttribute("aria-hidden", "true");
expect(within(link).queryByText(/Другие активы 0 %/)).not.toBeInTheDocument();
expect(within(link).queryByText(/Другие активы 0,0 %/))
.not.toBeInTheDocument();
expect(link).toHaveTextContent("По данным брокера");
expect(link).toHaveTextContent("Структура RUB: Акции 100");
});
@@ -15,6 +15,11 @@ import classes from "./BrokerageAccountList.module.css";
const DECIMAL_PART_COUNT = 2;
const STRUCTURE_CATEGORY_ORDER = ["STOCK", "BOND", "OTHER", "CASH"] as const;
const percentFormatter = new Intl.NumberFormat("ru-RU", {
maximumFractionDigits: 1,
minimumFractionDigits: 1,
});
type AvailableSummary = Extract<
BrokerageAccountCard["summary"],
{ state: "available" }
@@ -37,20 +42,15 @@ type StructureCurrency = PortfolioSummary["structure"]["currencies"][number];
function formatPercent(value: null | string) {
if (value === null) return "—";
const formatted = `${value.replace(".", ",")}\u{A0}%`;
if (isZero(value))
return value.startsWith("-") ? formatted.slice(1) : formatted;
const rounded = percentFormatter.format(Math.abs(Number(value)));
let sign = "";
if (rounded !== "0,0") sign = value.startsWith("-") ? "−" : "+";
return value.startsWith("-") ? `−${formatted.slice(1)}` : `+${formatted}`;
return `${sign}${rounded}\u{A0}%`;
}
function formatStructurePercent(value: string) {
let trimmed = value;
while (trimmed.includes(".") && trimmed.endsWith("0"))
trimmed = trimmed.slice(0, -1);
if (trimmed.endsWith(".")) trimmed = trimmed.slice(0, -1);
return trimmed.replace(".", ",");
return percentFormatter.format(Number(value));
}
function isZero(value: string) {
@@ -65,22 +65,18 @@ const ReturnValue: FC<ReturnValueProps> = (props) => {
const { t } = useTranslation();
const { item } = props;
const isNegative = item.percent !== null
&& item.percent.startsWith("-")
&& !isZero(item.percent);
const isPositive = item.percent !== null
&& !item.percent.startsWith("-")
&& !isZero(item.percent);
const displayedPercent = formatPercent(item.percent);
const isNegative = displayedPercent.startsWith("−");
const isPositive = displayedPercent.startsWith("+");
let toneClass = classes.neutral;
if (isNegative) toneClass = classes.negative;
else if (isPositive) toneClass = classes.positive;
return (
<Group className={classes.return} gap="xs" wrap="nowrap">
<Group className={classes.return} gap="xs" wrap="wrap">
<Text className={toneClass} fw={700} size="sm">
{formatPercent(item.percent)}
{displayedPercent}
</Text>
<Text className={toneClass} size="sm">
@@ -200,35 +196,35 @@ const BrokerageAccountSummary: FC<BrokerageAccountSummaryProps> = (props) => {
return (
<Stack className={classes.balance} gap="xs">
<Group align="flex-start" gap="lg" justify="flex-end" wrap="nowrap">
<Stack className={classes.summary} gap={4}>
{summary.totals.map(total => (
<Text className={classes.total} fw={700} key={total.currency}>
{formatMoney(total, { withRoundedCents: true })}
</Text>
))}
<Stack className={classes.summary} gap="sm">
{summary.totals.map((total) => {
const item = summary.portfolio.unrealizedReturnByCurrency.find(
returnItem => returnItem.currency === total.currency,
);
{!!summary.remainingCurrencyCount && (
<Text c="dimmed" size="sm">
{t("accounts.remainingCurrencies", {
count: summary.remainingCurrencyCount,
})}
</Text>
)}
</Stack>
return (
<Stack
className={classes.currencySummary}
gap={2}
key={total.currency}
>
<Text className={classes.total} fw={700}>
{formatMoney(total, { withRoundedCents: true })}
</Text>
<Stack gap={4}>
{summary.totals.map((total) => {
const item = summary.portfolio.unrealizedReturnByCurrency.find(
returnItem => returnItem.currency === total.currency,
);
{item && <ReturnValue item={item} />}
</Stack>
);
})}
return item
? <ReturnValue item={item} key={total.currency} />
: null;
})}
</Stack>
</Group>
{!!summary.remainingCurrencyCount && (
<Text c="dimmed" size="sm">
{t("accounts.remainingCurrencies", {
count: summary.remainingCurrencyCount,
})}
</Text>
)}
</Stack>
{summary.portfolio.cashBalances.length > 0 && (
<Group className={classes.cash} gap="xs" justify="flex-end">
@@ -103,7 +103,7 @@ describe("BrokerageEventGroup", () => {
event({ id: "iis", name: "ИИС" }, "200"),
]);
expect(screen.getByRole("list", { name: /10 USD.*200 ₽/ }))
expect(screen.getByRole("list", { name: /10 \$.*200 ₽/ }))
.toBeInTheDocument();
});
@@ -0,0 +1,20 @@
import { apiQueryClient, type paths, useAuthenticatedQuery } from "@/shared/api";
type Performance = NonNullable<
paths["/api/v1/brokerage-accounts/{accountId}/performance"]["get"]["responses"][200]["content"]["application/json"]["data"]
>;
function usePerformance(accountId: string) {
return useAuthenticatedQuery({
meta: { accessGroup: "brokerage" },
...apiQueryClient.queryOptions(
"get",
"/api/v1/brokerage-accounts/{accountId}/performance",
{ params: { path: { accountId } } },
),
enabled: Boolean(accountId),
staleTime: 30_000,
});
}
export { type Performance, usePerformance };
+1
View File
@@ -0,0 +1 @@
export { type Performance, usePerformance } from "./api/usePerformance";
@@ -10,6 +10,9 @@ import { server } from "@/test/server";
import { useScreenSync } from "../index";
const TRANSPORT_ATTEMPTS = 3;
const TRANSPORT_RECOVERY_MS = 3000;
function auth() {
configureAuthClient({
accessToken: () => "synthetic",
@@ -28,11 +31,13 @@ describe("read-only screen synchronization", () => {
gets += 1;
syncModes.push(new URL(request.url).searchParams.get("sync"));
return gets === 1
// The transport retries a transient read twice (1 s, 2 s) on its own.
return gets <= TRANSPORT_ATTEMPTS
? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
: HttpResponse.json(resource([]));
}),
);
vi.useFakeTimers();
const { result } = renderHook(
() => {
@@ -46,12 +51,26 @@ describe("read-only screen synchronization", () => {
{ wrapper: createQueryWrapper().wrapper },
);
await waitFor(() => expect(gets).toBe(1));
await act(async () => result.current.sync.retry());
await waitFor(() => expect(result.current.accounts.data).toEqual([]));
try {
// Exhaust the transport back-off so the query settles in error.
await vi.waitFor(async () => {
await act(() => vi.advanceTimersByTimeAsync(TRANSPORT_RECOVERY_MS));
expect(result.current.sync.transportError).toBe(true);
});
expect(gets).toBe(TRANSPORT_ATTEMPTS);
expect(gets).toBe(2);
expect(syncModes).toEqual([null, null]);
await act(async () => result.current.sync.retry());
await vi.waitFor(async () => {
await act(() => vi.advanceTimersByTimeAsync(0));
expect(result.current.accounts.data).toEqual([]);
});
}
finally {
vi.useRealTimers();
}
expect(gets).toBe(TRANSPORT_ATTEMPTS + 1);
expect(syncModes).toEqual(Array.from({ length: gets }, () => null));
});
it("refreshes the currently open resources together", async () => {
@@ -330,7 +330,7 @@ describe("Upcoming event date filters", () => {
expect(screen.getByLabelText("URL")).toBeEmptyDOMElement();
expect(screen.getByRole("button", { name: "Применить" })).toBeDisabled();
expect(
screen.getByText("За выбранный период событий не найдено"),
screen.getByText("На выбранный период предстоящих событий не найдено"),
).toBeVisible();
},
);
@@ -174,7 +174,7 @@ describe("AccountEventsPage", () => {
it("renders empty and error states with retry", async () => {
const { rerender } = renderPage();
expect(
screen.getByText("За выбранный период событий не найдено"),
screen.getByText("На выбранный период предстоящих событий не найдено"),
).toBeInTheDocument();
query.mockReturnValue({
data: undefined,
@@ -239,7 +239,7 @@ describe("AccountEventsPage", () => {
"true",
);
expect(
screen.queryByText("За выбранный период событий не найдено"),
screen.queryByText("На выбранный период предстоящих событий не найдено"),
).not.toBeInTheDocument();
});
@@ -785,7 +785,7 @@ describe("income period and snapshot boundary", () => {
expect(screen.queryByText("USD")).not.toBeInTheDocument();
const cards = screen.getAllByRole("listitem");
expect(cards).toHaveLength(3);
expect(cards[0]).toHaveTextContent("+10 USD");
expect(cards[0]).toHaveTextContent("+10 $");
expect(cards[1]).toHaveTextContent("−2 ₽");
expect(cards[2]).toHaveTextContent("−3 ₽");
expect(screen.queryByText(/Итого:|Выплат:/)).not.toBeInTheDocument();
@@ -817,11 +817,11 @@ describe("income period and snapshot boundary", () => {
);
renderPage(undefined, "all");
expect(await screen.findByText("Купон · BOND")).toBeInTheDocument();
expect(await screen.findByText("Выплата купонов BOND")).toBeInTheDocument();
expect(screen.getByText("+30 ₽")).toBeInTheDocument();
const accounts = within(screen.getByRole("list", {
name: /Купон · BOND, Исполнено/,
name: /Выплата купонов BOND, Исполнено/,
}));
expect(accounts.getByText("Брокерский")).toBeInTheDocument();
@@ -856,7 +856,7 @@ describe("income period and snapshot boundary", () => {
expect(await screen.findByText("+30 ₽")).toBeInTheDocument();
const accounts = within(screen.getByRole("list", {
name: /Купон · BOND/,
name: /Выплата купонов BOND/,
}));
expect(accounts.getAllByRole("listitem")).toHaveLength(2);
@@ -889,7 +889,7 @@ describe("income period and snapshot boundary", () => {
);
const view = renderPage(undefined, "all");
await screen.findByText("Купон · BOND");
await screen.findByText("Выплата купонов BOND");
expect(screen.queryByText("+30 ₽")).not.toBeInTheDocument();
view.unmount();
@@ -440,7 +440,7 @@ describe("AccountOperationsPage", () => {
renderPage();
expect(
await screen.findByRole("heading", { name: "Журнал операций" }),
await screen.findByRole("heading", { name: "История операций" }),
).toBeInTheDocument();
expect(
screen.queryByRole("link", { name: "К счету" }),
@@ -482,7 +482,7 @@ describe("AccountOperationsPage", () => {
renderPage();
expect(
await screen.findByRole("heading", { name: "Журнал операций" }),
await screen.findByRole("heading", { name: "История операций" }),
).toBeInTheDocument();
await waitFor(() => expect(searches.length).toBeGreaterThan(0));
const countBefore = searches.length;
@@ -521,7 +521,7 @@ describe("AccountOperationsPage", () => {
renderPage();
expect(
await screen.findByRole("heading", { name: "Журнал операций" }),
await screen.findByRole("heading", { name: "История операций" }),
).toBeInTheDocument();
fireEvent.click(screen.getByRole("combobox", { name: "Категории" }));
fireEvent.click(await screen.findByText("Налог"));
@@ -579,7 +579,7 @@ describe("AccountOperationsPage", () => {
);
renderPage();
expect(
await screen.findByText("Не удалось загрузить журнал", undefined, {
await screen.findByText("Не удалось загрузить историю операций", undefined, {
timeout: RETRIES_EXHAUSTED_MS,
}),
).toBeInTheDocument();
@@ -787,10 +787,10 @@ describe("all-account operation groups", () => {
fireEvent.click(screen.getByRole("button", { name: "Далее" }));
const accounts = await screen.findByRole("list", {
name: /Купон · BOND, Исполнено/,
name: /Выплата купонов BOND, Исполнено/,
});
expect(screen.getByText("Купон · BOND")).toBeInTheDocument();
expect(screen.getByText("Выплата купонов BOND")).toBeInTheDocument();
expect(screen.getByText("+200 ₽")).toBeInTheDocument();
expect(within(accounts).getAllByRole("listitem")).toHaveLength(2);
+105
View File
@@ -0,0 +1,105 @@
import type { Performance } from "@/entities/performance";
import { formatDate, formatMoney, formatPercentagePoints, formatSignedPercent } from "@/shared/lib";
type TextValue = { tone: Tone; value: string };
type Tone
= | "negative"
| "neutral"
| "positive";
const reasonLabels: Record<string, string> = {
ACCOUNT_VALUATION_DATES_DIFFER: "Оценки счетов сделаны в разные дни",
AMBIGUOUS_RETURN: "У расчёта доходности несколько возможных решений",
HISTORY_START_UNKNOWN: "Начало истории счёта неизвестно",
INDEX_HISTORY_UNAVAILABLE: "История индекса временно недоступна",
NO_SOLUTION: "Расчёт доходности не сходится",
NON_RUB_ACTIVITY: "Есть операции или позиции не в рублях",
OPERATIONS_HISTORY_INCOMPLETE: "История операций ещё не получена полностью",
PORTFOLIO_VALUATION_INCOMPLETE: "Нет полной оценки портфеля",
UNCONFIRMED_TRANSFER: "Перевод между счетами не удалось подтвердить",
UNVALUED_SECURITIES_TRANSFER: "Бумаги переведены без денежной оценки",
};
const unknownReason = "Причину недоступности не удалось определить";
function performanceVm(data: Performance) {
return {
basis: data.return.basis,
comparison: data.outperformance
? {
money: signedMoney(data.outperformance.money),
points: valueText(
data.outperformance.percentagePoints,
formatPercentagePoints,
),
}
: null,
current: formatMoney(data.currentValue),
currentPoint: data.series.length > 0
? { date: formatDate(`${data.series.at(-1)?.date ?? data.period.to}T00:00:00Z`) }
: null,
days: data.period.days,
excluded: data.excludedAccounts.map(item => ({
id: item.accountId,
name: item.name,
reason: reasonText(item.reason),
})),
from: data.period.from,
indexReason: data.benchmark.unavailableReason
? reasonText(data.benchmark.unavailableReason)
: null,
indexReturn: valueText(data.benchmark.return.value, formatSignedPercent),
indexValue: data.benchmark.value ? formatMoney(data.benchmark.value) : "—",
invested: formatMoney(data.netInvested),
profit: signedMoney(data.profit),
returnReason: data.return.unavailableReason
? reasonText(data.return.unavailableReason)
: null,
returnValue: valueText(data.return.value, formatSignedPercent),
series: data.series.map(item => ({
benchmarkValue: Number(item.benchmarkValue),
date: item.date,
label: formatDate(`${item.date}T00:00:00Z`),
netInvested: Number(item.netInvested),
referenceValue: item.referenceValue === null
? null
: Number(item.referenceValue),
})),
to: data.period.to,
};
}
function reasonText(reason: string): string {
// eslint-disable-next-line security/detect-object-injection -- Lookup accepts only an API reason, with a safe fallback.
return reasonLabels[reason] ?? unknownReason;
}
function signedMoney(value: Performance["profit"]): TextValue {
return {
tone: tone(value.value),
value: formatMoney(value, { withSign: true }),
};
}
function tone(value: string): Tone {
const number = Number(value);
if (number > 0) return "positive";
return number < 0 ? "negative" : "neutral";
}
// Tone follows the displayed text, so "0,0 %" is never coloured.
function valueText(
value: null | string,
format: (value: string) => string,
): TextValue {
if (value === null) return { tone: "neutral", value: "—" };
const text = format(value);
if (text.startsWith("+")) return { tone: "positive", value: text };
return { tone: text.startsWith("−") ? "negative" : "neutral", value: text };
}
export { performanceVm, reasonText };
@@ -850,9 +850,9 @@ describe("AccountPage states", () => {
expect(
screen.getByRole("heading", { name: "Портфель пока пуст" }),
).toBeInTheDocument();
expect(screen.getByRole("link", { name: "Открыть журнал" }))
expect(screen.getByRole("link", { name: "Открыть историю операций" }))
.toBeInTheDocument();
expect(screen.getByRole("link", { name: "Открыть будущие события" }))
expect(screen.getByRole("link", { name: "Открыть предстоящие события" }))
.toBeInTheDocument();
expect(screen.getByRole("link", { name: "Открыть пассивный доход" }))
.toBeInTheDocument();
@@ -893,10 +893,10 @@ describe("AccountPage states", () => {
}),
).toBeVisible();
expect(
screen.getByRole("status", { name: "Загрузка будущих событий" }),
screen.getByRole("status", { name: "Загрузка предстоящих событий" }),
).toBeVisible();
expect(
screen.queryByText("На ближайшие 30 дней событий не найдено."),
screen.queryByText("На ближайшие 30 дней предстоящих событий не найдено."),
).not.toBeInTheDocument();
expect(screen.getByText("Загрузка дохода текущего месяца")).toBeVisible();
expect(screen.queryByText("Нет текущих сумм")).not.toBeInTheDocument();
@@ -1076,7 +1076,7 @@ describe("AccountPage states", () => {
/>,
);
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
fireEvent.click(screen.getByRole("tab", { name: "История операций" }));
expect(
screen.getByText("Пока недоступно"),
).toBeInTheDocument();
@@ -1115,7 +1115,7 @@ describe("AccountPage states", () => {
/>,
);
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
fireEvent.click(screen.getByRole("tab", { name: "История операций" }));
expect(screen.getByText("Сделка")).toBeInTheDocument();
expect(screen.getByText("−12 ₽")).toBeInTheDocument();
});
@@ -1169,8 +1169,8 @@ describe("AccountPage states", () => {
/>,
);
fireEvent.click(screen.getByRole("tab", { name: "События" }));
const section = screen.getByRole("tabpanel", { name: "События" });
fireEvent.click(screen.getByRole("tab", { name: "Предстоящие события" }));
const section = screen.getByRole("tabpanel", { name: "Предстоящие события" });
const content = within(section);
const text = section.textContent ?? "";
@@ -1191,7 +1191,7 @@ describe("AccountPage states", () => {
expect(
content.getByText("11.09.2026 · Дата реестра · RU000A0JX0J2"),
).toBeVisible();
for (const amount of ["850,50 ₽", "0 USD", "1 000 ₽", "Сумма неизвестна"])
for (const amount of ["850,50 ₽", "0 $", "1 000 ₽", "Сумма неизвестна"])
expect(content.getByText(amount)).toBeVisible();
expect(content.getAllByText("Прогноз")).toHaveLength(4);
expect(content.queryByText("Без движения денег")).not.toBeInTheDocument();
@@ -1211,15 +1211,15 @@ describe("AccountPage states", () => {
/>,
);
fireEvent.click(screen.getByRole("tab", { name: "События" }));
fireEvent.click(screen.getByRole("tab", { name: "Предстоящие события" }));
const content = within(
screen.getByRole("tabpanel", { name: "События" }),
screen.getByRole("tabpanel", { name: "Предстоящие события" }),
);
if (state === "loading") {
const skeleton = content.getByRole("status", {
name: "Загрузка будущих событий",
name: "Загрузка предстоящих событий",
});
// eslint-disable-next-line vitest/no-conditional-expect -- The fixed table case selects the expected outcome; every case asserts its own branch.
@@ -1230,7 +1230,7 @@ describe("AccountPage states", () => {
else {
// eslint-disable-next-line vitest/no-conditional-expect -- The table case deterministically selects the empty state.
expect(
content.getByText("На ближайшие 30 дней событий не найдено."),
content.getByText("На ближайшие 30 дней предстоящих событий не найдено."),
).toBeVisible();
}
@@ -1251,7 +1251,7 @@ describe("AccountPage states", () => {
/>,
);
fireEvent.click(screen.getByRole("tab", { name: "События" }));
fireEvent.click(screen.getByRole("tab", { name: "Предстоящие события" }));
expect(
screen.getByText("Данные появятся здесь, когда чтение восстановится."),
).toBeInTheDocument();
@@ -1522,8 +1522,8 @@ describe("AccountPage states", () => {
.toBeVisible();
expect(screen.queryByText("Вторая")).not.toBeInTheDocument();
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
expect(screen.getByText("Последних событий пока нет.")).toBeVisible();
fireEvent.click(screen.getByRole("tab", { name: "История операций" }));
expect(screen.getByText("Последних операций пока нет.")).toBeVisible();
});
it("links operation, event and income previews to their detail pages", () => {
@@ -1538,8 +1538,8 @@ describe("AccountPage states", () => {
);
for (const [tab, href] of [
["Операции", "/accounts/account-1/operations"],
["События", "/accounts/account-1/events"],
["История операций", "/accounts/account-1/operations"],
["Предстоящие события", "/accounts/account-1/events"],
["Доход", "/accounts/account-1/income"],
]) {
fireEvent.click(screen.getByRole("tab", { name: tab }));
@@ -1655,7 +1655,7 @@ describe("AccountPage states", () => {
await screen.findByRole("heading", { level: 1, name: "Все счета" });
const operationGroup = screen.getByRole("list", {
name: /Купон · BOND, Исполнено/,
name: /Выплата купонов BOND, Исполнено/,
});
expect(screen.getByText("+500 ₽")).toBeInTheDocument();
@@ -30,6 +30,7 @@ import { AccountHeading } from "./AccountHeading.view";
import { Concentration } from "./Concentration/Concentration.view";
import { CurrencyCards } from "./CurrencyCards/CurrencyCards.view";
import { IncomeSummary } from "./IncomeSummary.view";
import { PerformanceTab } from "./Performance/PerformanceTab";
import { PortfolioStructure } from "./PortfolioStructure/PortfolioStructure";
import { PositionSection } from "./PositionSection.view";
import { RecentOperations } from "./RecentOperations.view";
@@ -148,6 +149,8 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
<Tabs.Tab value="events">{t("portfolio.tabs.events")}</Tabs.Tab>
<Tabs.Tab value="income">{t("portfolio.tabs.income")}</Tabs.Tab>
<Tabs.Tab value="performance">{t("portfolio.tabs.performance")}</Tabs.Tab>
</Tabs.List>
<Tabs.Panel value="positions">
@@ -211,6 +214,10 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
/>
)}
</Tabs.Panel>
<Tabs.Panel value="performance">
{props.accountId && <PerformanceTab accountId={props.accountId} />}
</Tabs.Panel>
</Tabs>
</Stack>
);
@@ -0,0 +1,3 @@
.positive { color: var(--wl-color-positive); }
.negative { color: var(--wl-color-negative); }
.neutral { color: var(--mantine-color-dark-7); }
@@ -0,0 +1,106 @@
import type { Meta, StoryObj } from "@storybook/react-vite";
import type { Performance } from "@/entities/performance";
import { PerformanceView } from "./Performance.view";
const rub = (value: string) => ({ currency: "RUB", value });
const series = Array.from({ length: 24 }, (_, month) => {
const date = new Date(Date.UTC(2024, month, 1)).toISOString().slice(0, 10);
const invested = 300_000 + Math.floor(month / 6) * 150_000;
return {
benchmarkValue: String(Math.round(invested * (1 + month * 0.009))),
date,
netInvested: String(invested),
referenceValue: String(Math.round(invested * (1 + month * 0.004))),
};
});
const data: Performance = {
accountId: "account-1",
benchmark: {
asOf: "2025-12-01",
code: "MCFTRR",
return: { basis: "annual", unavailableReason: null, value: "0.108" },
unavailableReason: null,
value: rub("1387973"),
},
calculatedAt: "2025-12-01T00:00:00Z",
completeness: "complete",
currentValue: rub("1536400"),
excludedAccounts: [],
netInvested: rub("1060000"),
outperformance: { money: rub("148427"), percentagePoints: "0.043" },
period: { days: 700, from: "2024-01-01", to: "2025-12-01" },
profit: rub("476400"),
reference: {
asOf: "2025-12-01",
code: "IMOEX",
return: { basis: "annual", unavailableReason: null, value: "0.047" },
unavailableReason: null,
value: rub("1150000"),
},
return: { basis: "annual", unavailableReason: null, value: "0.151" },
series,
};
const meta = {
args: { data },
component: PerformanceView,
parameters: {
docs: {
description: {
component:
"Вкладка «Результат»: доходность, прибыль, те же деньги в индексе Мосбиржи и опережение. Синтетический серверный ответ без расчётов на клиенте.",
},
},
},
tags: ["autodocs"],
title: "Product/Performance",
} satisfies Meta<typeof PerformanceView>;
export default meta;
type Story = StoryObj<typeof meta>;
export const Ahead: Story = {};
export const Behind: Story = {
args: {
data: {
...data,
currentValue: rub("1172400"),
outperformance: { money: rub("-215573"), percentagePoints: "-0.068" },
profit: rub("112400"),
return: { basis: "annual", unavailableReason: null, value: "0.04" },
},
},
};
export const ShortHistory: Story = {
args: {
data: {
...data,
benchmark: {
...data.benchmark,
return: { basis: "period", unavailableReason: null, value: "0.112" },
},
period: { days: 277, from: "2025-02-27", to: "2025-12-01" },
return: { basis: "period", unavailableReason: null, value: "0.074" },
},
},
};
export const Incomplete: Story = {
args: {
data: {
...data,
completeness: "incomplete",
excludedAccounts: [
{ accountId: "usd", name: "Валютный", reason: "NON_RUB_ACTIVITY" },
],
},
},
};
@@ -0,0 +1,185 @@
import { LineChart } from "@mantine/charts";
import {
Accordion,
ActionIcon,
Alert,
Group,
Paper,
SimpleGrid,
Stack,
Text,
Title,
Tooltip,
} from "@mantine/core";
import { useTranslation } from "react-i18next";
import type { Performance } from "@/entities/performance";
import { formatChartValue, formatDate } from "@/shared/lib";
import { performanceVm } from "../../../../model/performance";
import classes from "./Performance.module.css";
const formatRub = (value: number) => `${formatChartValue(Math.round(value))} ₽`;
function PerformanceView({ data }: Readonly<{ data: Performance }>) {
const { t } = useTranslation();
const vm = performanceVm(data);
const basis = vm.basis === "annual"
? t("portfolio.performance.yearly")
: t("portfolio.performance.periodLabel", { days: vm.days });
const comparisonTone = vm.comparison?.points.tone ?? "neutral";
let comparisonTitle = t("portfolio.performance.marketEqual");
if (comparisonTone === "positive") comparisonTitle = t("portfolio.performance.marketAhead");
else if (comparisonTone === "negative") comparisonTitle = t("portfolio.performance.marketBehind");
const percentText = vm.returnValue.value;
const indexText = vm.indexReturn.value;
const currentLines = vm.currentPoint
? [{ color: "blue.6", label: t("portfolio.performance.current"), x: vm.currentPoint.date }]
: [];
const profitCaption = t("portfolio.performance.profitCaption", { current: vm.current, invested: vm.invested });
const chartLabel = [
`${t("portfolio.performance.invested")}: ${vm.invested}`,
`${t("portfolio.performance.benchmark")}: ${vm.indexValue}`,
`${t("portfolio.performance.current")}: ${vm.current}`,
`${t("portfolio.performance.returnLabel")}: ${percentText}`,
].join("; ");
return (
<Stack gap="md">
{vm.excluded.length > 0 && (
<Alert role="status" title={t("portfolio.performance.incomplete")}>
{vm.excluded.map(item => (
<Text key={item.id} size="sm">
{t("portfolio.performance.unavailableReason", item)}
</Text>
))}
</Alert>
)}
{vm.basis === "period" && (
<Alert role="status">
{t("portfolio.performance.periodNote", { days: vm.days })}
</Alert>
)}
<SimpleGrid cols={{ base: 1, lg: 4, sm: 2 }}>
<Paper component="dl" m={0} p="md" withBorder>
<Text component="dt" size="sm">{t("portfolio.performance.returnLabel")}</Text>
<Text className={classes[vm.returnValue.tone]} component="dd" fw={700} m={0} size="xl">
{percentText}
</Text>
<Text c="dimmed" size="xs">{vm.returnReason ?? basis}</Text>
</Paper>
<Paper component="dl" m={0} p="md" withBorder>
<Text component="dt" size="sm">{t("portfolio.performance.profit")}</Text>
<Text className={classes[vm.profit.tone]} component="dd" fw={700} m={0} size="xl">
{vm.profit.value}
</Text>
<Text c="dimmed" size="xs">{profitCaption}</Text>
</Paper>
<Paper component="dl" m={0} p="md" withBorder>
<Group gap="xs">
<Text component="dt" size="sm">{t("portfolio.performance.benchmark")}</Text>
<Tooltip
events={{ focus: true, hover: true, touch: true }}
label={t("portfolio.performance.benchmarkHint")}
multiline
w={280}
>
<ActionIcon
aria-label={t("portfolio.performance.benchmarkHint")}
size="xs"
variant="subtle"
>?
</ActionIcon>
</Tooltip>
</Group>
<Text component="dd" fw={700} m={0} size="xl">{indexText}</Text>
<Text c="dimmed" size="xs">
{vm.indexReason ?? `${basis} · ${vm.indexValue}`}
</Text>
</Paper>
<Paper component="dl" m={0} p="md" withBorder>
<Text component="dt" size="sm">
{comparisonTitle}
</Text>
<Text
className={classes[vm.comparison?.points.tone ?? "neutral"]}
component="dd"
fw={700}
m={0}
size="xl"
>
{vm.comparison?.points.value ?? "—"}
</Text>
<Text c="dimmed" size="xs">{vm.comparison?.money.value ?? vm.indexReason ?? vm.returnReason}</Text>
</Paper>
</SimpleGrid>
<Paper component="section" p="md" withBorder>
<Title mb="sm" order={2} size="h4">{t("portfolio.performance.chartTitle")}</Title>
{vm.series.length > 0
? (
<LineChart
aria-label={chartLabel}
curveType="linear"
data={vm.series}
dataKey="label"
gridAxis="y"
h={{ base: 220, sm: 300 }}
lineProps={{ isAnimationActive: false }}
referenceLines={currentLines}
series={[
{ color: "dark.4", label: t("portfolio.performance.invested"), name: "netInvested" },
{ color: "orange.6", label: t("portfolio.performance.benchmark"), name: "benchmarkValue" },
{ color: "gray.5", label: t("portfolio.performance.reference"), name: "referenceValue", strokeDasharray: "4 3" },
]}
tooltipAnimationDuration={0}
valueFormatter={formatRub}
yAxisProps={{ domain: [0, "auto"], width: 70 }}
/>
)
: <Text c="dimmed">{t("portfolio.performance.benchmarkUnavailable")}</Text>}
<Text c="dimmed" mt="sm" size="sm">
{t("portfolio.performance.missingHistory")}
</Text>
</Paper>
<Accordion variant="contained">
<Accordion.Item value="method">
<Accordion.Control>{t("portfolio.performance.calculation")}</Accordion.Control>
<Accordion.Panel>
<Text size="sm">
{t("portfolio.performance.datePeriod", { from: formatDate(`${vm.from}T00:00:00Z`), to: formatDate(`${vm.to}T00:00:00Z`) })}
</Text>
<Text mt="sm" size="sm">{t("portfolio.performance.method")}</Text>
</Accordion.Panel>
</Accordion.Item>
</Accordion>
</Stack>
);
}
export { PerformanceView };
@@ -0,0 +1,193 @@
import { MantineProvider } from "@mantine/core";
import { QueryClientProvider } from "@tanstack/react-query";
import { fireEvent, render, screen } from "@testing-library/react";
import { http, HttpResponse, type JsonBodyType } from "msw";
import { describe, expect, it, vi } from "vitest";
import type { Performance } from "@/entities/performance";
import { configureAuthClient } from "@/shared/api";
import { createTestQueryClient } from "@/test/query";
import { server } from "@/test/server";
import { PerformanceTab } from "./PerformanceTab";
const url = "*/api/v1/brokerage-accounts/:accountId/performance";
const rub = (value: string) => ({ currency: "RUB", value });
function performance(overrides: Partial<Performance> = {}): Performance {
return {
accountId: "account-1",
benchmark: {
asOf: "2025-12-31",
code: "MCFTRR",
return: { basis: "annual", unavailableReason: null, value: "0.048809" },
unavailableReason: null,
value: rub("110000"),
},
calculatedAt: "2026-01-01T00:00:00Z",
completeness: "complete",
currentValue: rub("121000"),
excludedAccounts: [],
netInvested: rub("100000"),
outperformance: { money: rub("11000"), percentagePoints: "0.051191" },
period: { days: 730, from: "2024-01-01", to: "2025-12-31" },
profit: rub("21000"),
reference: {
asOf: "2025-12-31",
code: "IMOEX",
return: { basis: "annual", unavailableReason: null, value: "0.02" },
unavailableReason: null,
value: rub("105000"),
},
return: { basis: "annual", unavailableReason: null, value: "0.1" },
series: [
{ benchmarkValue: "100000", date: "2024-01-01", netInvested: "100000", referenceValue: "100000" },
{ benchmarkValue: "110000", date: "2025-12-31", netInvested: "100000", referenceValue: "105000" },
],
...overrides,
};
}
function renderTab(body: JsonBodyType, status = 200) {
configureAuthClient({
accessToken: () => "test-token",
clear: vi.fn(),
refresh: () => Promise.resolve(true),
});
server.use(http.get(url, () => HttpResponse.json(body, { status })));
return render(
<QueryClientProvider client={createTestQueryClient()}>
<MantineProvider>
<PerformanceTab accountId="account-1" />
</MantineProvider>
</QueryClientProvider>,
);
}
const meta = { dependencies: [], unavailable: [] };
describe("PerformanceTab", () => {
it("shows return, profit, the same money in the index and outperformance with signs", async () => {
renderTab({ data: performance(), meta });
expect(await screen.findByText("+10,0 %")).toBeInTheDocument();
expect(screen.getByText("+21 000 ₽")).toBeInTheDocument();
expect(screen.getByText("+4,9 %")).toBeInTheDocument();
expect(screen.getByText("Опережение рынка")).toBeInTheDocument();
expect(screen.getByText("+5,1 п.п.")).toBeInTheDocument();
expect(screen.getByText("+11 000 ₽")).toBeInTheDocument();
// Index codes are allowed only inside "Как считали", not as captions.
expect(screen.getByText("Те же деньги в индексе Мосбиржи")).toBeInTheDocument();
expect(screen.queryByText("MCFTRR")).not.toBeInTheDocument();
});
it("labels lagging the market without colour-only meaning", async () => {
renderTab({
data: performance({
outperformance: { money: rub("-5000"), percentagePoints: "-0.02" },
}),
meta,
});
expect(await screen.findByText("Отставание от рынка")).toBeInTheDocument();
expect(screen.getByText("−2,0 п.п.")).toBeInTheDocument();
});
it("never says annual when history is shorter than a year", async () => {
renderTab({
data: performance({
benchmark: { ...performance().benchmark, return: { basis: "period", unavailableReason: null, value: "0.05" } },
period: { days: 200, from: "2025-06-14", to: "2025-12-31" },
return: { basis: "period", unavailableReason: null, value: "0.07" },
}),
meta,
});
expect(await screen.findByText(/проценты показаны за 200 дн\./)).toBeInTheDocument();
expect(screen.queryByText(/годовых/)).not.toBeInTheDocument();
});
it("lists excluded accounts when the all-accounts result is incomplete", async () => {
renderTab({
data: performance({
completeness: "incomplete",
excludedAccounts: [{ accountId: "usd", name: "Валютный", reason: "NON_RUB_ACTIVITY" }],
}),
meta,
});
expect(await screen.findByText("Результат неполный")).toBeInTheDocument();
expect(screen.getByText("Валютный: Есть операции или позиции не в рублях")).toBeInTheDocument();
});
it("explains unavailability instead of showing zeros, including unknown reasons", async () => {
renderTab({
data: null,
meta: {
dependencies: [],
unavailable: [
{ accountId: "iis", name: "ИИС", reason: "HISTORY_START_UNKNOWN" },
{ accountId: "x", name: "Новый", reason: "SOMETHING_NEW" },
],
},
});
expect(await screen.findByText("Доходность недоступна")).toBeInTheDocument();
expect(screen.getByText("ИИС: Начало истории счёта неизвестно")).toBeInTheDocument();
expect(screen.getByText("Новый: Причину недоступности не удалось определить")).toBeInTheDocument();
expect(screen.queryByText(/0,0 %/)).not.toBeInTheDocument();
});
it("keeps profit and hides the comparison when the index is unavailable", async () => {
renderTab({
data: performance({
benchmark: {
asOf: null,
code: "MCFTRR",
return: { basis: "annual", unavailableReason: "INDEX_HISTORY_UNAVAILABLE", value: null },
unavailableReason: "INDEX_HISTORY_UNAVAILABLE",
value: null,
},
outperformance: null,
series: [],
}),
meta,
});
expect(await screen.findByText("+21 000 ₽")).toBeInTheDocument();
expect(screen.getByText("Сравнение с индексом сейчас недоступно")).toBeInTheDocument();
});
it("does not colour or call a rounded-to-zero difference outperformance", async () => {
renderTab({
data: performance({
outperformance: { money: rub("0"), percentagePoints: "-0.0004" },
}),
meta,
});
expect(await screen.findByText("Сравнение с рынком")).toBeInTheDocument();
expect(screen.getByText("0,0 п.п.")).toBeInTheDocument();
});
it("explains a pending sync when no account reasons are available", async () => {
renderTab({ data: null, meta });
expect(await screen.findByText(/ещё синхронизируются/)).toBeInTheDocument();
});
it("shows a local error with retry", async () => {
renderTab({ code: "INTERNAL_SERVER_ERROR", status: 500 }, 500);
expect(await screen.findByText("Не удалось загрузить результат инвестирования", {}, { timeout: 8000 })).toBeInTheDocument();
server.use(http.get(
url,
() => HttpResponse.json({ data: performance(), meta }),
));
fireEvent.click(screen.getByRole("button", { name: "Повторить" }));
expect(await screen.findByText("+10,0 %")).toBeInTheDocument();
}, 10_000);
});
@@ -0,0 +1,66 @@
import { Button, Paper, SimpleGrid, Skeleton, Stack, Text, Title } from "@mantine/core";
import { useTranslation } from "react-i18next";
import { usePerformance } from "@/entities/performance";
import { reasonText } from "../../../../model/performance";
import { PerformanceView } from "./Performance.view";
function PerformanceTab({ accountId }: Readonly<{ accountId: string }>) {
const { t } = useTranslation();
const query = usePerformance(accountId);
if (query.isPending) return (
<Stack aria-label={t("portfolio.performance.returnLabel")} gap="md">
<SimpleGrid cols={{ base: 1, lg: 4, sm: 2 }}>
{["rate", "profit", "benchmark", "difference"].map(key => (
<Paper key={key} p="md" withBorder>
<Skeleton h={14} mb="sm" w="60%" />
<Skeleton h={28} w="80%" />
</Paper>
))}
</SimpleGrid>
<Skeleton h={220} />
</Stack>
);
const onRetry = () => {
void query.refetch();
};
if (query.isError) return (
<Paper p="lg" withBorder>
<Stack align="flex-start" gap="sm">
<Text>{t("portfolio.performance.error")}</Text>
<Button onClick={onRetry} variant="light">
{t("portfolio.performance.retry")}
</Button>
</Stack>
</Paper>
);
if (!query.data.data) return (
<Paper p="xl" withBorder>
<Title order={2} size="h4">{t("portfolio.performance.unavailable")}</Title>
{query.data.meta.unavailable.length === 0 && (
<Text c="dimmed" mt="sm">{t("portfolio.performance.syncing")}</Text>
)}
{query.data.meta.unavailable.map(item => (
<Text c="dimmed" key={item.accountId} mt="sm">
{t("portfolio.performance.unavailableReason", {
name: item.name,
reason: reasonText(item.reason),
})}
</Text>
))}
</Paper>
);
return <PerformanceView data={query.data.data} />;
}
export { PerformanceTab };
@@ -60,7 +60,7 @@ describe("portfolio structure", () => {
screen.getByRole("combobox", { name: "Валюта структуры портфеля" }),
);
fireEvent.click(screen.getByRole("option", { name: "USD" }));
expect(screen.getByRole("list")).toHaveTextContent("60 USD");
expect(screen.getByRole("list")).toHaveTextContent("60 $");
expect(screen.getByRole("list")).not.toHaveTextContent("₽");
view.rerender(ui({ currencies: [rub], unvaluedCategories: [] }));
expect(screen.getByRole("list")).toHaveTextContent("60 ₽");
@@ -110,7 +110,9 @@ describe("AccountsPage", () => {
renderPage(client);
expect(await screen.findByText("175,30 ₽")).toBeInTheDocument();
expect(screen.getAllByText("20,00 USD")).not.toHaveLength(0);
expect(screen.getAllByText("20,00 $")).not.toHaveLength(0);
expect(screen.queryByText("Ваши инвестиции по счетам"))
.not.toBeInTheDocument();
expect(screen.getByText("5 счетов")).toBeInTheDocument();
expect(screen.getByText("Нет текущих сумм")).toBeInTheDocument();
expect(screen.getByText(
@@ -0,0 +1,21 @@
.summary {
min-width: 0;
padding-bottom: var(--mantine-spacing-lg);
border-bottom: 1px solid var(--wl-color-border);
}
.primaryTotal {
font-size: clamp(1.75rem, 4vw, 2.25rem);
font-variant-numeric: tabular-nums;
line-height: 1.2;
overflow-wrap: anywhere;
}
.otherTotal {
font-variant-numeric: tabular-nums;
overflow-wrap: anywhere;
}
.meta {
padding-top: var(--mantine-spacing-xs);
}
@@ -1,6 +1,6 @@
import type { FC } from "react";
import { Button, SimpleGrid, Stack, Text, Title } from "@mantine/core";
import { Button, Group, Stack, Text, Title } from "@mantine/core";
import { useTranslation } from "react-i18next";
import { Link } from "react-router";
@@ -13,6 +13,8 @@ import {
import { formatMoney } from "@/shared/lib";
import { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
import classes from "./AccountsPageLoaded.module.css";
const DECIMAL_BASE = 10n;
const DECIMAL_PART_COUNT = 2;
const ZERO = 0n;
@@ -87,52 +89,55 @@ function sumDecimals(values: string[]) {
const AccountsPageLoaded: FC<AccountsPageLoadedProps> = (props) => {
const { t } = useTranslation();
const { excludedCount, totals } = accountTotals(props.accounts);
const primaryTotal = totals.find(total => total.currency === "RUB") ?? totals[0];
const otherTotals = totals.filter(total => total !== primaryTotal);
return (
<Stack gap="lg">
<Stack gap={4}>
<Title order={1}>{t("accounts.title")}</Title>
<Title order={1}>{t("accounts.title")}</Title>
<Stack className={classes.summary} gap="xs">
<Text c="dimmed" size="sm">
{t("accounts.subtitle")}
{t("accounts.currentValue")}
</Text>
</Stack>
<Stack gap="xs">
<SimpleGrid cols={{ base: 1, xs: 2 }} spacing="xs">
<Stack gap={4}>
<Text c="dimmed" size="sm">
{t("accounts.currentValue")}
</Text>
{totals.length > 0
? totals.map(total => (
<Text fw={700} key={total.currency} size="lg">
{formatMoney(total, { withRoundedCents: true })}
</Text>
))
: <Text c="dimmed">{t("accounts.summaryNoTotals")}</Text>}
</Stack>
<Stack gap={4}>
<Text fw={600}>{t("accounts.count", {
count: props.accounts.length,
})}
</Text>
{excludedCount > 0 && (
<Text c="dimmed" size="sm">
{t("accounts.summaryExcluded", { count: excludedCount })}
{primaryTotal
? (
<Text className={classes.primaryTotal} fw={700}>
{formatMoney(primaryTotal, { withRoundedCents: true })}
</Text>
)
: (
<Text c="dimmed">{t("accounts.summaryNoTotals")}</Text>
)}
</Stack>
</SimpleGrid>
<SourceSyncStatus
lastAttempt={props.meta.lastAttempt}
lastSuccessfulAt={props.meta.lastSuccessfulAt}
stale={props.meta.freshness === "stale"}
/>
{otherTotals.length > 0 && (
<Group gap="md" wrap="wrap">
{otherTotals.map(total => (
<Text className={classes.otherTotal} key={total.currency}>
{formatMoney(total, { withRoundedCents: true })}
</Text>
))}
</Group>
)}
<Group className={classes.meta} gap="xs" wrap="wrap">
<Text c="dimmed" size="xs">
{t("accounts.count", { count: props.accounts.length })}
</Text>
<SourceSyncStatus
lastAttempt={props.meta.lastAttempt}
lastSuccessfulAt={props.meta.lastSuccessfulAt}
stale={props.meta.freshness === "stale"}
/>
</Group>
{excludedCount > 0 && (
<Text c="dimmed" size="sm">
{t("accounts.summaryExcluded", { count: excludedCount })}
</Text>
)}
{!!props.readRetry && <ReadRetry {...props.readRetry} />}
</Stack>
+1 -1
View File
@@ -351,7 +351,7 @@ describe("bond page", () => {
screen.queryByRole("heading", { name: "Моя позиция" }),
).not.toBeInTheDocument();
expect(
screen.getByRole("heading", { name: "Моя история событий" }),
screen.getByRole("heading", { name: "История операций" }),
).toBeVisible();
});
it(
@@ -490,7 +490,7 @@ describe("stock page", () => {
fireEvent.click(screen.getByRole("button", { name: "Далее" }));
controls.recoverOperations();
expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
expect(screen.getByRole("heading", { name: "Моя история событий" })).toBeVisible();
expect(screen.getByRole("heading", { name: "История операций" })).toBeVisible();
},
);
it("keeps the last quote without manual refresh", async () => {
+241 -204
View File
@@ -276,6 +276,38 @@ export interface paths {
patch?: never;
trace?: never;
};
"/api/v1/brokerage-accounts/all/performance": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
get: operations["PerformanceController_all"];
put?: never;
post?: never;
delete?: never;
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/v1/brokerage-accounts/{accountId}/performance": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
get: operations["PerformanceController_account"];
put?: never;
post?: never;
delete?: never;
options?: never;
head?: never;
patch?: never;
trace?: never;
};
"/api/v1/brokerage-accounts/all/operations": {
parameters: {
query?: never;
@@ -708,22 +740,6 @@ export interface paths {
patch?: never;
trace?: never;
};
"/api/v1/tbank-sync/{id}": {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
get: operations["TbankSyncController_status"];
put?: never;
post?: never;
delete?: never;
options?: never;
head?: never;
patch?: never;
trace?: never;
};
}
export type webhooks = Record<string, never>;
export interface components {
@@ -1138,6 +1154,73 @@ export interface components {
data: components["schemas"]["PortfolioDto"] | null;
meta: components["schemas"]["InvestmentResourceMetaDto"];
};
PerformancePeriodDto: {
/** Format: date */
from: string;
/** Format: date */
to: string;
days: number;
};
/** @enum {string} */
PerformanceUnavailableReason: "ACCOUNT_VALUATION_DATES_DIFFER" | "AMBIGUOUS_RETURN" | "HISTORY_START_UNKNOWN" | "INDEX_HISTORY_UNAVAILABLE" | "NON_RUB_ACTIVITY" | "NO_SOLUTION" | "OPERATIONS_HISTORY_INCOMPLETE" | "PORTFOLIO_VALUATION_INCOMPLETE" | "UNCONFIRMED_TRANSFER" | "UNVALUED_SECURITIES_TRANSFER";
PerformanceReturnDto: {
/** @description Decimal fraction: 0.151 = 15.1% */
value: string | null;
/** @enum {string} */
basis: "annual" | "period";
unavailableReason: components["schemas"]["PerformanceUnavailableReason"] | null;
};
PerformanceIndexDto: {
/** @enum {string} */
code: "MCFTRR" | "IMOEX";
value: components["schemas"]["MoneyDto"] | null;
return: components["schemas"]["PerformanceReturnDto"];
/** Format: date */
asOf: string | null;
unavailableReason: components["schemas"]["PerformanceUnavailableReason"] | null;
};
PerformanceOutperformanceDto: {
/** @description Difference between rates as decimal fractions */
percentagePoints: string;
money: components["schemas"]["MoneyDto"];
};
PerformanceSeriesPointDto: {
/** Format: date */
date: string;
netInvested: string;
benchmarkValue: string;
referenceValue: string | null;
};
PerformanceExcludedAccountDto: {
accountId: string;
name: string;
reason: components["schemas"]["PerformanceUnavailableReason"];
};
PerformanceDto: {
accountId: string;
period: components["schemas"]["PerformancePeriodDto"];
netInvested: components["schemas"]["MoneyDto"];
currentValue: components["schemas"]["MoneyDto"];
profit: components["schemas"]["MoneyDto"];
return: components["schemas"]["PerformanceReturnDto"];
benchmark: components["schemas"]["PerformanceIndexDto"];
reference: components["schemas"]["PerformanceIndexDto"];
outperformance: components["schemas"]["PerformanceOutperformanceDto"] | null;
series: components["schemas"]["PerformanceSeriesPointDto"][];
/** @enum {string} */
completeness: "complete" | "incomplete";
excludedAccounts: components["schemas"]["PerformanceExcludedAccountDto"][];
/** Format: date-time */
calculatedAt: string;
};
PerformanceMetaDto: {
dependencies: components["schemas"]["InvestmentDependencyDto"][];
unavailable: components["schemas"]["PerformanceExcludedAccountDto"][];
};
PerformanceResourceDto: {
data: components["schemas"]["PerformanceDto"] | null;
meta: components["schemas"]["PerformanceMetaDto"];
};
BrokerageOperationDto: {
account?: components["schemas"]["AccountReferenceDto"];
id: string;
@@ -1708,84 +1791,6 @@ export interface components {
PutTbankConnectionDto: {
token: string;
};
EventsInvestmentScreenDto: {
accountId: string;
/**
* @description discriminator enum property added by openapi-typescript
* @enum {string}
*/
screen: "events";
/**
* Format: date
* @description Inclusive UTC calendar start date (YYYY-MM-DD). May be supplied independently; defaults to today in UTC.
*/
from?: string;
/**
* Format: date
* @description Inclusive UTC calendar end date (YYYY-MM-DD). May be supplied independently; defaults to 30 days after from. Timestamp queries use the start of the following UTC day as the exclusive end.
*/
to?: string;
};
IncomeInvestmentScreenDto: {
accountId: string;
/**
* @description discriminator enum property added by openapi-typescript
* @enum {string}
*/
screen: "income";
/**
* Format: date
* @description Inclusive start calendar date in Europe/Moscow (YYYY-MM-DD). Supply both from and to, or neither for the current Moscow month.
*/
from?: string;
/**
* Format: date
* @description Inclusive end calendar date in Europe/Moscow (YYYY-MM-DD). Supply both from and to, or neither. Timestamp queries use the start of the following Moscow day as the exclusive end, capped at now.
*/
to?: string;
};
SyncCandleRangeDto: {
/** Format: date-time */
from: string;
/** Format: date-time */
to: string;
};
TimestampInvestmentScreenDto: {
accountId?: string;
/** Format: uuid */
instrumentUid?: string;
query?: string;
/** @enum {string} */
candlePeriod?: "month" | "halfYear" | "year" | "all";
candleRange?: components["schemas"]["SyncCandleRangeDto"];
categories?: ("trade" | "income" | "tax" | "fee" | "transfer" | "other")[];
limit?: number;
/**
* @description discriminator enum property added by openapi-typescript
* @enum {string}
*/
screen: "accounts" | "account" | "operations" | "stocks" | "bonds" | "stock" | "bond";
/**
* Format: date-time
* @description Start instant for operations.
*/
from?: string;
/**
* Format: date-time
* @description End instant for operations.
*/
to?: string;
};
TbankSyncStatusDto: {
/** Format: uuid */
id: string;
scope: (components["schemas"]["IncomeInvestmentScreenDto"] | components["schemas"]["EventsInvestmentScreenDto"] | components["schemas"]["TimestampInvestmentScreenDto"]) | null;
/** Format: date-time */
now: string;
/** @enum {string} */
state: "running" | "succeeded" | "failed" | "cancelled";
errorCode: string | null;
};
};
responses: never;
parameters: never;
@@ -3525,6 +3530,136 @@ export interface operations {
};
};
};
PerformanceController_all: {
parameters: {
query?: never;
header?: never;
path?: never;
cookie?: never;
};
requestBody?: never;
responses: {
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["PerformanceResourceDto"];
};
};
/** @description Invalid request */
400: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Authentication required */
401: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Resource not found */
404: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Internal server error */
500: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Upstream service unavailable */
503: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
};
};
PerformanceController_account: {
parameters: {
query?: never;
header?: never;
path: {
accountId: string;
};
cookie?: never;
};
requestBody?: never;
responses: {
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["PerformanceResourceDto"];
};
};
/** @description Invalid request */
400: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Authentication required */
401: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Resource not found */
404: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Internal server error */
500: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Upstream service unavailable */
503: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
};
};
BrokerageOperationsController_all: {
parameters: {
query?: {
@@ -3673,9 +3808,7 @@ export interface operations {
};
IncomeAnalyticsController_allSummary: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path?: never;
cookie?: never;
@@ -3740,7 +3873,6 @@ export interface operations {
IncomeAnalyticsController_allAnalytics: {
parameters: {
query?: {
sync?: "observe";
/** @description Inclusive calendar date in Europe/Moscow. Supply both from/to or neither. */
from?: string;
/** @description Inclusive calendar date in Europe/Moscow, no later than today. Supply both from/to or neither. */
@@ -3809,9 +3941,7 @@ export interface operations {
};
IncomeAnalyticsController_summary: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
accountId: string;
@@ -3878,7 +4008,6 @@ export interface operations {
IncomeAnalyticsController_analytics: {
parameters: {
query?: {
sync?: "observe";
/** @description Inclusive calendar date in Europe/Moscow. Supply both from/to or neither. */
from?: string;
/** @description Inclusive calendar date in Europe/Moscow, no later than today. Supply both from/to or neither. */
@@ -3950,7 +4079,6 @@ export interface operations {
UpcomingEventsController_all: {
parameters: {
query?: {
sync?: "observe";
/** @description Inclusive UTC calendar start date (YYYY-MM-DD). May be supplied independently; defaults to today in UTC. */
from?: string;
/** @description Inclusive UTC calendar end date (YYYY-MM-DD). May be supplied independently; defaults to 30 days after from. Timestamp queries use the start of the following UTC day as the exclusive end. */
@@ -4020,7 +4148,6 @@ export interface operations {
UpcomingEventsController_get: {
parameters: {
query?: {
sync?: "observe";
/** @description Inclusive UTC calendar start date (YYYY-MM-DD). May be supplied independently; defaults to today in UTC. */
from?: string;
/** @description Inclusive UTC calendar end date (YYYY-MM-DD). May be supplied independently; defaults to 30 days after from. Timestamp queries use the start of the following UTC day as the exclusive end. */
@@ -4092,7 +4219,6 @@ export interface operations {
StockController_search: {
parameters: {
query: {
sync?: "observe";
query: string;
};
header?: never;
@@ -4158,9 +4284,7 @@ export interface operations {
};
StockController_getByTicker: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
ticker: string;
@@ -4362,9 +4486,7 @@ export interface operations {
};
StockController_get: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
uid: string;
@@ -4430,9 +4552,7 @@ export interface operations {
};
StockController_quote: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
uid: string;
@@ -4499,7 +4619,6 @@ export interface operations {
StockController_candles: {
parameters: {
query?: {
sync?: "observe";
period?: "month" | "halfYear" | "year" | "all";
};
header?: never;
@@ -4633,9 +4752,7 @@ export interface operations {
};
StockController_company: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
uid: string;
@@ -4701,9 +4818,7 @@ export interface operations {
};
StockController_dividends: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
uid: string;
@@ -4769,9 +4884,7 @@ export interface operations {
};
BondController_metrics: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
uid: string;
@@ -4838,7 +4951,6 @@ export interface operations {
BondController_search: {
parameters: {
query: {
sync?: "observe";
query: string;
};
header?: never;
@@ -4904,9 +5016,7 @@ export interface operations {
};
BondController_getByTicker: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
ticker: string;
@@ -4972,9 +5082,7 @@ export interface operations {
};
BondController_get: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
uid: string;
@@ -5040,9 +5148,7 @@ export interface operations {
};
BondController_quote: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
uid: string;
@@ -5109,7 +5215,6 @@ export interface operations {
BondController_candles: {
parameters: {
query?: {
sync?: "observe";
period?: "month" | "halfYear" | "year" | "all";
};
header?: never;
@@ -5243,9 +5348,7 @@ export interface operations {
};
BondController_coupons: {
parameters: {
query?: {
sync?: "observe";
};
query?: never;
header?: never;
path: {
uid: string;
@@ -5503,70 +5606,4 @@ export interface operations {
};
};
};
TbankSyncController_status: {
parameters: {
query?: never;
header?: never;
path: {
id: string;
};
cookie?: never;
};
requestBody?: never;
responses: {
200: {
headers: {
[name: string]: unknown;
};
content: {
"application/json": components["schemas"]["TbankSyncStatusDto"];
};
};
/** @description Invalid request */
400: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Authentication required */
401: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Resource not found */
404: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Internal server error */
500: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
/** @description Upstream service unavailable */
503: {
headers: {
[name: string]: unknown;
};
content: {
"application/problem+json": components["schemas"]["ProblemDetailsDto"];
};
};
};
};
}
File diff suppressed because it is too large Load Diff
+59 -26
View File
@@ -51,7 +51,6 @@ const ru = {
incomplete: "{{category}}: доля неизвестна",
label: "Структура в {{currency}}: {{value}}",
},
subtitle: "Ваши инвестиции по счетам",
summaryEmpty: "Нет текущих сумм",
summaryExcluded_few:
"Ещё {{count}} счёта не включены: нет актуального портфеля",
@@ -275,7 +274,7 @@ const ru = {
COUPON_TYPE_VARIABLE: "Переменный",
},
couponWindow:
"Календарь выпуска с {{from}} по {{to}}. Личные зачисления показаны в истории событий.",
"Календарь выпуска с {{from}} по {{to}}. Полученные выплаты показаны в истории операций.",
couponYield: "Текущая купонная доходность, годовых",
couponYieldNote:
"Купонная доходность = ближайший купон × 365 / дней в купонном периоде / цена без НКД × 100 %. Это годовая оценка при сохранении размера купона и номинала, без налогов, комиссий и реинвестирования; для плавающего или переменного купона будущий доход изменится.",
@@ -344,10 +343,10 @@ const ru = {
breadcrumbs: {
accountFallback: "Счет",
accounts: "Брокерские счета",
events: "Будущие события",
events: "Предстоящие события",
income: "Пассивный доход",
label: "Хлебные крошки",
operations: "Операции",
operations: "История операций",
settings: "Настройки",
},
entryGroup: {
@@ -357,20 +356,20 @@ const ru = {
dateKind: { event: "Дата события", registry: "Дата реестра" },
emptyText:
"Доступные источники не сообщили о купонах, дивидендах, погашениях или офертах в этом периоде.",
emptyTitle: "За выбранный период событий не найдено",
errorText: "Попробуйте запросить прогноз еще раз.",
errorTitle: "Не удалось загрузить будущие события",
emptyTitle: "На выбранный период предстоящих событий не найдено",
errorText: "Попробуйте загрузить предстоящие события ещё раз.",
errorTitle: "Не удалось загрузить предстоящие события",
forecastWindow: "Прогноз от {{date}} на {{from}} – {{to}}",
hint: "Прогноз рассчитан по текущей позиции до налогов. Покрытие зависит от доступных данных MOEX.",
noAmount: "Сумма неизвестна",
open: "Открыть будущие события",
open: "Открыть предстоящие события",
projectedAmount: "Ожидаемая сумма",
recentEmpty: "На ближайшие 30 дней событий не найдено.",
recentError: "Не удалось загрузить будущие события.",
recentLoading: "Загрузка будущих событий",
recentTitle: "Будущие события",
recentEmpty: "На ближайшие 30 дней предстоящих событий не найдено.",
recentError: "Не удалось загрузить предстоящие события.",
recentLoading: "Загрузка предстоящих событий",
recentTitle: "Предстоящие события",
retry: "Повторить",
title: "Будущие события",
title: "Предстоящие события",
type: {
coupon: "Купон",
dividend: "Дивиденд",
@@ -444,6 +443,7 @@ const ru = {
transfer: "Перевод",
},
clearPeriod: "Очистить период",
couponPayment: "Выплата купонов {{instrument}}",
emptyText: "Измените период или фильтры.",
emptyTitle: "Операций нет",
entryLabel: {
@@ -452,14 +452,14 @@ const ru = {
dividend: "Дивиденд",
},
},
errorText: "Попробуйте запросить операции еще раз.",
errorTitle: "Не удалось загрузить журнал",
errorText: "Попробуйте загрузить историю операций ещё раз.",
errorTitle: "Не удалось загрузить историю операций",
from: "С",
next: "Далее",
noInstrument: "Без инструмента",
noMoney: "Без движения денег",
occurredAt: "Исполнено {{date}}",
open: "Открыть журнал",
open: "Открыть историю операций",
operationType: {
buy: "Покупка",
coupon: "Купон",
@@ -476,13 +476,13 @@ const ru = {
previous: "Назад",
price: "Цена: {{value}}",
quantity: "{{value}} шт.",
recentEmpty: "Последних событий пока нет.",
recentError: "Не удалось загрузить последние события.",
recentLoading: "Загрузка последних событий",
recentTitle: "Последние события",
recentEmpty: "Последних операций пока нет.",
recentError: "Не удалось загрузить последние операции.",
recentLoading: "Загрузка последних операций",
recentTitle: "Последние операции",
reset: "Сбросить",
retry: "Повторить",
title: "Журнал операций",
title: "История операций",
to: "По",
},
navigation: {
@@ -543,6 +543,38 @@ const ru = {
emptyTitle: "Портфель пока пуст",
more: "Подробнее",
otherPositions: "Другие позиции",
performance: {
benchmark: "Те же деньги в индексе Мосбиржи",
benchmarkHint:
"Если бы каждое пополнение вкладывалось в индекс Мосбиржи с учётом дивидендов после налогов",
benchmarkUnavailable: "Сравнение с индексом сейчас недоступно",
calculation: "Как считали",
chartTitle: "Ваш портфель против индекса",
current: "Ваш портфель сейчас",
datePeriod: "С {{from}} по {{to}}",
error: "Не удалось загрузить результат инвестирования",
incomplete: "Результат неполный",
invested: "Вложено (нетто)",
marketAhead: "Опережение рынка",
marketBehind: "Отставание от рынка",
marketEqual: "Сравнение с рынком",
method:
"Доходность учитывает суммы и даты пополнений и выводов. Купоны, дивиденды, налоги и комиссии уже входят в текущую стоимость. Для сравнения те же потоки вложены в индекс полной доходности Мосбиржи с дивидендами после налогов (MCFTRR). Ценовой индекс IMOEX дивиденды не учитывает и показан только для справки. Источник: MOEX ISS. Это не налоговый расчёт.",
missingHistory:
"Линии прошлой стоимости вашего портфеля нет: такая история ещё не накоплена. Точка справа — текущая оценка.",
periodLabel: "за {{days}} дн.",
periodNote:
"История меньше года: проценты показаны за {{days}} дн. без пересчёта в годовые.",
profit: "Прибыль",
profitCaption: "{{current}} сейчас · вложено {{invested}}",
reference: "Индекс Мосбиржи без дивидендов",
retry: "Повторить",
returnLabel: "Доходность",
syncing: "Данные счетов ещё синхронизируются. Результат появится после загрузки.",
unavailable: "Доходность недоступна",
unavailableReason: "{{name}}: {{reason}}",
yearly: "годовых",
},
positionFilter: "Тип позиции",
positionKinds: {
bonds: "Облигации",
@@ -583,9 +615,10 @@ const ru = {
},
tabs: {
cash: "Деньги",
events: "События",
events: "Предстоящие события",
income: "Доход",
operations: "Операции",
operations: "История операций",
performance: "Результат",
positions: "Позиции",
},
title: "Портфель",
@@ -638,10 +671,10 @@ const ru = {
dividendNote:
"Личная сумма — оценка по текущему количеству, не гарантия выплаты. Налоги не сопоставлены; дата выплаты компании может отличаться от дня зачисления на ваш счёт.",
dividendWindow:
"События компании с {{from}} по {{to}}. Личные зачисления показаны отдельно в истории событий.",
"События компании с {{from}} по {{to}}. Полученные выплаты показаны отдельно в истории операций.",
estimateUnavailable:
"Данные позиции не удалось обновить. Личная оценка недоступна или рассчитана по сохранённой позиции.",
eventFilter: "Фильтр событий",
eventFilter: "Фильтр операций",
eventPrice: "Цена: {{value}}",
eventQuantity: "{{value}} шт.",
exchanges: {
@@ -657,7 +690,7 @@ const ru = {
trades: "Сделки",
},
forming: "Формируется",
history: "Моя история событий",
history: "История операций",
historyNote:
"Операции по этой акции на доступных открытых счетах, включая периоды до текущего года. Дата сделки — дата операции брокера; количество — исполненная часть. История закрытых счетов не включена.",
incomplete: "Последняя свеча ещё формируется: её цена может измениться.",
+11 -1
View File
@@ -3,12 +3,22 @@ import { describe, expect, it } from "vitest";
import {
formatDate,
formatMoney,
formatPercentagePoints,
formatSignedPercent,
formatSnapshotDay,
formatSnapshotTime,
instrumentLogoUrl,
} from "./display";
describe("shared display helpers", () => {
it("formats signed rates as percentages and percentage points without negative zero", () => {
expect(formatSignedPercent("0.151")).toBe("+15,1 %");
expect(formatSignedPercent("-0.15149")).toBe("−15,1 %");
expect(formatSignedPercent("0")).toBe("0,0 %");
expect(formatSignedPercent("-0.00049")).toBe("0,0 %");
expect(formatPercentagePoints("0.043")).toBe("+4,3 п.п.");
expect(formatPercentagePoints("-0.0435")).toBe("−4,4 п.п.");
});
it("uses padded Russian dates and preserves the UTC date of timestamps", () => {
expect(formatDate("2027-09-10")).toBe("10.09.2027");
expect(formatDate("2024-02-29")).toBe("29.02.2024");
@@ -33,7 +43,7 @@ describe("shared display helpers", () => {
"-1 234 567,89 ₽",
);
expect(formatMoney({ currency: "RUB", value: "10" })).toBe("10 ₽");
expect(formatMoney({ currency: "USD", value: "0.5" })).toBe("0,5 USD");
expect(formatMoney({ currency: "USD", value: "0.5" })).toBe("0,5 $");
expect(formatMoney({ currency: "RUB", value: "0001234.50" })).toBe(
"0 001 234,50 ₽",
);
+31 -1
View File
@@ -1,3 +1,5 @@
import { decimalFromString } from "./decimal";
const DECIMAL_PART_COUNT = 2;
const DEFAULT_MINOR_UNITS = 2;
@@ -86,7 +88,10 @@ function formatMoney(
? `${integerPart}.${normalizedFraction}`
: integerPart;
const currency = money.currency === "RUB" ? "₽" : money.currency;
let currency = money.currency;
if (currency === "RUB") currency = "₽";
else if (currency === "USD") currency = "$";
const formatted = `${formatDecimal(decimal)} ${currency}`;
if (!withSign) return formatted;
@@ -96,6 +101,29 @@ function formatMoney(
return value.startsWith("-") ? `−${formatted.slice(1)}` : `+${formatted}`;
}
function formatPercentagePoints(rate: string): string {
return formatRate(rate, "п.п.");
}
function formatRate(rate: string, suffix: string): string {
const { scale, value } = decimalFromString(rate);
const abs = value < 0n ? -value : value;
const radix = 10n;
const half = 2n;
const tenthsPerUnit = 1000n;
const denominator = radix ** BigInt(scale);
const tenths = (abs * tenthsPerUnit + denominator / half) / denominator;
let sign = "";
if (tenths !== 0n) sign = value < 0n ? "−" : "+";
const formatted = `${formatDecimal(String(tenths / radix))},${tenths % radix}`;
return `${sign}${formatted} ${suffix}`;
}
function formatSignedPercent(rate: string): string {
return formatRate(rate, "%");
}
function isZeroDecimal(value: string) {
const unsigned = value.startsWith("-") ? value.slice(1) : value;
@@ -168,6 +196,8 @@ export {
formatDate,
formatDecimal,
formatMoney,
formatPercentagePoints,
formatSignedPercent,
formatSnapshotDay,
formatSnapshotTime,
instrumentLogoUrl,
+2
View File
@@ -12,6 +12,8 @@ export {
formatDate,
formatDecimal,
formatMoney,
formatPercentagePoints,
formatSignedPercent,
formatSnapshotDay,
formatSnapshotTime,
instrumentLogoUrl,
@@ -4,6 +4,40 @@
background: var(--wl-color-subtle);
}
.flat {
background: var(--wl-color-surface);
}
.flat > :first-child {
border: 0;
background: transparent;
}
.flat .accounts {
padding-bottom: var(--mantine-spacing-md);
}
.flat .accountRow {
padding-block: var(--mantine-spacing-md);
}
.flat .accountRow:last-child {
padding-bottom: 0;
}
.flat .accountRow > :first-child {
min-width: 0;
overflow-wrap: anywhere;
}
.positive {
color: var(--wl-color-positive);
}
.negative {
color: var(--wl-color-negative);
}
.accounts {
padding: 0 var(--mantine-spacing-md) var(--mantine-spacing-sm);
list-style: none;
@@ -38,4 +72,12 @@
.accountRow {
align-items: flex-start;
}
.flat .accountRow {
flex-wrap: wrap;
}
.flat .accountValue {
white-space: normal;
}
}
+23 -14
View File
@@ -9,11 +9,15 @@ import classes from "./EntryGroup.module.css";
type AccountRowProps = {
accountName: string;
tone?: "negative"
| "neutral"
| "positive";
value: string;
valueLabel: string;
};
type EntryGroupProps = PropsWithChildren<{
flat?: boolean;
header: ReactNode;
label: string;
}>;
@@ -25,13 +29,14 @@ type EntryGroupTotalProps = {
const AccountRow: FC<AccountRowProps> = (props) => {
const accessibleName = `${props.accountName}, ${props.value}`;
const valueClass = props.tone ? classes[props.tone] : undefined;
return (
<li aria-label={accessibleName} className={classes.accountRow}>
<Text>{props.accountName}</Text>
<Stack className={classes.accountValue} gap={2}>
<Text fw={700}>{props.value}</Text>
<Text className={valueClass} fw={700}>{props.value}</Text>
<Text c="dimmed" size="xs">{props.valueLabel}</Text>
</Stack>
@@ -53,20 +58,24 @@ const AccountCardRow: FC<AccountRowProps> = props => (
</li>
);
const EntryGroup: FC<EntryGroupProps> = props => (
<Paper className={classes.group} component="li" withBorder>
{props.header}
const EntryGroup: FC<EntryGroupProps> = (props) => {
const groupClass = props.flat ? `${classes.group} ${classes.flat}` : classes.group;
<Stack
aria-label={props.label}
className={classes.accounts}
component="ul"
gap={0}
>
{props.children}
</Stack>
</Paper>
);
return (
<Paper className={groupClass} component="li" withBorder>
{props.header}
<Stack
aria-label={props.label}
className={classes.accounts}
component="ul"
gap={0}
>
{props.children}
</Stack>
</Paper>
);
};
const EntryGroupTotal: FC<EntryGroupTotalProps> = (props) => {
const { t } = useTranslation();
+4
View File
@@ -1,5 +1,6 @@
import "@testing-library/jest-dom/vitest";
import { cleanup, configure } from "@testing-library/react";
import { MotionGlobalConfig } from "motion/react";
import { afterAll, afterEach, beforeAll, vi } from "vitest";
import { configureAuthClient } from "@/shared/api";
@@ -10,6 +11,9 @@ import { server } from "./server";
// Allow async UI updates on the slower CI runner; local waits stay unchanged.
if (process.env.CI) configure({ asyncUtilTimeout: 5000 });
// Route fades start at opacity 0; under load toBeVisible can catch that frame.
MotionGlobalConfig.skipAnimations = true;
beforeAll(() => server.listen({ onUnhandledRequest: "error" }));
afterEach(() => {
cleanup();