chore(release): 1.4.0

.ai/architecture.md

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

CHANGELOG.md

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

dependency-cruiser.cjs

@@ -29,17 +29,17 @@ module.exports = {
 		},
 		{
 			from: {
-				path: "^src/(app|pages|widgets|features|entities|shared)/([^/]+)/",
+				path: "^src/(app|pages|features|entities|shared)/([^/]+)/",
 			},
 			name: "slices-must-use-public-api",
 			severity: "error",
 			to: {
-				path: String.raw`^src/(app|pages|widgets|features|entities|shared)/([^/]+)/(?!index\.ts$)`,
+				path: String.raw`^src/(app|pages|features|entities|shared)/([^/]+)/(?!index\.ts$)`,
 				pathNot: "^src/$1/$2/",
 			},
 		},
 		{
-			from: { path: "^src/(pages|widgets|features|entities)/([^/]+)/" },
+			from: { path: "^src/(pages|features|entities)/([^/]+)/" },
 			name: "no-same-layer-cross-slice-imports",
 			severity: "error",
 			to: { path: "^src/$1/", pathNot: "^src/$1/$2/" },
@@ -48,24 +48,18 @@ module.exports = {
 			from: { path: "^src/shared/" },
 			name: "shared-must-not-depend-on-layers",
 			severity: "error",
-			to: { path: "^src/(entities|features|widgets|pages|app)/" },
+			to: { path: "^src/(entities|features|pages|app)/" },
 		},
 		{
 			from: { path: "^src/entities/" },
 			name: "entities-must-not-depend-on-higher-layers",
 			severity: "error",
-			to: { path: "^src/(features|widgets|pages|app)/" },
+			to: { path: "^src/(features|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,12 +17,21 @@ http {
         default $http_x_forwarded_proto;
         '' $scheme;
     }
+    # One shared budget: the external proxy's client-IP forwarding is not verified.
+    map "$request_method:$uri" $auth_admission_key {
+        default "";
+        POST:/api/v1/auth/login auth;
+        POST:/api/v1/auth/register auth;
+    }
+    limit_req_zone $auth_admission_key zone=auth_admission:1m rate=2r/s;
+    limit_req_status 429;
     server {
         listen 8080;
         server_name _;
         root /usr/share/nginx/html;
         resolver 127.0.0.11 valid=5s ipv6=off;
         location /api/ {
+            limit_req zone=auth_admission burst=5 nodelay;
             set $backend http://backend:3000;
             proxy_pass $backend$request_uri;
             proxy_set_header Host $http_host;

eslint-rules.mjs

@@ -25,7 +25,11 @@ const readability = {
 				)
 					context.report({ messageId: "schema", node });
 			},
-			FunctionDeclaration: checkParameters,
+			FunctionDeclaration(node) {
+				checkParameters(node);
+				if (node.id?.name?.endsWith?.("ViewModel"))
+					context.report({ messageId: "vmName", node: node.id });
+			},
 			FunctionExpression: checkParameters,
 			ImportDeclaration(node) {
 				if (
@@ -95,6 +99,7 @@ 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.3.0",
+	"version": "1.4.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "wealth-ledger-frontend",
-			"version": "1.3.0",
+			"version": "1.4.0",
 			"workspaces": [
 				"packages/*"
 			],

package.json

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

renovate.json

@@ -1,15 +1,30 @@
 {
 	"$schema": "https://docs.renovatebot.com/renovate-schema.json",
-	"extends": ["config:recommended", ":semanticCommitTypeAll(chore)"],
+	"extends": ["config:recommended", ":semanticCommitTypeAll(chore)", "security:minimumReleaseAgeNpm"],
 	"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,6 +217,7 @@ beforeEach(() => {
 							}),
 					),
 					incomeTotalsByCurrency: [],
+					window: { from: "2026-09-01", to: "2026-10-01" },
 				}),
 			),
 		),

src/app/routes/DocumentTitle/DocumentTitle.tsx

@@ -1,6 +1,5 @@
 import type { FC } from "react";
 
-import { useDocumentTitle } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
 
 import { useCurrentRoute } from "@/app/model";
