feat(instruments): offer per-section retry after exhausted reads (WealthLedger/frontend#55)

.ai/architecture.md

@@ -8,7 +8,7 @@ Vitest — отдельную JSDOM конфигурацию. Точные versi
 [package.json](../package.json), реализация — source of truth.
 
 ```text
-app → pages → features → entities → shared
+app → pages → widgets → features → entities → shared
 page container → page VM → entity/feature query → shared/api → backend /api/v1
                          ↓
                  props → state/section views
@@ -30,13 +30,14 @@ contract; frontend не читает его checkout для генерации
 | --- | --- |
 | Bootstrap, глобальные providers, routes | `app` |
 | Композиция маршрута и поведение, нужное только этому экрану | `pages/<page>` |
+| Крупная переиспользуемая композиция экрана | `widgets/<widget>` |
 | Самостоятельная пользовательская возможность с собственным смыслом | `features/<capability>` |
 | Представление/поведение бизнес-сущности | `entities/<entity>` |
 | Переиспользуемый код без WealthLedger domain meaning | `shared` |
 
-Локальный FSD profile: `app → pages → features → entities → shared`.
+Локальный FSD profile: `app → pages → widgets → features → entities → shared`.
-Слой `widgets` не используется: композиция экрана и компонент для одной page
+Widget собирает несколько нижних слоёв в самостоятельный UI-блок; компонент для
-остаются у page. Form, mutation или click handler сами по себе не
+одной page остаётся у page. Form, mutation или click handler сами по себе не
 требуют feature. Два callers не делают domain helper generic shared.
 Slice именуется по ответственности, а не `helpers`, `hooks` или `types`.
 
@@ -48,12 +49,12 @@ Slice именуется по ответственности, а не `helpers`,
 
 Cross-slice consumer использует `@/` и `index.ts` владельца, например
 `@/entities/portfolio`. Alias Vite и TypeScript согласован. Другой slice не
-импортирует внутренний файл напрямую. Slices `pages`, `features`, `entities` не зависят от соседнего slice своего слоя;
+импортирует внутренний файл напрямую. Slices `pages`, `widgets`, `features`, `entities` не зависят от соседнего slice своего слоя;
 композиция принадлежит вышележащему owner. Existing меж-slice исключения
 не являются разрешением добавлять новые.
 
 Направление зависимостей, public imports и запрет соседних slices в
-`pages`, `features`, `entities` проверяет `npm run deps`. Внутренние imports
+`pages`, `widgets`, `features`, `entities` проверяет `npm run deps`. Внутренние imports
 одного slice и связи shared segments этот запрет не ограничивает.
 Knip проверяет использование exports, а не смысл placement.
 

CHANGELOG.md

@@ -1,30 +1,5 @@
 # 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

dependency-cruiser.cjs

@@ -29,17 +29,17 @@ module.exports = {
 		},
 		{
 			from: {
-				path: "^src/(app|pages|features|entities|shared)/([^/]+)/",
+				path: "^src/(app|pages|widgets|features|entities|shared)/([^/]+)/",
 			},
 			name: "slices-must-use-public-api",
 			severity: "error",
 			to: {
-				path: String.raw`^src/(app|pages|features|entities|shared)/([^/]+)/(?!index\.ts$)`,
+				path: String.raw`^src/(app|pages|widgets|features|entities|shared)/([^/]+)/(?!index\.ts$)`,
 				pathNot: "^src/$1/$2/",
 			},
 		},
 		{
-			from: { path: "^src/(pages|features|entities)/([^/]+)/" },
+			from: { path: "^src/(pages|widgets|features|entities)/([^/]+)/" },
 			name: "no-same-layer-cross-slice-imports",
 			severity: "error",
 			to: { path: "^src/$1/", pathNot: "^src/$1/$2/" },
@@ -48,18 +48,24 @@ module.exports = {
 			from: { path: "^src/shared/" },
 			name: "shared-must-not-depend-on-layers",
 			severity: "error",
-			to: { path: "^src/(entities|features|pages|app)/" },
+			to: { path: "^src/(entities|features|widgets|pages|app)/" },
 		},
 		{
 			from: { path: "^src/entities/" },
 			name: "entities-must-not-depend-on-higher-layers",
 			severity: "error",
-			to: { path: "^src/(features|pages|app)/" },
+			to: { path: "^src/(features|widgets|pages|app)/" },
 		},
 		{
 			from: { path: "^src/features/" },
 			name: "features-must-not-depend-on-higher-layers",
 			severity: "error",
+			to: { path: "^src/(widgets|pages|app)/" },
+		},
+		{
+			from: { path: "^src/widgets/" },
+			name: "widgets-must-not-depend-on-higher-layers",
+			severity: "error",
 			to: { path: "^src/(pages|app)/" },
 		},
 		{

docker/nginx.conf

@@ -17,21 +17,12 @@ 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;

eslint-rules.mjs

@@ -25,11 +25,7 @@ const readability = {
 				)
 					context.report({ messageId: "schema", node });
 			},
-			FunctionDeclaration(node) {
+			FunctionDeclaration: checkParameters,
-				checkParameters(node);
-				if (node.id?.name?.endsWith?.("ViewModel"))
-					context.report({ messageId: "vmName", node: node.id });
-			},
 			FunctionExpression: checkParameters,
 			ImportDeclaration(node) {
 				if (
@@ -99,7 +95,6 @@ const readability = {
 			schema: "Declare Zod schemas in a dedicated *.schema.ts file.",
 			svg: "Own SVG markup in packages/icons, and import its public component.",
 			union: "Put complex union members on separate lines.",
-			vmName: "Name custom hooks use*Vm, not use*ViewModel.",
 		},
 		schema: [],
 		type: "suggestion",

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "wealth-ledger-frontend",
-	"version": "1.4.0",
+	"version": "1.3.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "wealth-ledger-frontend",
-			"version": "1.4.0",
+			"version": "1.3.0",
 			"workspaces": [
 				"packages/*"
 			],

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "wealth-ledger-frontend",
 	"private": true,
-	"version": "1.4.0",
+	"version": "1.3.0",
 	"type": "module",
 	"engines": {
 		"node": "24.22.1"

renovate.json

@@ -1,30 +1,15 @@
 {
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
-	"extends": ["config:recommended", ":semanticCommitTypeAll(chore)", "security:minimumReleaseAgeNpm"],
+	"extends": ["config:recommended", ":semanticCommitTypeAll(chore)"],
 	"timezone": "Europe/Moscow",
 	"labels": ["dependencies"],
 	"dependencyDashboard": true,
 	"rangeStrategy": "pin",
-	"prConcurrentLimit": 5,
-	"lockFileMaintenance": {
-		"enabled": true,
-		"schedule": ["before 4am on the first day of the month"]
-	},
 	"packageRules": [
 		{
 			"matchUpdateTypes": ["minor", "patch"],
 			"groupName": "non-major dependencies"
 		},
-		{
-			"matchManagers": ["github-actions"],
-			"matchUpdateTypes": ["minor", "patch"],
-			"groupName": "non-major github actions"
-		},
-		{
-			"matchManagers": ["docker-compose", "dockerfile"],
-			"matchUpdateTypes": ["minor", "patch"],
-			"groupName": "non-major container images"
-		},
 		{
 			"matchUpdateTypes": ["major"],
 			"dependencyDashboardApproval": true

src/app/routes/AppRoutes/AllAccounts.test.tsx

@@ -217,7 +217,6 @@ beforeEach(() => {
 							}),
 					),
 					incomeTotalsByCurrency: [],
-					window: { from: "2026-09-01", to: "2026-10-01" },
 				}),
 			),
 		),
@@ -227,9 +226,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 +310,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: "Подробнее" }))

src/app/routes/DocumentTitle/DocumentTitle.tsx

@@ -1,5 +1,6 @@
 import type { FC } from "react";
 
+import { useDocumentTitle } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
 
 import { useCurrentRoute } from "@/app/model";
@@ -7,12 +8,12 @@ import { useBankCard } from "@/entities/bank-card";
 import { useBond } from "@/entities/bond";
 import { useBrokerageAccounts } from "@/entities/brokerage-account";
 import { useStock } from "@/entities/stock";
-import { useAppDocumentTitle } from "@/shared/ui";
 
 type DocumentTitleProps = { title: string };
 
 const DocumentTitle: FC<DocumentTitleProps> = (props): undefined => {
-	useAppDocumentTitle(props.title);
+	const { t } = useTranslation();
+	useDocumentTitle(`${props.title} — ${t("appName")}`);
 };
 
 type AccountDocumentTitleProps = {

src/app/routes/RouteErrorBoundary/RouteErrorBoundary.tsx

@@ -1,12 +1,12 @@
 import type { FC, PropsWithChildren } from "react";
 
 import { Button, Stack, Text, Title } from "@mantine/core";
+import { useDocumentTitle } from "@mantine/hooks";
 import { Component } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useLocation } from "react-router";
 
 import { useAuth } from "@/features/auth";
-import { useAppDocumentTitle } from "@/shared/ui";
 
 type BoundaryProps = PropsWithChildren<{
 	authenticated: boolean;
@@ -37,7 +37,7 @@ class Boundary extends Component<BoundaryProps, State> {
 const RouteErrorFallback: FC<RouteErrorFallbackProps> = (props) => {
 	const { authenticated } = props;
 	const { t } = useTranslation();
-	useAppDocumentTitle(t("routeError.title"));
+	useDocumentTitle(`${t("routeError.title")} — ${t("appName")}`);
 	const to = authenticated ? "/accounts" : "/login";
 
 	return (

src/app/ui/AppBreadcrumbs/AppBreadcrumbs.test.tsx

@@ -55,9 +55,9 @@ describe("AppBreadcrumbs", () => {
 	});
 
 	it.each([
-		["operations", "История операций"],
+		["operations", "Операции"],
-		["OPERATIONS", "История операций"],
+		["OPERATIONS", "Операции"],
-		["events", "Предстоящие события"],
+		["events", "Будущие события"],
 		["income", "Пассивный доход"],
 	])("links to the account hierarchy from %s", (section, title) => {
 		renderBreadcrumbs(`/accounts/account-1/${section}`, [

src/app/ui/AppBreadcrumbs/AppBreadcrumbs.tsx

@@ -7,8 +7,10 @@ import { useCurrentRoute } from "@/app/model";
 
 import { AccountBreadcrumbs } from "./AccountBreadcrumbs";
 import { AccountScopeSwitch } from "./AccountScopeSwitch/AccountScopeSwitch";
+import { BondBreadcrumbs } from "./BondBreadcrumbs";
 import { BreadcrumbTrail } from "./BreadcrumbTrail";
-import { EntityBreadcrumbs } from "./EntityBreadcrumbs";
+import { CardBreadcrumbs } from "./CardBreadcrumbs";
+import { StockBreadcrumbs } from "./StockBreadcrumbs";
 
 const AppBreadcrumbs: FC = () => {
 	const { t } = useTranslation();
@@ -24,16 +26,9 @@ const AppBreadcrumbs: FC = () => {
 		stock,
 	} = useCurrentRoute();
 
-	if (bond) {
+	if (bond) return <BondBreadcrumbs identifier={bond.params.bondId ?? ""} />;
-		return <EntityBreadcrumbs identifier={bond.params.bondId ?? ""} kind="bond" />;
+	if (stock)
-	}
+		return <StockBreadcrumbs identifier={stock.params.stockId ?? ""} />;
-
-	if (stock) {
-		return (
-			<EntityBreadcrumbs identifier={stock.params.stockId ?? ""} kind="stock" />
-		);
-	}
-
 	if (account && (section || !account.params.section))
 		return (
 			<Stack gap={0} mb="md">
@@ -48,13 +43,8 @@ const AppBreadcrumbs: FC = () => {
 				/>
 			</Stack>
 		);
-
+	if (card) return <CardBreadcrumbs identifier={card.params.cardId ?? ""} />;
-	if (card) {
-		return <EntityBreadcrumbs identifier={card.params.cardId ?? ""} kind="card" />;
-	}
-
 	if (cards) return <BreadcrumbTrail items={[{ label: t("bank.title") }]} />;
-
 	if (accounts)
 		return <BreadcrumbTrail items={[{ label: t("breadcrumbs.accounts") }]} />;
 

src/app/ui/AppBreadcrumbs/BondBreadcrumbs.tsx

@@ -0,0 +1,25 @@
+import type { FC } from "react";
+
+import { useTranslation } from "react-i18next";
+
+import { useBond } from "@/entities/bond";
+
+import { BreadcrumbTrail } from "./BreadcrumbTrail";
+
+type BondBreadcrumbsProps = { identifier: string };
+
+const BondBreadcrumbs: FC<BondBreadcrumbsProps> = (props) => {
+	const { data } = useBond(props.identifier);
+	const { t } = useTranslation();
+
+	return (
+		<BreadcrumbTrail
+			items={[
+				{ label: t("bond.searchTitle"), to: "/bonds" },
+				{ label: data?.name ?? t("bond.instrument") },
+			]}
+		/>
+	);
+};
+
+export { BondBreadcrumbs };

src/app/ui/AppBreadcrumbs/BreadcrumbTrail.tsx

@@ -39,4 +39,4 @@ const BreadcrumbTrail: FC<BreadcrumbTrailProps> = (props) => {
 	);
 };
 
-export { BreadcrumbTrail, type Crumb };
+export { BreadcrumbTrail };

src/app/ui/AppBreadcrumbs/CardBreadcrumbs.tsx

@@ -0,0 +1,25 @@
+import type { FC } from "react";
+
+import { useTranslation } from "react-i18next";
+
+import { useBankCard } from "@/entities/bank-card";
+
+import { BreadcrumbTrail } from "./BreadcrumbTrail";
+
+type CardBreadcrumbsProps = { identifier: string };
+
+const CardBreadcrumbs: FC<CardBreadcrumbsProps> = (props) => {
+	const { data } = useBankCard(props.identifier);
+	const { t } = useTranslation();
+
+	return (
+		<BreadcrumbTrail
+			items={[
+				{ label: t("bank.title"), to: "/cards" },
+				{ label: data?.name ?? t("bank.card") },
+			]}
+		/>
+	);
+};
+
+export { CardBreadcrumbs };

src/app/ui/AppBreadcrumbs/EntityBreadcrumbs.tsx

@@ -1,48 +0,0 @@
-import type { FC } from "react";
-
-import { useTranslation } from "react-i18next";
-
-import { useBankCard } from "@/entities/bank-card";
-import { useBond } from "@/entities/bond";
-import { useStock } from "@/entities/stock";
-
-import type { Crumb } from "./BreadcrumbTrail";
-
-import { BreadcrumbTrail } from "./BreadcrumbTrail";
-
-type EntityBreadcrumbsProps = {
-	identifier: string;
-	kind:
-		| "bond"
-		| "card"
-		| "stock";
-};
-
-const EntityBreadcrumbs: FC<EntityBreadcrumbsProps> = (props) => {
-	const { identifier, kind } = props;
-	const { t } = useTranslation();
-
-	const bond = useBond(kind === "bond" ? identifier : "");
-	const card = useBankCard(kind === "card" ? identifier : "");
-	const stock = useStock(kind === "stock" ? identifier : "");
-
-	let parent: Crumb;
-	let name: string;
-
-	if (kind === "bond") {
-		parent = { label: t("bond.searchTitle"), to: "/bonds" };
-		name = bond.data?.name ?? t("bond.instrument");
-	}
-	else if (kind === "stock") {
-		parent = { label: t("stock.searchTitle"), to: "/stocks" };
-		name = stock.data?.name ?? t("stock.share");
-	}
-	else {
-		parent = { label: t("bank.title"), to: "/cards" };
-		name = card.data?.name ?? t("bank.card");
-	}
-
-	return <BreadcrumbTrail items={[parent, { label: name }]} />;
-};
-
-export { EntityBreadcrumbs };

src/app/ui/AppBreadcrumbs/StockBreadcrumbs.tsx

@@ -0,0 +1,25 @@
+import type { FC } from "react";
+
+import { useTranslation } from "react-i18next";
+
+import { useStock } from "@/entities/stock";
+
+import { BreadcrumbTrail } from "./BreadcrumbTrail";
+
+type StockBreadcrumbsProps = { identifier: string };
+
+const StockBreadcrumbs: FC<StockBreadcrumbsProps> = (props) => {
+	const { data } = useStock(props.identifier);
+	const { t } = useTranslation();
+
+	return (
+		<BreadcrumbTrail
+			items={[
+				{ label: t("stock.searchTitle"), to: "/stocks" },
+				{ label: data?.name ?? t("stock.share") },
+			]}
+		/>
+	);
+};
+
+export { StockBreadcrumbs };

src/entities/bank-card/api/mutations.ts

@@ -5,7 +5,6 @@ import {
 	ApiErrorCode,
 	apiErrorCode,
 	isApiErrorCode,
-	isGetUnder,
 } from "@/shared/api";
 
 import type {
@@ -27,14 +26,21 @@ async function mutationData<T>(
 	return data;
 }
 
-const bankCardGetPredicate = isGetUnder(["/api/v1/bank-cards"]);
-
 function useBankMutationOptions() {
 	const queryClient = useQueryClient();
 
 	const invalidate = () =>
 		queryClient.invalidateQueries({
-			predicate: ({ queryKey }) => bankCardGetPredicate(queryKey),
+			predicate: ({ queryKey }) => {
+				const [method, path] = queryKey;
+
+				return (
+					method === "get"
+					&& typeof path === "string"
+					&& (path === "/api/v1/bank-cards"
+						|| path.startsWith("/api/v1/bank-cards/"))
+				);
+			},
 		});
 
 	return {

src/entities/broker-operation/model/display.ts

@@ -49,10 +49,6 @@ 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),
@@ -135,7 +131,6 @@ function paymentPresentation(
 export {
 	brokerageOperationGroupKey,
 	entryLabelKey,
-	isCouponPayment,
 	isIncomePayment,
 	isZeroDecimal,
 	operationLabelKey,

src/entities/broker-operation/ui/OperationGroup.test.tsx

@@ -55,27 +55,23 @@ function renderGroup(
 }
 
 describe("OperationGroup", () => {
-	it("shows the received coupon and positive totals in flat account rows", () => {
+	it("shows the header, exact total and separate card rows per account", () => {
 		renderGroup([
-			{ ...operation("1", { id: "broker", name: "Брокерский" }, "0.1"), description: "Выплата купонов СФО ВТБ РКС Эталон 04" },
+			operation("1", { id: "broker", name: "Брокерский" }, "0.1"),
 			operation("2", { id: "iis", name: "ИИС" }, "0.2"),
 		]);
 
-		expect(screen.getByText("Выплата купонов СФО ВТБ РКС Эталон 04")).toBeInTheDocument();
+		expect(screen.getByText("Купон · BOND")).toBeInTheDocument();
 		expect(screen.getByText("+0,3 ₽")).toBeInTheDocument();
 
 		const accounts = within(screen.getByRole("list", {
-			name: /Выплата купонов СФО ВТБ РКС Эталон 04, Исполнено 14\.08\.2026.*, \+0,3 ₽/,
+			name: /Купон · BOND, Исполнено 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();
 	});
@@ -87,10 +83,8 @@ 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"])(
@@ -120,7 +114,6 @@ 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", () => {
@@ -130,7 +123,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);

src/entities/broker-operation/ui/OperationGroup.tsx

@@ -9,13 +9,12 @@ import {
 	sumMoney,
 	totalText,
 } from "@/shared/lib";
-import { AccountCardRow, AccountRow, EntryGroup, EntryGroupTotal } from "@/shared/ui";
+import { AccountCardRow, EntryGroup, EntryGroupTotal } from "@/shared/ui";
 
 import type { BrokerageOperation } from "../api/useBrokerageOperations";
 
 import {
 	entryLabelKey,
-	isCouponPayment,
 	isZeroDecimal,
 	operationLabelKey,
 	paymentPresentation,
@@ -38,8 +37,6 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
 		? entryLabelKey(first)
 		: operationLabelKey(first.type));
 
-	const isCoupon = isCouponPayment(first);
-
 	const instrument
 		= first.ticker ?? first.instrumentType ?? t("ledger.noInstrument");
 
@@ -55,21 +52,9 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
 		: null;
 
 	const date = formatSnapshotDay(first.occurredAt);
-	const description = first.description.trim();
+	const title = `${typeLabel} · ${instrument}`;
-	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 }),
@@ -78,14 +63,13 @@ 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={totalTone}
+					tone="neutral"
 					value={<EntryGroupTotal isSigned totals={totals} />}
 					valueLabel={typeLabel}
 					wrap
@@ -96,15 +80,14 @@ const OperationGroup: FC<OperationGroupProps> = (props) => {
 			{props.entries.map(({ key, operation }) => {
 				const payment = paymentPresentation(operation);
 
-				const accountRowProps = {
+				return (
-					accountName: operation.account?.name ?? "—",
+					<AccountCardRow
-					value: payment.amount,
+						accountName={operation.account?.name ?? "—"}
-					valueLabel: t(payment.label),
+						key={key}
-				};
+						value={payment.amount}
-
+						valueLabel={t(payment.label)}
-				return isCoupon
+					/>
-					? <AccountRow key={key} {...accountRowProps} tone={payment.tone} />
+				);
-					: <AccountCardRow key={key} {...accountRowProps} />;
 			})}
 		</EntryGroup>
 	);

src/entities/brokerage-account/ui/BrokerageAccountList/BrokerageAccountList.module.css

@@ -65,32 +65,18 @@
 
 .summary {
 	font-variant-numeric: tabular-nums lining-nums;
-	align-items: flex-end;
+	white-space: nowrap;
-}
-
-.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;
 }
 
@@ -152,11 +138,7 @@
 		text-align: left;
 	}
 
-	.summary {
+	.balance > div {
-		align-items: flex-start;
-	}
-
-	.return {
 		justify-content: flex-start;
 	}
 }

src/entities/brokerage-account/ui/BrokerageAccountList/BrokerageAccountList.test.tsx

@@ -119,26 +119,25 @@ 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,4 %")).toBeInTheDocument();
+		expect(within(link).getByText("+12,40 %")).toBeInTheDocument();
 		expect(within(link).getByText("+136 900 ₽")).toBeInTheDocument();
-		expect(within(link).getByText("−3,1 %")).toBeInTheDocument();
+		expect(within(link).getByText("−3,05 %")).toBeInTheDocument();
-		expect(within(link).getByText("−4,2 $")).toBeInTheDocument();
+		expect(within(link).getByText("−4,2 USD")).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 $")).not.toHaveLength(0);
+		expect(within(link).getAllByText("20,00 USD")).not.toHaveLength(0);
 		expect(within(link).getByText("17 позиций")).toBeInTheDocument();
 		expect(screen.getByRole("img", {
-			name: "Структура в RUB: Акции 50,0 %; Облигации 30,0 %; "
+			name: "Структура в RUB: Акции 50 %; Облигации 30 %; "
-				+ "Другие активы 0,0 %; Свободные деньги 20,0 %",
+				+ "Другие активы 0 %; Свободные деньги 20 %",
 		})).toBeInTheDocument();
-		const stockLegend = within(link).getByText(/Акции 50,0 %/);
+		const stockLegend = within(link).getByText(/Акции 50 %/);
-		expect(stockLegend).toHaveTextContent("● Акции 50,0 %");
+		expect(stockLegend).toHaveTextContent("● Акции 50 %");
 		// 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,0 %/))
+		expect(within(link).queryByText(/Другие активы 0 %/)).not.toBeInTheDocument();
-			.not.toBeInTheDocument();
 		expect(link).toHaveTextContent("По данным брокера");
 		expect(link).toHaveTextContent("Структура RUB: Акции 100");
 	});

src/entities/brokerage-account/ui/BrokerageAccountList/BrokerageAccountList.tsx

@@ -15,11 +15,6 @@ 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" }
@@ -42,15 +37,20 @@ type StructureCurrency = PortfolioSummary["structure"]["currencies"][number];
 function formatPercent(value: null | string) {
 	if (value === null) return "—";
 
-	const rounded = percentFormatter.format(Math.abs(Number(value)));
+	const formatted = `${value.replace(".", ",")}\u{A0}%`;
-	let sign = "";
+	if (isZero(value))
-	if (rounded !== "0,0") sign = value.startsWith("-") ? "−" : "+";
+		return value.startsWith("-") ? formatted.slice(1) : formatted;
 
-	return `${sign}${rounded}\u{A0}%`;
+	return value.startsWith("-") ? `−${formatted.slice(1)}` : `+${formatted}`;
 }
 
 function formatStructurePercent(value: string) {
-	return percentFormatter.format(Number(value));
+	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(".", ",");
 }
 
 function isZero(value: string) {
@@ -65,18 +65,22 @@ const ReturnValue: FC<ReturnValueProps> = (props) => {
 	const { t } = useTranslation();
 	const { item } = props;
 
-	const displayedPercent = formatPercent(item.percent);
+	const isNegative = item.percent !== null
-	const isNegative = displayedPercent.startsWith("−");
+		&& item.percent.startsWith("-")
-	const isPositive = displayedPercent.startsWith("+");
+		&& !isZero(item.percent);
+
+	const isPositive = item.percent !== null
+		&& !item.percent.startsWith("-")
+		&& !isZero(item.percent);
 
 	let toneClass = classes.neutral;
 	if (isNegative) toneClass = classes.negative;
 	else if (isPositive) toneClass = classes.positive;
 
 	return (
-		<Group className={classes.return} gap="xs" wrap="wrap">
+		<Group className={classes.return} gap="xs" wrap="nowrap">
 			<Text className={toneClass} fw={700} size="sm">
-				{displayedPercent}
+				{formatPercent(item.percent)}
 			</Text>
 
 			<Text className={toneClass} size="sm">
@@ -196,35 +200,35 @@ const BrokerageAccountSummary: FC<BrokerageAccountSummaryProps> = (props) => {
 
 	return (
 		<Stack className={classes.balance} gap="xs">
-			<Stack className={classes.summary} gap="sm">
+			<Group align="flex-start" gap="lg" justify="flex-end" wrap="nowrap">
-				{summary.totals.map((total) => {
+				<Stack className={classes.summary} gap={4}>
-					const item = summary.portfolio.unrealizedReturnByCurrency.find(
+					{summary.totals.map(total => (
-						returnItem => returnItem.currency === total.currency,
+						<Text className={classes.total} fw={700} key={total.currency}>
-					);
+							{formatMoney(total, { withRoundedCents: true })}
+						</Text>
+					))}
 
-					return (
+					{!!summary.remainingCurrencyCount && (
-						<Stack
+						<Text c="dimmed" size="sm">
-							className={classes.currencySummary}
+							{t("accounts.remainingCurrencies", {
-							gap={2}
+								count: summary.remainingCurrencyCount,
-							key={total.currency}
+							})}
-						>
+						</Text>
-							<Text className={classes.total} fw={700}>
+					)}
-								{formatMoney(total, { withRoundedCents: true })}
+				</Stack>
-							</Text>
 
-							{item && <ReturnValue item={item} />}
+				<Stack gap={4}>
-						</Stack>
+					{summary.totals.map((total) => {
-					);
+						const item = summary.portfolio.unrealizedReturnByCurrency.find(
-				})}
+							returnItem => returnItem.currency === total.currency,
+						);
 
-				{!!summary.remainingCurrencyCount && (
+						return item
-					<Text c="dimmed" size="sm">
+							? <ReturnValue item={item} key={total.currency} />
-						{t("accounts.remainingCurrencies", {
+							: null;
-							count: summary.remainingCurrencyCount,
+					})}
-						})}
+				</Stack>
-					</Text>
+			</Group>
-				)}
-			</Stack>
 
 			{summary.portfolio.cashBalances.length > 0 && (
 				<Group className={classes.cash} gap="xs" justify="flex-end">

src/entities/brokerage-event/ui/BrokerageEventGroup.test.tsx

@@ -103,7 +103,7 @@ describe("BrokerageEventGroup", () => {
 			event({ id: "iis", name: "ИИС" }, "200"),
 		]);
 
-		expect(screen.getByRole("list", { name: /10 \$.*200 ₽/ }))
+		expect(screen.getByRole("list", { name: /10 USD.*200 ₽/ }))
 			.toBeInTheDocument();
 	});
 

src/features/tbank-connection/model/connection-boundary.ts

@@ -2,18 +2,19 @@ import type { QueryClient } from "@tanstack/react-query";
 
 import {
 	apiQueryClient,
-	isGetUnder,
 	type paths,
 } from "@/shared/api";
 
 type TbankConnectionStatus
 	= paths["/api/v1/tbank-connection"]["get"]["responses"][200]["content"]["application/json"];
 
-const investmentGetPredicate = isGetUnder([
+function isInvestmentPath(path: string) {
-	"/api/v1/brokerage-accounts",
+	return [
-	"/api/v1/stocks",
+		"/api/v1/brokerage-accounts",
-	"/api/v1/bonds",
+		"/api/v1/stocks",
-]);
+		"/api/v1/bonds",
+	].some(root => path === root || path.startsWith(`${root}/`));
+}
 
 const tbankConnectionQueryOptions = () =>
 	apiQueryClient.queryOptions("get", "/api/v1/tbank-connection");
@@ -26,7 +27,15 @@ function commitTbankConnectionBoundary(
 ) {
 	queryClient.setQueryData(tbankConnectionQueryKey, status);
 	void queryClient.resetQueries({
-		predicate: ({ queryKey }) => investmentGetPredicate(queryKey),
+		predicate: ({ queryKey }) => {
+			const [method, path] = queryKey;
+
+			return (
+				method === "get"
+				&& typeof path === "string"
+				&& isInvestmentPath(path)
+			);
+		},
 	});
 }
 

src/features/tbank-connection/ui/TbankConnectionSection/TbankConnectionSection.tsx

@@ -4,16 +4,16 @@ import {
 	TbankConnectionError,
 	TbankConnectionLoading,
 } from "./TbankConnectionSection.view";
-import { useTbankConnectionSectionVm } from "./TbankConnectionSection.vm";
+import { useTbankConnectionViewModel } from "./TbankConnectionSection.vm";
 import { TbankConnectionSectionLoaded } from "./TbankConnectionSectionLoaded";
 
 const TbankConnectionSection: FC = () => {
-	const vm = useTbankConnectionSectionVm();
+	const viewModel = useTbankConnectionViewModel();
-	if (vm.state === "loading") return <TbankConnectionLoading />;
+	if (viewModel.state === "loading") return <TbankConnectionLoading />;
 
-	return vm.state === "error"
+	return viewModel.state === "error"
-		? <TbankConnectionError retry={vm.retry} />
+		? <TbankConnectionError retry={viewModel.retry} />
-		: <TbankConnectionSectionLoaded {...vm} />;
+		: <TbankConnectionSectionLoaded {...viewModel} />;
 };
 
 export { TbankConnectionSection };

src/features/tbank-connection/ui/TbankConnectionSection/TbankConnectionSection.vm.ts

@@ -2,7 +2,7 @@ import { useAuthenticatedQuery } from "@/shared/api";
 
 import { tbankConnectionQueryOptions } from "../../model/connection-boundary";
 
-function useTbankConnectionSectionVm() {
+function useTbankConnectionViewModel() {
 	const status = useAuthenticatedQuery({
 		...tbankConnectionQueryOptions(),
 	});
@@ -22,4 +22,4 @@ function useTbankConnectionSectionVm() {
 	};
 }
 
-export { useTbankConnectionSectionVm };
+export { useTbankConnectionViewModel };

src/pages/account-events/ui/AccountEventsPage/AccountEventsPage.filters.test.tsx

@@ -26,7 +26,7 @@ import { resource } from "@/test/resource";
 import { server } from "@/test/server";
 
 import { AccountEventsPage } from "./AccountEventsPage";
-import { useAccountEventsPageVm } from "./AccountEventsPage.vm";
+import { useAccountEventsPageViewModel } from "./AccountEventsPage.vm";
 
 const Navigation: FC = () => {
 	const location = useLocation();
@@ -100,7 +100,7 @@ describe("Upcoming event date filters", () => {
 		);
 		const queryClient = createTestQueryClient();
 
-		const { result } = renderHook(() => useAccountEventsPageVm(), {
+		const { result } = renderHook(() => useAccountEventsPageViewModel(), {
 			wrapper: ({ children }) => (
 				<QueryClientProvider client={queryClient}>
 					<MemoryRouter initialEntries={["?from=2099-02-01"]}>
@@ -146,7 +146,7 @@ describe("Upcoming event date filters", () => {
 			const queryClient = createTestQueryClient();
 
 			const { result } = renderHook(
-				() => useAccountEventsPageVm(),
+				() => useAccountEventsPageViewModel(),
 				{
 					wrapper: ({ children }) => (
 						<QueryClientProvider client={queryClient}>
@@ -176,11 +176,7 @@ describe("Upcoming event date filters", () => {
 					({ request }) => {
 						searches.push(new URL(request.url).search);
 
-						return HttpResponse.json(resource({
+						return HttpResponse.json(resource({ events: [] }));
-							calculatedAt: "2026-08-14T00:00:00Z",
-							events: [],
-							window: { from: "2026-08-14", to: "2026-09-13" },
-						}));
 					},
 				),
 			);
@@ -227,11 +223,7 @@ describe("Upcoming event date filters", () => {
 					"*/api/v1/brokerage-accounts/:accountId/events",
 					({ request }) =>
 						new URL(request.url).searchParams.get("from") === defaultFrom
-							? HttpResponse.json(resource({
+							? HttpResponse.json(resource({ events: [] }))
-									calculatedAt: "2026-08-14T00:00:00Z",
-									events: [],
-									window: { from: "2026-08-14", to: "2026-09-13" },
-								}))
 							: HttpResponse.json({ code: "VALIDATION_ERROR" }, { status: 400 }),
 				),
 			);
@@ -264,7 +256,6 @@ describe("Upcoming event date filters", () => {
 								calculatedAt: "2099-01-01T00:00:00Z",
 								events: [],
 								incomeTotalsByCurrency: [],
-								window: { from: "2099-01-01", to: "2099-01-31" },
 							}),
 						);
 					},
@@ -273,7 +264,6 @@ 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"]);
 
@@ -330,7 +320,7 @@ describe("Upcoming event date filters", () => {
 			expect(screen.getByLabelText("URL")).toBeEmptyDOMElement();
 			expect(screen.getByRole("button", { name: "Применить" })).toBeDisabled();
 			expect(
-				screen.getByText("На выбранный период предстоящих событий не найдено"),
+				screen.getByText("За выбранный период событий не найдено"),
 			).toBeVisible();
 		},
 	);
@@ -371,7 +361,7 @@ it("retains the previous complete forecast when its source refresh fails", async
 	);
 	const queryClient = createTestQueryClient();
 
-	const { result } = renderHook(() => useAccountEventsPageVm(), {
+	const { result } = renderHook(() => useAccountEventsPageViewModel(), {
 		wrapper: ({ children }) => (
 			<QueryClientProvider client={queryClient}>
 				<MemoryRouter initialEntries={["/accounts/all/events"]}>

src/pages/account-events/ui/AccountEventsPage/AccountEventsPage.retry.test.tsx

@@ -17,8 +17,6 @@ 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",
@@ -34,7 +32,6 @@ const snapshot = resource({
 		},
 	],
 	incomeTotalsByCurrency: [{ currency: "RUB", value: "123.45" }],
-	window: { from: "2026-08-14", to: "2026-09-13" },
 });
 
 function renderEvents() {
@@ -103,13 +100,7 @@ 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;
 
@@ -120,7 +111,6 @@ 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();
 
@@ -137,7 +127,6 @@ 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;
@@ -147,7 +136,6 @@ describe("AccountEventsPage read retry", () => {
 				expect(screen.queryByText("Не удалось обновить данные"))
 					.not.toBeInTheDocument());
 			expect(requests).toBe(5);
-			expect(imports).toBe(0);
 		},
 	);
 

src/pages/account-events/ui/AccountEventsPage/AccountEventsPage.test.tsx

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

src/pages/account-events/ui/AccountEventsPage/AccountEventsPage.tsx

@@ -1,17 +1,17 @@
 import type { FC } from "react";
 
-import { useAccountEventsPageVm } from "./AccountEventsPage.vm";
+import { useAccountEventsPageViewModel } from "./AccountEventsPage.vm";
 import { AccountEventsPageError } from "./components/AccountEventsPageError.view";
 import { AccountEventsPageLoaded } from "./components/AccountEventsPageLoaded.view";
 import { AccountEventsPageLoading } from "./components/AccountEventsPageLoading.view";
 
 const AccountEventsPage: FC = () => {
-	const vm = useAccountEventsPageVm();
+	const viewModel = useAccountEventsPageViewModel();
-	if (vm.state === "loading") return <AccountEventsPageLoading />;
+	if (viewModel.state === "loading") return <AccountEventsPageLoading />;
 
-	return vm.state === "error"
+	return viewModel.state === "error"
-		? <AccountEventsPageError {...vm} />
+		? <AccountEventsPageError {...viewModel} />
-		: <AccountEventsPageLoaded {...vm} />;
+		: <AccountEventsPageLoaded {...viewModel} />;
 };
 
 export { AccountEventsPage };

src/pages/account-events/ui/AccountEventsPage/AccountEventsPage.vm.ts

@@ -18,7 +18,6 @@ import {
 type AccountEventsPageViewModel
 	= | {
 		allAccounts: boolean;
-		calculatedAt: string;
 		canApply: boolean;
 		draftPeriod: [null | string, null | string];
 		events: BrokerageEvent[];
@@ -32,7 +31,6 @@ type AccountEventsPageViewModel
 		source?: InvestmentResourceMeta;
 		state: "loaded";
 		totalVisible: boolean;
-		window: { from: string; to: string };
 	}
 	| {
 		onReset: () => void;
@@ -41,7 +39,7 @@ type AccountEventsPageViewModel
 	}
 	| { state: "loading" };
 
-function useAccountEventsPageVm(): AccountEventsPageViewModel {
+function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 	const { accountId = "" } = useParams();
 
 	const {
@@ -112,7 +110,6 @@ function useAccountEventsPageVm(): AccountEventsPageViewModel {
 
 	return {
 		allAccounts: accountId === "all",
-		calculatedAt: events.data.calculatedAt,
 		canApply:
 			(draftFrom !== appliedFrom || draftTo !== appliedTo)
 			&& isValidPeriod(draftFrom, draftTo),
@@ -136,8 +133,7 @@ function useAccountEventsPageVm(): AccountEventsPageViewModel {
 		source: events.meta,
 		state: "loaded",
 		totalVisible: events.meta?.completeness === "complete",
-		window: events.data.window,
 	};
 }
 
-export { type AccountEventsPageViewModel, useAccountEventsPageVm };
+export { type AccountEventsPageViewModel, useAccountEventsPageViewModel };

src/pages/account-events/ui/AccountEventsPage/components/AccountEventsPageLoaded.view.tsx

@@ -17,7 +17,7 @@ import {
 	brokerageEventGroupKey,
 	brokerageEventKey,
 } from "@/entities/brokerage-event";
-import { formatDate, formatSnapshotTime, groupItems } from "@/shared/lib";
+import { groupItems } from "@/shared/lib";
 import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
 
 import type { AccountEventsPageViewModel } from "../AccountEventsPage.vm";
@@ -89,14 +89,6 @@ 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

src/pages/account-income/ui/AccountIncomePage/AccountIncomePage.test.tsx

@@ -34,7 +34,7 @@ import { server } from "@/test/server";
 import { toIncomeDisplayModel } from "../../model/display";
 import { AccountIncomePage } from "./AccountIncomePage";
 import {
-	useAccountIncomePageVm,
+	useAccountIncomePageViewModel,
 } from "./AccountIncomePage.vm";
 import { IncomePayments } from "./components/IncomePayments.view";
 
@@ -171,7 +171,7 @@ describe("AccountIncomePage", () => {
 		);
 		const queryClient = createTestQueryClient();
 
-		const { result } = renderHook(() => useAccountIncomePageVm(), {
+		const { result } = renderHook(() => useAccountIncomePageViewModel(), {
 			wrapper: ({ children }) => (
 				<QueryClientProvider client={queryClient}>
 					<MemoryRouter initialEntries={["?from=2024-02-29&to=2024-03-01"]}>
@@ -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 $");
+		expect(cards[0]).toHaveTextContent("+10 USD");
 		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();
 

src/pages/account-income/ui/AccountIncomePage/AccountIncomePage.tsx

@@ -1,17 +1,17 @@
 import type { FC } from "react";
 
-import { useAccountIncomePageVm } from "./AccountIncomePage.vm";
+import { useAccountIncomePageViewModel } from "./AccountIncomePage.vm";
 import { AccountIncomePageError } from "./components/AccountIncomePageError.view";
 import { AccountIncomePageLoaded } from "./components/AccountIncomePageLoaded.view";
 import { AccountIncomePageLoading } from "./components/AccountIncomePageLoading.view";
 
 const AccountIncomePage: FC = () => {
-	const vm = useAccountIncomePageVm();
+	const viewModel = useAccountIncomePageViewModel();
-	if (vm.state === "loading") return <AccountIncomePageLoading />;
+	if (viewModel.state === "loading") return <AccountIncomePageLoading />;
 
-	return vm.state === "error"
+	return viewModel.state === "error"
-		? <AccountIncomePageError {...vm} />
+		? <AccountIncomePageError {...viewModel} />
-		: <AccountIncomePageLoaded {...vm} />;
+		: <AccountIncomePageLoaded {...viewModel} />;
 };
 
 export { AccountIncomePage };

src/pages/account-income/ui/AccountIncomePage/AccountIncomePage.vm.ts

@@ -43,7 +43,7 @@ type AccountIncomePageViewModel
 	}
 	| { state: "loading" };
 
-const useAccountIncomePageVm = (): AccountIncomePageViewModel => {
+const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
 	const { accountId = "" } = useParams();
 	const [searchParameters, setSearchParameters] = useSearchParams();
 
@@ -146,5 +146,5 @@ function isValidIncomePeriod(period: IncomePeriod): boolean {
 
 export {
 	type AccountIncomePageViewModel,
-	useAccountIncomePageVm,
+	useAccountIncomePageViewModel,
 };

src/pages/account-operations/ui/AccountOperationsPage/AccountOperationsPage.test.tsx

@@ -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);
 

src/pages/account-operations/ui/AccountOperationsPage/AccountOperationsPage.tsx

@@ -6,15 +6,15 @@ import { AccountOperationsPageLoaded } from "./components/AccountOperationsPageL
 import { AccountOperationsPageLoading } from "./components/AccountOperationsPageLoading.view";
 
 const AccountOperationsPage: FC = () => {
-	const vm = useAccountOperationsPageVm();
+	const viewModel = useAccountOperationsPageVm();
 
-	if (vm.state === "loading") {
+	if (viewModel.state === "loading") {
 		return <AccountOperationsPageLoading />;
 	}
 
-	return vm.state === "error"
+	return viewModel.state === "error"
-		? <AccountOperationsPageError {...vm} />
+		? <AccountOperationsPageError {...viewModel} />
-		: <AccountOperationsPageLoaded {...vm} />;
+		: <AccountOperationsPageLoaded {...viewModel} />;
 };
 
 export { AccountOperationsPage };

src/pages/account/model/positions.test.ts

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

src/pages/account/model/positions.ts

@@ -152,7 +152,7 @@ function toAccountPagePositionSections(
 	const denominators = new Map<string, number>();
 
 	for (const position of portfolio.positions) {
-		if (position.type === "CURRENCY" || !position.currentValue) continue;
+		if (!position.currentValue) continue;
 		const currency = position.currentValue.currency;
 		denominators.set(
 			currency,

src/pages/account/ui/AccountPage/AccountPage.test.tsx

@@ -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: "Предстоящие события" }));
+		fireEvent.click(screen.getByRole("tab", { name: "События" }));
-		const section = screen.getByRole("tabpanel", { 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 $", "1 000 ₽", "Сумма неизвестна"])
+		for (const amount of ["850,50 ₽", "0 USD", "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: "История операций" }));
+		fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
-		expect(screen.getByText("Последних операций пока нет.")).toBeVisible();
+		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/operations"],
-			["Предстоящие события", "/accounts/account-1/events"],
+			["События", "/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();

src/pages/account/ui/AccountPage/AccountPage.tsx

@@ -1,48 +1,48 @@
 import type { FC } from "react";
 
-import { useAccountPageVm } from "./AccountPage.vm";
+import { useAccountPageViewModel } from "./AccountPage.vm";
 import { AccountPageEmpty } from "./components/AccountPageEmpty.view";
 import { AccountPageError } from "./components/AccountPageError.view";
 import { AccountPageLoaded } from "./components/AccountPageLoaded.view";
 import { AccountPageLoading } from "./components/AccountPageLoading/AccountPageLoading.view";
 
 const AccountPage: FC = () => {
-	const vm = useAccountPageVm();
+	const viewModel = useAccountPageViewModel();
-	if (vm.state === "loading") return <AccountPageLoading />;
+	if (viewModel.state === "loading") return <AccountPageLoading />;
-	if (vm.state === "error") return <AccountPageError {...vm} />;
+	if (viewModel.state === "error") return <AccountPageError {...viewModel} />;
-	if (vm.state === "empty")
+	if (viewModel.state === "empty")
 		return (
 			<AccountPageEmpty
-				account={vm.account}
+				account={viewModel.account}
-				accountId={vm.accountId}
+				accountId={viewModel.accountId}
-				incomeSummary={vm.incomeSummary}
+				incomeSummary={viewModel.incomeSummary}
-				readRetry={vm.readRetry}
+				readRetry={viewModel.readRetry}
-				recentEvents={vm.recentEvents}
+				recentEvents={viewModel.recentEvents}
-				recentOperations={vm.recentOperations}
+				recentOperations={viewModel.recentOperations}
-				source={vm.source}
+				source={viewModel.source}
 			/>
 		);
 
 	return (
 		<AccountPageLoaded
-			account={vm.account}
+			account={viewModel.account}
-			accountId={vm.accountId}
+			accountId={viewModel.accountId}
-			concentration={vm.concentration}
+			concentration={viewModel.concentration}
-			currency={vm.currency}
+			currency={viewModel.currency}
-			incomeSummary={vm.incomeSummary}
+			incomeSummary={viewModel.incomeSummary}
-			onCurrencyChange={vm.onCurrencyChange}
+			onCurrencyChange={viewModel.onCurrencyChange}
-			onSliceChange={vm.onSliceChange}
+			onSliceChange={viewModel.onSliceChange}
-			onTabChange={vm.onTabChange}
+			onTabChange={viewModel.onTabChange}
-			partial={vm.partial}
+			partial={viewModel.partial}
-			portfolio={vm.portfolio}
+			portfolio={viewModel.portfolio}
-			positionSections={vm.positionSections}
+			positionSections={viewModel.positionSections}
-			readRetry={vm.readRetry}
+			readRetry={viewModel.readRetry}
-			recentEvents={vm.recentEvents}
+			recentEvents={viewModel.recentEvents}
-			recentOperations={vm.recentOperations}
+			recentOperations={viewModel.recentOperations}
-			slice={vm.slice}
+			slice={viewModel.slice}
-			source={vm.source}
+			source={viewModel.source}
-			tab={vm.tab}
+			tab={viewModel.tab}
-			unrealizedReturns={vm.unrealizedReturns}
+			unrealizedReturns={viewModel.unrealizedReturns}
 		/>
 	);
 };

src/pages/account/ui/AccountPage/AccountPage.vm.test.tsx

@@ -12,7 +12,7 @@ import { resource } from "@/test/resource";
 import { server } from "@/test/server";
 
 import { portfolio } from "../../model/positions.fixtures";
-import { useAccountPageVm } from "./AccountPage.vm";
+import { useAccountPageViewModel } from "./AccountPage.vm";
 
 function configureTestAuth() {
 	configureAuthClient({
@@ -102,12 +102,12 @@ function mockLoadedAccountPage() {
 	);
 }
 
-describe("useAccountPageVm", () => {
+describe("useAccountPageViewModel", () => {
 	it("prepares recent operations and events state for presentation views", async () => {
 		configureTestAuth();
 		mockLoadedAccountPage();
 
-		const { result } = renderHook(() => useAccountPageVm(), {
+		const { result } = renderHook(() => useAccountPageViewModel(), {
 			wrapper: createWrapper(),
 		});
 
@@ -154,7 +154,7 @@ describe("useAccountPageVm", () => {
 			),
 		);
 
-		const { result } = renderHook(() => useAccountPageVm(), {
+		const { result } = renderHook(() => useAccountPageViewModel(), {
 			wrapper: createWrapper(),
 		});
 
@@ -194,7 +194,7 @@ it("keeps overview sections independent when their source data is incomplete", a
 		),
 	);
 
-	const { result } = renderHook(() => useAccountPageVm(), {
+	const { result } = renderHook(() => useAccountPageViewModel(), {
 		wrapper: createWrapper(),
 	});
 
@@ -232,7 +232,7 @@ it("keeps overview sections loaded without exposing technical retry", async () =
 		),
 	);
 
-	const { result } = renderHook(() => useAccountPageVm(), {
+	const { result } = renderHook(() => useAccountPageViewModel(), {
 		wrapper: createWrapper(),
 	});
 

src/pages/account/ui/AccountPage/AccountPage.vm.ts

@@ -77,7 +77,7 @@ type AccountPageViewModel
 		| { code?: string; readRetry: AccountPageReadRetry; state: "error" }
 		| { state: "loading" };
 
-function useAccountPageVm(): AccountPageViewModel {
+function useAccountPageViewModel(): AccountPageViewModel {
 	const { accountId } = useParams();
 	const { t } = useTranslation();
 
@@ -199,4 +199,4 @@ function useAccountPageVm(): AccountPageViewModel {
 	};
 }
 
-export { useAccountPageVm };
+export { useAccountPageViewModel };

src/pages/account/ui/AccountPage/components/AccountPageEmpty.view.tsx

@@ -9,6 +9,7 @@ import type { InvestmentResourceMeta } from "@/shared/api";
 
 import { BrokerageEventsPreview } from "@/entities/brokerage-event";
 import { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
+import { PortfolioStructure } from "@/widgets/portfolio-structure";
 
 import type {
 	AccountPageIncomeSummary,
@@ -18,7 +19,6 @@ import type {
 
 import { AccountHeading } from "./AccountHeading.view";
 import { IncomeSummary } from "./IncomeSummary.view";
-import { PortfolioStructure } from "./PortfolioStructure/PortfolioStructure";
 import { RecentOperations } from "./RecentOperations.view";
 
 type AccountPageEmptyProps = {

src/pages/account/ui/AccountPage/components/AccountPageLoaded.view.tsx

@@ -16,6 +16,7 @@ import type { InvestmentResourceMeta } from "@/shared/api";
 import { BrokerageEventsPreview } from "@/entities/brokerage-event";
 import { formatMoney } from "@/shared/lib";
 import { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
+import { PortfolioStructure } from "@/widgets/portfolio-structure";
 
 import type { Concentration as ConcentrationModel, Slice } from "../../../model/concentration";
 import type { AccountPagePositionSection } from "../../../model/positions";
@@ -30,7 +31,6 @@ import { AccountHeading } from "./AccountHeading.view";
 import { Concentration } from "./Concentration/Concentration.view";
 import { CurrencyCards } from "./CurrencyCards/CurrencyCards.view";
 import { IncomeSummary } from "./IncomeSummary.view";
-import { PortfolioStructure } from "./PortfolioStructure/PortfolioStructure";
 import { PositionSection } from "./PositionSection.view";
 import { RecentOperations } from "./RecentOperations.view";
 

src/pages/accounts/ui/AccountsPage/AccountsPage.test.tsx

@@ -110,9 +110,7 @@ describe("AccountsPage", () => {
 		renderPage(client);
 
 		expect(await screen.findByText("175,30 ₽")).toBeInTheDocument();
-		expect(screen.getAllByText("20,00 $")).not.toHaveLength(0);
+		expect(screen.getAllByText("20,00 USD")).not.toHaveLength(0);
-		expect(screen.queryByText("Ваши инвестиции по счетам"))
-			.not.toBeInTheDocument();
 		expect(screen.getByText("5 счетов")).toBeInTheDocument();
 		expect(screen.getByText("Нет текущих сумм")).toBeInTheDocument();
 		expect(screen.getByText(

src/pages/accounts/ui/AccountsPage/AccountsPage.tsx

@@ -1,22 +1,22 @@
 import type { FC } from "react";
 
-import { useAccountsPageVm } from "./AccountsPage.vm";
+import { useAccountsPageViewModel } from "./AccountsPage.vm";
 import { AccountsPageEmpty } from "./components/AccountsPageEmpty.view";
 import { AccountsPageError } from "./components/AccountsPageError.view";
 import { AccountsPageLoaded } from "./components/AccountsPageLoaded.view";
 import { AccountsPageLoading } from "./components/AccountsPageLoading.view";
 
 const AccountsPage: FC = () => {
-	const vm = useAccountsPageVm();
+	const viewModel = useAccountsPageViewModel();
-	if (vm.state === "loading") return <AccountsPageLoading />;
+	if (viewModel.state === "loading") return <AccountsPageLoading />;
-	if (vm.state === "error") return <AccountsPageError {...vm} />;
+	if (viewModel.state === "error") return <AccountsPageError {...viewModel} />;
-	if (vm.state === "empty") return <AccountsPageEmpty />;
+	if (viewModel.state === "empty") return <AccountsPageEmpty />;
 
 	return (
 		<AccountsPageLoaded
-			accounts={vm.accounts}
+			accounts={viewModel.accounts}
-			meta={vm.meta}
+			meta={viewModel.meta}
-			readRetry={vm.readRetry}
+			readRetry={viewModel.readRetry}
 		/>
 	);
 };

src/pages/accounts/ui/AccountsPage/AccountsPage.vm.ts

@@ -30,7 +30,7 @@ function isAccountsAccessFailure(code?: string) {
 		|| isApiErrorCode(code, ApiErrorCode.TbankNotConnected);
 }
 
-function useAccountsPageVm(): AccountsPageViewModel {
+function useAccountsPageViewModel(): AccountsPageViewModel {
 	const accounts = useBrokerageAccounts();
 	useScreenSync({ screen: "accounts" }, [accounts]);
 
@@ -73,4 +73,4 @@ function useAccountsPageVm(): AccountsPageViewModel {
 	};
 }
 
-export { useAccountsPageVm };
+export { useAccountsPageViewModel };

src/pages/accounts/ui/AccountsPage/components/AccountsPageLoaded.module.css

@@ -1,21 +0,0 @@
-.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);
-}

src/pages/accounts/ui/AccountsPage/components/AccountsPageLoaded.view.tsx

@@ -1,6 +1,6 @@
 import type { FC } from "react";
 
-import { Button, Group, Stack, Text, Title } from "@mantine/core";
+import { Button, SimpleGrid, Stack, Text, Title } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
@@ -13,8 +13,6 @@ 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;
@@ -89,55 +87,52 @@ 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">
-			<Title order={1}>{t("accounts.title")}</Title>
+			<Stack gap={4}>
+				<Title order={1}>{t("accounts.title")}</Title>
 
-			<Stack className={classes.summary} gap="xs">
 				<Text c="dimmed" size="sm">
-					{t("accounts.currentValue")}
+					{t("accounts.subtitle")}
 				</Text>
+			</Stack>
 
-				{primaryTotal
+			<Stack gap="xs">
-					? (
+				<SimpleGrid cols={{ base: 1, xs: 2 }} spacing="xs">
-							<Text className={classes.primaryTotal} fw={700}>
+					<Stack gap={4}>
-								{formatMoney(primaryTotal, { withRoundedCents: true })}
+						<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 })}
 							</Text>
-						)
-					: (
-							<Text c="dimmed">{t("accounts.summaryNoTotals")}</Text>
 						)}
+					</Stack>
+				</SimpleGrid>
 
-				{otherTotals.length > 0 && (
+				<SourceSyncStatus
-					<Group gap="md" wrap="wrap">
+					lastAttempt={props.meta.lastAttempt}
-						{otherTotals.map(total => (
+					lastSuccessfulAt={props.meta.lastSuccessfulAt}
-							<Text className={classes.otherTotal} key={total.currency}>
+					stale={props.meta.freshness === "stale"}
-								{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>

src/pages/bond/ui/BondPage/BondPage.test.tsx

@@ -351,7 +351,7 @@ describe("bond page", () => {
 			screen.queryByRole("heading", { name: "Моя позиция" }),
 		).not.toBeInTheDocument();
 		expect(
-			screen.getByRole("heading", { name: "История операций" }),
+			screen.getByRole("heading", { name: "Моя история событий" }),
 		).toBeVisible();
 	});
 	it(

src/pages/card/ui/OperationForm/OperationForm.vm.ts

@@ -120,52 +120,11 @@ const useOperationFormVm = (props: OperationFormProps) => {
 					body: { ...body, version },
 					id: props.operation.id,
 				});
-			else {
+			else
-				const base = {
+				await operationCreation.mutateAsync({
-					amount: body.amount,
-					cardId: values.cardId,
-					date: values.date,
-					description: values.description,
 					id: intent,
-				};
+					...body,
-
+				});
-				switch (values.kind) {
-					case "expense": {
-						await operationCreation.mutateAsync({
-							...base,
-							categoryId: values.categoryId || defaultCategoryId,
-							kind: values.kind,
-						});
-						break;
-					}
-
-					case "refund": {
-						await operationCreation.mutateAsync({
-							...base,
-							kind: values.kind,
-							originalExpenseId: values.originalExpenseId,
-						});
-						break;
-					}
-
-					case "topup": {
-						await operationCreation.mutateAsync({
-							...base,
-							kind: values.kind,
-						});
-						break;
-					}
-
-					case "transfer": {
-						await operationCreation.mutateAsync({
-							...base,
-							kind: values.kind,
-							targetCardId: values.targetCardId,
-						});
-						break;
-					}
-				}
-			}
 
 			notifications.show({
 				id: "bank-operation-saved-" + actionId,

src/pages/login/ui/LoginPage.tsx

@@ -1,13 +1,13 @@
 import type { FC } from "react";
 
+import { useDocumentTitle } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
 
 import { AuthPageLayout, LoginForm } from "@/features/auth";
-import { useAppDocumentTitle } from "@/shared/ui";
 
 const LoginPage: FC = () => {
 	const { t } = useTranslation();
-	useAppDocumentTitle(t("auth.login"));
+	useDocumentTitle(`${t("auth.login")} — ${t("appName")}`);
 
 	return (
 		<AuthPageLayout title={t("auth.login")}>

src/pages/not-found/ui/NotFoundPage.tsx

@@ -1,15 +1,14 @@
 import type { FC } from "react";
 
 import { Button, Stack, Title } from "@mantine/core";
+import { useDocumentTitle } from "@mantine/hooks";
 import { StateView } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
-import { useAppDocumentTitle } from "@/shared/ui";
-
 const NotFoundPage: FC = () => {
 	const { t } = useTranslation();
-	useAppDocumentTitle(t("notFound.title"));
+	useDocumentTitle(`${t("notFound.title")} — ${t("appName")}`);
 
 	return (
 		<Stack>

src/pages/register/ui/RegisterPage.tsx

@@ -1,13 +1,13 @@
 import type { FC } from "react";
 
+import { useDocumentTitle } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
 
 import { AuthPageLayout, RegisterForm } from "@/features/auth";
-import { useAppDocumentTitle } from "@/shared/ui";
 
 const RegisterPage: FC = () => {
 	const { t } = useTranslation();
-	useAppDocumentTitle(t("auth.register"));
+	useDocumentTitle(`${t("auth.register")} — ${t("appName")}`);
 
 	return (
 		<AuthPageLayout title={t("auth.register")}>

src/pages/settings/ui/SettingsPage/SettingsPage.tsx

@@ -1,24 +1,13 @@
 import type { FC } from "react";
 
 import { Button, Stack, Title } from "@mantine/core";
-import { useTranslation } from "react-i18next";
 
-import { useAuth } from "@/features/auth";
 import { TbankConnectionSection } from "@/features/tbank-connection";
 
-const SettingsPage: FC = () => {
+import { useSettingsPageVm } from "./SettingsPage.vm";
-	const { t } = useTranslation();
-	const { logout } = useAuth();
 
-	// eslint-disable-next-line frontend/readability -- the page VM was removed as degenerate (frontend#143); a one-off error-swallowing logout is not a ViewModel.
+const SettingsPage: FC = () => {
-	const onLogout = async () => {
+	const { onLogout, t } = useSettingsPageVm();
-		try {
-			await logout();
-		}
-		catch {
-			// The session is already cleared; the route guard owns navigation.
-		}
-	};
 
 	return (
 		<Stack>

src/pages/settings/ui/SettingsPage/SettingsPage.vm.ts

@@ -0,0 +1,21 @@
+import { useTranslation } from "react-i18next";
+
+import { useAuth } from "@/features/auth";
+
+function useSettingsPageVm() {
+	const { t } = useTranslation();
+	const { logout } = useAuth();
+
+	const onLogout = async () => {
+		try {
+			await logout();
+		}
+		catch {
+			// The session is already cleared; the route guard owns navigation.
+		}
+	};
+
+	return { onLogout, t };
+}
+
+export { useSettingsPageVm };

src/pages/stock/ui/StockPage/StockPage.test.tsx

@@ -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 () => {

src/shared/api/authenticated-query.test.tsx

@@ -6,7 +6,10 @@ import { createQueryWrapper } from "@/test/query";
 import { resource } from "@/test/resource";
 import { server } from "@/test/server";
 
-import { useAuthenticatedQuery } from "./authenticated-query";
+import {
+	useAuthenticatedQueries,
+	useAuthenticatedQuery,
+} from "./authenticated-query";
 import { apiQueryClient, configureAuthClient } from "./client";
 
 const useSingleQuery = () =>
@@ -14,49 +17,58 @@ const useSingleQuery = () =>
 		apiQueryClient.queryOptions("get", "/api/v1/brokerage-accounts"),
 	);
 
+const useMultipleQueries = () =>
+	useAuthenticatedQueries([
+		apiQueryClient.queryOptions("get", "/api/v1/brokerage-accounts"),
+	])[0];
+
 describe("useAuthenticatedQuery", () => {
-	it("keeps protected queries idle without a session and loads after session configuration", async () => {
+	it.each(["single", "multiple"])(
-		const requests = vi.fn();
+		"keeps %s protected queries idle without a session and loads after session configuration",
-		server.use(
+		async (mode) => {
-			http.get("*/api/v1/brokerage-accounts", () => {
+			const requests = vi.fn();
-				requests();
+			server.use(
+				http.get("*/api/v1/brokerage-accounts", () => {
+					requests();
 
-				return HttpResponse.json(
+					return HttpResponse.json(
-					resource([
+						resource([
-						{
+							{
-							id: "account-1",
+								id: "account-1",
-							name: "Основной",
+								name: "Основной",
-							openedOn: "2024-08-13",
+								openedOn: "2024-08-13",
-							type: "BROKERAGE",
+								type: "BROKERAGE",
-						},
+							},
-					]),
+						]),
-				);
+					);
-			}),
+				}),
-		);
+			);
 
-		const { result } = renderHook(useSingleQuery, {
+			const { result } = renderHook(
-			wrapper: createQueryWrapper().wrapper,
+				mode === "single" ? useSingleQuery : useMultipleQueries,
-		});
+				{ wrapper: createQueryWrapper().wrapper },
+			);
 
-		await new Promise(resolve => setTimeout(resolve, 0));
+			await new Promise(resolve => setTimeout(resolve, 0));
-		expect(requests).not.toHaveBeenCalled();
+			expect(requests).not.toHaveBeenCalled();
-		expect(result.current?.fetchStatus).toBe("idle");
+			expect(result.current?.fetchStatus).toBe("idle");
 
-		configureAuthClient({
+			configureAuthClient({
-			accessToken: () => "token",
+				accessToken: () => "token",
-			clear: vi.fn(),
+				clear: vi.fn(),
-			refresh: () => Promise.resolve(true),
+				refresh: () => Promise.resolve(true),
-		});
+			});
 
-		await waitFor(() => expect(result.current?.isSuccess).toBe(true));
+			await waitFor(() => expect(result.current?.isSuccess).toBe(true));
-		expect(requests).toHaveBeenCalledOnce();
+			expect(requests).toHaveBeenCalledOnce();
-		expect(result.current?.data?.data).toEqual([
+			expect(result.current?.data?.data).toEqual([
-			{
+				{
-				id: "account-1",
+					id: "account-1",
-				name: "Основной",
+					name: "Основной",
-				openedOn: "2024-08-13",
+					openedOn: "2024-08-13",
-				type: "BROKERAGE",
+					type: "BROKERAGE",
-			},
+				},
-		]);
+			]);
-	});
+		},
+	);
 });

src/shared/api/authenticated-query.ts

@@ -1,5 +1,6 @@
 import {
 	type QueryKey,
+	useQueries,
 	useQuery,
 	type UseQueryOptions,
 	type UseQueryResult,
@@ -11,6 +12,25 @@ import {
 	subscribeAuthenticatedSession,
 } from "./client";
 
+function useAuthenticatedQueries<TData, TError, TQueryKey extends QueryKey>(
+	queries: UseQueryOptions<TData, TError, TData, TQueryKey>[],
+) {
+	const hasSession = useHasAuthenticatedSession();
+
+	return useQueries({
+		queries: queries.map(
+			(options): UseQueryOptions<TData, TError, TData, TQueryKey> => ({
+				...options,
+				enabled: query =>
+					hasSession
+					&& (typeof options.enabled === "function"
+						? options.enabled(query)
+						: (options.enabled ?? true)),
+			}),
+		),
+	});
+}
+
 function useAuthenticatedQuery<
 	TQueryFunctionData = unknown,
 	TError = Error,
@@ -38,4 +58,4 @@ function useHasAuthenticatedSession() {
 	);
 }
 
-export { useAuthenticatedQuery };
+export { useAuthenticatedQueries, useAuthenticatedQuery };

src/shared/api/client.ts

@@ -208,50 +208,51 @@ function parseJson(body: string): unknown {
 }
 
 async function readAttempt(request: Request): Promise<ReadAttempt> {
-	// Manual timeout (not AbortSignal.timeout) so fake-timer tests can advance it.
+	const controller = new AbortController();
-	const timeout = new AbortController();
+	const failure: { reason?: "abort" | "timeout" } = {};
-	const timer = setTimeout(() => timeout.abort(), GET_DEADLINE_MS);
+
-	const signal = AbortSignal.any([request.signal, timeout.signal]);
+	const { promise: deadline, reject: rejectDeadline }
+		= Promise.withResolvers<never>();
+
+	const timeout = setTimeout(() => {
+		failure.reason = "timeout";
+		controller.abort();
+		rejectDeadline(abortError());
+	}, GET_DEADLINE_MS);
+
+	const abort = () => {
+		failure.reason = "abort";
+		controller.abort();
+		rejectDeadline(abortError());
+	};
+
+	request.signal.addEventListener("abort", abort, { once: true });
+	const timedRequest = new Request(request, { signal: controller.signal });
 
 	try {
-		// MSW keeps a stalled body readable after abort, so keep the race.
+		const response = await Promise.race([fetch(timedRequest), deadline]);
-		const response = await Promise.race([
+		const body = await Promise.race([response.text(), deadline]);
-			fetch(new Request(request, { signal })),
+		const problem = parseJson(body);
-			rejectOnAbort(signal),
-		]);
-
-		const body = await Promise.race([response.text(), rejectOnAbort(signal)]);
 
 		return {
-			problem: parseJson(body),
+			problem,
 			reason: "transient",
 			response: new Response(body, response),
 		};
 	}
 	catch (error) {
-		if (request.signal.aborted) return { reason: "abort" };
+		if (failure.reason === "abort") return { reason: "abort" };
-		// Timeout or network failure: retryable.
+		if (failure.reason === "timeout" || isNetworkFailure(error))
-		if (timeout.signal.aborted || isNetworkFailure(error))
 			return { reason: "transient" };
 
 		throw error;
 	}
 	finally {
-		clearTimeout(timer);
+		clearTimeout(timeout);
+		request.signal.removeEventListener("abort", abort);
 	}
 }
 
-function rejectOnAbort(signal: AbortSignal): Promise<never> {
-	return new Promise((_resolve, reject) => {
-		// The signal is either already aborted or one of two parents firing once.
-		signal.addEventListener(
-			"abort",
-			() => reject(abortError()),
-			{ once: true },
-		);
-	});
-}
-
 function retryAfterMs(response: Response): number | undefined {
 	const header = response.headers.get("Retry-After");
 	if (!header) return undefined;

src/shared/api/generated/schema.d.ts

@@ -775,77 +775,6 @@ export interface components {
              */
             password: string;
         };
-        RubMoneyInputDto: {
-            /** @enum {string} */
-            currency: "RUB";
-            value: string;
-        };
-        CreateExpenseOperationDto: {
-            /** Format: uuid */
-            id: string;
-            /** Format: uuid */
-            cardId: string;
-            amount: components["schemas"]["RubMoneyInputDto"];
-            /** Format: date */
-            date: string;
-            description?: string;
-            /**
-             * @description discriminator enum property added by openapi-typescript
-             * @enum {string}
-             */
-            kind: "expense";
-            /** Format: uuid */
-            categoryId?: string;
-        };
-        CreateTopupOperationDto: {
-            /** Format: uuid */
-            id: string;
-            /** Format: uuid */
-            cardId: string;
-            amount: components["schemas"]["RubMoneyInputDto"];
-            /** Format: date */
-            date: string;
-            description?: string;
-            /**
-             * @description discriminator enum property added by openapi-typescript
-             * @enum {string}
-             */
-            kind: "topup";
-        };
-        CreateTransferOperationDto: {
-            /** Format: uuid */
-            id: string;
-            /** Format: uuid */
-            cardId: string;
-            amount: components["schemas"]["RubMoneyInputDto"];
-            /** Format: date */
-            date: string;
-            description?: string;
-            /**
-             * @description discriminator enum property added by openapi-typescript
-             * @enum {string}
-             */
-            kind: "transfer";
-            /** Format: uuid */
-            targetCardId: string;
-        };
-        CreateRefundOperationDto: {
-            /** Format: uuid */
-            id: string;
-            /** Format: uuid */
-            cardId: string;
-            amount: components["schemas"]["RubMoneyInputDto"];
-            /** Format: date */
-            date: string;
-            description?: string;
-            /**
-             * @description discriminator enum property added by openapi-typescript
-             * @enum {string}
-             */
-            kind: "refund";
-            /** Format: uuid */
-            originalExpenseId: string;
-        };
         MoneyDto: {
             currency: string;
             value: string;
@@ -863,6 +792,11 @@ export interface components {
             archivedAt: string | null;
             version: number;
         };
+        RubMoneyInputDto: {
+            /** @enum {string} */
+            currency: "RUB";
+            value: string;
+        };
         CreateBankCardDto: {
             /** Format: uuid */
             id: string;
@@ -907,6 +841,24 @@ export interface components {
             net: components["schemas"]["MoneyDto"];
             categories: components["schemas"]["BankSummaryCategoryDto"][];
         };
+        CreateBankOperationDto: {
+            /** Format: uuid */
+            id: string;
+            /** @enum {string} */
+            kind: "expense" | "topup" | "transfer" | "refund";
+            /** Format: uuid */
+            cardId: string;
+            /** Format: uuid */
+            targetCardId?: string;
+            /** Format: uuid */
+            categoryId?: string;
+            /** Format: uuid */
+            originalExpenseId?: string;
+            amount: components["schemas"]["RubMoneyInputDto"];
+            /** Format: date */
+            date: string;
+            description?: string;
+        };
         BankOperationDto: {
             id: string;
             /** @enum {string} */
@@ -2646,7 +2598,7 @@ export interface operations {
         };
         requestBody: {
             content: {
-                "application/json": components["schemas"]["CreateExpenseOperationDto"] | components["schemas"]["CreateTopupOperationDto"] | components["schemas"]["CreateTransferOperationDto"] | components["schemas"]["CreateRefundOperationDto"];
+                "application/json": components["schemas"]["CreateBankOperationDto"];
             };
         };
         responses: {

src/shared/api/index.ts

@@ -13,7 +13,6 @@ export {
 	isApiErrorCode,
 	isBrokerageAccessLoss,
 } from "./problem-details";
-export { isGetUnder } from "./query-predicate";
 export { isReadFailureExhausted, readRetry } from "./read-failure";
 
 export {

src/shared/api/query-predicate.test.ts

@@ -1,26 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { isGetUnder } from "./query-predicate";
-
-describe("isGetUnder", () => {
-	it("matches the root itself and nested paths for get queries only", () => {
-		const predicate = isGetUnder(["/api/v1/bank-cards"]);
-
-		expect(predicate(["get", "/api/v1/bank-cards"])).toBe(true);
-		expect(predicate(["get", "/api/v1/bank-cards/{id}"])).toBe(true);
-		expect(predicate(["get", "/api/v1/bank-cards"])).toBe(true);
-		expect(predicate(["get", "/api/v1/bank-cardsx"])).toBe(false);
-		expect(predicate(["post", "/api/v1/bank-cards"])).toBe(false);
-		expect(predicate(["get", "/api/v1/other"])).toBe(false);
-	});
-
-	it("checks every root and tolerates init and non-string parts", () => {
-		const predicate = isGetUnder(["/api/v1/stocks", "/api/v1/bonds"]);
-
-		expect(predicate(["get", "/api/v1/stocks/{uid}/quote", { params: {} }]))
-			.toBe(true);
-		expect(predicate(["get", "/api/v1/bonds"])).toBe(true);
-		expect(predicate([undefined, "/api/v1/stocks"])).toBe(false);
-		expect(predicate(["get", undefined])).toBe(false);
-	});
-});

src/shared/api/query-predicate.ts

@@ -1,18 +0,0 @@
-import type { QueryKey } from "@tanstack/react-query";
-
-// openapi-react-query shapes query keys as [method, path, init].
-function isGetUnder(roots: readonly string[]) {
-	const predicate = (queryKey: QueryKey) => {
-		const [method, path] = queryKey as readonly [unknown, unknown];
-
-		return (
-			method === "get"
-			&& typeof path === "string"
-			&& roots.some(root => path === root || path.startsWith(`${root}/`))
-		);
-	};
-
-	return predicate;
-}
-
-export { isGetUnder };

src/shared/api/resource-query.test.tsx

@@ -37,6 +37,38 @@ function auth() {
 }
 
 describe("persistent resource query lifecycle", () => {
+	it("observes once into the canonical cache without another import", async () => {
+		auth();
+		const modes: (null | string)[] = [];
+		let observations = 0;
+		server.use(
+			http.get(
+				"*/api/v1/brokerage-accounts/:accountId/portfolio",
+				({ request }) => {
+					const mode = new URL(request.url).searchParams.get("sync");
+					modes.push(mode);
+					if (mode) observations += 1;
+
+					return HttpResponse.json(
+						resource(snapshot, {
+							dataRevision: observations > 0 ? "new" : "old",
+						}),
+					);
+				},
+			),
+		);
+		const { queryClient, wrapper } = createQueryWrapper();
+		const { result } = renderHook(() => usePrivateResource("a"), { wrapper });
+		await waitFor(() => expect(result.current.isSuccess).toBe(true));
+		await act(() => result.current.observe());
+		await waitFor(() => expect(result.current.meta?.dataRevision).toBe("new"));
+
+		expect(modes).toEqual([null, "observe"]);
+		expect(queryClient.getQueryCache().getAll()).toHaveLength(1);
+		expect(
+			queryClient.getQueryData(resourceOptions("a").queryKey),
+		).toMatchObject({ data: snapshot, meta: { dataRevision: "new" } });
+	});
 	it("keeps successful HTTP state distinct from missing or failed source data", async () => {
 		auth();
 		server.use(
@@ -104,6 +136,47 @@ describe("persistent resource query lifecycle", () => {
 		expect(result.current.isSuccess).toBe(true);
 		expect(result.current.isPending).toBe(false);
 	});
+	it("keeps the observed snapshot when an older query finishes later", async () => {
+		auth();
+
+		const { promise: blocked, resolve: release }
+			= Promise.withResolvers<void>();
+
+		let isStarted = false;
+		server.use(
+			http.get(
+				"*/api/v1/brokerage-accounts/:accountId/portfolio",
+				async ({ request }) => {
+					if (!new URL(request.url).searchParams.has("sync")) {
+						isStarted = true;
+						await blocked;
+
+						return HttpResponse.json(resource({ ...snapshot, isStale: true }));
+					}
+
+					return HttpResponse.json(resource(snapshot));
+				},
+			),
+		);
+
+		const { result } = renderHook(() => usePrivateResource("a"), {
+			wrapper: createQueryWrapper().wrapper,
+		});
+
+		await waitFor(() => expect(isStarted).toBe(true));
+		// Capture the observation promise before releasing the old handler; the
+		// final assertion must follow its settlement, not the handler release.
+		let observation: Promise<unknown> = Promise.resolve();
+		await act(async () => {
+			observation = result.current.observe() ?? Promise.resolve();
+			await observation;
+		});
+		await act(async () => {
+			release();
+			await observation;
+		});
+		expect(result.current.data).toEqual(snapshot);
+	});
 	it("clears private snapshots on confirmed access loss and fences another pending success", async () => {
 		auth();
 		let isDenied = false;

src/shared/api/resource-query.ts

@@ -1,5 +1,6 @@
 import {
 	type QueryClient,
+	type QueryFunctionContext,
 	useQueryClient,
 	type UseQueryOptions,
 } from "@tanstack/react-query";
@@ -8,6 +9,7 @@ import { useEffect } from "react";
 import type { components, paths } from "./generated/schema";
 
 import { useAuthenticatedQuery } from "./authenticated-query";
+import { getAuthenticatedSessionSnapshot } from "./client";
 import { apiErrorCode, isBrokerageAccessLoss } from "./problem-details";
 
 type InvestmentResourceMeta = components["schemas"]["InvestmentResourceMetaDto"];
@@ -29,7 +31,7 @@ type ResourcePath = {
 type ResourceQueryKey = readonly [
 	"get",
 	ResourcePath,
-	{ params?: { path?: object; query?: object } }?,
+	{ params?: { path?: object; query?: { sync?: "observe" } } }?,
 ];
 
 function invalidateResourceAccess(
@@ -55,6 +57,22 @@ function invalidateResourceAccess(
 		});
 }
 
+// Keep endpoint and parameters intact. The generated queryFn accepts the
+// optional sync mode even for a cache key originally created without init.
+function observationKey<K extends readonly unknown[]>(key: K): K {
+	const [method, path, init] = key as unknown as [
+		string,
+		string,
+		{ params?: { path?: object; query?: object } }?,
+	];
+
+	return [method, path, {
+		...init,
+		params: { ...init?.params, query: { ...init?.params?.query, sync: "observe" } },
+	}] as unknown as K;
+}
+
+// Observation changes transport mode, never the generated cache identity.
 function useResourceQuery<
 	T extends Resource,
 	E = unknown,
@@ -74,17 +92,50 @@ function useResourceQuery<
 		if (group) invalidateResourceAccess(client, group, query.error);
 	}, [client, group, query.error]);
 
+	const observe = async () => {
+		const queryFunction = options.queryFn;
+		if (
+			typeof queryFunction !== "function"
+			|| !query.isEnabled
+			|| !getAuthenticatedSessionSnapshot()
+		)
+			return;
+		// Cancellation is synchronous; start the replacement in the same boundary.
+		void client.cancelQueries({ exact: true, queryKey: options.queryKey });
+
+		return client.query({
+			...options,
+			queryFn: async (context: QueryFunctionContext<K>) => {
+				const queryKey = observationKey(context.queryKey);
+
+				return queryFunction({ ...context, queryKey });
+			},
+			retry: false,
+			// Keep the cache envelope independent of observer projection.
+			select: undefined,
+			staleTime: 0,
+		});
+	};
+
 	const data: T["data"] | undefined = query.data?.data;
 	const meta: T["meta"] | undefined = query.data?.meta;
 
 	// Project resource fields; refetch still returns the transport envelope.
-	// queryKey is kept for screen-sync cache bookkeeping.
 	return {
-		// eslint-disable-next-line @tanstack/query/no-rest-destructuring -- Single projection point; consumers already depend on the whole query state.
-		...query,
 		data: data ?? undefined,
+		error: query.error,
+		fetchStatus: query.fetchStatus,
+		isEnabled: query.isEnabled,
+		isError: query.isError,
+		isFetching: query.isFetching,
+		isLoading: query.isLoading,
+		isPending: query.isPending,
+		isSuccess: query.isSuccess,
 		meta,
+		observe,
 		queryKey: options.queryKey,
+		refetch: query.refetch,
+		status: query.status,
 		sync: query.data && "sync" in query.data ? query.data.sync : undefined,
 	};
 }

src/shared/api/spec/openapi.json

@@ -1053,29 +1053,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "oneOf": [
+                "$ref": "#/components/schemas/CreateBankOperationDto"
-                  {
-                    "$ref": "#/components/schemas/CreateExpenseOperationDto"
-                  },
-                  {
-                    "$ref": "#/components/schemas/CreateTopupOperationDto"
-                  },
-                  {
-                    "$ref": "#/components/schemas/CreateTransferOperationDto"
-                  },
-                  {
-                    "$ref": "#/components/schemas/CreateRefundOperationDto"
-                  }
-                ],
-                "discriminator": {
-                  "propertyName": "kind",
-                  "mapping": {
-                    "expense": "#/components/schemas/CreateExpenseOperationDto",
-                    "topup": "#/components/schemas/CreateTopupOperationDto",
-                    "transfer": "#/components/schemas/CreateTransferOperationDto",
-                    "refund": "#/components/schemas/CreateRefundOperationDto"
-                  }
-                }
               }
             }
           }
@@ -5362,187 +5340,6 @@
           "password"
         ]
       },
-      "RubMoneyInputDto": {
-        "type": "object",
-        "properties": {
-          "currency": {
-            "type": "string",
-            "enum": [
-              "RUB"
-            ]
-          },
-          "value": {
-            "type": "string",
-            "pattern": "^-?[0-9]+(\\.[0-9]{1,2})?$"
-          }
-        },
-        "required": [
-          "currency",
-          "value"
-        ]
-      },
-      "CreateExpenseOperationDto": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "cardId": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "amount": {
-            "$ref": "#/components/schemas/RubMoneyInputDto"
-          },
-          "date": {
-            "type": "string",
-            "format": "date"
-          },
-          "description": {
-            "type": "string",
-            "maxLength": 500
-          },
-          "kind": {
-            "type": "string",
-            "enum": [
-              "expense"
-            ]
-          },
-          "categoryId": {
-            "type": "string",
-            "format": "uuid"
-          }
-        },
-        "required": [
-          "id",
-          "cardId",
-          "amount",
-          "date",
-          "kind"
-        ]
-      },
-      "CreateTopupOperationDto": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "cardId": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "amount": {
-            "$ref": "#/components/schemas/RubMoneyInputDto"
-          },
-          "date": {
-            "type": "string",
-            "format": "date"
-          },
-          "description": {
-            "type": "string",
-            "maxLength": 500
-          },
-          "kind": {
-            "type": "string",
-            "enum": [
-              "topup"
-            ]
-          }
-        },
-        "required": [
-          "id",
-          "cardId",
-          "amount",
-          "date",
-          "kind"
-        ]
-      },
-      "CreateTransferOperationDto": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "cardId": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "amount": {
-            "$ref": "#/components/schemas/RubMoneyInputDto"
-          },
-          "date": {
-            "type": "string",
-            "format": "date"
-          },
-          "description": {
-            "type": "string",
-            "maxLength": 500
-          },
-          "kind": {
-            "type": "string",
-            "enum": [
-              "transfer"
-            ]
-          },
-          "targetCardId": {
-            "type": "string",
-            "format": "uuid"
-          }
-        },
-        "required": [
-          "id",
-          "cardId",
-          "amount",
-          "date",
-          "kind",
-          "targetCardId"
-        ]
-      },
-      "CreateRefundOperationDto": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "cardId": {
-            "type": "string",
-            "format": "uuid"
-          },
-          "amount": {
-            "$ref": "#/components/schemas/RubMoneyInputDto"
-          },
-          "date": {
-            "type": "string",
-            "format": "date"
-          },
-          "description": {
-            "type": "string",
-            "maxLength": 500
-          },
-          "kind": {
-            "type": "string",
-            "enum": [
-              "refund"
-            ]
-          },
-          "originalExpenseId": {
-            "type": "string",
-            "format": "uuid"
-          }
-        },
-        "required": [
-          "id",
-          "cardId",
-          "amount",
-          "date",
-          "kind",
-          "originalExpenseId"
-        ]
-      },
       "MoneyDto": {
         "type": "object",
         "properties": {
@@ -5614,6 +5411,25 @@
           "version"
         ]
       },
+      "RubMoneyInputDto": {
+        "type": "object",
+        "properties": {
+          "currency": {
+            "type": "string",
+            "enum": [
+              "RUB"
+            ]
+          },
+          "value": {
+            "type": "string",
+            "pattern": "^-?[0-9]+(\\.[0-9]{1,2})?$"
+          }
+        },
+        "required": [
+          "currency",
+          "value"
+        ]
+      },
       "CreateBankCardDto": {
         "type": "object",
         "properties": {
@@ -5783,6 +5599,58 @@
           "categories"
         ]
       },
+      "CreateBankOperationDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "kind": {
+            "type": "string",
+            "enum": [
+              "expense",
+              "topup",
+              "transfer",
+              "refund"
+            ]
+          },
+          "cardId": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "targetCardId": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "categoryId": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "originalExpenseId": {
+            "type": "string",
+            "format": "uuid"
+          },
+          "amount": {
+            "$ref": "#/components/schemas/RubMoneyInputDto"
+          },
+          "date": {
+            "type": "string",
+            "format": "date"
+          },
+          "description": {
+            "type": "string",
+            "maxLength": 500
+          }
+        },
+        "required": [
+          "id",
+          "kind",
+          "cardId",
+          "amount",
+          "date"
+        ]
+      },
       "BankOperationDto": {
         "type": "object",
         "properties": {

src/shared/i18n/locales/ru.ts

@@ -51,6 +51,7 @@ const ru = {
 				incomplete: "{{category}}: доля неизвестна",
 				label: "Структура в {{currency}}: {{value}}",
 			},
+			subtitle: "Ваши инвестиции по счетам",
 			summaryEmpty: "Нет текущих сумм",
 			summaryExcluded_few:
 				"Ещё {{count}} счёта не включены: нет актуального портфеля",
@@ -274,7 +275,7 @@ const ru = {
 				COUPON_TYPE_VARIABLE: "Переменный",
 			},
 			couponWindow:
-				"Календарь выпуска с {{from}} по {{to}}. Полученные выплаты показаны в истории операций.",
+				"Календарь выпуска с {{from}} по {{to}}. Личные зачисления показаны в истории событий.",
 			couponYield: "Текущая купонная доходность, годовых",
 			couponYieldNote:
 				"Купонная доходность = ближайший купон × 365 / дней в купонном периоде / цена без НКД × 100 %. Это годовая оценка при сохранении размера купона и номинала, без налогов, комиссий и реинвестирования; для плавающего или переменного купона будущий доход изменится.",
@@ -343,10 +344,10 @@ const ru = {
 		breadcrumbs: {
 			accountFallback: "Счет",
 			accounts: "Брокерские счета",
-			events: "Предстоящие события",
+			events: "Будущие события",
 			income: "Пассивный доход",
 			label: "Хлебные крошки",
-			operations: "История операций",
+			operations: "Операции",
 			settings: "Настройки",
 		},
 		entryGroup: {
@@ -356,20 +357,19 @@ const ru = {
 			dateKind: { event: "Дата события", registry: "Дата реестра" },
 			emptyText:
 				"Доступные источники не сообщили о купонах, дивидендах, погашениях или офертах в этом периоде.",
-			emptyTitle: "На выбранный период предстоящих событий не найдено",
+			emptyTitle: "За выбранный период событий не найдено",
-			errorText: "Попробуйте загрузить предстоящие события ещё раз.",
+			errorText: "Попробуйте запросить прогноз еще раз.",
-			errorTitle: "Не удалось загрузить предстоящие события",
+			errorTitle: "Не удалось загрузить будущие события",
-			forecastWindow: "Прогноз от {{date}} на {{from}} – {{to}}",
 			hint: "Прогноз рассчитан по текущей позиции до налогов. Покрытие зависит от доступных данных MOEX.",
 			noAmount: "Сумма неизвестна",
-			open: "Открыть предстоящие события",
+			open: "Открыть будущие события",
 			projectedAmount: "Ожидаемая сумма",
-			recentEmpty: "На ближайшие 30 дней предстоящих событий не найдено.",
+			recentEmpty: "На ближайшие 30 дней событий не найдено.",
-			recentError: "Не удалось загрузить предстоящие события.",
+			recentError: "Не удалось загрузить будущие события.",
-			recentLoading: "Загрузка предстоящих событий",
+			recentLoading: "Загрузка будущих событий",
-			recentTitle: "Предстоящие события",
+			recentTitle: "Будущие события",
 			retry: "Повторить",
-			title: "Предстоящие события",
+			title: "Будущие события",
 			type: {
 				coupon: "Купон",
 				dividend: "Дивиденд",
@@ -443,7 +443,6 @@ const ru = {
 				transfer: "Перевод",
 			},
 			clearPeriod: "Очистить период",
-			couponPayment: "Выплата купонов {{instrument}}",
 			emptyText: "Измените период или фильтры.",
 			emptyTitle: "Операций нет",
 			entryLabel: {
@@ -452,14 +451,14 @@ const ru = {
 					dividend: "Дивиденд",
 				},
 			},
-			errorText: "Попробуйте загрузить историю операций ещё раз.",
+			errorText: "Попробуйте запросить операции еще раз.",
-			errorTitle: "Не удалось загрузить историю операций",
+			errorTitle: "Не удалось загрузить журнал",
 			from: "С",
 			next: "Далее",
 			noInstrument: "Без инструмента",
 			noMoney: "Без движения денег",
 			occurredAt: "Исполнено {{date}}",
-			open: "Открыть историю операций",
+			open: "Открыть журнал",
 			operationType: {
 				buy: "Покупка",
 				coupon: "Купон",
@@ -476,13 +475,13 @@ const ru = {
 			previous: "Назад",
 			price: "Цена: {{value}}",
 			quantity: "{{value}} шт.",
-			recentEmpty: "Последних операций пока нет.",
+			recentEmpty: "Последних событий пока нет.",
-			recentError: "Не удалось загрузить последние операции.",
+			recentError: "Не удалось загрузить последние события.",
-			recentLoading: "Загрузка последних операций",
+			recentLoading: "Загрузка последних событий",
-			recentTitle: "Последние операции",
+			recentTitle: "Последние события",
 			reset: "Сбросить",
 			retry: "Повторить",
-			title: "История операций",
+			title: "Журнал операций",
 			to: "По",
 		},
 		navigation: {
@@ -583,9 +582,9 @@ const ru = {
 			},
 			tabs: {
 				cash: "Деньги",
-				events: "Предстоящие события",
+				events: "События",
 				income: "Доход",
-				operations: "История операций",
+				operations: "Операции",
 				positions: "Позиции",
 			},
 			title: "Портфель",
@@ -638,10 +637,10 @@ const ru = {
 			dividendNote:
 				"Личная сумма — оценка по текущему количеству, не гарантия выплаты. Налоги не сопоставлены; дата выплаты компании может отличаться от дня зачисления на ваш счёт.",
 			dividendWindow:
-				"События компании с {{from}} по {{to}}. Полученные выплаты показаны отдельно в истории операций.",
+				"События компании с {{from}} по {{to}}. Личные зачисления показаны отдельно в истории событий.",
 			estimateUnavailable:
 				"Данные позиции не удалось обновить. Личная оценка недоступна или рассчитана по сохранённой позиции.",
-			eventFilter: "Фильтр операций",
+			eventFilter: "Фильтр событий",
 			eventPrice: "Цена: {{value}}",
 			eventQuantity: "{{value}} шт.",
 			exchanges: {
@@ -657,7 +656,7 @@ const ru = {
 				trades: "Сделки",
 			},
 			forming: "Формируется",
-			history: "История операций",
+			history: "Моя история событий",
 			historyNote:
 				"Операции по этой акции на доступных открытых счетах, включая периоды до текущего года. Дата сделки — дата операции брокера; количество — исполненная часть. История закрытых счетов не включена.",
 			incomplete: "Последняя свеча ещё формируется: её цена может измениться.",

src/shared/lib/display.test.ts

@@ -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 $");
+		expect(formatMoney({ currency: "USD", value: "0.5" })).toBe("0,5 USD");
 		expect(formatMoney({ currency: "RUB", value: "0001234.50" })).toBe(
 			"0 001 234,50 ₽",
 		);

src/shared/lib/display.ts

@@ -86,10 +86,7 @@ function formatMoney(
 		? `${integerPart}.${normalizedFraction}`
 		: integerPart;
 
-	let currency = money.currency;
+	const currency = money.currency === "RUB" ? "₽" : money.currency;
-	if (currency === "RUB") currency = "₽";
-	else if (currency === "USD") currency = "$";
-
 	const formatted = `${formatDecimal(decimal)} ${currency}`;
 
 	if (!withSign) return formatted;

src/shared/ui/EntryGroup/EntryGroup.module.css

@@ -4,40 +4,6 @@
 	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;
@@ -72,12 +38,4 @@
 	.accountRow {
 		align-items: flex-start;
 	}
-
-	.flat .accountRow {
-		flex-wrap: wrap;
-	}
-
-	.flat .accountValue {
-		white-space: normal;
-	}
 }

src/shared/ui/EntryGroup/EntryGroup.tsx

@@ -9,15 +9,11 @@ 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;
 }>;
@@ -29,14 +25,13 @@ 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 className={valueClass} fw={700}>{props.value}</Text>
+				<Text fw={700}>{props.value}</Text>
 
 				<Text c="dimmed" size="xs">{props.valueLabel}</Text>
 			</Stack>
@@ -58,24 +53,20 @@ const AccountCardRow: FC<AccountRowProps> = props => (
 	</li>
 );
 
-const EntryGroup: FC<EntryGroupProps> = (props) => {
+const EntryGroup: FC<EntryGroupProps> = props => (
-	const groupClass = props.flat ? `${classes.group} ${classes.flat}` : classes.group;
+	<Paper className={classes.group} component="li" withBorder>
+		{props.header}
 
-	return (
+		<Stack
-		<Paper className={groupClass} component="li" withBorder>
+			aria-label={props.label}
-			{props.header}
+			className={classes.accounts}
-
+			component="ul"
-			<Stack
+			gap={0}
-				aria-label={props.label}
+		>
-				className={classes.accounts}
+			{props.children}
-				component="ul"
+		</Stack>
-				gap={0}
+	</Paper>
-			>
+);
-				{props.children}
-			</Stack>
-		</Paper>
-	);
-};
 
 const EntryGroupTotal: FC<EntryGroupTotalProps> = (props) => {
 	const { t } = useTranslation();

src/shared/ui/index.ts

@@ -11,4 +11,3 @@ export {
 	type ReadRetryProps,
 } from "./ReadRetry/ReadRetry";
 export { SourceSyncStatus } from "./SourceSyncStatus/SourceSyncStatus";
-export { useAppDocumentTitle } from "./useAppDocumentTitle";

src/shared/ui/useAppDocumentTitle.ts

@@ -1,13 +0,0 @@
-import { useDocumentTitle } from "@mantine/hooks";
-import { useTranslation } from "react-i18next";
-
-/**
- * Sets `document.title` to `<title> — <appName>`.
- * Owner of the "page title + app name suffix" formatting rule.
- */
-function useAppDocumentTitle(title: string) {
-	const { t } = useTranslation();
-	useDocumentTitle(`${title} — ${t("appName")}`);
-}
-
-export { useAppDocumentTitle };

src/test/handlers.ts

@@ -66,7 +66,6 @@ const handlers = [
 				accountId: "account-1",
 				calculatedAt: "2026-08-14T00:00:00Z",
 				events: [],
-				window: { from: "2026-08-14", to: "2026-09-13" },
 			}),
 		),
 	),

src/widgets/portfolio-structure/index.ts

@@ -0,0 +1 @@
+export { PortfolioStructure } from "./ui/PortfolioStructure";

src/widgets/portfolio-structure/ui/PortfolioStructure.stories.tsx

@@ -28,7 +28,7 @@ const meta = {
 		},
 	},
 	tags: ["autodocs"],
-	title: "Product/PortfolioStructure",
+	title: "Widgets/PortfolioStructure",
 } satisfies Meta<typeof PortfolioStructure>;
 
 export default meta;

src/widgets/portfolio-structure/ui/PortfolioStructure.test.tsx

@@ -60,7 +60,7 @@ describe("portfolio structure", () => {
 			screen.getByRole("combobox", { name: "Валюта структуры портфеля" }),
 		);
 		fireEvent.click(screen.getByRole("option", { name: "USD" }));
-		expect(screen.getByRole("list")).toHaveTextContent("60 $");
+		expect(screen.getByRole("list")).toHaveTextContent("60 USD");
 		expect(screen.getByRole("list")).not.toHaveTextContent("₽");
 		view.rerender(ui({ currencies: [rub], unvaluedCategories: [] }));
 		expect(screen.getByRole("list")).toHaveTextContent("60 ₽");