feat: clarify grouped coupon payouts (WealthLedger/frontend#162 )

fix: unify history and upcoming events labels (#161 ) (#163 )
fix: polish accounts portfolio summary (#159 )
2026-11-07 10:51:05 +03:00 · 2026-11-07 10:50:51 +03:00 · 2026-11-06 15:17:27 +03:00 · 2026-11-06 07:45:29 +03:00 · 2026-11-05 07:23:07 +03:00
35 changed files with 426 additions and 208 deletions
@@ -1,5 +1,30 @@
 # Changelog

+## [1.4.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.3.0...v1.4.0) (2026-11-06)
+
+### Features
+
+* **investments:** warn and offer retry after exhausted read retries (WealthLedger/frontend[#55](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/55)) ([#136](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/136)) ([8ce1e8e](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/8ce1e8e44486dcc23d4c074559ca2bb517880b60))
+
+### Bug Fixes
+
+* **account:** show source metadata on empty account and income (WealthLedger/frontend[#55](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/55)) ([#133](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/133)) ([9619dc9](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/9619dc979172dbc16391206e801ed67862d20116))
+* align audit findings for Events, currency and auth (WealthLedger/frontend[#155](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/155)) ([668f2ef](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/668f2ef70e535a1222e7f600b1be4a31fefc6f8b))
+
+### Refactoring
+
+* **api:** consume bank operation oneOf contract (WealthLedger/frontend[#144](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/144)) ([#152](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/152)) ([2d070ce](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/2d070ce2b54bbee466ecf6cc18b437910f0c07f8))
+* drop dead query helpers and simplify read deadline (WealthLedger/frontend[#141](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/141)) ([#149](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/149)) ([5077bd4](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/5077bd4f0baa4a59643e875485c2f08253cc198d))
+* move portfolio structure into account page, drop widgets (WealthLedger/frontend[#139](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/139)) ([#140](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/140)) ([e2d143d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e2d143df46e650139e49b7c80a886008ede86d2a))
+* normalize view models and share breadcrumbs and titles (WealthLedger/frontend[#143](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/143)) ([#153](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/153)) ([2db39f2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/2db39f25d9478350ad56a1b2e2ca6496068257c5))
+* replace repeated lazy page wrappers with lazyPage helper ([#131](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/131)) ([#132](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/132)) ([71fbe77](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/71fbe7774d3ed63fcb84bc644da997921bc049b2))
+* share path-root query predicate (WealthLedger/frontend[#142](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/142)) ([#154](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/154)) ([cadba8d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/cadba8d075daf9b20c0c9de97ad5bd8f5a3e74fc))
+
+### Maintenance
+
+* **api:** update OpenAPI snapshot with UpcomingEventsDto.window (WealthLedger/frontend[#134](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/134)) ([#135](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/135)) ([aaee959](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/aaee9591d7880193ee9b0c14339e8477264e4a94))
+* **deps:** set Renovate release age, PR limit and update groups (WealthLedger/main[#6](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/6)) ([#137](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/137)) ([ad93725](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/ad93725a84615ec329631b71ed8db33337085740))
+
 ## [1.3.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.2.1...v1.3.0) (2026-11-01)

 ### Features
@@ -17,12 +17,21 @@ http {
        default $http_x_forwarded_proto;
        '' $scheme;
    }
+    # One shared budget: the external proxy's client-IP forwarding is not verified.
+    map "$request_method:$uri" $auth_admission_key {
+        default "";
+        POST:/api/v1/auth/login auth;
+        POST:/api/v1/auth/register auth;
+    }
+    limit_req_zone $auth_admission_key zone=auth_admission:1m rate=2r/s;
+    limit_req_status 429;
    server {
        listen 8080;
        server_name _;
        root /usr/share/nginx/html;
        resolver 127.0.0.11 valid=5s ipv6=off;
        location /api/ {
+            limit_req zone=auth_admission burst=5 nodelay;
            set $backend http://backend:3000;
            proxy_pass $backend$request_uri;
            proxy_set_header Host $http_host;
@@ -1,12 +1,12 @@
 {
 	"name": "wealth-ledger-frontend",
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "wealth-ledger-frontend",
-			"version": "1.3.0",
+			"version": "1.4.0",
 			"workspaces": [
 				"packages/*"
 			],
@@ -1,7 +1,7 @@
 {
 	"name": "wealth-ledger-frontend",
 	"private": true,
-	"version": "1.3.0",
+	"version": "1.4.0",
 	"type": "module",
 	"engines": {
 		"node": "24.22.1"
@@ -217,6 +217,7 @@ beforeEach(() => {
 							}),
 					),
 					incomeTotalsByCurrency: [],
+					window: { from: "2026-09-01", to: "2026-10-01" },
 				}),
 			),
 		),
@@ -226,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(
@@ -310,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();
 	});

@@ -176,7 +176,11 @@ describe("Upcoming event date filters", () => {
 					({ request }) => {
 						searches.push(new URL(request.url).search);

-						return HttpResponse.json(resource({ events: [] }));
+						return HttpResponse.json(resource({
+							calculatedAt: "2026-08-14T00:00:00Z",
+							events: [],
+							window: { from: "2026-08-14", to: "2026-09-13" },
+						}));
 					},
 				),
 			);
@@ -223,7 +227,11 @@ describe("Upcoming event date filters", () => {
 					"*/api/v1/brokerage-accounts/:accountId/events",
 					({ request }) =>
 						new URL(request.url).searchParams.get("from") === defaultFrom
-							? HttpResponse.json(resource({ events: [] }))
+							? HttpResponse.json(resource({
+									calculatedAt: "2026-08-14T00:00:00Z",
+									events: [],
+									window: { from: "2026-08-14", to: "2026-09-13" },
+								}))
 							: HttpResponse.json({ code: "VALIDATION_ERROR" }, { status: 400 }),
 				),
 			);
@@ -256,6 +264,7 @@ describe("Upcoming event date filters", () => {
 								calculatedAt: "2099-01-01T00:00:00Z",
 								events: [],
 								incomeTotalsByCurrency: [],
+								window: { from: "2099-01-01", to: "2099-01-31" },
 							}),
 						);
 					},
@@ -264,6 +273,7 @@ describe("Upcoming event date filters", () => {
 			renderEvents(accountId, ["?from=2026-02-01&to=2026-02-28"]);
 			const from = await screen.findByLabelText("Период");
 			expect(from).toHaveTextContent("01.02.2026 – 28.02.2026");
+			expect(screen.getByText(/Прогноз от .* на 01\.01\.2099 – 31\.01\.2099/)).toBeVisible();
 			expect(screen.getByRole("button", { name: "Применить" })).toBeDisabled();
 			expect(searches).toEqual(["?from=2026-02-01&to=2026-02-28"]);

@@ -320,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();
 		},
 	);
@@ -17,6 +17,8 @@ const RETRIES_EXHAUSTED_MS = 6000;
 const TEST_MS = 10_000;

 const snapshot = resource({
+	accountId: "account-1",
+	calculatedAt: "2026-08-14T00:00:00Z",
 	events: [
 		{
 			date: "2026-10-01",
@@ -32,6 +34,7 @@ const snapshot = resource({
 		},
 	],
 	incomeTotalsByCurrency: [{ currency: "RUB", value: "123.45" }],
+	window: { from: "2026-08-14", to: "2026-09-13" },
 });

 function renderEvents() {
@@ -100,7 +103,13 @@ describe("AccountEventsPage read retry", () => {
 		async () => {
 			let isFailing = false;
 			let requests = 0;
+			let imports = 0;
 			server.use(
+				http.post("*/api/v1/tbank-sync", () => {
+					imports += 1;
+
+					return HttpResponse.json({}, { status: 202 });
+				}),
 				http.get("*/api/v1/brokerage-accounts/:accountId/events", () => {
 					requests += 1;

@@ -111,6 +120,7 @@ describe("AccountEventsPage read retry", () => {
 			);
 			const { queryClient } = renderEvents();
 			await screen.findByText("Купон · Synthetic coupon");
+			expect(screen.getByText(/Прогноз от .* на 14\.08\.2026 – 13\.09\.2026/)).toBeVisible();
 			expect(screen.queryByRole("button", { name: "Повторить" }))
 				.not.toBeInTheDocument();

@@ -127,6 +137,7 @@ describe("AccountEventsPage read retry", () => {

 			expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
 			expect(screen.getByText("Купон · Synthetic coupon")).toBeInTheDocument();
+			expect(screen.getByText(/Прогноз от .* на 14\.08\.2026 – 13\.09\.2026/)).toBeVisible();
 			expect(requests).toBe(4);

 			isFailing = false;
@@ -136,6 +147,7 @@ describe("AccountEventsPage read retry", () => {
 				expect(screen.queryByText("Не удалось обновить данные"))
 					.not.toBeInTheDocument());
 			expect(requests).toBe(5);
+			expect(imports).toBe(0);
 		},
 	);

@@ -47,6 +47,7 @@ describe("AccountEventsPage", () => {
 					accountId: "account",
 					calculatedAt: "2026-08-14T00:00:00Z",
 					events: [],
+					window: { from: "2026-08-14", to: "2026-09-13" },
 				},
 				isError: false,
 				isLoading: false,
@@ -136,6 +137,7 @@ describe("AccountEventsPage", () => {
 							type: "offer",
 						},
 					],
+					window: { from: "2026-08-14", to: "2026-09-13" },
 				},
 				isError: false,
 				isLoading: false,
@@ -172,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,
@@ -237,7 +239,7 @@ describe("AccountEventsPage", () => {
 			"true",
 		);
 		expect(
-			screen.queryByText("За выбранный период событий не найдено"),
+			screen.queryByText("На выбранный период предстоящих событий не найдено"),
 		).not.toBeInTheDocument();
 	});

@@ -276,6 +278,7 @@ describe("AccountEventsPage", () => {
 				accountId: "all",
 				calculatedAt: "2026-08-14T00:00:00Z",
 				events: [...events],
+				window: { from: "2026-08-14", to: "2026-09-13" },
 			},
 			isError: false,
 			isLoading: false,
@@ -18,6 +18,7 @@ import {
 type AccountEventsPageViewModel
 	= | {
 		allAccounts: boolean;
+		calculatedAt: string;
 		canApply: boolean;
 		draftPeriod: [null | string, null | string];
 		events: BrokerageEvent[];
@@ -31,6 +32,7 @@ type AccountEventsPageViewModel
 		source?: InvestmentResourceMeta;
 		state: "loaded";
 		totalVisible: boolean;
+		window: { from: string; to: string };
 	}
 	| {
 		onReset: () => void;
@@ -110,6 +112,7 @@ function useAccountEventsPageVm(): AccountEventsPageViewModel {

 	return {
 		allAccounts: accountId === "all",
+		calculatedAt: events.data.calculatedAt,
 		canApply:
 			(draftFrom !== appliedFrom || draftTo !== appliedTo)
 			&& isValidPeriod(draftFrom, draftTo),
@@ -133,6 +136,7 @@ function useAccountEventsPageVm(): AccountEventsPageViewModel {
 		source: events.meta,
 		state: "loaded",
 		totalVisible: events.meta?.completeness === "complete",
+		window: events.data.window,
 	};
 }

@@ -17,7 +17,7 @@ import {
 	brokerageEventGroupKey,
 	brokerageEventKey,
 } from "@/entities/brokerage-event";
-import { groupItems } from "@/shared/lib";
+import { formatDate, formatSnapshotTime, groupItems } from "@/shared/lib";
 import { ReadRetry, SourceSyncStatus } from "@/shared/ui";

 import type { AccountEventsPageViewModel } from "../AccountEventsPage.vm";
@@ -89,6 +89,14 @@ const AccountEventsPageLoaded: FC<AccountEventsPageLoadedProps> = (props) => {

 			<Text c="dimmed">{t("events.hint")}</Text>

+			<Text c="dimmed" size="sm">
+				{t("events.forecastWindow", {
+					date: formatSnapshotTime(props.calculatedAt),
+					from: formatDate(props.window.from),
+					to: formatDate(props.window.to),
+				})}
+			</Text>
+
 			<Group align="end">
 				<DatePickerInput
 					allowSingleDateInRange
@@ -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);

@@ -23,7 +23,7 @@ function sections(positions: Portfolio["positions"]) {
 }

 describe("account position sections", () => {
-	it("excludes currency instruments only from display, preserving order and share denominators", () => {
+	it("excludes currency mirrors from display and share denominators", () => {
 		const otherTypes = [
 			"OPTION",
 			"OTHER",
@@ -73,12 +73,30 @@ describe("account position sections", () => {
 			"FIGI-FUND",
 			...otherTypes.map(type => `FIGI-${type}-NEXT`),
 		]);
-		expect(sections[0]?.groups[0]?.positions[0].shareText).toBe("40 %");
-		expect(sections[1]?.groups[0]?.positions[0].shareText).toBe("20 %");
-		expect(sections[2]?.groups[1]?.positions[0].shareText).toBe("20 %");
+		expect(sections[0]?.groups[0]?.positions[0].shareText).toBe("50 %");
+		expect(sections[1]?.groups[0]?.positions[0].shareText).toBe("25 %");
+		expect(sections[2]?.groups[1]?.positions[0].shareText).toBe("25 %");
 		expect(snapshot).toEqual(original);
 	});

+	it("keeps all-account positions from both accounts without counting mirrored cash", () => {
+		const result = sections([
+			makePosition({ account: { id: "a", name: "Основной" }, currentValue: { currency: "RUB", value: "100" } }),
+			makePosition({ account: { id: "a", name: "Основной" }, currentValue: { currency: "RUB", value: "50" }, type: "CURRENCY" }),
+			makePosition({ account: { id: "b", name: "ИИС" }, currentValue: { currency: "RUB", value: "100" } }),
+		]);
+
+		const visible = result.flatMap(section =>
+			section.groups.flatMap(group => group.positions));
+
+		expect(visible)
+			.toEqual(expect.arrayContaining([
+				expect.objectContaining({ account: { id: "a", name: "Основной" }, shareText: "50 %" }),
+				expect.objectContaining({ account: { id: "b", name: "ИИС" }, shareText: "50 %" }),
+			]));
+		expect(visible).toHaveLength(2);
+	});
+
 	it("prepares grouped position sections with derived display data", () => {
 		expect(
 			toAccountPagePositionSections(portfolio).map(({ groups, kind }) => ({
@@ -152,7 +152,7 @@ function toAccountPagePositionSections(
 	const denominators = new Map<string, number>();

 	for (const position of portfolio.positions) {
-		if (!position.currentValue) continue;
+		if (position.type === "CURRENCY" || !position.currentValue) continue;
 		const currency = position.currentValue.currency;
 		denominators.set(
 			currency,
@@ -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();
@@ -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>
@@ -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 () => {
@@ -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,19 +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: "Дивиденд",
@@ -443,6 +443,7 @@ const ru = {
 				transfer: "Перевод",
 			},
 			clearPeriod: "Очистить период",
+			couponPayment: "Выплата купонов {{instrument}}",
 			emptyText: "Измените период или фильтры.",
 			emptyTitle: "Операций нет",
 			entryLabel: {
@@ -451,14 +452,14 @@ const ru = {
 					dividend: "Дивиденд",
 				},
 			},
-			errorText: "Попробуйте запросить операции еще раз.",
-			errorTitle: "Не удалось загрузить журнал",
+			errorText: "Попробуйте загрузить историю операций ещё раз.",
+			errorTitle: "Не удалось загрузить историю операций",
 			from: "С",
 			next: "Далее",
 			noInstrument: "Без инструмента",
 			noMoney: "Без движения денег",
 			occurredAt: "Исполнено {{date}}",
-			open: "Открыть журнал",
+			open: "Открыть историю операций",
 			operationType: {
 				buy: "Покупка",
 				coupon: "Купон",
@@ -475,13 +476,13 @@ const ru = {
 			previous: "Назад",
 			price: "Цена: {{value}}",
 			quantity: "{{value}} шт.",
-			recentEmpty: "Последних событий пока нет.",
-			recentError: "Не удалось загрузить последние события.",
-			recentLoading: "Загрузка последних событий",
-			recentTitle: "Последние события",
+			recentEmpty: "Последних операций пока нет.",
+			recentError: "Не удалось загрузить последние операции.",
+			recentLoading: "Загрузка последних операций",
+			recentTitle: "Последние операции",
 			reset: "Сбросить",
 			retry: "Повторить",
-			title: "Журнал операций",
+			title: "История операций",
 			to: "По",
 		},
 		navigation: {
@@ -582,9 +583,9 @@ const ru = {
 			},
 			tabs: {
 				cash: "Деньги",
-				events: "События",
+				events: "Предстоящие события",
 				income: "Доход",
-				operations: "Операции",
+				operations: "История операций",
 				positions: "Позиции",
 			},
 			title: "Портфель",
@@ -637,10 +638,10 @@ const ru = {
 			dividendNote:
 				"Личная сумма — оценка по текущему количеству, не гарантия выплаты. Налоги не сопоставлены; дата выплаты компании может отличаться от дня зачисления на ваш счёт.",
 			dividendWindow:
-				"События компании с {{from}} по {{to}}. Личные зачисления показаны отдельно в истории событий.",
+				"События компании с {{from}} по {{to}}. Полученные выплаты показаны отдельно в истории операций.",
 			estimateUnavailable:
 				"Данные позиции не удалось обновить. Личная оценка недоступна или рассчитана по сохранённой позиции.",
-			eventFilter: "Фильтр событий",
+			eventFilter: "Фильтр операций",
 			eventPrice: "Цена: {{value}}",
 			eventQuantity: "{{value}} шт.",
 			exchanges: {
@@ -656,7 +657,7 @@ const ru = {
 				trades: "Сделки",
 			},
 			forming: "Формируется",
-			history: "Моя история событий",
+			history: "История операций",
 			historyNote:
 				"Операции по этой акции на доступных открытых счетах, включая периоды до текущего года. Дата сделки — дата операции брокера; количество — исполненная часть. История закрытых счетов не включена.",
 			incomplete: "Последняя свеча ещё формируется: её цена может измениться.",
@@ -33,7 +33,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 ₽",
 		);
@@ -86,7 +86,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;
@@ -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;
+	}
 }
@@ -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();
@@ -66,6 +66,7 @@ const handlers = [
 				accountId: "account-1",
 				calculatedAt: "2026-08-14T00:00:00Z",
 				events: [],
+				window: { from: "2026-08-14", to: "2026-09-13" },
 			}),
 		),
 	),
Author	SHA1	Message	Date
ksv741	850823e1f5	feat: clarify grouped coupon payouts (WealthLedger/frontend#162 ) Frontend verify / commits (pull_request) Successful in 31s Details Frontend verify / verify (pull_request) Successful in 6m27s Details Frontend verify / commits (pull_request) Successful in 30s Details Frontend verify / security (pull_request) Successful in 10s Details	2026-11-07 10:51:05 +03:00
codex-bot	ed0b5388ab	fix: unify history and upcoming events labels (#161 ) (#163 ) Frontend verify / commits (push) Skipped Details Frontend verify / security (push) Successful in 12s Details Frontend verify / verify (push) Failing after 7m18s Details	2026-11-07 10:50:51 +03:00
codex-bot	134c951178	fix: polish accounts portfolio summary (#159 ) Frontend verify / commits (push) Skipped Details Frontend verify / security (push) Successful in 10s Details Frontend verify / verify (push) Failing after 7m26s Details	2026-11-06 15:17:27 +03:00
ksv741	2fd7d59e65	chore(release): 1.4.0 Frontend verify / commits (pull_request) Successful in 30s Details Frontend verify / security (pull_request) Successful in 9s Details Frontend verify / verify (pull_request) Successful in 5m31s Details Frontend verify / commits (push) Skipped Details Frontend verify / security (push) Successful in 9s Details Frontend verify / verify (push) Successful in 5m38s Details Frontend image / publish (push) Successful in 7m13s Details	2026-11-06 07:45:29 +03:00
codex-bot	668f2ef70e	fix: align audit findings for Events, currency and auth (WealthLedger/frontend#155 ) Frontend verify / commits (push) Skipped Details Frontend verify / security (push) Successful in 10s Details Frontend verify / verify (push) Failing after 7m7s Details	2026-11-05 07:23:07 +03:00