@@ -8,12 +7,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 => {
-	const { t } = useTranslation();
+	useAppDocumentTitle(props.title);
-	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();
-	useDocumentTitle(`${t("routeError.title")} — ${t("appName")}`);
+	useAppDocumentTitle(t("routeError.title"));
 	const to = authenticated ? "/accounts" : "/login";
 
 	return (

src/app/ui/AppBreadcrumbs/AppBreadcrumbs.tsx

@@ -7,10 +7,8 @@ import { useCurrentRoute } from "@/app/model";
 
 import { AccountBreadcrumbs } from "./AccountBreadcrumbs";
 import { AccountScopeSwitch } from "./AccountScopeSwitch/AccountScopeSwitch";
-import { BondBreadcrumbs } from "./BondBreadcrumbs";
 import { BreadcrumbTrail } from "./BreadcrumbTrail";
-import { CardBreadcrumbs } from "./CardBreadcrumbs";
+import { EntityBreadcrumbs } from "./EntityBreadcrumbs";
-import { StockBreadcrumbs } from "./StockBreadcrumbs";
 
 const AppBreadcrumbs: FC = () => {
 	const { t } = useTranslation();
@@ -26,9 +24,16 @@ const AppBreadcrumbs: FC = () => {
 		stock,
 	} = useCurrentRoute();
 
-	if (bond) return <BondBreadcrumbs identifier={bond.params.bondId ?? ""} />;
+	if (bond) {
-	if (stock)
+		return <EntityBreadcrumbs identifier={bond.params.bondId ?? ""} kind="bond" />;
-		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">
@@ -43,8 +48,13 @@ 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

@@ -1,25 +0,0 @@
-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 };
+export { BreadcrumbTrail, type Crumb };

src/app/ui/AppBreadcrumbs/CardBreadcrumbs.tsx

@@ -1,25 +0,0 @@
-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

@@ -0,0 +1,48 @@
+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

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

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

@@ -2,19 +2,18 @@ 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"];
 
-function isInvestmentPath(path: string) {
+const investmentGetPredicate = isGetUnder([
-	return [
+	"/api/v1/brokerage-accounts",
-		"/api/v1/brokerage-accounts",
+	"/api/v1/stocks",
-		"/api/v1/stocks",
+	"/api/v1/bonds",
-		"/api/v1/bonds",
+]);
-	].some(root => path === root || path.startsWith(`${root}/`));
-}
 
 const tbankConnectionQueryOptions = () =>
 	apiQueryClient.queryOptions("get", "/api/v1/tbank-connection");
@@ -27,15 +26,7 @@ function commitTbankConnectionBoundary(
 ) {
 	queryClient.setQueryData(tbankConnectionQueryKey, status);
 	void queryClient.resetQueries({
-		predicate: ({ queryKey }) => {
+		predicate: ({ queryKey }) => investmentGetPredicate(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 { useTbankConnectionViewModel } from "./TbankConnectionSection.vm";
+import { useTbankConnectionSectionVm } from "./TbankConnectionSection.vm";
 import { TbankConnectionSectionLoaded } from "./TbankConnectionSectionLoaded";
 
 const TbankConnectionSection: FC = () => {
-	const viewModel = useTbankConnectionViewModel();
+	const vm = useTbankConnectionSectionVm();
-	if (viewModel.state === "loading") return <TbankConnectionLoading />;
+	if (vm.state === "loading") return <TbankConnectionLoading />;
 
-	return viewModel.state === "error"
+	return vm.state === "error"
-		? <TbankConnectionError retry={viewModel.retry} />
+		? <TbankConnectionError retry={vm.retry} />
-		: <TbankConnectionSectionLoaded {...viewModel} />;
+		: <TbankConnectionSectionLoaded {...vm} />;
 };
 
 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 useTbankConnectionViewModel() {
+function useTbankConnectionSectionVm() {
 	const status = useAuthenticatedQuery({
 		...tbankConnectionQueryOptions(),
 	});
@@ -22,4 +22,4 @@ function useTbankConnectionViewModel() {
 	};
 }
 
-export { useTbankConnectionViewModel };
+export { useTbankConnectionSectionVm };

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

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

@@ -17,6 +17,8 @@ const RETRIES_EXHAUSTED_MS = 6000;
 const TEST_MS = 10_000;
 
 const snapshot = resource({
+	accountId: "account-1",
+	calculatedAt: "2026-08-14T00:00:00Z",
 	events: [
 		{
 			date: "2026-10-01",
@@ -32,6 +34,7 @@ const snapshot = resource({
 		},
 	],
 	incomeTotalsByCurrency: [{ currency: "RUB", value: "123.45" }],
+	window: { from: "2026-08-14", to: "2026-09-13" },
 });
 
 function renderEvents() {
@@ -100,7 +103,13 @@ describe("AccountEventsPage read retry", () => {
 		async () => {
 			let isFailing = false;
 			let requests = 0;
+			let imports = 0;
 			server.use(
+				http.post("*/api/v1/tbank-sync", () => {
+					imports += 1;
+
+					return HttpResponse.json({}, { status: 202 });
+				}),
 				http.get("*/api/v1/brokerage-accounts/:accountId/events", () => {
 					requests += 1;
 
@@ -111,6 +120,7 @@ describe("AccountEventsPage read retry", () => {
 			);
 			const { queryClient } = renderEvents();
 			await screen.findByText("Купон · Synthetic coupon");
+			expect(screen.getByText(/Прогноз от .* на 14\.08\.2026 – 13\.09\.2026/)).toBeVisible();
 			expect(screen.queryByRole("button", { name: "Повторить" }))
 				.not.toBeInTheDocument();
 
@@ -127,6 +137,7 @@ describe("AccountEventsPage read retry", () => {
 
 			expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
 			expect(screen.getByText("Купон · Synthetic coupon")).toBeInTheDocument();
+			expect(screen.getByText(/Прогноз от .* на 14\.08\.2026 – 13\.09\.2026/)).toBeVisible();
 			expect(requests).toBe(4);
 
 			isFailing = false;
@@ -136,6 +147,7 @@ describe("AccountEventsPage read retry", () => {
 				expect(screen.queryByText("Не удалось обновить данные"))
 					.not.toBeInTheDocument());
 			expect(requests).toBe(5);
+			expect(imports).toBe(0);
 		},
 	);
 

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

@@ -47,6 +47,7 @@ describe("AccountEventsPage", () => {
 					accountId: "account",
 					calculatedAt: "2026-08-14T00:00:00Z",
 					events: [],
+					window: { from: "2026-08-14", to: "2026-09-13" },
 				},
 				isError: false,
 				isLoading: false,
@@ -136,6 +137,7 @@ describe("AccountEventsPage", () => {
 							type: "offer",
 						},
 					],
+					window: { from: "2026-08-14", to: "2026-09-13" },
 				},
 				isError: false,
 				isLoading: false,
@@ -276,6 +278,7 @@ describe("AccountEventsPage", () => {
 				accountId: "all",
 				calculatedAt: "2026-08-14T00:00:00Z",
 				events: [...events],
+				window: { from: "2026-08-14", to: "2026-09-13" },
 			},
 			isError: false,
 			isLoading: false,

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

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

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

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

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

@@ -17,7 +17,7 @@ import {
 	brokerageEventGroupKey,
 	brokerageEventKey,
 } from "@/entities/brokerage-event";
-import { groupItems } from "@/shared/lib";
+import { formatDate, formatSnapshotTime, groupItems } from "@/shared/lib";
 import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
 
 import type { AccountEventsPageViewModel } from "../AccountEventsPage.vm";
@@ -89,6 +89,14 @@ const AccountEventsPageLoaded: FC<AccountEventsPageLoadedProps> = (props) => {
 
 			<Text c="dimmed">{t("events.hint")}</Text>
 
+			<Text c="dimmed" size="sm">
+				{t("events.forecastWindow", {
+					date: formatSnapshotTime(props.calculatedAt),
+					from: formatDate(props.window.from),
+					to: formatDate(props.window.to),
+				})}
+			</Text>
+
 			<Group align="end">
 				<DatePickerInput
 					allowSingleDateInRange

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

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

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

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

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

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 viewModel = useAccountOperationsPageVm();
+	const vm = useAccountOperationsPageVm();
 
-	if (viewModel.state === "loading") {
+	if (vm.state === "loading") {
 		return <AccountOperationsPageLoading />;
 	}
 
-	return viewModel.state === "error"
+	return vm.state === "error"
-		? <AccountOperationsPageError {...viewModel} />
+		? <AccountOperationsPageError {...vm} />
-		: <AccountOperationsPageLoaded {...viewModel} />;
+		: <AccountOperationsPageLoaded {...vm} />;
 };
 
 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 instruments only from display, preserving order and share denominators", () => {
+	it("excludes currency mirrors from display and share denominators", () => {
 		const otherTypes = [
 			"OPTION",
 			"OTHER",
@@ -73,12 +73,30 @@ describe("account position sections", () => {
 			"FIGI-FUND",
 			...otherTypes.map(type => `FIGI-${type}-NEXT`),
 		]);
-		expect(sections[0]?.groups[0]?.positions[0].shareText).toBe("40 %");
+		expect(sections[0]?.groups[0]?.positions[0].shareText).toBe("50 %");
-		expect(sections[1]?.groups[0]?.positions[0].shareText).toBe("20 %");
+		expect(sections[1]?.groups[0]?.positions[0].shareText).toBe("25 %");
-		expect(sections[2]?.groups[1]?.positions[0].shareText).toBe("20 %");
+		expect(sections[2]?.groups[1]?.positions[0].shareText).toBe("25 %");
 		expect(snapshot).toEqual(original);
 	});
 
+	it("keeps all-account positions from both accounts without counting mirrored cash", () => {
+		const result = sections([
+			makePosition({ account: { id: "a", name: "Основной" }, currentValue: { currency: "RUB", value: "100" } }),
+			makePosition({ account: { id: "a", name: "Основной" }, currentValue: { currency: "RUB", value: "50" }, type: "CURRENCY" }),
+			makePosition({ account: { id: "b", name: "ИИС" }, currentValue: { currency: "RUB", value: "100" } }),
+		]);
+
+		const visible = result.flatMap(section =>
+			section.groups.flatMap(group => group.positions));
+
+		expect(visible)
+			.toEqual(expect.arrayContaining([
+				expect.objectContaining({ account: { id: "a", name: "Основной" }, shareText: "50 %" }),
+				expect.objectContaining({ account: { id: "b", name: "ИИС" }, shareText: "50 %" }),
+			]));
+		expect(visible).toHaveLength(2);
+	});
+
 	it("prepares grouped position sections with derived display data", () => {
 		expect(
 			toAccountPagePositionSections(portfolio).map(({ groups, kind }) => ({

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.currentValue) continue;
+		if (position.type === "CURRENCY" || !position.currentValue) continue;
 		const currency = position.currentValue.currency;
 		denominators.set(
 			currency,

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

@@ -1,48 +1,48 @@
 import type { FC } from "react";
 
-import { useAccountPageViewModel } from "./AccountPage.vm";
+import { useAccountPageVm } 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 viewModel = useAccountPageViewModel();
+	const vm = useAccountPageVm();
-	if (viewModel.state === "loading") return <AccountPageLoading />;
+	if (vm.state === "loading") return <AccountPageLoading />;
-	if (viewModel.state === "error") return <AccountPageError {...viewModel} />;
+	if (vm.state === "error") return <AccountPageError {...vm} />;
-	if (viewModel.state === "empty")
+	if (vm.state === "empty")
 		return (
 			<AccountPageEmpty
-				account={viewModel.account}
+				account={vm.account}
-				accountId={viewModel.accountId}
+				accountId={vm.accountId}
-				incomeSummary={viewModel.incomeSummary}
+				incomeSummary={vm.incomeSummary}
-				readRetry={viewModel.readRetry}
+				readRetry={vm.readRetry}
-				recentEvents={viewModel.recentEvents}
+				recentEvents={vm.recentEvents}
-				recentOperations={viewModel.recentOperations}
+				recentOperations={vm.recentOperations}
-				source={viewModel.source}
+				source={vm.source}
 			/>
 		);
 
 	return (
 		<AccountPageLoaded
-			account={viewModel.account}
+			account={vm.account}
-			accountId={viewModel.accountId}
+			accountId={vm.accountId}
-			concentration={viewModel.concentration}
+			concentration={vm.concentration}
-			currency={viewModel.currency}
+			currency={vm.currency}
-			incomeSummary={viewModel.incomeSummary}
+			incomeSummary={vm.incomeSummary}
-			onCurrencyChange={viewModel.onCurrencyChange}
+			onCurrencyChange={vm.onCurrencyChange}
-			onSliceChange={viewModel.onSliceChange}
+			onSliceChange={vm.onSliceChange}
-			onTabChange={viewModel.onTabChange}
+			onTabChange={vm.onTabChange}
-			partial={viewModel.partial}
+			partial={vm.partial}
-			portfolio={viewModel.portfolio}
+			portfolio={vm.portfolio}
-			positionSections={viewModel.positionSections}
+			positionSections={vm.positionSections}
-			readRetry={viewModel.readRetry}
+			readRetry={vm.readRetry}
-			recentEvents={viewModel.recentEvents}
+			recentEvents={vm.recentEvents}
-			recentOperations={viewModel.recentOperations}
+			recentOperations={vm.recentOperations}
-			slice={viewModel.slice}
+			slice={vm.slice}
-			source={viewModel.source}
+			source={vm.source}
-			tab={viewModel.tab}
+			tab={vm.tab}
-			unrealizedReturns={viewModel.unrealizedReturns}
+			unrealizedReturns={vm.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 { useAccountPageViewModel } from "./AccountPage.vm";
+import { useAccountPageVm } from "./AccountPage.vm";
 
 function configureTestAuth() {
 	configureAuthClient({
@@ -102,12 +102,12 @@ function mockLoadedAccountPage() {
 	);
 }
 
-describe("useAccountPageViewModel", () => {
+describe("useAccountPageVm", () => {
 	it("prepares recent operations and events state for presentation views", async () => {
 		configureTestAuth();
 		mockLoadedAccountPage();
 
-		const { result } = renderHook(() => useAccountPageViewModel(), {
+		const { result } = renderHook(() => useAccountPageVm(), {
 			wrapper: createWrapper(),
 		});
 
@@ -154,7 +154,7 @@ describe("useAccountPageViewModel", () => {
 			),
 		);
 
-		const { result } = renderHook(() => useAccountPageViewModel(), {
+		const { result } = renderHook(() => useAccountPageVm(), {
 			wrapper: createWrapper(),
 		});
 
@@ -194,7 +194,7 @@ it("keeps overview sections independent when their source data is incomplete", a
 		),
 	);
 
-	const { result } = renderHook(() => useAccountPageViewModel(), {
+	const { result } = renderHook(() => useAccountPageVm(), {
 		wrapper: createWrapper(),
 	});
 
@@ -232,7 +232,7 @@ it("keeps overview sections loaded without exposing technical retry", async () =
 		),
 	);
 
-	const { result } = renderHook(() => useAccountPageViewModel(), {
+	const { result } = renderHook(() => useAccountPageVm(), {
 		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 useAccountPageViewModel(): AccountPageViewModel {
+function useAccountPageVm(): AccountPageViewModel {
 	const { accountId } = useParams();
 	const { t } = useTranslation();
 
@@ -199,4 +199,4 @@ function useAccountPageViewModel(): AccountPageViewModel {
 	};
 }
 
-export { useAccountPageViewModel };
+export { useAccountPageVm };

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

@@ -9,7 +9,6 @@ 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,
@@ -19,6 +18,7 @@ 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,7 +16,6 @@ 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";
@@ -31,6 +30,7 @@ import { AccountHeading } from "./AccountHeading.view";
 import { Concentration } from "./Concentration/Concentration.view";
 import { CurrencyCards } from "./CurrencyCards/CurrencyCards.view";
 import { IncomeSummary } from "./IncomeSummary.view";
+import { PortfolioStructure } from "./PortfolioStructure/PortfolioStructure";
 import { PositionSection } from "./PositionSection.view";
 import { RecentOperations } from "./RecentOperations.view";
 

src/pages/account/ui/AccountPage/components/PortfolioStructure/PortfolioStructure.stories.tsx

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

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

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

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

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

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

@@ -120,11 +120,52 @@ const useOperationFormVm = (props: OperationFormProps) => {
 					body: { ...body, version },
 					id: props.operation.id,
 				});
-			else
+			else {
-				await operationCreation.mutateAsync({
+				const base = {
+					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();
-	useDocumentTitle(`${t("auth.login")} — ${t("appName")}`);
+	useAppDocumentTitle(t("auth.login"));
 
 	return (
 		<AuthPageLayout title={t("auth.login")}>

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

@@ -1,14 +1,15 @@
 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();
-	useDocumentTitle(`${t("notFound.title")} — ${t("appName")}`);
+	useAppDocumentTitle(t("notFound.title"));
 
 	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();
-	useDocumentTitle(`${t("auth.register")} — ${t("appName")}`);
+	useAppDocumentTitle(t("auth.register"));
 
 	return (
 		<AuthPageLayout title={t("auth.register")}>

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

@@ -1,13 +1,24 @@
 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";
 
-import { useSettingsPageVm } from "./SettingsPage.vm";
-
 const SettingsPage: FC = () => {
-	const { onLogout, t } = useSettingsPageVm();
+	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 onLogout = async () => {
+		try {
+			await logout();
+		}
+		catch {
+			// The session is already cleared; the route guard owns navigation.
+		}
+	};
 
 	return (
 		<Stack>

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

@@ -1,21 +0,0 @@
-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/shared/api/authenticated-query.test.tsx

@@ -6,10 +6,7 @@ import { createQueryWrapper } from "@/test/query";
 import { resource } from "@/test/resource";
 import { server } from "@/test/server";
 
-import {
+import { useAuthenticatedQuery } from "./authenticated-query";
-	useAuthenticatedQueries,
-	useAuthenticatedQuery,
-} from "./authenticated-query";
 import { apiQueryClient, configureAuthClient } from "./client";
 
 const useSingleQuery = () =>
@@ -17,58 +14,49 @@ const useSingleQuery = () =>
 		apiQueryClient.queryOptions("get", "/api/v1/brokerage-accounts"),
 	);
 
-const useMultipleQueries = () =>
-	useAuthenticatedQueries([
-		apiQueryClient.queryOptions("get", "/api/v1/brokerage-accounts"),
-	])[0];
-
 describe("useAuthenticatedQuery", () => {
-	it.each(["single", "multiple"])(
+	it("keeps protected queries idle without a session and loads after session configuration", async () => {
-		"keeps %s protected queries idle without a session and loads after session configuration",
+		const requests = vi.fn();
-		async (mode) => {
+		server.use(
-			const requests = vi.fn();
+			http.get("*/api/v1/brokerage-accounts", () => {
-			server.use(
+				requests();
-				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(
+		const { result } = renderHook(useSingleQuery, {
-				mode === "single" ? useSingleQuery : useMultipleQueries,
+			wrapper: createQueryWrapper().wrapper,
-				{ 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,6 +1,5 @@
 import {
 	type QueryKey,
-	useQueries,
 	useQuery,
 	type UseQueryOptions,
 	type UseQueryResult,
@@ -12,25 +11,6 @@ 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,
@@ -58,4 +38,4 @@ function useHasAuthenticatedSession() {
 	);
 }
 
-export { useAuthenticatedQueries, useAuthenticatedQuery };
+export { useAuthenticatedQuery };

src/shared/api/client.ts

@@ -208,51 +208,50 @@ function parseJson(body: string): unknown {
 }
 
 async function readAttempt(request: Request): Promise<ReadAttempt> {
-	const controller = new AbortController();
+	// Manual timeout (not AbortSignal.timeout) so fake-timer tests can advance it.
-	const failure: { reason?: "abort" | "timeout" } = {};
+	const timeout = new AbortController();
-
+	const timer = setTimeout(() => timeout.abort(), GET_DEADLINE_MS);
-	const { promise: deadline, reject: rejectDeadline }
+	const signal = AbortSignal.any([request.signal, timeout.signal]);
-		= 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 {
-		const response = await Promise.race([fetch(timedRequest), deadline]);
+		// MSW keeps a stalled body readable after abort, so keep the race.
-		const body = await Promise.race([response.text(), deadline]);
+		const response = await Promise.race([
-		const problem = parseJson(body);
+			fetch(new Request(request, { signal })),
+			rejectOnAbort(signal),
+		]);
+
+		const body = await Promise.race([response.text(), rejectOnAbort(signal)]);
 
 		return {
-			problem,
+			problem: parseJson(body),
 			reason: "transient",
 			response: new Response(body, response),
 		};
 	}
 	catch (error) {
-		if (failure.reason === "abort") return { reason: "abort" };
+		if (request.signal.aborted) return { reason: "abort" };
-		if (failure.reason === "timeout" || isNetworkFailure(error))
+		// Timeout or network failure: retryable.
+		if (timeout.signal.aborted || isNetworkFailure(error))
 			return { reason: "transient" };
 
 		throw error;
 	}
 	finally {
-		clearTimeout(timeout);
+		clearTimeout(timer);
-		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,6 +775,77 @@ 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;
@@ -792,11 +863,6 @@ export interface components {
             archivedAt: string | null;
             version: number;
         };
-        RubMoneyInputDto: {
-            /** @enum {string} */
-            currency: "RUB";
-            value: string;
-        };
         CreateBankCardDto: {
             /** Format: uuid */
             id: string;
@@ -841,24 +907,6 @@ 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} */
@@ -2598,7 +2646,7 @@ export interface operations {
         };
         requestBody: {
             content: {
-                "application/json": components["schemas"]["CreateBankOperationDto"];
+                "application/json": components["schemas"]["CreateExpenseOperationDto"] | components["schemas"]["CreateTopupOperationDto"] | components["schemas"]["CreateTransferOperationDto"] | components["schemas"]["CreateRefundOperationDto"];
             };
         };
         responses: {

src/shared/api/index.ts

@@ -13,6 +13,7 @@ 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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,18 @@
+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,38 +37,6 @@ 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(
@@ -136,47 +104,6 @@ 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,6 +1,5 @@
 import {
 	type QueryClient,
-	type QueryFunctionContext,
 	useQueryClient,
 	type UseQueryOptions,
 } from "@tanstack/react-query";
@@ -9,7 +8,6 @@ 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"];
@@ -31,7 +29,7 @@ type ResourcePath = {
 type ResourceQueryKey = readonly [
 	"get",
 	ResourcePath,
-	{ params?: { path?: object; query?: { sync?: "observe" } } }?,
+	{ params?: { path?: object; query?: object } }?,
 ];
 
 function invalidateResourceAccess(
@@ -57,22 +55,6 @@ 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,
@@ -92,50 +74,17 @@ 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,7 +1053,29 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CreateBankOperationDto"
+                "oneOf": [
+                  {
+                    "$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"
+                  }
+                }
               }
             }
           }
@@ -5340,6 +5362,187 @@
           "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": {
@@ -5411,25 +5614,6 @@
           "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": {
@@ -5599,58 +5783,6 @@
           "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

@@ -360,6 +360,7 @@ const ru = {
 			emptyTitle: "За выбранный период событий не найдено",
 			errorText: "Попробуйте запросить прогноз еще раз.",
 			errorTitle: "Не удалось загрузить будущие события",
+			forecastWindow: "Прогноз от {{date}} на {{from}} – {{to}}",
 			hint: "Прогноз рассчитан по текущей позиции до налогов. Покрытие зависит от доступных данных MOEX.",
 			noAmount: "Сумма неизвестна",
 			open: "Открыть будущие события",

src/shared/ui/index.ts

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

src/shared/ui/useAppDocumentTitle.ts

@@ -0,0 +1,13 @@
+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,6 +66,7 @@ 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

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