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,61 @@
 # 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
+
+* **account:** add concentration tab with top-5 slices and chart (WealthLedger/main[#48](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/48)) ([#127](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/127)) ([70a2c33](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/70a2c335fdddb8b6a99e3f609befe06aeb8cc45d))
+* group all-account rows by instrument and day (WealthLedger/main[#47](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/47)) ([#126](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/126)) ([71126c9](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/71126c91f0b30f4d65a313ddc7d7f86963340455))
+* make brokerage account list compact ([#111](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/111)) ([c24704a](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/c24704affacbe7fbc08f5e2b61bb6e7ffa6053b9))
+* remove top header and rework mobile bottom navigation ([#109](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/109)) ([1a92f02](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/1a92f023c1c79f646424f72710ab74de63386a11))
+* replace account page accordion with tabs and show open position result ([#112](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/112)) ([3075081](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/3075081df188de0630d314ba15a34fe6efd1eea9))
+* show return, cash and structure on account cards ([#114](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/114)) ([431559b](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/431559be0fca9eb37f6a09d930d502f939884e39))
+
+### Bug Fixes
+
+* round money to currency minor units without negative zero (WealthLedger/frontend[#118](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/118)) ([#119](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/119)) ([1d49904](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/1d4990491f254e1ec6bafad8204872eaae2982d0))
+* show account source sync status (WealthLedger/frontend[#120](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/120)) ([#121](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/121)) ([a56edf2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/a56edf2b3757ef0b0f6c42ecbd422a1a563f6505))
+* show history loading alert only while loading (WealthLedger/frontend[#124](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/124)) ([#125](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/125)) ([6792f5b](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/6792f5b70aa3ba90b2eb2df7e63d3ae2f669e295))
+* stabilize auth client registration (WealthLedger/frontend[#95](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/95)) ([#122](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/122)) ([5796d2d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/5796d2d789963e66a3a4bcd79eab44700f16bd31))
+
+### Refactoring
+
+* derive api error codes from contract (WealthLedger/backend[#117](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/117)) ([#123](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/123)) ([32e8fe9](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/32e8fe9402665ea0c350f5f247d87e328ffd44c8))
+
+### Tests
+
+* pin date in all accounts events test ([#115](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/115)) ([58b4e12](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/58b4e126330d01c1d6865bd0e9dd066a028fba08))
+
+### Maintenance
+
+* **deps:** resolve minimatch and glob audit advisories (WealthLedger/main[#49](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/49)) ([#128](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/128)) ([7242240](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/7242240b2188e9d1ca1325e65d0e1a0a3655d882))
+* sync brokerage accounts contract (WealthLedger/backend[#138](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/138)) ([0e4bbec](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/0e4bbec2a7b814579095ea7ef6db68a70508fa29))
+
 ## [1.2.1](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.2.0...v1.2.1) (2026-10-24)
 
 ### Bug Fixes

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.2.1",
+	"version": "1.4.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "wealth-ledger-frontend",
-			"version": "1.2.1",
+			"version": "1.4.0",
 			"workspaces": [
 				"packages/*"
 			],

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "wealth-ledger-frontend",
 	"private": true,
-	"version": "1.2.1",
+	"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

@@ -46,8 +46,10 @@ const position: Portfolio["positions"][number]
 		displayName: "Сбербанк",
 		figi: "SBER",
 		isin: null,
+		issuer: null,
 		logoName: null,
 		quantity: "2",
+		sector: null,
 		ticker: "SBER",
 		type: "STOCK",
 	};
@@ -215,6 +217,7 @@ beforeEach(() => {
 							}),
 					),
 					incomeTotalsByCurrency: [],
+					window: { from: "2026-09-01", to: "2026-10-01" },
 				}),
 			),
 		),

src/app/routes/AppRoutes/AppRoutes.tsx

@@ -1,4 +1,4 @@
-import type { FC } from "react";
+import type { ComponentType, FC } from "react";
 
 import { lazy } from "react";
 import { Navigate, Route, Routes } from "react-router";
@@ -6,101 +6,35 @@ import { Navigate, Route, Routes } from "react-router";
 import { LazyPage } from "../RouteFallback";
 import { Protected, Public } from "../RouteGuards";
 
-const CardPage = lazy(async () => {
+// Pages use named exports; React.lazy needs a default export per dynamic import (one chunk each).
-	const { CardPage } = await import("@/pages/card");
+function lazyPage<Name extends string>(
+	load: () => Promise<Record<Name, ComponentType>>,
+	name: Name,
+) {
+	return lazy(async () => {
+		const page = await load();
 
-	return { default: CardPage };
+		// eslint-disable-next-line security/detect-object-injection -- `name` is a compile-time literal checked against the module's exports.
-});
+		return { default: page[name] };
+	});
+}
 
-const CardsPage = lazy(async () => {
+const CardPage = lazyPage(async () => import("@/pages/card"), "CardPage");
-	const { CardsPage } = await import("@/pages/cards");
+const CardsPage = lazyPage(async () => import("@/pages/cards"), "CardsPage");
-
+const BondPage = lazyPage(async () => import("@/pages/bond"), "BondPage");
-	return { default: CardsPage };
+const BondsPage = lazyPage(async () => import("@/pages/bonds"), "BondsPage");
-});
+const StockPage = lazyPage(async () => import("@/pages/stock"), "StockPage");
-
+const StocksPage = lazyPage(async () => import("@/pages/stocks"), "StocksPage");
-const BondPage = lazy(async () => {
+const AccountPage = lazyPage(async () => import("@/pages/account"), "AccountPage");
-	const { BondPage } = await import("@/pages/bond");
+const AccountEventsPage = lazyPage(async () => import("@/pages/account-events"), "AccountEventsPage");
-
+const AccountOperationsPage = lazyPage(async () => import("@/pages/account-operations"), "AccountOperationsPage");
-	return { default: BondPage };
+const AccountIncomePage = lazyPage(async () => import("@/pages/account-income"), "AccountIncomePage");
-});
+const AccountsPage = lazyPage(async () => import("@/pages/accounts"), "AccountsPage");
-
+const LoginPage = lazyPage(async () => import("@/pages/login"), "LoginPage");
-const BondsPage = lazy(async () => {
+const NotFoundPage = lazyPage(async () => import("@/pages/not-found"), "NotFoundPage");
-	const { BondsPage } = await import("@/pages/bonds");
+const RegisterPage = lazyPage(async () => import("@/pages/register"), "RegisterPage");
-
+const SettingsPage = lazyPage(async () => import("@/pages/settings"), "SettingsPage");
-	return { default: BondsPage };
+const ProtectedLayout = lazyPage(async () => import("../ProtectedLayout"), "ProtectedLayout");
-});
-
-const StockPage = lazy(async () => {
-	const { StockPage } = await import("@/pages/stock");
-
-	return { default: StockPage };
-});
-
-const StocksPage = lazy(async () => {
-	const { StocksPage } = await import("@/pages/stocks");
-
-	return { default: StocksPage };
-});
-
-const AccountPage = lazy(async () => {
-	const { AccountPage } = await import("@/pages/account");
-
-	return { default: AccountPage };
-});
-
-const AccountEventsPage = lazy(async () => {
-	const { AccountEventsPage } = await import("@/pages/account-events");
-
-	return { default: AccountEventsPage };
-});
-
-const AccountOperationsPage = lazy(async () => {
-	const { AccountOperationsPage } = await import("@/pages/account-operations");
-
-	return { default: AccountOperationsPage };
-});
-
-const AccountIncomePage = lazy(async () => {
-	const { AccountIncomePage } = await import("@/pages/account-income");
-
-	return { default: AccountIncomePage };
-});
-
-const AccountsPage = lazy(async () => {
-	const { AccountsPage } = await import("@/pages/accounts");
-
-	return { default: AccountsPage };
-});
-
-const LoginPage = lazy(async () => {
-	const { LoginPage } = await import("@/pages/login");
-
-	return { default: LoginPage };
-});
-
-const NotFoundPage = lazy(async () => {
-	const { NotFoundPage } = await import("@/pages/not-found");
-
-	return { default: NotFoundPage };
-});
-
-const RegisterPage = lazy(async () => {
-	const { RegisterPage } = await import("@/pages/register");
-
-	return { default: RegisterPage };
-});
-
-const SettingsPage = lazy(async () => {
-	const { SettingsPage } = await import("@/pages/settings");
-
-	return { default: SettingsPage };
-});
-
-const ProtectedLayout = lazy(async () => {
-	const { ProtectedLayout } = await import("../ProtectedLayout");
-
-	return { default: ProtectedLayout };
-});
 
 const AppRoutes: FC = () => (
 	<Routes>

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/instrument-details/model/section.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest";
+import { describe, expect, it, vi } from "vitest";
 
 import { resource } from "@/test/resource";
 
@@ -76,4 +76,29 @@ describe("instrument source and transport presentation", () => {
 			loading: false,
 		});
 	});
+
+	it("carries the retry of an exhausted read and only of that read", () => {
+		const refetch = vi.fn(() => Promise.resolve());
+
+		const state = section({
+			data: { rows: [] },
+			error: { code: "TBANK_UNAVAILABLE", status: 503 },
+			isError: true,
+			isFetching: false,
+			refetch,
+		});
+
+		expect(state.readRetry?.exhausted).toBe(true);
+		state.readRetry?.onRetry();
+		expect(refetch).toHaveBeenCalledOnce();
+	});
+
+	it("offers no retry for access loss or a healthy read", () => {
+		const base = { data: undefined, isFetching: false, refetch: vi.fn() };
+
+		expect(section({ ...base, error: { code: "NOT_FOUND" }, isError: true })
+			.readRetry?.exhausted).toBe(false);
+		expect(section({ ...base, error: null, isError: false })
+			.readRetry?.exhausted).toBe(false);
+	});
 });

src/features/instrument-details/model/section.ts

@@ -1,10 +1,11 @@
-import type { InvestmentResourceMeta } from "@/shared/api";
+import { type InvestmentResourceMeta, readRetry } from "@/shared/api";
 
 type SectionState = {
 	error: boolean;
 	hasData: boolean;
 	loading: boolean;
 	partial?: boolean;
+	readRetry?: ReturnType<typeof readRetry>;
 };
 
 function hasSectionData(data: unknown) {
@@ -13,8 +14,11 @@ function hasSectionData(data: unknown) {
 
 function section(query: {
 	data: unknown;
+	error?: unknown;
 	isError: boolean;
+	isFetching?: boolean;
 	meta?: InvestmentResourceMeta;
+	refetch?: () => Promise<unknown>;
 }): SectionState {
 	const isError = query.isError || query.meta?.lastAttempt.state === "failed";
 	const hasData = hasSectionData(query.data);
@@ -24,6 +28,17 @@ function section(query: {
 		hasData,
 		loading: !hasData && !isError,
 		partial: query.meta?.completeness === "incomplete",
+		// Each section retries only its own GET, so sections recover independently.
+		readRetry: query.refetch
+			? readRetry([
+					{
+						error: query.error,
+						isError: query.isError,
+						isFetching: query.isFetching ?? false,
+						refetch: query.refetch,
+					},
+				])
+			: undefined,
 	};
 }
 

src/features/instrument-details/ui/InstrumentSection.view.tsx

@@ -12,6 +12,8 @@ import {
 import { LoadingSkeleton } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
+import { ReadRetry } from "@/shared/ui";
+
 import type { SectionState } from "../model/section";
 
 import classes from "./InstrumentDetails.module.css";
@@ -81,6 +83,8 @@ const InstrumentSection: FC<InstrumentSectionProps> = (props) => {
 				</Alert>
 			)}
 
+			{!!props.state.readRetry && <ReadRetry {...props.state.readRetry} />}
+
 			{sectionContent}
 		</Paper>
 	);

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

@@ -0,0 +1,167 @@
+import { MantineProvider } from "@mantine/core";
+import { QueryClientProvider } from "@tanstack/react-query";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { http, HttpResponse } from "msw";
+import { MemoryRouter, Route, Routes } from "react-router";
+import { describe, expect, it, vi } from "vitest";
+
+import { configureAuthClient } from "@/shared/api";
+import { createTestQueryClient } from "@/test/query";
+import { resource } from "@/test/resource";
+import { server } from "@/test/server";
+
+import { AccountEventsPage } from "./AccountEventsPage";
+
+// Automatic read retries wait 1s + 2s before the failure is final.
+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",
+			dateKind: "event",
+			displayName: "Synthetic coupon",
+			figi: null,
+			instrumentUid: null,
+			isin: null,
+			logoName: null,
+			projectedAmount: { currency: "RUB", value: "123.45" },
+			ticker: "SYN",
+			type: "coupon",
+		},
+	],
+	incomeTotalsByCurrency: [{ currency: "RUB", value: "123.45" }],
+	window: { from: "2026-08-14", to: "2026-09-13" },
+});
+
+function renderEvents() {
+	configureAuthClient({
+		accessToken: () => "token",
+		clear: vi.fn(),
+		refresh: () => Promise.resolve(true),
+	});
+	const queryClient = createTestQueryClient();
+
+	render(
+		<QueryClientProvider client={queryClient}>
+			<MantineProvider env="test">
+				<MemoryRouter initialEntries={["/accounts/account-1/events"]}>
+					<Routes>
+						<Route
+							element={<AccountEventsPage />}
+							path="/accounts/:accountId/events"
+						/>
+					</Routes>
+				</MemoryRouter>
+			</MantineProvider>
+		</QueryClientProvider>,
+	);
+
+	return { queryClient };
+}
+
+describe("AccountEventsPage read retry", () => {
+	it(
+		"offers retry after an initial failure and recovers in place",
+		{ timeout: TEST_MS },
+		async () => {
+			let isFailing = true;
+			let requests = 0;
+			server.use(
+				http.get("*/api/v1/brokerage-accounts/:accountId/events", () => {
+					requests += 1;
+
+					return isFailing
+						? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
+						: HttpResponse.json(snapshot);
+				}),
+			);
+			renderEvents();
+
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: RETRIES_EXHAUSTED_MS },
+			);
+
+			expect(requests).toBe(3);
+
+			isFailing = false;
+			fireEvent.click(retry);
+
+			expect(await screen.findByText("Купон · Synthetic coupon")).toBeInTheDocument();
+			expect(requests).toBe(4);
+		},
+	);
+
+	it(
+		"keeps cached events, warns and retries the same GET",
+		{ timeout: TEST_MS },
+		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;
+
+					return isFailing
+						? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
+						: HttpResponse.json(snapshot);
+				}),
+			);
+			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();
+
+			isFailing = true;
+			void queryClient.invalidateQueries({
+				queryKey: ["get", "/api/v1/brokerage-accounts/{accountId}/events"],
+			});
+
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: RETRIES_EXHAUSTED_MS },
+			);
+
+			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;
+			fireEvent.click(retry);
+
+			await waitFor(() =>
+				expect(screen.queryByText("Не удалось обновить данные"))
+					.not.toBeInTheDocument());
+			expect(requests).toBe(5);
+			expect(imports).toBe(0);
+		},
+	);
+
+	it("does not offer a plain retry when the account is gone", async () => {
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/events", () =>
+				HttpResponse.json({ code: "NOT_FOUND" }, { status: 404 })),
+		);
+		renderEvents();
+
+		await waitFor(() =>
+			expect(screen.queryByRole("heading", { name: "Загрузка" }))
+				.not.toBeInTheDocument());
+		expect(screen.queryByRole("button", { name: "Повторить" }))
+			.not.toBeInTheDocument();
+	});
+});

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,
@@ -169,15 +171,18 @@ describe("AccountEventsPage", () => {
 		expect(screen.getAllByText("O")).toHaveLength(2);
 	});
 
-	it("renders empty and quiet error states", async () => {
+	it("renders empty and error states with retry", async () => {
 		const { rerender } = renderPage();
 		expect(
 			screen.getByText("За выбранный период событий не найдено"),
 		).toBeInTheDocument();
 		query.mockReturnValue({
 			data: undefined,
+			error: { code: "TBANK_UNAVAILABLE", status: 503 },
 			isError: true,
+			isFetching: false,
 			isLoading: false,
+			refetch: vi.fn(),
 		} as never);
 		rerender(
 			<MantineProvider>
@@ -187,7 +192,7 @@ describe("AccountEventsPage", () => {
 			</MantineProvider>,
 		);
 		expect(await screen.findByRole("button", { name: "Сбросить" })).toBeVisible();
-		expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
+		expect(screen.getByRole("button", { name: "Повторить" })).toBeVisible();
 	});
 
 	it("shows a structural busy state before events are available", () => {
@@ -273,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

@@ -1,13 +1,12 @@
 import { useState } from "react";
 import { useParams } from "react-router";
 
-import type { InvestmentResourceMeta } from "@/shared/api";
-
 import {
 	type BrokerageEvent,
 	useBrokerageEvents,
 } from "@/entities/brokerage-event";
 import { useScreenSync } from "@/features/tbank-connection";
+import { type InvestmentResourceMeta, readRetry } from "@/shared/api";
 import {
 	defaultPeriod,
 	isValidPeriod,
@@ -19,6 +18,7 @@ import {
 type AccountEventsPageViewModel
 	= | {
 		allAccounts: boolean;
+		calculatedAt: string;
 		canApply: boolean;
 		draftPeriod: [null | string, null | string];
 		events: BrokerageEvent[];
@@ -28,14 +28,20 @@ type AccountEventsPageViewModel
 		onPeriodPopoverOpen: () => void;
 		onReset: () => void;
 		partial?: boolean;
+		readRetry: ReturnType<typeof readRetry>;
 		source?: InvestmentResourceMeta;
 		state: "loaded";
 		totalVisible: boolean;
+		window: { from: string; to: string };
+	}
+	| {
+		onReset: () => void;
+		readRetry: ReturnType<typeof readRetry>;
+		state: "error";
 	}
-	| { onReset: () => void; state: "error" }
 	| { state: "loading" };
 
-function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
+function useAccountEventsPageVm(): AccountEventsPageViewModel {
 	const { accountId = "" } = useParams();
 
 	const {
@@ -83,6 +89,8 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 		isFetching: events.isFetching,
 	});
 
+	const retry = readRetry([events]);
+
 	if (availability === "loading" && events.isLoading)
 		return { state: "loading" };
 
@@ -94,15 +102,17 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 	if ((events.isError || events.meta?.lastAttempt.state === "failed") && !events.data)
 		return {
 			onReset,
+			readRetry: retry,
 			state: "error",
 		};
 	if (!events.data)
 		return availability === "unavailable"
-			? { onReset, state: "error" }
+			? { onReset, readRetry: retry, state: "error" }
 			: { state: "loading" };
 
 	return {
 		allAccounts: accountId === "all",
+		calculatedAt: events.data.calculatedAt,
 		canApply:
 			(draftFrom !== appliedFrom || draftTo !== appliedTo)
 			&& isValidPeriod(draftFrom, draftTo),
@@ -122,10 +132,12 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 		onPeriodPopoverOpen: () => setMinDate(moscowDate(new Date())),
 		onReset,
 		partial: events.meta?.completeness === "incomplete",
+		readRetry: retry,
 		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/AccountEventsPageError.view.tsx

@@ -4,7 +4,12 @@ import { Button, Group } from "@mantine/core";
 import { StateView } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
-type AccountEventsPageErrorProps = { onReset: () => void };
+import { ReadRetryButton, type ReadRetryProps } from "@/shared/ui";
+
+type AccountEventsPageErrorProps = {
+	onReset: () => void;
+	readRetry: ReadRetryProps;
+};
 
 const AccountEventsPageError: FC<AccountEventsPageErrorProps> = (props) => {
 	const { t } = useTranslation();
@@ -13,6 +18,13 @@ const AccountEventsPageError: FC<AccountEventsPageErrorProps> = (props) => {
 		<StateView
 			action={(
 				<Group>
+					{props.readRetry.exhausted && (
+						<ReadRetryButton
+							onRetry={props.readRetry.onRetry}
+							retrying={props.readRetry.retrying}
+						/>
+					)}
+
 					<Button onClick={props.onReset} variant="default">
 						{t("ledger.reset")}
 					</Button>

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

@@ -17,8 +17,8 @@ import {
 	brokerageEventGroupKey,
 	brokerageEventKey,
 } from "@/entities/brokerage-event";
-import { groupItems } from "@/shared/lib";
+import { formatDate, formatSnapshotTime, groupItems } from "@/shared/lib";
-import { SourceSyncStatus } from "@/shared/ui";
+import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
 
 import type { AccountEventsPageViewModel } from "../AccountEventsPage.vm";
 
@@ -83,10 +83,20 @@ const AccountEventsPageLoaded: FC<AccountEventsPageLoadedProps> = (props) => {
 				stale={props.source?.freshness === "stale"}
 			/>
 
+			<ReadRetry {...props.readRetry} />
+
 			{!!props.partial && <Alert role="status">{t("investment.partial")}</Alert>}
 
 			<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

@@ -26,6 +26,7 @@ import { afterEach, describe, expect, it, vi } from "vitest";
 import type { IncomeAnalytics } from "@/entities/income";
 
 import { configureAuthClient } from "@/shared/api";
+import { formatSnapshotTime } from "@/shared/lib";
 import { createTestQueryClient } from "@/test/query";
 import { resource } from "@/test/resource";
 import { server } from "@/test/server";
@@ -33,10 +34,14 @@ 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";
 
+// Automatic read retries wait 1s + 2s before the failure is final.
+const RETRIES_EXHAUSTED_MS = 6000;
+const TEST_MS = 10_000;
+
 const analytics
 	= {
 		accountId: "account-1",
@@ -166,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"]}>
@@ -403,21 +408,124 @@ describe("AccountIncomePage", () => {
 		expect(screen.queryByText(/Сравнение с/)).not.toBeInTheDocument();
 	});
 
-	it("shows a quiet realized error", async () => {
+	it.each([
+		["full", analytics],
+		["empty", { ...analytics, buckets: [], entries: [], instruments: [], totalsByCurrency: [] }],
+	])("shows the server source time and last attempt for a %s result", async (_name, data) => {
 		server.use(
-			http.get(
+			http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
-				"*/api/v1/brokerage-accounts/account-1/income-analytics",
+				HttpResponse.json(
-				() => new HttpResponse(null, { status: 503 }),
+					resource(data, {
+						freshness: "stale",
+						lastAttempt: {
+							finishedAt: "2026-08-27T01:00:00Z",
+							problems: [],
+							startedAt: "2026-08-27T00:59:00Z",
+							state: "failed",
+						},
+						lastSuccessfulAt: "2026-08-26T12:00:00Z",
+					}),
+				),
 			),
 		);
 		renderPage();
-		expect(
+		expect(await screen.findByText(/^Данные на /)).toHaveTextContent(
-			await screen.findByText("Не удалось рассчитать пассивный доход", undefined, {
+			formatSnapshotTime("2026-08-26T12:00:00Z"),
-				timeout: 4000,
+		);
-			}),
+		expect(screen.getByText("Обновление не удалось")).toBeInTheDocument();
-		).toBeInTheDocument();
+		expect(screen.getByText("Данные требуют обновления")).toBeInTheDocument();
 		expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
 	});
+
+	it(
+		"offers retry after an initial failure and recovers in place",
+		{ timeout: TEST_MS },
+		async () => {
+			let isFailing = true;
+			let requests = 0;
+			server.use(
+				http.get(
+					"*/api/v1/brokerage-accounts/account-1/income-analytics",
+					() => {
+						requests += 1;
+
+						return isFailing
+							? new HttpResponse(null, { status: 503 })
+							: HttpResponse.json(resource(analytics));
+					},
+				),
+			);
+			renderPage();
+			expect(
+				await screen.findByText(
+					"Не удалось рассчитать пассивный доход",
+					undefined,
+					{ timeout: RETRIES_EXHAUSTED_MS },
+				),
+			).toBeInTheDocument();
+			const retry = screen.getByRole("button", { name: "Повторить" });
+			expect(requests).toBe(3);
+
+			isFailing = false;
+			fireEvent.click(retry);
+
+			expect(
+				await screen.findByRole("region", { name: "Выплаты" }),
+			).toBeInTheDocument();
+			expect(requests).toBe(4);
+		},
+	);
+
+	it(
+		"keeps cached income, warns and retries the same GET",
+		{ timeout: TEST_MS },
+		async () => {
+			let isFailing = false;
+			let requests = 0;
+			server.use(
+				http.get(
+					"*/api/v1/brokerage-accounts/account-1/income-analytics",
+					() => {
+						requests += 1;
+
+						return isFailing
+							? HttpResponse.json(
+									{ code: "TBANK_UNAVAILABLE" },
+									{ status: 503 },
+								)
+							: HttpResponse.json(resource(analytics));
+					},
+				),
+			);
+			const { queryClient } = renderPage();
+			await screen.findByRole("region", { name: "Выплаты" });
+			expect(screen.queryByRole("button", { name: "Повторить" }))
+				.not.toBeInTheDocument();
+
+			isFailing = true;
+			void queryClient.invalidateQueries({
+				queryKey: ["get", "/api/v1/brokerage-accounts/{accountId}/income-analytics"],
+			});
+
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: RETRIES_EXHAUSTED_MS },
+			);
+
+			expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
+			expect(screen.getByRole("region", { name: "Выплаты" })).toBeInTheDocument();
+			expect(requests).toBe(4);
+
+			isFailing = false;
+			fireEvent.click(retry);
+
+			await waitFor(() =>
+				expect(screen.queryByText("Не удалось обновить данные"))
+					.not.toBeInTheDocument());
+			expect(requests).toBe(5);
+		},
+	);
 });
 
 const LocationProbe: FC = () => {

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

@@ -5,6 +5,7 @@ import { useParams, useSearchParams } from "react-router";
 
 import { type IncomeAnalytics, useIncomeAnalytics } from "@/entities/income";
 import { useScreenSync } from "@/features/tbank-connection";
+import { type InvestmentResourceMeta, readRetry } from "@/shared/api";
 import { isValidPeriod, moscowDate, useInitialAvailability } from "@/shared/lib";
 
 import {
@@ -30,16 +31,19 @@ type AccountIncomePageViewModel
 		onReset: () => void;
 		onSubmit: (values: IncomeForm) => void;
 		partial?: boolean;
+		readRetry: ReturnType<typeof readRetry>;
+		source?: InvestmentResourceMeta;
 		state: "loaded";
 		totalVisible: boolean;
 	}
 	| {
 		period: IncomePeriod;
+		readRetry: ReturnType<typeof readRetry>;
 		state: "error";
 	}
 	| { state: "loading" };
 
-const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
+const useAccountIncomePageVm = (): AccountIncomePageViewModel => {
 	const { accountId = "" } = useParams();
 	const [searchParameters, setSearchParameters] = useSearchParams();
 
@@ -84,12 +88,14 @@ const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
 		isFetching: analytics.isFetching,
 	});
 
+	const retry = readRetry([analytics]);
+
 	if (availability === "loading" && analytics.isLoading)
 		return { state: "loading" };
 
 	if (!analytics.data)
 		return availability === "unavailable"
-			? { period, state: "error" }
+			? { period, readRetry: retry, state: "error" }
 			: { state: "loading" };
 
 	const display = toIncomeDisplayModel(analytics.data);
@@ -116,6 +122,8 @@ const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
 		onReset,
 		onSubmit,
 		partial: analytics.meta?.completeness === "incomplete",
+		readRetry: retry,
+		source: analytics.meta,
 		state: "loaded",
 		totalVisible: analytics.meta?.completeness === "complete",
 	};
@@ -138,5 +146,5 @@ function isValidIncomePeriod(period: IncomePeriod): boolean {
 
 export {
 	type AccountIncomePageViewModel,
-	useAccountIncomePageViewModel,
+	useAccountIncomePageVm,
 };

src/pages/account-income/ui/AccountIncomePage/components/AccountIncomePageError.view.tsx

@@ -3,15 +3,27 @@ import type { FC } from "react";
 import { StateView } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
+import { ReadRetryButton } from "@/shared/ui";
+
 import type { AccountIncomePageViewModel } from "../AccountIncomePage.vm";
 
 type ErrorProps = Extract<AccountIncomePageViewModel, { state: "error" }>;
 
-const AccountIncomePageError: FC<ErrorProps> = () => {
+const AccountIncomePageError: FC<ErrorProps> = (props) => {
 	const { t } = useTranslation();
 
+	const retry = props.readRetry.exhausted
+		? (
+				<ReadRetryButton
+					onRetry={props.readRetry.onRetry}
+					retrying={props.readRetry.retrying}
+				/>
+			)
+		: undefined;
+
 	return (
 		<StateView
+			action={retry}
 			error
 			text={t("income.errorText")}
 			title={t("income.errorTitle")}

src/pages/account-income/ui/AccountIncomePage/components/AccountIncomePageLoaded.view.tsx

@@ -9,6 +9,8 @@ import { StateView } from "@wealthledger/ui";
 import { FormProvider } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
+import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
+
 import type { AccountIncomePageViewModel } from "../AccountIncomePage.vm";
 
 import classes from "../AccountIncomePage.module.css";
@@ -49,6 +51,14 @@ const AccountIncomePageLoaded: FC<LoadedProps> = (props) => {
 				/>
 			</FormProvider>
 
+			<SourceSyncStatus
+				lastAttempt={props.source?.lastAttempt}
+				lastSuccessfulAt={props.source?.lastSuccessfulAt}
+				stale={props.source?.freshness === "stale"}
+			/>
+
+			<ReadRetry {...props.readRetry} />
+
 			<AccountIncomePageLoadedSummary {...props} />
 
 			<Alert color="blue">{t("income.taxBoundary")}</Alert>

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

@@ -90,9 +90,13 @@ function configureTestAuth() {
 	});
 }
 
-function renderPage(search = "", accountId = "account-1") {
+function renderPage(
+	search = "",
+	accountId = "account-1",
+	queryClient = createTestQueryClient(),
+) {
 	return render(
-		<QueryClientProvider client={createTestQueryClient()}>
+		<QueryClientProvider client={queryClient}>
 			<MantineProvider>
 				<MemoryRouter
 					initialEntries={[`/accounts/${accountId}/operations${search}`]}
@@ -109,6 +113,18 @@ function renderPage(search = "", accountId = "account-1") {
 	);
 }
 
+// Automatic read retries wait 1s + 2s before the failure is final.
+const RETRIES_EXHAUSTED_MS = 6000;
+const TEST_MS = 10_000;
+
+const loadedOperations = {
+	accountId: "account-1",
+	hasNext: false,
+	items: [operation],
+	nextCursor: null,
+	observedAt: "2026-08-14T00:00:00Z",
+};
+
 describe("LedgerEntryRow", () => {
 	it("marks cashless operations without rendering operation details", () => {
 		render(
@@ -545,20 +561,87 @@ describe("AccountOperationsPage", () => {
 		).toBeInTheDocument();
 	});
 
-	it("renders an error state", async () => {
+	it(
-		configureTestAuth();
+		"renders an error state with retry that recovers in place",
-		server.use(
+		{ timeout: TEST_MS },
-			http.get("*/api/v1/brokerage-accounts/:accountId/operations", () =>
+		async () => {
-				HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 }),
+			configureTestAuth();
-			),
+			let isFailing = true;
-		);
+			let requests = 0;
-		renderPage();
+			server.use(
-		expect(
+				http.get("*/api/v1/brokerage-accounts/:accountId/operations", () => {
-			await screen.findByText("Не удалось загрузить журнал", undefined, {
+					requests += 1;
-				timeout: 4000,
+
-			}),
+					return isFailing
-		).toBeInTheDocument();
+						? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
-	});
+						: HttpResponse.json(resource(loadedOperations));
+				}),
+			);
+			renderPage();
+			expect(
+				await screen.findByText("Не удалось загрузить журнал", undefined, {
+					timeout: RETRIES_EXHAUSTED_MS,
+				}),
+			).toBeInTheDocument();
+			expect(requests).toBe(3);
+
+			isFailing = false;
+			fireEvent.click(screen.getByRole("button", { name: "Повторить" }));
+
+			expect(await screen.findByText("Покупка акций")).toBeInTheDocument();
+			expect(requests).toBe(4);
+		},
+	);
+
+	it(
+		"keeps cached operations, warns and retries the same GET",
+		{ timeout: TEST_MS },
+		async () => {
+			configureTestAuth();
+			let isFailing = false;
+			let requests = 0;
+			server.use(
+				http.get("*/api/v1/brokerage-accounts/:accountId/operations", () => {
+					requests += 1;
+
+					return isFailing
+						? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
+						: HttpResponse.json(resource(loadedOperations));
+				}),
+			);
+			const queryClient = createTestQueryClient();
+			renderPage("", "account-1", queryClient);
+			await screen.findByText("Покупка акций");
+			expect(screen.queryByRole("button", { name: "Повторить" }))
+				.not.toBeInTheDocument();
+
+			isFailing = true;
+			void queryClient.invalidateQueries({
+				queryKey: [
+					"get",
+					"/api/v1/brokerage-accounts/{accountId}/operations",
+				],
+			});
+
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: RETRIES_EXHAUSTED_MS },
+			);
+
+			expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
+			expect(screen.getByText("Покупка акций")).toBeInTheDocument();
+			expect(requests).toBe(4);
+
+			isFailing = false;
+			fireEvent.click(retry);
+
+			await waitFor(() =>
+				expect(screen.queryByText("Не удалось обновить данные"))
+					.not.toBeInTheDocument());
+			expect(requests).toBe(5);
+		},
+	);
 
 	it("keeps a null operations envelope loading instead of a confirmed empty period", async () => {
 		configureTestAuth();

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-operations/ui/AccountOperationsPage/AccountOperationsPage.vm.ts

@@ -12,7 +12,12 @@ import {
 	useBrokerageOperationHistory,
 } from "@/entities/broker-operation";
 import { useScreenSync } from "@/features/tbank-connection";
-import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "@/shared/api";
+import {
+	ApiErrorCode,
+	apiErrorCode,
+	isApiErrorCode,
+	readRetry,
+} from "@/shared/api";
 import {
 	defaultPeriod,
 	isValidPeriod,
@@ -42,11 +47,16 @@ type AccountOperationsPageViewModel
 		onPrevious: () => void;
 		onReset: () => void;
 		partial?: boolean;
+		readRetry: ReturnType<typeof readRetry>;
 		source?: InvestmentResourceMeta;
 		state: "loaded";
 		totalVisible: boolean;
 	}
-	| { onReset: () => void; state: "error" }
+	| {
+		onReset: () => void;
+		readRetry: ReturnType<typeof readRetry>;
+		state: "error";
+	}
 	| { state: "loading" };
 
 const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
@@ -107,6 +117,8 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
 		isFetching: operations.isFetching,
 	});
 
+	const retry = readRetry([operations]);
+
 	if (availability === "loading" && operations.isLoading)
 		return { state: "loading" };
 
@@ -134,11 +146,11 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
 		(isInvalidCursor || !operations.data)
 		&& (operations.isError || operations.meta?.lastAttempt.state === "failed")
 	)
-		return { onReset, state: "error" };
+		return { onReset, readRetry: retry, state: "error" };
 
 	if (!operations.data)
 		return availability === "unavailable"
-			? { onReset, state: "error" }
+			? { onReset, readRetry: retry, state: "error" }
 			: { state: "loading" };
 
 	const nextCursor = operations.data.nextCursor;
@@ -182,6 +194,7 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
 		onPrevious: history.onPrevious,
 		onReset,
 		partial: operations.meta?.completeness === "incomplete",
+		readRetry: retry,
 		source: operations.meta,
 		state: "loaded",
 		totalVisible: operations.meta?.completeness === "complete",

src/pages/account-operations/ui/AccountOperationsPage/components/AccountOperationsPageError.view.tsx

@@ -1,9 +1,11 @@
 import type { FC } from "react";
 
-import { Button } from "@mantine/core";
+import { Button, Group } from "@mantine/core";
 import { StateView } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
+import { ReadRetryButton } from "@/shared/ui";
+
 import type { AccountOperationsPageViewModel } from "../AccountOperationsPage.vm";
 
 type AccountOperationsPageErrorProps = Extract<
@@ -19,9 +21,18 @@ const AccountOperationsPageError: FC<AccountOperationsPageErrorProps> = (
 	return (
 		<StateView
 			action={(
-				<Button onClick={props.onReset} variant="default">
+				<Group gap="sm" justify="center">
-					{t("ledger.reset")}
+					{props.readRetry.exhausted && (
-				</Button>
+						<ReadRetryButton
+							onRetry={props.readRetry.onRetry}
+							retrying={props.readRetry.retrying}
+						/>
+					)}
+
+					<Button onClick={props.onReset} variant="default">
+						{t("ledger.reset")}
+					</Button>
+				</Group>
 			)}
 			text={t("ledger.errorText")}
 			title={t("ledger.errorTitle")}

src/pages/account-operations/ui/AccountOperationsPage/components/AccountOperationsPageLoaded.view.tsx

@@ -19,7 +19,7 @@ import {
 	OperationGroup,
 } from "@/entities/broker-operation";
 import { groupItems } from "@/shared/lib";
-import { SourceSyncStatus } from "@/shared/ui";
+import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
 
 import type { AccountOperationsPageViewModel } from "../AccountOperationsPage.vm";
 
@@ -102,6 +102,8 @@ const AccountOperationsPageLoaded: FC<AccountOperationsPageLoadedProps> = (
 				stale={props.source?.freshness === "stale"}
 			/>
 
+			<ReadRetry {...props.readRetry} />
+
 			{!!props.partial && <Alert role="status">{t("investment.partial")}</Alert>}
 
 			{!!props.historyLoading && <Alert>{t("investment.history")}</Alert>}

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

@@ -0,0 +1,175 @@
+import { describe, expect, it } from "vitest";
+
+import type { Portfolio } from "@/entities/portfolio";
+
+import { toConcentration } from "./concentration";
+import { portfolio, position } from "./positions.fixtures";
+
+function snapshot(positions: Portfolio["positions"]): Portfolio {
+	return { ...portfolio, positions };
+}
+
+function stock(
+	name: string,
+	value: null | string,
+	currency = "RUB",
+	overrides: Partial<Portfolio["positions"][number]> = {},
+): Portfolio["positions"][number] {
+	return {
+		...position,
+		currentValue: value === null ? null : { currency, value },
+		displayName: name,
+		...overrides,
+	};
+}
+
+const labels = {
+	missingIssuer: "Эмитент не указан",
+	missingSector: "Сектор не указан",
+	other: "Прочее",
+	sector: (code: string) => code,
+};
+
+describe("account concentration", () => {
+	it("uses exact positive values and excludes cash, negatives and nulls", () => {
+		const model = toConcentration(snapshot([
+			stock("A", "1"), stock("B", "15"),
+			stock("C", "0"), stock("D", "-50"), stock("E", null),
+			stock("F", null, "USD"), stock("G", "-3", "USD"),
+		]), "stocks", "RUB", labels);
+
+		expect(model.currencies).toEqual(["RUB", "USD"]);
+		expect(model.total).toBe("16");
+		expect(model.items.map(item => item.share)).toEqual(["93,8 %", "6,3 %"]);
+		expect(model.unaccounted).toBe(3);
+		const negative = snapshot([stock("A", "-3", "USD")]);
+		expect(toConcentration(negative, "stocks", "USD", labels))
+			.toMatchObject({ empty: true, unaccounted: 1 });
+	});
+
+	it("ranks seven positions with exact other and top-five totals", () => {
+		const model = toConcentration(snapshot([
+			stock("A", "400"), stock("B", "250"), stock("C", "150"),
+			stock("D", "100"), stock("E", "50"), stock("F", "30"),
+			stock("G", "20"),
+		]), "stocks", "RUB", labels);
+
+		expect(model.items.map(item => item.amount)).toEqual([
+			"400", "250", "150", "100", "50",
+		]);
+		expect(model.other).toMatchObject({
+			amount: "50", count: 2, share: "5 %",
+		});
+		expect(model.top5Share).toBe("95 %");
+		expect(model.other?.entries.map(item => item.share)).toEqual([
+			"3 %", "2 %",
+		]);
+	});
+
+	it("keeps sixth row, tiny share and stable alphabetical ties", () => {
+		const model = toConcentration(snapshot([
+			stock("Сбер", "100"), stock("X5", "100"),
+			stock("VK", "100"), stock("D", "100"),
+			stock("E", "100"), stock("F", "100"),
+		]), "stocks", "RUB", labels);
+
+		expect(model.items).toHaveLength(6);
+		expect(model.other).toBeNull();
+		expect(model.items.slice(0, 2).map(item => item.name)).toEqual([
+			"D", "E",
+		]);
+
+		const tiny = snapshot([
+			stock("Large", "100000000"), stock("Small", "1"),
+		]);
+
+		expect(toConcentration(tiny, "stocks", "RUB", labels).items[1]?.share)
+			.toBe("< 0,1 %");
+	});
+
+	it("groups sectors and issuers by codes, not labels", () => {
+		const positions = [
+			stock("A", "300", "RUB", {
+				issuer: { id: "one", name: "Сбербанк" }, sector: "energy",
+			}),
+			stock("B", "200", "RUB", {
+				issuer: { id: "one", name: "Сбер" }, sector: "energy",
+				type: "BOND",
+			}),
+			stock("C", "100", "RUB", {
+				issuer: { id: "two", name: "Сбер" }, sector: "financial",
+				type: "FUND",
+			}),
+			stock("D", "50", "RUB", { issuer: null, sector: null }),
+		];
+
+		expect(toConcentration(snapshot(positions), "sectors", "RUB", labels)
+			.items.map(item => item.amount)).toEqual(["500", "100", "50"]);
+		expect(toConcentration(snapshot(positions), "issuers", "RUB", labels)
+			.items.map(item => [item.name, item.amount])).toEqual([
+			["Сбербанк", "500"], ["", "50"],
+		]);
+	});
+
+	it("orders equal sums by displayed name", () => {
+		const issuers = snapshot([
+			stock("A", "300", "RUB", {
+				issuer: { id: "g", name: "Газпром" }, sector: "energy",
+			}),
+			stock("B", "300", "RUB", {
+				issuer: { id: "s", name: "Сбер" }, sector: "energy",
+			}),
+			stock("C", "200", "RUB", { issuer: null, sector: "energy" }),
+			stock("D", "100", "RUB", { issuer: null, sector: "energy" }),
+		]);
+
+		expect(toConcentration(issuers, "issuers", "RUB", labels)
+			.items.map(item => [item.label, item.amount])).toEqual([
+			["Газпром", "300"], ["Сбер", "300"], ["Эмитент не указан", "300"],
+		]);
+
+		const sectors = snapshot([
+			stock("A", "100", "RUB", { sector: "it" }),
+			stock("B", "100", "RUB", { sector: "energy" }),
+		]);
+
+		const sectorLabels = {
+			...labels,
+			sector: (code: string) => code === "it"
+				? "Информационные технологии"
+				: "Энергетика",
+		};
+
+		expect(toConcentration(sectors, "sectors", "RUB", sectorLabels)
+			.items.map(item => item.label))
+			.toEqual(["Информационные технологии", "Энергетика"]);
+	});
+
+	it("chooses issuer name from the largest position, then alphabetically", () => {
+		const data = snapshot([
+			stock("A", "100", "RUB", {
+				issuer: { id: "brand", name: "Ястреб" },
+			}),
+			stock("B", "300", "RUB", {
+				issuer: { id: "brand", name: "Альфа" },
+			}),
+			stock("C", "400", "RUB", {
+				issuer: { id: "other", name: "Бета" },
+			}),
+		]);
+
+		expect(toConcentration(data, "issuers", "RUB", labels).items
+			.map(item => [item.name, item.label, item.amount])).toEqual([
+			["Альфа", "Альфа", "400"], ["Бета", "Бета", "400"],
+		]);
+	});
+
+	it("uses ISIN before ticker for bonds", () => {
+		const data = snapshot([stock("Облигация", "100", "RUB", {
+			isin: "RU000A0JX0J2", ticker: "BOND", type: "BOND",
+		})]);
+
+		expect(toConcentration(data, "bonds", "RUB", labels)
+			.items[0]?.logo?.subtitle).toBe("RU000A0JX0J2");
+	});
+});

src/pages/account/model/concentration.ts

@@ -0,0 +1,300 @@
+import type { Portfolio } from "@/entities/portfolio";
+
+import {
+	type Decimal,
+	decimalFromString,
+	decimalToString,
+	instrumentLogoUrl,
+	sumDecimals,
+} from "@/shared/lib";
+
+type Concentration = {
+	currencies: string[];
+	empty: boolean;
+	items: ConcentrationItem[];
+	other: ConcentrationOther | null;
+	top5Share: null | string;
+	total: null | string;
+	unaccounted: number;
+};
+
+type ConcentrationItem = {
+	amount: string;
+	chartValue: number;
+	key: string;
+	label: string;
+	logo: ConcentrationLogo | null;
+	name: string;
+	share: string;
+	unknown: boolean;
+};
+
+type ConcentrationLabels = {
+	missingIssuer: string;
+	missingSector: string;
+	other: string;
+	sector: (code: string) => string;
+};
+
+type ConcentrationLogo = {
+	src: null | string;
+	subtitle: null | string;
+};
+
+type ConcentrationOther = ConcentrationItem & {
+	count: number;
+	entries: ConcentrationItem[];
+};
+
+type Group = {
+	best?: { name: string; value: Decimal };
+	first: number;
+	key: string;
+	label: string;
+	logo: ConcentrationLogo | null;
+	name: string;
+	unknown: boolean;
+	values: Decimal[];
+};
+
+type Position = Portfolio["positions"][number];
+
+type Slice = "bonds"
+	| "issuers"
+	| "sectors"
+	| "stocks";
+
+const eligibleTypes = new Set(["BOND", "FUND", "STOCK"]);
+const RADIX = 10n;
+const CHART_PRECISION = 1_000_000n;
+const SHARE_PRECISION = 1000n;
+const HALF = 2n;
+const TOP = 5;
+const FIRST_OTHER = 7;
+
+const compareNames = (a: string, b: string) =>
+	a.toLowerCase().localeCompare(b.toLowerCase(), "en", {
+		numeric: false,
+	});
+
+function addPosition(
+	groups: Map<string, Group>,
+	position: Position,
+	index: number,
+	slice: Slice,
+	labels: ConcentrationLabels,
+	selected: null | string,
+): number {
+	if (!isIncluded(slice, position.type)) return 0;
+	if (!position.currentValue) return 1;
+	if (position.currentValue.currency !== selected) return 0;
+	const value = decimalFromString(position.currentValue.value);
+	if (value.value < 0n) return 1;
+	if (value.value === 0n) return 0;
+	const identity = groupIdentity(position, slice, index, labels);
+
+	const group = groups.get(identity.key) ?? {
+		...identity, first: index, values: [],
+	};
+
+	group.values.push(value);
+
+	if (slice === "issuers" && !identity.unknown) {
+		const best = group.best;
+
+		if (!best || compareDecimal(value, best.value) > 0
+			|| (compareDecimal(value, best.value) === 0
+				&& compareNames(identity.name, best.name) < 0)) {
+			group.best = { name: identity.name, value };
+			group.name = identity.name;
+			group.label = identity.label;
+		}
+	}
+
+	groups.set(identity.key, group);
+
+	return 0;
+}
+
+function chartValue(part: Decimal, total: Decimal): number {
+	const scale = Math.max(part.scale, total.scale);
+	const numerator = part.value * RADIX ** BigInt(scale - part.scale);
+	const denominator = total.value * RADIX ** BigInt(scale - total.scale);
+
+	return Number(numerator * CHART_PRECISION / denominator)
+		/ Number(CHART_PRECISION);
+}
+
+function compareDecimal(a: Decimal, b: Decimal): number {
+	const scale = Math.max(a.scale, b.scale);
+	const left = a.value * RADIX ** BigInt(scale - a.scale);
+	const right = b.value * RADIX ** BigInt(scale - b.scale);
+
+	if (left > right) return 1;
+
+	return left < right ? -1 : 0;
+}
+
+function concentrationCurrencies(portfolio: Portfolio): string[] {
+	return [...new Set(portfolio.positions
+		.filter(position => eligibleTypes.has(position.type))
+		.filter(position => position.currentValue
+			&& decimalFromString(position.currentValue.value).value !== 0n)
+		.map(position => position.currentValue?.currency)
+		.filter((value): value is string => !!value))]
+		.toSorted((a, b) => a.localeCompare(b));
+}
+
+function groupIdentity(
+	position: Position,
+	slice: Slice,
+	index: number,
+	labels: ConcentrationLabels,
+) {
+	if (slice === "sectors") {
+		const sector = position.sector;
+		const isUnknown = !sector;
+
+		return {
+			key: sector ?? "",
+			label: isUnknown
+				? labels.missingSector
+				: labels.sector(sector),
+			logo: null,
+			name: sector ?? "",
+			unknown: isUnknown,
+		};
+	}
+
+	if (slice === "issuers") {
+		const isUnknown = !position.issuer;
+
+		return {
+			key: position.issuer?.id ?? "",
+			label: position.issuer ? position.issuer.name : labels.missingIssuer,
+			logo: null,
+			name: position.issuer?.name ?? "",
+			unknown: isUnknown,
+		};
+	}
+
+	return {
+		key: String(index),
+		label: position.displayName,
+		logo: {
+			src: instrumentLogoUrl(position.logoName),
+			subtitle: slice === "bonds"
+				? position.isin ?? position.ticker ?? position.figi
+				: position.ticker ?? position.isin ?? position.figi,
+		},
+		name: position.displayName,
+		unknown: false,
+	};
+}
+
+function isIncluded(slice: Slice, type: string): boolean {
+	if (slice === "stocks") return type === "STOCK";
+	if (slice === "bonds") return type === "BOND";
+
+	return slice === "issuers" ? type === "STOCK" || type === "BOND" : eligibleTypes.has(type);
+}
+
+function share(part: Decimal, total: Decimal): string {
+	const scale = Math.max(part.scale, total.scale);
+	const numerator = part.value * RADIX ** BigInt(scale - part.scale);
+	const denominator = total.value * RADIX ** BigInt(scale - total.scale);
+	if (numerator * SHARE_PRECISION < denominator) return "< 0,1 %";
+
+	const tenths = (numerator * SHARE_PRECISION * HALF + denominator)
+		/ (HALF * denominator);
+
+	return tenths % RADIX === 0n ? `${tenths / RADIX} %` : `${tenths / RADIX},${tenths % RADIX} %`;
+}
+
+function toConcentration(
+	portfolio: Portfolio,
+	slice: Slice,
+	currency: null | string,
+	labels: ConcentrationLabels,
+): Concentration {
+	const currencies = concentrationCurrencies(portfolio);
+
+	const selected = currency && currencies.includes(currency)
+		? currency
+		: currencies[0] ?? null;
+
+	const groups = new Map<string, Group>();
+	let unaccounted = 0;
+
+	for (const [index, position] of portfolio.positions.entries()) {
+		unaccounted += addPosition(
+			groups, position, index, slice, labels, selected,
+		);
+	}
+
+	const ranked = Array.from(groups.values(), group => ({
+		...group, sum: sumDecimals(group.values),
+	})).toSorted((a, b) => compareDecimal(b.sum, a.sum)
+		|| compareNames(a.label, b.label) || a.first - b.first);
+
+	const total = ranked.length > 0
+		? sumDecimals(ranked.map(item => item.sum))
+		: null;
+
+	const entries = total
+		? ranked.map(group => ({
+				amount: decimalToString(group.sum),
+				chartValue: chartValue(group.sum, total),
+				key: group.key,
+				label: group.label,
+				logo: group.logo,
+				name: group.name,
+				share: share(group.sum, total),
+				unknown: group.unknown,
+			}))
+		: [];
+
+	const rest = entries.length >= FIRST_OTHER ? entries.slice(TOP) : [];
+
+	const otherSum = rest.length > 0
+		? sumDecimals(ranked.slice(TOP).map(item => item.sum))
+		: null;
+
+	const other = otherSum && total
+		? {
+				amount: decimalToString(otherSum),
+				chartValue: chartValue(otherSum, total),
+				count: rest.length,
+				entries: rest,
+				key: "__other",
+				label: labels.other,
+				logo: null,
+				name: "", share: share(otherSum, total), unknown: false,
+			}
+		: null;
+
+	const top5 = ranked.length > TOP
+		? sumDecimals(ranked.slice(0, TOP).map(item => item.sum))
+		: null;
+
+	return {
+		currencies,
+		empty: !total,
+		items: other ? entries.slice(0, TOP) : entries,
+		other,
+		top5Share: top5 && total ? share(top5, total) : null,
+		total: total && decimalToString(total),
+		unaccounted,
+	};
+}
+
+export {
+	concentrationCurrencies,
+	toConcentration,
+};
+export type {
+	Concentration,
+	ConcentrationItem,
+	ConcentrationLabels,
+	Slice,
+};

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

@@ -13,8 +13,10 @@ const portfolio
 				displayName: "Акция",
 				figi: "FIGI-STOCK",
 				isin: null,
+				issuer: null,
 				logoName: "akciya.png",
 				quantity: "2",
+				sector: null,
 				ticker: null,
 				type: "STOCK",
 			},
@@ -25,8 +27,10 @@ const portfolio
 				displayName: "Облигация",
 				figi: "FIGI-BOND",
 				isin: "RU000A0JX0J2",
+				issuer: null,
 				logoName: null,
 				quantity: "1",
+				sector: null,
 				ticker: null,
 				type: "BOND",
 			},
@@ -37,8 +41,10 @@ const portfolio
 				displayName: "Фонд",
 				figi: "FIGI-FUND",
 				isin: null,
+				issuer: null,
 				logoName: "fond.png",
 				quantity: "3",
+				sector: null,
 				ticker: null,
 				type: "FUND",
 			},

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.test.tsx

@@ -8,7 +8,9 @@ import {
 	within,
 } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
-import { MemoryRouter, Route, Routes } from "react-router";
+import { useState } from "react";
+import { getI18n } from "react-i18next";
+import { MemoryRouter, Route, Routes, useNavigate } from "react-router";
 import { describe, expect, it, vi } from "vitest";
 
 import type { BrokerageOperation } from "@/entities/broker-operation";
@@ -16,6 +18,7 @@ import type { BrokerageEvent } from "@/entities/brokerage-event";
 
 import { type Portfolio, portfolioQueryOptions } from "@/entities/portfolio";
 import { configureAuthClient } from "@/shared/api";
+import { formatSnapshotTime } from "@/shared/lib";
 import { createTestQueryClient } from "@/test/query";
 import { resource } from "@/test/resource";
 import { server } from "@/test/server";
@@ -25,6 +28,7 @@ import type {
 	AccountPageRecentOperations,
 } from "../../model/previews";
 
+import { toConcentration } from "../../model/concentration";
 import {
 	toAccountPagePositionSections,
 	toUnrealizedReturns,
@@ -35,6 +39,19 @@ import { AccountPageError } from "./components/AccountPageError.view";
 import { AccountPageLoaded } from "./components/AccountPageLoaded.view";
 import { AccountPageLoading } from "./components/AccountPageLoading/AccountPageLoading.view";
 
+function AccountSwitcher() {
+	const navigate = useNavigate();
+
+	return (
+		<button
+			onClick={() => navigate("/accounts/account-2")}
+			type="button"
+		>
+			Другой счёт
+		</button>
+	);
+}
+
 function configureTestAuth() {
 	configureAuthClient({
 		accessToken: () => "test-token",
@@ -43,6 +60,10 @@ function configureTestAuth() {
 	});
 }
 
+// Automatic read retries wait 1s + 2s before the failure is final.
+const RETRIES_EXHAUSTED_MS = 6000;
+const TEST_MS = 10_000;
+
 function renderAccountRoute(queryClient: QueryClient, accountId = "account-1") {
 	configureTestAuth();
 
@@ -50,6 +71,8 @@ function renderAccountRoute(queryClient: QueryClient, accountId = "account-1") {
 		<QueryClientProvider client={queryClient}>
 			<MantineProvider>
 				<MemoryRouter initialEntries={[`/accounts/${accountId}`]}>
+					<AccountSwitcher />
+
 					<Routes>
 						<Route element={<AccountPage />} path="/accounts/:accountId" />
 					</Routes>
@@ -84,8 +107,10 @@ const portfolio
 				displayName: "Вторая",
 				figi: "FIGI-2",
 				isin: null,
+				issuer: null,
 				logoName: "vtoraya.png",
 				quantity: "2",
+				sector: null,
 				ticker: null,
 				type: "STOCK",
 			},
@@ -96,8 +121,10 @@ const portfolio
 				displayName: "Первая",
 				figi: "FIGI-1",
 				isin: "RU000A0JX0J2",
+				issuer: null,
 				logoName: null,
 				quantity: "1",
+				sector: null,
 				ticker: null,
 				type: "BOND",
 			},
@@ -116,8 +143,10 @@ function position(
 		displayName: "Инструмент",
 		figi: null,
 		isin: null,
+		issuer: null,
 		logoName: null,
 		quantity: "1",
+		sector: null,
 		ticker: null,
 		type: "STOCK",
 		...overrides,
@@ -134,6 +163,19 @@ const emptyRecentEvents: AccountPageRecentEvents = {
 	to: "/accounts/account-1/events",
 };
 
+function concentrationLabels() {
+	const i18n = getI18n();
+
+	return {
+		missingIssuer: i18n.t("portfolio.concentration.missingIssuer"),
+		missingSector: i18n.t("portfolio.concentration.missingSector"),
+		other: i18n.t("portfolio.concentration.other"),
+		sector: (code: string) => i18n.t(`stock.sectors.${code}`, {
+			defaultValue: code,
+		}),
+	};
+}
+
 function emptyProps() {
 	return {
 		recentEvents: emptyRecentEvents,
@@ -141,17 +183,388 @@ function emptyProps() {
 	};
 }
 
+const LoadedHarness = (
+	props: Omit<Partial<Parameters<typeof AccountPageLoaded>[0]>, "onTabChange">,
+) => {
+	const [tab, setTab] = useState(props.tab ?? "positions");
+
+	return (
+		<AccountPageLoaded
+			{...loadedProps()}
+			{...props}
+			onTabChange={value => setTab(value ?? "positions")}
+			tab={tab}
+		/>
+	);
+};
+
 function loadedProps(nextPortfolio: Portfolio = portfolio) {
 	return {
+		concentration: null,
+		currency: null,
+		onCurrencyChange: vi.fn(),
+		onSliceChange: vi.fn(),
 		portfolio: nextPortfolio,
 		positionSections: toAccountPagePositionSections(nextPortfolio),
 		recentEvents: emptyRecentEvents,
 		recentOperations: emptyRecentOperations,
+		slice: "stocks" as const,
 		unrealizedReturns: toUnrealizedReturns(nextPortfolio.positions),
 	};
 }
 
 describe("AccountPage states", () => {
+	it("shows concentration only for a loaded individual account", async () => {
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () =>
+				HttpResponse.json(resource({
+					...portfolio,
+					positions: [position({
+						currentValue: { currency: "RUB", value: "100" },
+						displayName: "Акция",
+					})],
+				})),
+			),
+		);
+		const client = createTestQueryClient();
+		renderAccountRoute(client);
+		const tab = await screen.findByRole("tab", { name: "Концентрация" });
+		expect(tab).toHaveAttribute("aria-selected", "false");
+		fireEvent.click(tab);
+		expect(screen.getAllByText("100 ₽")).toHaveLength(2);
+		expect(screen.getByRole("img", { name: "Распределение позиций" }))
+			.toHaveAccessibleDescription(/Акция: 100 ₽, 100 %/);
+	});
+
+	it("shows server source time and attempt for an empty account", async () => {
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () =>
+				HttpResponse.json(resource(
+					{
+						...portfolio,
+						cashBalances: [],
+						isStale: false,
+						positions: [],
+						totalsByCurrency: [],
+					},
+					{
+						lastAttempt: {
+							finishedAt: "2026-08-14T01:00:00Z",
+							problems: [],
+							startedAt: "2026-08-14T00:59:00Z",
+							state: "failed",
+						},
+						lastSuccessfulAt: "2026-08-13T12:00:00Z",
+					},
+				)),
+			),
+		);
+		renderAccountRoute(createTestQueryClient());
+		expect(await screen.findByText(/^Данные на /)).toHaveTextContent(
+			formatSnapshotTime("2026-08-13T12:00:00Z"),
+		);
+		expect(screen.getByText("Обновление не удалось")).toBeInTheDocument();
+		expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
+	});
+
+	it("expands and resets other when switching slice", () => {
+		const positions = [400, 250, 150, 100, 50, 30, 20].map(
+			(value, index) => position({
+				currentValue: { currency: "RUB", value: String(value) },
+				displayName: `Акция ${index + 1}`,
+			}),
+		);
+
+		const data = { ...portfolio, positions };
+
+		const model = toConcentration(
+			data, "stocks", "RUB", concentrationLabels(),
+		);
+
+		const props = loadedProps(data);
+		renderPage(
+			<LoadedHarness
+				{...props}
+				accountId="a"
+				concentration={model}
+				currency="RUB"
+				tab="concentration"
+			/>,
+		);
+		const other = screen.getByRole("button", { name: /Прочее/ });
+		expect(other).toHaveAttribute("aria-expanded", "false");
+		fireEvent.click(other);
+		expect(other).toHaveAttribute("aria-expanded", "true");
+		expect(screen.getByText("Акция 7")).toBeInTheDocument();
+		fireEvent.click(screen.getByRole("radio", { name: "Секторы" }));
+		expect(props.onSliceChange).toHaveBeenCalledWith("sectors");
+	});
+
+	it.each([
+		[2, "2 элемента"],
+		[5, "5 элементов"],
+		[21, "21 элемент"],
+	])("pluralizes the other count %d as %s", (count, expected) => {
+		const values = [400, 250, 150, 100, 50];
+
+		const rest = Array.from(
+			{ length: count },
+			(_, index) => 20 + index,
+		);
+
+		const positions = [...values, ...rest].map(
+			(value, index) => position({
+				currentValue: { currency: "RUB", value: String(value) },
+				displayName: `Акция ${index + 1}`,
+			}),
+		);
+
+		renderPage(
+			<LoadedHarness
+				{...loadedProps({ ...portfolio, positions })}
+				accountId="a"
+				concentration={toConcentration(
+					{ ...portfolio, positions },
+					"stocks",
+					"RUB",
+					concentrationLabels(),
+				)}
+				currency="RUB"
+				tab="concentration"
+			/>,
+		);
+
+		const other = screen.getByRole("button", { name: /Прочее/ });
+		expect(other).toHaveTextContent(expected);
+	});
+
+	it("shows ticker subtitles and stocks rows with logos, issuers without", () => {
+		const positions = [
+			position({
+				currentValue: { currency: "RUB", value: "300" },
+				displayName: "Сбербанк",
+				ticker: "SBER",
+			}),
+		];
+
+		const data = { ...portfolio, positions };
+
+		const view = renderPage(
+			<LoadedHarness
+				{...loadedProps(data)}
+				accountId="a"
+				concentration={toConcentration(
+					data, "stocks", "RUB", concentrationLabels(),
+				)}
+				currency="RUB"
+				tab="concentration"
+			/>,
+		);
+
+		expect(screen.getByText("SBER")).toBeInTheDocument();
+
+		view.unmount();
+
+		renderPage(
+			<LoadedHarness
+				{...loadedProps(data)}
+				accountId="a"
+				concentration={toConcentration(
+					data, "issuers", "RUB", concentrationLabels(),
+				)}
+				currency="RUB"
+				slice="issuers"
+				tab="concentration"
+			/>,
+		);
+
+		expect(screen.queryByText("SBER")).not.toBeInTheDocument();
+	});
+
+	it("hides the currency select when only one currency is available", () => {
+		const data = { ...portfolio, positions: [position({
+			currentValue: { currency: "RUB", value: "100" },
+			displayName: "Акция",
+		})] };
+
+		renderPage(
+			<LoadedHarness
+				{...loadedProps(data)}
+				accountId="a"
+				concentration={toConcentration(
+					data, "stocks", "RUB", concentrationLabels(),
+				)}
+				currency="RUB"
+				tab="concentration"
+			/>,
+		);
+
+		expect(screen.queryByRole("combobox", { name: "Валюта концентрации" }))
+			.not.toBeInTheDocument();
+	});
+
+	it("shows sector labels including government and unknown codes", () => {
+		const positions = [
+			position({
+				currentValue: { currency: "RUB", value: "300" },
+				displayName: "А",
+				sector: "government",
+			}),
+			position({
+				currentValue: { currency: "RUB", value: "100" },
+				displayName: "Б",
+				sector: "unknown_code",
+			}),
+		];
+
+		const data = { ...portfolio, positions };
+
+		renderPage(
+			<LoadedHarness
+				{...loadedProps(data)}
+				accountId="a"
+				concentration={toConcentration(
+					data, "sectors", "RUB", concentrationLabels(),
+				)}
+				currency="RUB"
+				slice="sectors"
+				tab="concentration"
+			/>,
+		);
+
+		expect(screen.getByText("Государственный сектор")).toBeInTheDocument();
+		expect(screen.getByText("unknown_code")).toBeInTheDocument();
+	});
+
+	it("describes ranked segments with amounts and shares", () => {
+		const data = { ...portfolio, positions: [
+			position({
+				currentValue: { currency: "RUB", value: "300" },
+				displayName: "Первая акция",
+			}),
+			position({
+				currentValue: { currency: "RUB", value: "100" },
+				displayName: "Вторая акция",
+			}),
+			...[50, 40, 30, 20, 10].map((value, index) => position({
+				currentValue: { currency: "RUB", value: String(value) },
+				displayName: `Остаток ${index + 1}`,
+			})),
+		] };
+
+		renderPage(
+			<LoadedHarness
+				{...loadedProps(data)}
+				accountId="a"
+				concentration={toConcentration(
+					data, "stocks", "RUB", concentrationLabels(),
+				)}
+				currency="RUB"
+				tab="concentration"
+			/>,
+		);
+
+		const chart = screen.getByRole("img", { name: "Распределение позиций" });
+
+		expect(chart).toHaveAccessibleDescription(
+			/Первая акция: 300 ₽, 54,5 %; Вторая акция: 100 ₽, 18,2 %; Остаток 1: 50 ₽, 9,1 %; Остаток 2: 40 ₽, 7,3 %; Остаток 3: 30 ₽, 5,5 %; Прочее: 30 ₽, 5,5 %/,
+		);
+		expect(screen.getByRole("button", { name: /Прочее/ }))
+			.toBeInTheDocument();
+	});
+
+	it("does not duplicate the partial warning on the concentration tab", () => {
+		const data = { ...portfolio, positions: [position({
+			currentValue: { currency: "RUB", value: "100" },
+			displayName: "Акция",
+		})] };
+
+		renderPage(
+			<LoadedHarness
+				{...loadedProps(data)}
+				accountId="a"
+				concentration={toConcentration(
+					data, "stocks", "RUB", concentrationLabels(),
+				)}
+				currency="RUB"
+				partial
+				tab="concentration"
+			/>,
+		);
+
+		expect(screen.getAllByRole("status"))
+			.toHaveLength(1);
+	});
+
+	it("keeps slice and currency while switching page tabs and resets on account change", async () => {
+		const multiCurrency = { ...portfolio, positions:
+			["RUB", "USD"].flatMap(currency =>
+				[400, 250, 150, 100, 50, 30, 20].map((value, index) =>
+					position({
+						currentValue: { currency, value: String(value) },
+						displayName: `${currency} акция ${index + 1}`,
+						sector: "energy", type: "STOCK",
+					}),
+				),
+			) };
+
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () =>
+				HttpResponse.json(resource(multiCurrency)),
+			),
+		);
+		const client = createTestQueryClient();
+		renderAccountRoute(client);
+
+		fireEvent.click(await screen.findByRole("tab", { name: "Концентрация" }));
+		fireEvent.click(screen.getByRole("button", { name: /Прочее/ }));
+		expect(screen.getByRole("button", { name: /Прочее/ }))
+			.toHaveAttribute("aria-expanded", "true");
+		fireEvent.click(screen.getByRole("combobox", { name: "Валюта концентрации" }));
+		fireEvent.click(screen.getByRole("option", { name: "USD" }));
+		expect(screen.getByRole("button", { name: /Прочее/ }))
+			.toHaveAttribute("aria-expanded", "false");
+		fireEvent.click(screen.getByRole("button", { name: /Прочее/ }));
+		fireEvent.click(screen.getByRole("radio", { name: "Секторы" }));
+		fireEvent.click(screen.getByRole("radio", { name: "Акции" }));
+		expect(screen.getByRole("button", { name: /Прочее/ }))
+			.toHaveAttribute("aria-expanded", "false");
+		fireEvent.click(screen.getByRole("radio", { name: "Секторы" }));
+		expect(screen.getByRole("combobox", { name: "Валюта концентрации" }))
+			.toHaveValue("USD");
+
+		fireEvent.click(screen.getByRole("tab", { name: "Позиции" }));
+		fireEvent.click(screen.getByRole("tab", { name: "Концентрация" }));
+
+		expect(screen.getByRole("radio", { name: "Секторы" }))
+			.toBeChecked();
+		expect(screen.getByRole("combobox", { name: "Валюта концентрации" }))
+			.toHaveValue("USD");
+		fireEvent.click(screen.getByRole("button", { name: "Другой счёт" }));
+		fireEvent.click(await screen.findByRole("tab", { name: "Концентрация" }));
+		expect(screen.getByRole("radio", { name: "Акции" })).toBeChecked();
+		expect(screen.getByRole("combobox", { name: "Валюта концентрации" }))
+			.toHaveValue("RUB");
+	});
+
+	it("falls back to the first currency when the selected one disappears", () => {
+		const data = { ...portfolio, positions: [
+			position({
+				currentValue: { currency: "USD", value: "200" },
+			}),
+			position({
+				currentValue: { currency: "RUB", value: "100" },
+			}),
+		] };
+
+		const model = toConcentration(
+			data, "stocks", "EUR", concentrationLabels(),
+		);
+
+		expect(model.currencies).toEqual(["RUB", "USD"]);
+		expect(model.total).toBe("100");
+		expect(model.items.map(item => item.amount)).toEqual(["100"]);
+	});
 	it("shows the loaded portfolio source sync status", async () => {
 		server.use(
 			http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () =>
@@ -306,7 +719,7 @@ describe("AccountPage states", () => {
 
 	it("shows supplied cash separately without adding currency instruments or recalculating totals", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps({
 					...portfolio,
 					cashBalances: [
@@ -490,14 +903,13 @@ describe("AccountPage states", () => {
 	});
 
 	it("renders a stale portfolio in upstream order with nullable values hidden", () => {
-		renderPage(<AccountPageLoaded {...loadedProps()} />);
+		renderPage(<LoadedHarness {...loadedProps()} />);
 
 		expect(
 			screen.getByRole("heading", { level: 1, name: "Портфель" }),
 		).toBeInTheDocument();
 		expect(screen.queryByText(/T-Bank временно недоступен/))
 			.not.toBeInTheDocument();
-		expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
 		expect(screen.getByRole("radio", { name: "Акции" })).toBeInTheDocument();
 		expect(
 			screen.getByRole("radio", { name: "Облигации" }),
@@ -528,7 +940,7 @@ describe("AccountPage states", () => {
 		"renders %s logos, fallbacks and signed returns including zero",
 		(type) => {
 			renderPage(
-				<AccountPageLoaded
+				<LoadedHarness
 					{...loadedProps({
 						...portfolio,
 						positions: [
@@ -571,7 +983,7 @@ describe("AccountPage states", () => {
 		"groups %s supporting metrics into quiet single lines",
 		(type) => {
 			renderPage(
-				<AccountPageLoaded
+				<LoadedHarness
 					{...loadedProps({
 						...portfolio,
 						positions: [position({
@@ -593,7 +1005,7 @@ describe("AccountPage states", () => {
 
 	it("uses the ticker only for stock cards and otherwise keeps the ISIN", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps({
 					...portfolio,
 					positions: [
@@ -618,7 +1030,7 @@ describe("AccountPage states", () => {
 
 	it("keeps other-position cards compact with labeled return and no logo", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps({
 					...portfolio,
 					positions: [position({
@@ -636,7 +1048,7 @@ describe("AccountPage states", () => {
 
 	it("uses the cached account title when available", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps()}
 
 				account={{
@@ -655,7 +1067,7 @@ describe("AccountPage states", () => {
 
 	it("keeps the portfolio visible when recent operations fail", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps()}
 				recentOperations={{
 					state: "error",
@@ -674,7 +1086,7 @@ describe("AccountPage states", () => {
 
 	it("uses the ledger row for a recent outgoing trade operation", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps()}
 
 				recentOperations={{
@@ -724,7 +1136,7 @@ describe("AccountPage states", () => {
 			};
 
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps()}
 
 				recentEvents={{
@@ -793,7 +1205,7 @@ describe("AccountPage states", () => {
 		"keeps the upcoming %s state and calendar action",
 		(state) => {
 			renderPage(
-				<AccountPageLoaded
+				<LoadedHarness
 					{...loadedProps()}
 					recentEvents={{ state, to: "/accounts/account-1/events" }}
 				/>,
@@ -830,7 +1242,7 @@ describe("AccountPage states", () => {
 
 	it("keeps the portfolio visible when upcoming events fail", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps()}
 				recentEvents={{
 					state: "error",
@@ -847,6 +1259,110 @@ describe("AccountPage states", () => {
 		expect(screen.getByText("Вторая")).toBeInTheDocument();
 	});
 
+	it(
+		"keeps cached totals, then warns and retries the same portfolio GET",
+		{ timeout: TEST_MS },
+		async () => {
+			let isFailing = false;
+			let requests = 0;
+			server.use(
+				http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () => {
+					requests += 1;
+					if (isFailing)
+						return HttpResponse.json(
+							{ code: "TBANK_UNAVAILABLE" },
+							{ status: 503 },
+						);
+
+					return HttpResponse.json(resource(
+						requests === 1
+							? portfolio
+							: { ...portfolio, totalsByCurrency: [{ currency: "RUB", value: "999" }] },
+						{ resourceKey: "portfolio" },
+					));
+				}),
+			);
+			const queryClient = createTestQueryClient();
+			renderAccountRoute(queryClient);
+			await screen.findByText("Вторая");
+			expect(screen.queryByRole("button", { name: "Повторить" }))
+				.not.toBeInTheDocument();
+
+			isFailing = true;
+			void queryClient.invalidateQueries({
+				queryKey: portfolioQueryOptions("account-1").queryKey,
+			});
+
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: RETRIES_EXHAUSTED_MS },
+			);
+
+			expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
+			expect(screen.getByText("Вторая")).toBeInTheDocument();
+			expect(screen.getByText("1 234,5 ₽")).toBeInTheDocument();
+			// One cached read plus the three automatic attempts.
+			expect(requests).toBe(4);
+
+			isFailing = false;
+			fireEvent.click(retry);
+
+			expect(await screen.findByText("999 ₽")).toBeInTheDocument();
+			expect(requests).toBe(5);
+			expect(screen.queryByText("Не удалось обновить данные"))
+				.not.toBeInTheDocument();
+			expect(screen.queryByRole("button", { name: "Повторить" }))
+				.not.toBeInTheDocument();
+		},
+	);
+
+	it(
+		"offers retry after an initial temporary failure and recovers in place",
+		{ timeout: TEST_MS },
+		async () => {
+			let isFailing = true;
+			let requests = 0;
+			server.use(
+				http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () => {
+					requests += 1;
+
+					return isFailing
+						? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
+						: HttpResponse.json(resource(portfolio, { resourceKey: "portfolio" }));
+				}),
+			);
+			renderAccountRoute(createTestQueryClient());
+
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: RETRIES_EXHAUSTED_MS },
+			);
+
+			expect(requests).toBe(3);
+			isFailing = false;
+			fireEvent.click(retry);
+
+			expect(await screen.findByText("Вторая")).toBeInTheDocument();
+			expect(requests).toBe(4);
+		},
+	);
+
+	it.each(["NOT_FOUND", "UNAUTHORIZED"])(
+		"does not offer a plain retry for %s after a cached portfolio",
+		async (code) => {
+			server.use(
+				http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () =>
+					HttpResponse.json({ code }, { status: code === "NOT_FOUND" ? 404 : 401 })),
+			);
+			renderAccountRoute(createTestQueryClient());
+			await waitFor(() =>
+				expect(screen.queryByRole("heading", { name: "Загрузка" })).not.toBeInTheDocument());
+			expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
+		},
+	);
+
 	it.each([503])(
 		"preserves totals quietly through refresh error %i and success",
 		async (status) => {
@@ -899,7 +1415,7 @@ describe("AccountPage states", () => {
 			});
 
 			expect(structure).toHaveTextContent("10 ₽");
-			expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
+			expect(screen.getByText(/^Данные на /)).toBeInTheDocument();
 			void queryClient.invalidateQueries({
 				queryKey: portfolioQueryOptions("account-1").queryKey,
 			});
@@ -943,7 +1459,7 @@ describe("AccountPage states", () => {
 					screen.getAllByRole("definition").map(node => node.textContent),
 				).toEqual(["-0,5 $"]),
 			);
-			expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
+			expect(screen.getByText(/^Данные на /)).toHaveTextContent("Данные на");
 			expect(structure).not.toHaveTextContent("10 ₽");
 			expect(structure).toHaveTextContent("Нет положительной стоимости");
 			expect(
@@ -984,7 +1500,7 @@ describe("AccountPage states", () => {
 		expect(
 			screen.getAllByRole("definition").map(node => node.textContent),
 		).toEqual(["1 234,5 ₽"]);
-		expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
+		expect(screen.getByText(/^Данные на /)).toBeInTheDocument();
 		expect(
 			screen.queryByRole("status", { name: "Загрузка" }),
 		).not.toBeInTheDocument();
@@ -995,7 +1511,7 @@ describe("AccountPage states", () => {
 	});
 
 	it("opens positions by default and switches between local tabs", () => {
-		renderPage(<AccountPageLoaded {...loadedProps()} />);
+		renderPage(<LoadedHarness {...loadedProps()} />);
 
 		expect(screen.getByRole("tab", { name: "Позиции" }))
 			.toHaveAttribute("aria-selected", "true");
@@ -1012,7 +1528,7 @@ describe("AccountPage states", () => {
 
 	it("links operation, event and income previews to their detail pages", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps()}
 				incomeSummary={{
 					state: "empty",
@@ -1033,7 +1549,7 @@ describe("AccountPage states", () => {
 	});
 
 	it("filters positions by the kinds present in the portfolio", () => {
-		renderPage(<AccountPageLoaded {...loadedProps()} />);
+		renderPage(<LoadedHarness {...loadedProps()} />);
 
 		expect(
 			screen.getAllByRole<HTMLInputElement>("radio").map(radio => radio.value),
@@ -1047,7 +1563,7 @@ describe("AccountPage states", () => {
 
 	it("hides the position filter when only one kind exists", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps({
 					...portfolio,
 					positions: [portfolio.positions[0]],
@@ -1060,7 +1576,7 @@ describe("AccountPage states", () => {
 	});
 
 	it("hides unrealized returns for a partial portfolio", () => {
-		renderPage(<AccountPageLoaded {...loadedProps()} partial />);
+		renderPage(<LoadedHarness {...loadedProps()} partial />);
 
 		expect(screen.queryByRole("region", { name: "Нереализованный результат" }))
 			.not.toBeInTheDocument();
@@ -1068,7 +1584,7 @@ describe("AccountPage states", () => {
 
 	it("omits an unrealized currency total when any return is incomplete", () => {
 		renderPage(
-			<AccountPageLoaded
+			<LoadedHarness
 				{...loadedProps({
 					...portfolio,
 					positions: [

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

@@ -1,38 +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}
-				recentEvents={viewModel.recentEvents}
+				readRetry={vm.readRetry}
-				recentOperations={viewModel.recentOperations}
+				recentEvents={vm.recentEvents}
+				recentOperations={vm.recentOperations}
+				source={vm.source}
 			/>
 		);
 
 	return (
 		<AccountPageLoaded
-			account={viewModel.account}
+			account={vm.account}
-			accountId={viewModel.accountId}
+			accountId={vm.accountId}
-			incomeSummary={viewModel.incomeSummary}
+			concentration={vm.concentration}
-			partial={viewModel.partial}
+			currency={vm.currency}
-			portfolio={viewModel.portfolio}
+			incomeSummary={vm.incomeSummary}
-			positionSections={viewModel.positionSections}
+			onCurrencyChange={vm.onCurrencyChange}
-			recentEvents={viewModel.recentEvents}
+			onSliceChange={vm.onSliceChange}
-			recentOperations={viewModel.recentOperations}
+			onTabChange={vm.onTabChange}
-			source={viewModel.source}
+			partial={vm.partial}
-			unrealizedReturns={viewModel.unrealizedReturns}
+			portfolio={vm.portfolio}
+			positionSections={vm.positionSections}
+			readRetry={vm.readRetry}
+			recentEvents={vm.recentEvents}
+			recentOperations={vm.recentOperations}
+			slice={vm.slice}
+			source={vm.source}
+			tab={vm.tab}
+			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

@@ -1,3 +1,5 @@
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
 import { useParams } from "react-router";
 
 import type { Portfolio } from "@/entities/portfolio";
@@ -14,9 +16,16 @@ import {
 import { useIncomeSummary } from "@/entities/income";
 import { usePortfolio } from "@/entities/portfolio";
 import { useScreenSync } from "@/features/tbank-connection";
-import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "@/shared/api";
+import { apiErrorCode, isBrokerageAccessLoss, readRetry } from "@/shared/api";
 import { useInitialAvailability } from "@/shared/lib";
 
+import {
+	type Concentration,
+	concentrationCurrencies,
+	type ConcentrationLabels,
+	type Slice,
+	toConcentration,
+} from "../../model/concentration";
 import {
 	type AccountPagePositionSection,
 	toAccountPagePositionSections,
@@ -36,8 +45,10 @@ type AccountPageContent = {
 	accountId?: string;
 	incomeSummary: AccountPageIncomeSummary;
 	partial?: boolean;
+	readRetry: AccountPageReadRetry;
 	recentEvents: AccountPageRecentEvents;
 	recentOperations: AccountPageRecentOperations;
+	source?: InvestmentResourceMeta;
 };
 
 type AccountPageEmptyViewModel = AccountPageContent & {
@@ -45,27 +56,47 @@ type AccountPageEmptyViewModel = AccountPageContent & {
 };
 
 type AccountPageLoadedViewModel = AccountPageContent & {
+	concentration: Concentration | null;
+	currency: null | string;
+	onCurrencyChange: (currency: null | string) => void;
+	onSliceChange: (slice: Slice) => void;
+	onTabChange: (tab: null | string) => void;
 	portfolio: Portfolio;
 	positionSections: AccountPagePositionSection[];
-	source?: InvestmentResourceMeta;
+	slice: Slice;
 	state: "loaded";
+	tab: string;
 	unrealizedReturns: Portfolio["totalsByCurrency"];
 };
 
+type AccountPageReadRetry = ReturnType<typeof readRetry>;
+
 type AccountPageViewModel
 	= | AccountPageEmptyViewModel
 		| AccountPageLoadedViewModel
-		| { code?: string; state: "error" }
+		| { code?: string; readRetry: AccountPageReadRetry; state: "error" }
 		| { state: "loading" };
 
-function isPortfolioAccessFailure(code?: string) {
+function useAccountPageVm(): AccountPageViewModel {
-	return isApiErrorCode(code, ApiErrorCode.InvalidTbankToken)
-		|| isApiErrorCode(code, ApiErrorCode.NotFound)
-		|| isApiErrorCode(code, ApiErrorCode.TbankNotConnected);
-}
-
-function useAccountPageViewModel(): AccountPageViewModel {
 	const { accountId } = useParams();
+	const { t } = useTranslation();
+
+	const [selection, setSelection] = useState<{
+		accountId?: string;
+		currency: null | string;
+		slice: Slice;
+		tab: string;
+	}>({ accountId, currency: null, slice: "stocks", tab: "positions" });
+
+	const current = selection.accountId === accountId
+		? selection
+		: {
+				accountId, currency: null, slice: "stocks" as const, tab: "positions",
+			};
+
+	const updateSelection = (change: Partial<typeof selection>) =>
+		setSelection({ ...current, ...change });
+
 	const portfolio = usePortfolio(accountId);
 
 	const operations = useBrokerageOperations(accountId, {
@@ -85,7 +116,9 @@ function useAccountPageViewModel(): AccountPageViewModel {
 	]);
 
 	const code = apiErrorCode(portfolio.error);
-	const isAccessFailure = isPortfolioAccessFailure(code);
+	// The portfolio drives this screen; the retry repeats only its GET.
+	const retry = readRetry([portfolio]);
+	const isAccessFailure = isBrokerageAccessLoss(code);
 
 	const availability = useInitialAvailability({
 		hasContent: !!portfolio.data,
@@ -94,12 +127,13 @@ function useAccountPageViewModel(): AccountPageViewModel {
 		isFetching: portfolio.isFetching,
 	});
 
-	if (isAccessFailure) return { code, state: "error" as const };
+	if (isAccessFailure)
+		return { code, readRetry: retry, state: "error" as const };
 
 	if (!portfolio.data)
-		return {
+		return availability === "unavailable"
-			state: availability === "unavailable" ? "error" : "loading",
+			? { code, readRetry: retry, state: "error" as const }
-		} as const;
+			: { state: "loading" as const };
 
 	const account = accounts.data?.find(item => item.id === accountId);
 	const recentOperations = toRecentOperations(accountId, operations);
@@ -116,26 +150,53 @@ function useAccountPageViewModel(): AccountPageViewModel {
 			account,
 			accountId,
 			incomeSummary,
+			readRetry: retry,
 			recentEvents,
 			recentOperations,
+			source: portfolio.meta,
 			state: "empty" as const,
 		};
 
 	const isPartial = portfolio.meta?.completeness === "incomplete";
+	const currencies = concentrationCurrencies(portfolio.data);
+
+	const currency = current.currency && currencies.includes(current.currency)
+		? current.currency
+		: currencies[0] ?? null;
+
+	const labels: ConcentrationLabels = {
+		missingIssuer: t("portfolio.concentration.missingIssuer"),
+		missingSector: t("portfolio.concentration.missingSector"),
+		other: t("portfolio.concentration.other"),
+		sector: code => t(`stock.sectors.${code}`, { defaultValue: code }),
+	};
+
+	const concentration = accountId !== "all"
+		&& current.tab === "concentration"
+		? toConcentration(portfolio.data, current.slice, currency, labels)
+		: null;
 
 	return {
 		account,
 		accountId,
+		concentration,
+		currency,
 		incomeSummary,
+		onCurrencyChange: value => updateSelection({ currency: value }),
+		onSliceChange: slice => updateSelection({ slice }),
+		onTabChange: tab => updateSelection({ tab: tab ?? "positions" }),
 		partial: isPartial,
 		portfolio: portfolio.data,
 		positionSections: toAccountPagePositionSections(portfolio.data),
+		readRetry: retry,
 		recentEvents,
 		recentOperations,
+		slice: current.slice,
 		source: portfolio.meta,
 		state: "loaded" as const,
+		tab: current.tab,
 		unrealizedReturns: toUnrealizedReturns(portfolio.data.positions),
 	};
 }
 
-export { useAccountPageViewModel };
+export { useAccountPageVm };

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

@@ -5,9 +5,10 @@ import { StateView } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
 import type { BrokerageAccount } from "@/entities/brokerage-account";
+import type { InvestmentResourceMeta } from "@/shared/api";
 
 import { BrokerageEventsPreview } from "@/entities/brokerage-event";
-import { PortfolioStructure } from "@/widgets/portfolio-structure";
+import { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
 
 import type {
 	AccountPageIncomeSummary,
@@ -17,14 +18,17 @@ import type {
 
 import { AccountHeading } from "./AccountHeading.view";
 import { IncomeSummary } from "./IncomeSummary.view";
+import { PortfolioStructure } from "./PortfolioStructure/PortfolioStructure";
 import { RecentOperations } from "./RecentOperations.view";
 
 type AccountPageEmptyProps = {
 	account?: BrokerageAccount;
 	accountId?: string;
 	incomeSummary?: AccountPageIncomeSummary;
+	readRetry?: ReadRetryProps;
 	recentEvents: AccountPageRecentEvents;
 	recentOperations: AccountPageRecentOperations;
+	source?: InvestmentResourceMeta;
 };
 
 const AccountPageEmpty: FC<AccountPageEmptyProps> = (props) => {
@@ -40,6 +44,14 @@ const AccountPageEmpty: FC<AccountPageEmptyProps> = (props) => {
 		<Stack>
 			<AccountHeading account={props.account} accountId={props.accountId} />
 
+			<SourceSyncStatus
+				lastAttempt={props.source?.lastAttempt}
+				lastSuccessfulAt={props.source?.lastSuccessfulAt}
+				stale={props.source?.freshness === "stale"}
+			/>
+
+			{!!props.readRetry && <ReadRetry {...props.readRetry} />}
+
 			<StateView text={text} title={t("portfolio.emptyTitle")} />
 
 			<PortfolioStructure

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

@@ -6,8 +6,12 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
 import { ApiErrorCode, isApiErrorCode } from "@/shared/api";
+import { ReadRetryButton, type ReadRetryProps } from "@/shared/ui";
 
-type AccountPageErrorProps = { code?: string };
+type AccountPageErrorProps = {
+	code?: string;
+	readRetry?: ReadRetryProps;
+};
 
 const AccountPageError: FC<AccountPageErrorProps> = (props) => {
 	const { code } = props;
@@ -43,8 +47,18 @@ const AccountPageError: FC<AccountPageErrorProps> = (props) => {
 			/>
 		);
 
+	const retry = props.readRetry?.exhausted
+		? (
+				<ReadRetryButton
+					onRetry={props.readRetry.onRetry}
+					retrying={props.readRetry.retrying}
+				/>
+			)
+		: undefined;
+
 	return (
 		<StateView
+			action={retry}
 			text={t("states.unavailableText")}
 			title={t("states.unavailableTitle")}
 		/>

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

@@ -15,9 +15,9 @@ import type { InvestmentResourceMeta } from "@/shared/api";
 
 import { BrokerageEventsPreview } from "@/entities/brokerage-event";
 import { formatMoney } from "@/shared/lib";
-import { SourceSyncStatus } from "@/shared/ui";
+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";
 import type {
 	AccountPageIncomeSummary,
@@ -27,27 +27,40 @@ import type {
 
 import classes from "../AccountPage.module.css";
 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";
 
 type AccountPageLoadedProps = {
 	account?: BrokerageAccount;
 	accountId?: string;
+	concentration: ConcentrationModel | null;
+	currency: null | string;
 	incomeSummary?: AccountPageIncomeSummary;
+	onCurrencyChange: (currency: null | string) => void;
+	onSliceChange: (slice: Slice) => void;
+	onTabChange: (tab: null | string) => void;
 	partial?: boolean;
 	portfolio: Portfolio;
 	positionSections: AccountPagePositionSection[];
+	readRetry?: ReadRetryProps;
 	recentEvents: AccountPageRecentEvents;
 	recentOperations: AccountPageRecentOperations;
+	slice: Slice;
 	source?: InvestmentResourceMeta;
+	tab: string;
 	unrealizedReturns: Portfolio["totalsByCurrency"];
 };
 
 const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 	const { t } = useTranslation();
 	const [filter, setFilter] = useState<string>();
+	const tab = props.tab;
+
+	const onTabChange = props.onTabChange;
 
 	const activeSection = props.positionSections.find(
 		section => section.kind === filter,
@@ -74,8 +87,12 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 				stale={props.source?.freshness === "stale"}
 			/>
 
+			{!!props.readRetry && <ReadRetry {...props.readRetry} />}
+
 			{props.partial
-				? <Alert role="status">{t("investment.partial")}</Alert>
+				? tab !== "concentration" && (
+					<Alert role="status">{t("investment.partial")}</Alert>
+				)
 				: <CurrencyCards amounts={props.portfolio.totalsByCurrency} />}
 
 			{!props.partial && props.unrealizedReturns.length > 0 && (
@@ -107,14 +124,21 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 
 			<Tabs
 				classNames={{ list: classes.tabsList }}
-				defaultValue="positions"
 				keepMounted={false}
+				onChange={onTabChange}
+				value={tab}
 			>
 				<Tabs.List aria-label={t("portfolio.sections")} mb="md">
 					<Tabs.Tab value="positions">
 						{t("portfolio.tabs.positions")}
 					</Tabs.Tab>
 
+					{props.accountId !== "all" && (
+						<Tabs.Tab value="concentration">
+							{t("portfolio.concentration.title")}
+						</Tabs.Tab>
+					)}
+
 					<Tabs.Tab value="cash">{t("portfolio.tabs.cash")}</Tabs.Tab>
 
 					<Tabs.Tab value="operations">
@@ -143,6 +167,22 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 					</Stack>
 				</Tabs.Panel>
 
+				{props.accountId !== "all" && (
+					<Tabs.Panel value="concentration">
+						{props.concentration && (
+							<Concentration
+								currency={props.currency}
+								key={`${props.slice}-${props.currency}`}
+								model={props.concentration}
+								onCurrencyChange={props.onCurrencyChange}
+								onSliceChange={props.onSliceChange}
+								partial={!!props.partial}
+								slice={props.slice}
+							/>
+						)}
+					</Tabs.Panel>
+				)}
+
 				<Tabs.Panel value="cash">
 					<CurrencyCards amounts={props.portfolio.cashBalances} />
 				</Tabs.Panel>

src/pages/account/ui/AccountPage/components/Concentration/Concentration.module.css

@@ -0,0 +1,111 @@
+.layout {
+	display: grid;
+	grid-template-columns: minmax(260px, 1fr) minmax(0, 1.4fr);
+	gap: var(--mantine-spacing-xl);
+	align-items: center;
+}
+
+.chart {
+	position: relative;
+	justify-self: center;
+}
+
+.pattern {
+	position: absolute;
+	width: 0;
+	height: 0;
+}
+
+.center {
+	position: absolute;
+	inset: 32%;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	text-align: center;
+	font-size: clamp(12px, 1.3vw, 17px);
+	overflow-wrap: anywhere;
+	pointer-events: none;
+}
+
+.srOnly {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	white-space: nowrap;
+}
+
+.list {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+.row {
+	display: flex;
+	align-items: center;
+	gap: var(--mantine-spacing-sm);
+	min-height: 58px;
+	border-bottom: 1px solid var(--mantine-color-gray-2);
+}
+
+.rank {
+	display: grid;
+	place-items: center;
+	width: 28px;
+	height: 28px;
+	flex: none;
+	border-radius: 50%;
+	color: white;
+}
+
+.identity {
+	flex: 1;
+	min-width: 0;
+	overflow-wrap: anywhere;
+}
+
+.bar,
+.bar span {
+	display: block;
+	height: 4px;
+	border-radius: 4px;
+}
+
+.bar {
+	background: var(--mantine-color-gray-2);
+}
+
+.value {
+	text-align: right;
+	white-space: nowrap;
+}
+
+.other {
+	display: flex;
+	justify-content: space-between;
+	gap: var(--mantine-spacing-sm);
+	width: 100%;
+	min-height: 44px;
+	align-items: center;
+	border: 0;
+	background: var(--mantine-color-gray-0);
+	color: inherit;
+	cursor: pointer;
+	text-align: left;
+}
+
+.other:focus-visible {
+	outline: 2px solid var(--mantine-color-blue-6);
+	outline-offset: 2px;
+}
+
+@media (max-width: 700px) {
+	.layout { grid-template-columns: 1fr; }
+	.slices { max-width: 100%; overflow-x: auto; }
+	.other { flex-wrap: wrap; }
+}

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

@@ -0,0 +1,330 @@
+import { DonutChart } from "@mantine/charts";
+import {
+	Alert, Box, Group, Paper, SegmentedControl, Select, Stack,
+	Text, Title,
+} from "@mantine/core";
+import { type FC, useId, useState } from "react";
+import { useTranslation } from "react-i18next";
+
+import { formatMoney } from "@/shared/lib";
+
+import type {
+	ConcentrationItem,
+	Concentration as ConcentrationModel,
+	Slice,
+} from "../../../../model/concentration";
+
+import { PositionLogo } from "../PositionLogo.view";
+import classes from "./Concentration.module.css";
+
+type Props = {
+	currency: null | string;
+	model: ConcentrationModel;
+	onCurrencyChange: (currency: null | string) => void;
+	onSliceChange: (slice: Slice) => void;
+	partial: boolean;
+	slice: Slice;
+};
+
+const sliceLabels = {
+	bonds: "portfolio.bonds",
+	issuers: "portfolio.concentration.issuers",
+	sectors: "portfolio.concentration.sectors",
+	stocks: "portfolio.stocks",
+} as const;
+
+type RowProps = {
+	color: string;
+	currency: string;
+	index: number;
+	item: ConcentrationItem;
+	logo?: ConcentrationItem["logo"];
+	name: string;
+};
+
+const colors = [
+	"#2563eb", "#18a999", "#f59e0b", "#8b5cf6", "#ef6c5b",
+	"#64748b",
+];
+
+const PERCENT = 100;
+const OTHER_START = 6;
+
+function amountFor(item: ConcentrationItem, currency: string): string {
+	return formatMoney({ currency, value: item.amount });
+}
+
+const ConcentrationRow: FC<RowProps> = props => (
+	<li className={classes.row}>
+		<span
+			aria-hidden="true"
+			className={classes.rank}
+			style={{ backgroundColor: props.color }}
+		>
+			{props.index}
+		</span>
+
+		{props.logo && <PositionLogo label={props.name} src={props.logo.src} />}
+
+		<span className={classes.identity}>
+			<span>{props.name}</span>
+
+			{props.logo?.subtitle && (
+				<Text c="dimmed" size="xs">{props.logo.subtitle}</Text>
+			)}
+
+			<span aria-hidden="true" className={classes.bar}>
+				<span style={{
+					backgroundColor: props.color,
+					width: `${props.item.chartValue * PERCENT}%`,
+				}}
+				/>
+			</span>
+		</span>
+
+		<span className={classes.value}>
+			<strong>{amountFor(props.item, props.currency)}</strong>
+
+			<Text c="dimmed" size="sm">{props.item.share}</Text>
+		</span>
+	</li>
+);
+
+type TooltipProps = {
+	active?: boolean;
+	payload?: { name?: number | string }[];
+	rows: { amount: string; label: string; share: string }[];
+};
+
+function chartCellProps(series: { name: string }, rows: ConcentrationItem[]) {
+	const index = Number(series.name);
+	const item = rows.at(index);
+
+	return {
+		stroke: "white",
+		strokeWidth: 2,
+		...((item?.unknown || (index === rows.length - 1
+			&& item?.key === "__other"))
+		&& { strokeDasharray: "3 2" }),
+	};
+}
+
+function rankLabel({ index }: { index: number; percent?: number }) {
+	return String(index + 1);
+}
+
+const ChartTooltip: FC<TooltipProps> = (props) => {
+	const row = props.rows[Number(props.payload?.[0]?.name)];
+	if (!row || !props.active) return;
+
+	return (
+		<Paper p="sm" radius="md" shadow="sm">
+			<Text fw={600} size="sm">{row.label}</Text>
+
+			<Text size="sm">{row.amount} · {row.share}</Text>
+		</Paper>
+	);
+};
+
+const Concentration: FC<Props> = (props) => {
+	const { t } = useTranslation();
+	const [expanded, setExpanded] = useState(false);
+	const otherId = useId();
+	const chartId = useId();
+	const currency = props.currency ?? "";
+
+	const rows = props.model.other
+		? [...props.model.items, props.model.other]
+		: props.model.items;
+
+	const chartData = rows.map((item, index) => ({
+		color: colors[index % colors.length] ?? colors[0] ?? "blue",
+		name: String(index),
+		value: item.chartValue,
+	}));
+
+	const chartText = [
+		props.model.top5Share && t("portfolio.concentration.top5", {
+			share: props.model.top5Share,
+		}),
+		props.model.total && formatMoney({
+			currency, value: props.model.total,
+		}),
+		...rows.map(item => `${item.label}: ${amountFor(item, currency)}, ${item.share}`),
+	].filter(Boolean).join("; ");
+
+	const slices = [
+		{ label: t("portfolio.stocks"), value: "stocks" },
+		{ label: t("portfolio.bonds"), value: "bonds" },
+		{ label: t("portfolio.concentration.sectors"), value: "sectors" },
+		{ label: t("portfolio.concentration.issuers"), value: "issuers" },
+	];
+
+	// eslint-disable-next-line frontend/readability -- Mantine callback closes over page action.
+	const selectSlice = (value: string) => props.onSliceChange(value as Slice);
+	// eslint-disable-next-line frontend/readability -- Disclosure state belongs to this view.
+	const toggleOther = () => setExpanded(value => !value);
+
+	// eslint-disable-next-line frontend/readability -- Chart callback closes over visible rows.
+	const cellProps = (series: { name: string }) => chartCellProps(series, rows);
+	const pieProps = { isAnimationActive: false, label: rankLabel };
+
+	const tooltipRows = rows.map(item => ({
+		amount: amountFor(item, currency),
+		label: item.label,
+		share: item.share,
+	}));
+
+	const tooltipProps = { content: <ChartTooltip rows={tooltipRows} /> };
+
+	const totalText = props.model.total
+		? formatMoney({ currency, value: props.model.total })
+		: "";
+
+	return (
+		<Stack gap="lg">
+			<Group align="end" justify="space-between">
+				<SegmentedControl
+					aria-label={t("portfolio.concentration.slice")}
+					className={classes.slices}
+					data={slices}
+					onChange={selectSlice}
+					value={props.slice}
+				/>
+
+				{props.model.currencies.length > 1 && (
+					<Select
+						allowDeselect={false}
+						aria-label={t("portfolio.concentration.currency")}
+						data={props.model.currencies}
+						onChange={props.onCurrencyChange}
+						value={props.currency}
+						w={130}
+					/>
+				)}
+			</Group>
+
+			{props.partial && (
+				<Alert role="status">{t("portfolio.concentration.incomplete")}</Alert>
+			)}
+
+			{props.model.empty
+				? (
+						<Stack gap="xs">
+							<Text fw={600}>{t(sliceLabels[props.slice])}
+								{props.currency && ` · ${props.currency}`}
+							</Text>
+
+							<Text>{t("portfolio.concentration.empty")}</Text>
+						</Stack>
+					)
+				: (
+						<Paper className={classes.layout} p="lg" radius="md" withBorder>
+							<Box className={classes.chart}>
+								<DonutChart
+									aria-describedby={chartId}
+									aria-label={t("portfolio.concentration.chart")}
+									cellProps={cellProps}
+									data={chartData}
+									pieProps={pieProps}
+									role="img"
+									size={260}
+									strokeWidth={24}
+									tooltipDataSource="segment"
+									tooltipProps={tooltipProps}
+								/>
+
+								<div aria-hidden="true" className={classes.center}>
+									{props.model.top5Share && (
+										<Text fw={700} size="sm">{t("portfolio.concentration.top5", {
+											share: props.model.top5Share,
+										})}
+										</Text>
+									)}
+
+									<Text fw={700}>{totalText}</Text>
+								</div>
+
+								<Text
+									className={classes.srOnly}
+									id={chartId}
+								>
+									{chartText}
+								</Text>
+							</Box>
+
+							<Stack gap="xs">
+								<Title order={3} size="md">{t("portfolio.concentration.title")}</Title>
+
+								<ol className={classes.list}>
+									{props.model.items.map((item, index) => (
+										<ConcentrationRow
+											color={colors[index % colors.length] ?? "blue"}
+											currency={currency}
+											index={index + 1}
+											item={item}
+											key={item.key}
+											logo={item.logo}
+											name={item.label}
+										/>
+									))}
+								</ol>
+
+								{props.model.other && (
+									<>
+										<button
+											aria-controls={otherId}
+											aria-expanded={expanded}
+											className={classes.other}
+											onClick={toggleOther}
+											type="button"
+										>
+											<span>{t("portfolio.concentration.other")} · {t(
+												"portfolio.concentration.otherCount",
+												{ count: props.model.other.count },
+											)}
+											</span>
+
+											<span>{amountFor(props.model.other, currency)} · {
+												props.model.other.share
+											}
+											</span>
+										</button>
+
+										<ol
+											className={classes.list}
+											hidden={!expanded}
+											id={otherId}
+											start={OTHER_START}
+										>
+											{props.model.other.entries.map((item, index) => (
+												<ConcentrationRow
+													color={colors[(index + OTHER_START) % colors.length]
+														?? "blue"}
+													currency={currency}
+													index={index + OTHER_START}
+													item={item}
+													key={item.key}
+													logo={item.logo}
+													name={item.label}
+												/>
+											))}
+										</ol>
+									</>
+								)}
+							</Stack>
+						</Paper>
+					)}
+
+			{props.model.unaccounted > 0 && (
+				<Text c="dimmed" size="sm">{t(
+					"portfolio.concentration.unaccounted",
+					{ count: props.model.unaccounted },
+				)}
+				</Text>
+			)}
+		</Stack>
+	);
+};
+
+export { Concentration };

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/account/ui/AccountPage/components/PositionCard/PositionCard.stories.tsx

@@ -12,6 +12,7 @@ const syntheticPosition
 		displayName: "Учебные технологии",
 		figi: null,
 		isin: null,
+		issuer: null,
 		logoName: null,
 		logoSrc: null,
 		quantity: "100",
@@ -19,6 +20,7 @@ const syntheticPosition
 		returnPercentText: "+25,00 %",
 		returnText: "+5 000 ₽",
 		returnTone: "positive",
+		sector: null,
 		shareText: "20%",
 		ticker: "DEMO",
 		type: "STOCK",

src/pages/account/ui/AccountPage/position-layout.browser.test.tsx

@@ -37,12 +37,14 @@ it("keeps expanded positions vertical while other positions adapt to the viewpor
 					displayName: `Инструмент ${index}`,
 					figi: null,
 					isin: null,
+					issuer: null,
 					logoName: null,
 					logoSrc: null,
 					quantity: "10",
 					returnPercent: null,
 					returnPercentText: null,
 					returnText: null,
+					sector: null,
 					shareText: null,
 					ticker: null,
 					type: kind === "stocks" ? "STOCK" : otherType,

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

@@ -1,6 +1,6 @@
 import { MantineProvider } from "@mantine/core";
 import { type QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import { render, screen, waitFor } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
 import { MemoryRouter } from "react-router";
 import { describe, expect, it, vi } from "vitest";
@@ -261,6 +261,101 @@ describe("AccountsPage", () => {
 	});
 });
 
+// Automatic read retries wait 1s + 2s before the failure is final.
+const RETRIES_EXHAUSTED_MS = 6000;
+const TEST_MS = 10_000;
+
+describe("exhausted read retries", () => {
+	it(
+		"keeps the cached list, warns and retries the same accounts GET",
+		{ timeout: TEST_MS },
+		async () => {
+			let isFailing = false;
+			let requests = 0;
+			server.use(
+				http.get("*/api/v1/brokerage-accounts", () => {
+					requests += 1;
+					if (isFailing)
+						return HttpResponse.json(
+							{ code: "TBANK_UNAVAILABLE" },
+							{ status: 503 },
+						);
+
+					return HttpResponse.json(resource([account]));
+				}),
+			);
+			const queryClient = createTestQueryClient();
+			renderPage(queryClient);
+			await screen.findByText("Основной");
+			expect(screen.queryByRole("button", { name: "Повторить" }))
+				.not.toBeInTheDocument();
+
+			isFailing = true;
+			void queryClient.invalidateQueries({
+				queryKey: brokerageAccountsQueryKey,
+			});
+
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: RETRIES_EXHAUSTED_MS },
+			);
+
+			expect(screen.getByText("Не удалось обновить данные")).toBeInTheDocument();
+			expect(screen.getByText("Основной")).toBeInTheDocument();
+			expect(requests).toBe(4);
+
+			isFailing = false;
+			fireEvent.click(retry);
+
+			await waitFor(() =>
+				expect(screen.queryByText("Не удалось обновить данные"))
+					.not.toBeInTheDocument());
+			expect(requests).toBe(5);
+			expect(screen.getByText("Основной")).toBeInTheDocument();
+		},
+	);
+
+	it(
+		"offers retry on the unavailable state after an initial failure",
+		{ timeout: TEST_MS },
+		async () => {
+			let isFailing = true;
+			server.use(
+				http.get("*/api/v1/brokerage-accounts", () =>
+					isFailing
+						? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
+						: HttpResponse.json(resource([account]))),
+			);
+			renderPage(createTestQueryClient());
+
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: RETRIES_EXHAUSTED_MS },
+			);
+
+			isFailing = false;
+			fireEvent.click(retry);
+
+			expect(await screen.findByText("Основной")).toBeInTheDocument();
+		},
+	);
+
+	it("does not offer a plain retry when the connection is lost", async () => {
+		server.use(
+			http.get("*/api/v1/brokerage-accounts", () =>
+				HttpResponse.json({ code: "TBANK_NOT_CONNECTED" }, { status: 409 })),
+		);
+		renderPage(createTestQueryClient());
+
+		expect(await screen.findByRole("link", { name: "Открыть настройки T-Bank" }))
+			.toBeInTheDocument();
+		expect(screen.queryByRole("button", { name: "Повторить" }))
+			.not.toBeInTheDocument();
+	});
+});
+
 it.each(["none", "failed"] as const)(
 	"keeps incomplete empty membership distinct from no accounts (attempt=%s)",
 	async (state) => {

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

@@ -1,21 +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={vm.readRetry}
 		/>
 	);
 };

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

@@ -4,25 +4,38 @@ import {
 	useBrokerageAccounts,
 } from "@/entities/brokerage-account";
 import { useScreenSync } from "@/features/tbank-connection";
-import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "@/shared/api";
+import {
+	ApiErrorCode,
+	apiErrorCode,
+	isApiErrorCode,
+	readRetry,
+} from "@/shared/api";
 import { useInitialAvailability } from "@/shared/lib";
 
+type AccountsPageReadRetry = ReturnType<typeof readRetry>;
+
 type AccountsPageViewModel
-	= | { accounts: BrokerageAccountCard[]; meta: NonNullable<ReturnType<typeof useBrokerageAccounts>["meta"]>; state: "loaded" }
+	= | {
-		| { code?: string; state: "error" }
+		accounts: BrokerageAccountCard[];
-		| { state: "empty" }
+		meta: NonNullable<ReturnType<typeof useBrokerageAccounts>["meta"]>;
-		| { state: "loading" };
+		readRetry: AccountsPageReadRetry;
+		state: "loaded";
+	}
+	| { code?: string; readRetry: AccountsPageReadRetry; state: "error" }
+	| { state: "empty" }
+	| { state: "loading" };
 
 function isAccountsAccessFailure(code?: string) {
 	return isApiErrorCode(code, ApiErrorCode.InvalidTbankToken)
 		|| isApiErrorCode(code, ApiErrorCode.TbankNotConnected);
 }
 
-function useAccountsPageViewModel(): AccountsPageViewModel {
+function useAccountsPageVm(): AccountsPageViewModel {
 	const accounts = useBrokerageAccounts();
 	useScreenSync({ screen: "accounts" }, [accounts]);
 
 	const code = apiErrorCode(accounts.error);
+	const retry = readRetry([accounts]);
 	const isAccessFailure = isAccountsAccessFailure(code);
 
 	const hasResult = !!accounts.data
@@ -36,12 +49,13 @@ function useAccountsPageViewModel(): AccountsPageViewModel {
 		isFetching: accounts.isFetching,
 	});
 
-	if (isAccessFailure) return { code, state: "error" as const };
+	if (isAccessFailure)
+		return { code, readRetry: retry, state: "error" as const };
 
 	if (!hasResult || !accounts.data)
-		return {
+		return availability === "unavailable"
-			state: availability === "unavailable" ? "error" : "loading",
+			? { code, readRetry: retry, state: "error" as const }
-		} as const;
+			: { state: "loading" as const };
 
 	if (accounts.data.length === 0)
 		return {
@@ -54,8 +68,9 @@ function useAccountsPageViewModel(): AccountsPageViewModel {
 	return {
 		accounts: brokerageAccountCards(accounts.data, meta.dependencies),
 		meta,
+		readRetry: retry,
 		state: "loaded" as const,
 	};
 }
 
-export { useAccountsPageViewModel };
+export { useAccountsPageVm };

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

@@ -6,8 +6,12 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
 import { ApiErrorCode, isApiErrorCode } from "@/shared/api";
+import { ReadRetryButton, type ReadRetryProps } from "@/shared/ui";
 
-type AccountsPageErrorProps = { code?: string };
+type AccountsPageErrorProps = {
+	code?: string;
+	readRetry?: ReadRetryProps;
+};
 
 const AccountsPageError: FC<AccountsPageErrorProps> = (props) => {
 	const { code } = props;
@@ -38,8 +42,18 @@ const AccountsPageError: FC<AccountsPageErrorProps> = (props) => {
 			/>
 		);
 
+	const retry = props.readRetry?.exhausted
+		? (
+				<ReadRetryButton
+					onRetry={props.readRetry.onRetry}
+					retrying={props.readRetry.retrying}
+				/>
+			)
+		: undefined;
+
 	return (
 		<StateView
+			action={retry}
 			text={t("states.unavailableText")}
 			title={t("states.unavailableTitle")}
 		/>

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

@@ -11,7 +11,7 @@ import {
 	BrokerageAccountList,
 } from "@/entities/brokerage-account";
 import { formatMoney } from "@/shared/lib";
-import { SourceSyncStatus } from "@/shared/ui";
+import { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
 
 const DECIMAL_BASE = 10n;
 const DECIMAL_PART_COUNT = 2;
@@ -20,6 +20,7 @@ const ZERO = 0n;
 type AccountsPageLoadedProps = {
 	accounts: BrokerageAccountCard[];
 	meta: InvestmentResourceMeta;
+	readRetry?: ReadRetryProps;
 };
 
 type Money = { currency: string; value: string };
@@ -132,6 +133,8 @@ const AccountsPageLoaded: FC<AccountsPageLoadedProps> = (props) => {
 					lastSuccessfulAt={props.meta.lastSuccessfulAt}
 					stale={props.meta.freshness === "stale"}
 				/>
+
+				{!!props.readRetry && <ReadRetry {...props.readRetry} />}
 			</Stack>
 
 			<Button

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

@@ -347,7 +347,6 @@ describe("bond page", () => {
 	it("keeps market content and sold-position history when coupons fail", async () => {
 		setup({ failCoupons: true, noPosition: true });
 		await screen.findByText("98,125 %");
-		expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
 		expect(
 			screen.queryByRole("heading", { name: "Моя позиция" }),
 		).not.toBeInTheDocument();
@@ -355,6 +354,22 @@ describe("bond page", () => {
 			screen.getByRole("heading", { name: "Моя история событий" }),
 		).toBeVisible();
 	});
+	it(
+		"offers a local retry for the failed coupons section only",
+		{ timeout: 10_000 },
+		async () => {
+			setup({ failCoupons: true });
+			await screen.findByText("98,125 %");
+			// Automatic read retries wait 1s + 2s before the failure is final.
+			await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: 6000 },
+			);
+			expect(screen.getAllByRole("button", { name: "Повторить" })).toHaveLength(1);
+			expect(screen.getByText("98,125 %")).toBeVisible();
+		},
+	);
 	it("preserves cached quote without manual refresh", async () => {
 		const controls = setup({ path: `/bonds/${uid}?period=year&events=trades` });
 		await screen.findByText("98,125 %");

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/pages/stock/ui/StockPage/StockPage.test.tsx

@@ -81,6 +81,7 @@ function setup(
 		candles?: NonNullable<StockPageVm["candles"]>["candles"];
 		cursorError?: string;
 		failCompany?: boolean;
+		failCompanyAfter?: { value: boolean };
 		failStock?: boolean;
 		metrics?: NonNullable<StockPageVm["company"]>["metrics"];
 		noPosition?: boolean;
@@ -133,7 +134,7 @@ function setup(
 					),
 				);
 			if (params.section === "company")
-				return options.failCompany
+				return (options.failCompanyAfter?.value ?? options.failCompany)
 					? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
 					: HttpResponse.json(
 
@@ -396,7 +397,6 @@ describe("stock page", () => {
 			screen.queryByRole("heading", { name: "Моя позиция" }),
 		).not.toBeInTheDocument();
 		expect(screen.getByRole("heading", { name: "График цены" })).toBeVisible();
-		expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
 	});
 	it("keeps successful sections visible when company data is initially missing", async () => {
 		const { requests } = setup({ failCompany: true });
@@ -404,8 +404,39 @@ describe("stock page", () => {
 		const previousRequests = requests.length;
 		expect(screen.getByText("Зачисление дивидендов")).toBeVisible();
 		expect(requests).toHaveLength(previousRequests);
-		expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
 	});
+	it(
+		"retries only the failed company section and recovers it in place",
+		{ timeout: 10_000 },
+		async () => {
+			const failing = { value: true };
+			const { requests } = setup({ failCompanyAfter: failing });
+			await screen.findByText("Зачисление дивидендов");
+
+			// Automatic read retries wait 1s + 2s before the failure is final.
+			const retry = await screen.findByRole(
+				"button",
+				{ name: "Повторить" },
+				{ timeout: 6000 },
+			);
+
+			expect(screen.getByRole("heading", { name: "График цены" })).toBeVisible();
+			expect(screen.getAllByRole("button", { name: "Повторить" })).toHaveLength(1);
+			const before = requests.length;
+			const companyBefore = requests.filter(url => url.pathname.endsWith("/company")).length;
+
+			failing.value = false;
+			fireEvent.click(retry);
+
+			await waitFor(() =>
+				expect(screen.queryByRole("button", { name: "Повторить" }))
+					.not.toBeInTheDocument());
+			expect(requests.filter(url => url.pathname.endsWith("/company")))
+				.toHaveLength(companyBefore + 1);
+			expect(requests.length - before).toBe(1);
+			expect(screen.getByText("Описание компании")).toBeVisible();
+		},
+	);
 	it("sends instrument-filtered continuation, restores it on returning to the filter and changes chart period", async () => {
 		const { requests } = setup();
 		await screen.findByText("Зачисление дивидендов");

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

@@ -3,7 +3,12 @@ import createQueryClient from "openapi-react-query";
 
 import type { paths } from "./generated/schema";
 
-import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "./problem-details";
+import {
+	ApiErrorCode,
+	apiErrorCode,
+	isApiErrorCode,
+	isBrokerageAccessLoss,
+} from "./problem-details";
 
 const HTTP_UNAUTHORIZED = 401;
 const HTTP_REQUEST_TIMEOUT = 408;
@@ -165,12 +170,8 @@ function isNetworkFailure(error: unknown): boolean {
 }
 
 function isPermanentCode(code?: string): boolean {
-	return [
+	return isBrokerageAccessLoss(code)
-		ApiErrorCode.InvalidTbankToken,
+		|| isApiErrorCode(code, ApiErrorCode.Unauthorized);
-		ApiErrorCode.NotFound,
-		ApiErrorCode.TbankNotConnected,
-		ApiErrorCode.Unauthorized,
-	].some(permanent => isApiErrorCode(code, permanent));
 }
 
 function isTransientReadFailure(
@@ -207,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} */
@@ -1056,6 +1104,10 @@ export interface components {
             id: string;
             name: string;
         };
+        PortfolioIssuerDto: {
+            id: string;
+            name: string;
+        };
         PortfolioPositionDto: {
             instrumentUid?: string | null;
             account?: components["schemas"]["AccountReferenceDto"];
@@ -1070,6 +1122,8 @@ export interface components {
             isin: string | null;
             ticker: string | null;
             logoName: string | null;
+            sector: string | null;
+            issuer: components["schemas"]["PortfolioIssuerDto"] | null;
         };
         PortfolioDto: {
             /** Format: date-time */
@@ -1226,6 +1280,12 @@ export interface components {
             data: components["schemas"]["IncomeAnalyticsDto"] | null;
             meta: components["schemas"]["IncomeAnalyticsMetaDto"];
         };
+        UpcomingEventsWindowDto: {
+            /** Format: date */
+            from: string;
+            /** Format: date */
+            to: string;
+        };
         UpcomingEventDto: {
             account?: components["schemas"]["AccountReferenceDto"];
             /** @enum {string} */
@@ -1246,6 +1306,8 @@ export interface components {
             accountId: string;
             /** Format: date-time */
             calculatedAt: string;
+            /** @description Inclusive UTC window the saved forecast was calculated for. Unchanged by the requested from/to filter. */
+            window: components["schemas"]["UpcomingEventsWindowDto"];
             events: components["schemas"]["UpcomingEventDto"][];
             incomeTotalsByCurrency: components["schemas"]["MoneyDto"][];
         };
@@ -1383,6 +1445,8 @@ export interface components {
             isin: string | null;
             ticker: string | null;
             logoName: string | null;
+            sector: string | null;
+            issuer: components["schemas"]["PortfolioIssuerDto"] | null;
             returnPercent: string | null;
         };
         StockPositionDto: {
@@ -2582,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

@@ -7,7 +7,14 @@ export {
 	configureAuthClient,
 } from "./client";
 export type { paths } from "./generated/schema";
-export { ApiErrorCode, apiErrorCode, isApiErrorCode } from "./problem-details";
+export {
+	ApiErrorCode,
+	apiErrorCode,
+	isApiErrorCode,
+	isBrokerageAccessLoss,
+} from "./problem-details";
+export { isGetUnder } from "./query-predicate";
+export { isReadFailureExhausted, readRetry } from "./read-failure";
 
 export {
 	type InvestmentResourceMeta,

src/shared/api/problem-details.test.ts

@@ -1,6 +1,11 @@
 import { expect, it } from "vitest";
 
-import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "./problem-details";
+import {
+	ApiErrorCode,
+	apiErrorCode,
+	isApiErrorCode,
+	isBrokerageAccessLoss,
+} from "./problem-details";
 
 it("matches known codes and preserves unknown wire codes for fallback handling", () => {
 	expect(
@@ -16,3 +21,10 @@ it("matches known codes and preserves unknown wire codes for fallback handling",
 	expect(apiErrorCode(null)).toBeUndefined();
 	expect(apiErrorCode({})).toBeUndefined();
 });
+
+it("separates brokerage access loss from UNAUTHORIZED, temporary and unknown codes", () => {
+	for (const code of ["INVALID_TBANK_TOKEN", "NOT_FOUND", "TBANK_NOT_CONNECTED"])
+		expect(isBrokerageAccessLoss(code)).toBe(true);
+	for (const code of ["UNAUTHORIZED", "TBANK_UNAVAILABLE", "FUTURE_PROVIDER_ERROR", undefined])
+		expect(isBrokerageAccessLoss(code)).toBe(false);
+});

src/shared/api/problem-details.ts

@@ -41,4 +41,14 @@ function isApiErrorCode(
 	return value === expected;
 }
 
-export { ApiErrorCode, apiErrorCode, isApiErrorCode };
+// Confirmed loss of access to the brokerage data. UNAUTHORIZED is a session
+// failure with its own refresh/sign-out path, so it is deliberately excluded.
+function isBrokerageAccessLoss(code?: string): boolean {
+	return [
+		ApiErrorCode.InvalidTbankToken,
+		ApiErrorCode.NotFound,
+		ApiErrorCode.TbankNotConnected,
+	].some(loss => isApiErrorCode(code, loss));
+}
+
+export { ApiErrorCode, apiErrorCode, isApiErrorCode, isBrokerageAccessLoss };

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/read-failure.test.ts

@@ -0,0 +1,80 @@
+import { describe, expect, it, vi } from "vitest";
+
+import { isReadFailureExhausted, readRetry } from "./read-failure";
+
+const transient = { code: "TBANK_UNAVAILABLE", status: 503 };
+const settled = { isError: true, isFetching: false };
+
+describe("isReadFailureExhausted", () => {
+	it("is true for a settled transient failure, even without a code", () => {
+		expect(isReadFailureExhausted({ ...settled, error: transient })).toBe(true);
+		expect(
+			isReadFailureExhausted({
+				...settled,
+				error: new TypeError("Network request failed"),
+			}),
+		).toBe(true);
+	});
+
+	it("stays true while a manual retry runs and false without a failure", () => {
+		expect(
+			isReadFailureExhausted({
+				error: transient,
+				isError: true,
+				isFetching: true,
+			}),
+		).toBe(true);
+		expect(
+			isReadFailureExhausted({
+				error: null,
+				isError: false,
+				isFetching: false,
+			}),
+		).toBe(false);
+	});
+
+	it.each([
+		"INVALID_TBANK_TOKEN",
+		"NOT_FOUND",
+		"TBANK_NOT_CONNECTED",
+		"UNAUTHORIZED",
+	])("is false for %s, which has its own action", (code) => {
+		expect(isReadFailureExhausted({ ...settled, error: { code } })).toBe(false);
+	});
+});
+
+describe("readRetry", () => {
+	it("refetches only the failed reads and reports a running retry", () => {
+		const failedRefetch = vi.fn(() => Promise.resolve());
+		const healthyRefetch = vi.fn(() => Promise.resolve());
+
+		const retry = readRetry([
+			{ ...settled, error: transient, refetch: failedRefetch },
+			{
+				error: null,
+				isError: false,
+				isFetching: true,
+				refetch: healthyRefetch,
+			},
+			{ ...settled, error: { code: "NOT_FOUND" }, refetch: healthyRefetch },
+		]);
+
+		expect(retry).toMatchObject({ exhausted: true, retrying: false });
+		retry.onRetry();
+		expect(failedRefetch).toHaveBeenCalledOnce();
+		expect(healthyRefetch).not.toHaveBeenCalled();
+	});
+
+	it("is not exhausted while every read is healthy", () => {
+		expect(
+			readRetry([
+				{
+					error: null,
+					isError: false,
+					isFetching: false,
+					refetch: vi.fn(() => Promise.resolve()),
+				},
+			]).exhausted,
+		).toBe(false);
+	});
+});

src/shared/api/read-failure.ts

@@ -0,0 +1,37 @@
+import {
+	ApiErrorCode,
+	apiErrorCode,
+	isApiErrorCode,
+	isBrokerageAccessLoss,
+} from "./problem-details";
+
+type ReadState = { error: unknown; isError: boolean; isFetching: boolean };
+
+type RetryableRead = ReadState & { refetch: () => Promise<unknown> };
+
+// Automatic retries run inside one fetchAppRead call and Query's own retry is
+// off, so a query in the error state has exhausted them. The state stays
+// "error" while a manual retry runs, which keeps the warning in place. Access
+// loss and a lost session keep their own actions and never offer a plain retry.
+function isReadFailureExhausted(state: ReadState): boolean {
+	if (!state.isError) return false;
+	const code = apiErrorCode(state.error);
+
+	return !isBrokerageAccessLoss(code)
+		&& !isApiErrorCode(code, ApiErrorCode.Unauthorized);
+}
+
+// Retry repeats only the GET of the failed queries, never a source sync.
+function readRetry(reads: RetryableRead[]) {
+	const failed = reads.filter(read => isReadFailureExhausted(read));
+
+	return {
+		exhausted: failed.length > 0,
+		onRetry: () => {
+			void Promise.allSettled(failed.map(read => read.refetch()));
+		},
+		retrying: failed.some(read => read.isFetching),
+	};
+}
+
+export { isReadFailureExhausted, readRetry };

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,8 +8,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";
-import { ApiErrorCode, apiErrorCode, isApiErrorCode } 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(
@@ -39,15 +37,7 @@ function invalidateResourceAccess(
 	group: string,
 	error: unknown,
 ) {
-	const errorCode = apiErrorCode(error);
+	if (!isBrokerageAccessLoss(apiErrorCode(error))) return;
-	if (
-		[
-			ApiErrorCode.InvalidTbankToken,
-			ApiErrorCode.NotFound,
-			ApiErrorCode.TbankNotConnected,
-		].every(code => !isApiErrorCode(errorCode, code))
-	)
-		return;
 
 	const affected = {
 		predicate: (cached: { meta?: Record<string, unknown> }) =>
@@ -65,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,
@@ -100,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": {
@@ -6423,6 +6555,21 @@
           "name"
         ]
       },
+      "PortfolioIssuerDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id",
+          "name"
+        ]
+      },
       "PortfolioPositionDto": {
         "type": "object",
         "properties": {
@@ -6495,6 +6642,19 @@
           "logoName": {
             "type": "string",
             "nullable": true
+          },
+          "sector": {
+            "type": "string",
+            "nullable": true
+          },
+          "issuer": {
+            "nullable": true,
+            "type": "object",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/PortfolioIssuerDto"
+              }
+            ]
           }
         },
         "required": [
@@ -6507,7 +6667,9 @@
           "absoluteReturn",
           "isin",
           "ticker",
-          "logoName"
+          "logoName",
+          "sector",
+          "issuer"
         ]
       },
       "PortfolioDto": {
@@ -7213,6 +7375,23 @@
           "meta"
         ]
       },
+      "UpcomingEventsWindowDto": {
+        "type": "object",
+        "properties": {
+          "from": {
+            "type": "string",
+            "format": "date"
+          },
+          "to": {
+            "type": "string",
+            "format": "date"
+          }
+        },
+        "required": [
+          "from",
+          "to"
+        ]
+      },
       "UpcomingEventDto": {
         "type": "object",
         "properties": {
@@ -7294,6 +7473,14 @@
             "type": "string",
             "format": "date-time"
           },
+          "window": {
+            "description": "Inclusive UTC window the saved forecast was calculated for. Unchanged by the requested from/to filter.",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/UpcomingEventsWindowDto"
+              }
+            ]
+          },
           "events": {
             "type": "array",
             "items": {
@@ -7310,6 +7497,7 @@
         "required": [
           "accountId",
           "calculatedAt",
+          "window",
           "events",
           "incomeTotalsByCurrency"
         ]
@@ -7910,6 +8098,19 @@
             "type": "string",
             "nullable": true
           },
+          "sector": {
+            "type": "string",
+            "nullable": true
+          },
+          "issuer": {
+            "nullable": true,
+            "type": "object",
+            "allOf": [
+              {
+                "$ref": "#/components/schemas/PortfolioIssuerDto"
+              }
+            ]
+          },
           "returnPercent": {
             "type": "string",
             "nullable": true
@@ -7926,6 +8127,8 @@
           "isin",
           "ticker",
           "logoName",
+          "sector",
+          "issuer",
           "returnPercent"
         ]
       },

src/shared/i18n/locales/ru.ts

@@ -360,6 +360,7 @@ const ru = {
 			emptyTitle: "За выбранный период событий не найдено",
 			errorText: "Попробуйте запросить прогноз еще раз.",
 			errorTitle: "Не удалось загрузить будущие события",
+			forecastWindow: "Прогноз от {{date}} на {{from}} – {{to}}",
 			hint: "Прогноз рассчитан по текущей позиции до налогов. Покрытие зависит от доступных данных MOEX.",
 			noAmount: "Сумма неизвестна",
 			open: "Открыть будущие события",
@@ -421,7 +422,9 @@ const ru = {
 			},
 			history: "История догружается",
 			partial: "Период загружен не полностью",
+			readFailed: "Не удалось обновить данные",
 			refresh: "Обновить",
+			retry: "Повторить",
 			sourceTime: "Данные на {{date}}",
 			stale: "Данные требуют обновления",
 			syncFailed:
@@ -509,6 +512,26 @@ const ru = {
 			bonds: "Облигации",
 			byAccount: "Позиции по счетам",
 			cashBalances: "Денежные остатки",
+			concentration: {
+				chart: "Распределение позиций",
+				currency: "Валюта концентрации",
+				empty: "В этом разрезе нет позиций с положительной оценкой.",
+				incomplete: "Данные неполные",
+				issuers: "Эмитенты",
+				missingIssuer: "Эмитент не указан",
+				missingSector: "Сектор не указан",
+				other: "Прочее",
+				otherCount: "{{count}} элементов",
+				otherCount_few: "{{count}} элемента",
+				otherCount_many: "{{count}} элементов",
+				otherCount_one: "{{count}} элемент",
+				otherCount_other: "{{count}} элемента",
+				sectors: "Секторы",
+				slice: "Разрез концентрации",
+				title: "Концентрация",
+				top5: "Топ-5 · {{share}}",
+				unaccounted: "Не учтено позиций: {{count}}",
+			},
 			connectionErrorText: "Настройте подключение, чтобы посмотреть портфель.",
 			connectionErrorTitle: "Проверьте подключение T-Bank",
 			currencies: {
@@ -760,6 +783,7 @@ const ru = {
 				consumer: "Потребительский сектор",
 				energy: "Энергетика",
 				financial: "Финансы",
+				government: "Государственный сектор",
 				health_care: "Здравоохранение",
 				industrials: "Промышленность",
 				it: "Информационные технологии",

src/shared/ui/ReadRetry/ReadRetry.test.tsx

@@ -0,0 +1,37 @@
+import { MantineProvider } from "@mantine/core";
+import { fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+
+import { ReadRetry } from "./ReadRetry";
+
+function renderRetry(props: Parameters<typeof ReadRetry>[0]) {
+	return render(
+		<MantineProvider>
+			<ReadRetry {...props} />
+		</MantineProvider>,
+	);
+}
+
+describe("ReadRetry", () => {
+	it("renders nothing until the automatic retries are exhausted", () => {
+		renderRetry({ exhausted: false, onRetry: vi.fn() });
+
+		expect(screen.queryByRole("status")).not.toBeInTheDocument();
+		expect(screen.queryByRole("button")).not.toBeInTheDocument();
+	});
+
+	it("announces the failure politely and retries on activation", () => {
+		const onRetry = vi.fn();
+		renderRetry({ exhausted: true, onRetry });
+
+		expect(screen.getByRole("status")).toHaveTextContent("Не удалось обновить данные");
+		fireEvent.click(screen.getByRole("button", { name: "Повторить" }));
+		expect(onRetry).toHaveBeenCalledOnce();
+	});
+
+	it("disables the action while the retry runs", () => {
+		renderRetry({ exhausted: true, onRetry: vi.fn(), retrying: true });
+
+		expect(screen.getByRole("button", { name: "Повторить" })).toBeDisabled();
+	});
+});

src/shared/ui/ReadRetry/ReadRetry.tsx

@@ -0,0 +1,42 @@
+import type { FC } from "react";
+
+import { Alert, Button, Group, Text } from "@mantine/core";
+import { useTranslation } from "react-i18next";
+
+// Shown only after the automatic read retries are exhausted. The action repeats
+// the failed GET of the affected query; it never starts a source sync.
+type ReadRetryProps = {
+	exhausted: boolean;
+	onRetry: () => void;
+	retrying?: boolean;
+};
+
+const ReadRetryButton: FC<Pick<ReadRetryProps, "onRetry" | "retrying">> = (
+	props,
+) => {
+	const { t } = useTranslation();
+
+	return (
+		<Button disabled={props.retrying} onClick={props.onRetry} variant="light">
+			{t("investment.retry")}
+		</Button>
+	);
+};
+
+const ReadRetry: FC<ReadRetryProps> = (props) => {
+	const { t } = useTranslation();
+
+	if (!props.exhausted) return null;
+
+	return (
+		<Alert aria-live="polite" color="orange" role="status">
+			<Group gap="sm" justify="space-between">
+				<Text>{t("investment.readFailed")}</Text>
+
+				<ReadRetryButton onRetry={props.onRetry} retrying={props.retrying} />
+			</Group>
+		</Alert>
+	);
+};
+
+export { ReadRetry, ReadRetryButton, type ReadRetryProps };

src/shared/ui/index.ts

@@ -5,4 +5,10 @@ export {
 	EntryGroupTotal,
 } from "./EntryGroup/EntryGroup";
 export { PayoutCard } from "./PayoutCard/PayoutCard";
+export {
+	ReadRetry,
+	ReadRetryButton,
+	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";