chore(deps): update non-major dependencies

.ai/architecture.md

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

.dockerignore

@@ -13,9 +13,6 @@
 !public/**
 !docker/
 !docker/**
-!scripts/
-!scripts/minimatch-compat/
-!scripts/minimatch-compat/**
 !packages/
 !packages/tokens/
 !packages/tokens/package.json

.gitea/workflows/verify.yml

@@ -66,7 +66,7 @@ jobs:
       - name: Verify pre-commit secret blocking and redaction
         run: PATH=/tmp/gitleaks-bin:$PATH node --test scripts/test-pre-commit.mjs
       - name: Audit runtime and development dependencies
-        run: npm audit --include=dev --audit-level=moderate
+        run: npm audit --include=dev --audit-level=low
 
   verify:
     needs: [commits, security]

CHANGELOG.md

@@ -1,75 +1,5 @@
 # Changelog
 
-## [1.4.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.3.0...v1.4.0) (2026-11-06)
-
-### Features
-
-* **investments:** warn and offer retry after exhausted read retries (WealthLedger/frontend[#55](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/55)) ([#136](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/136)) ([8ce1e8e](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/8ce1e8e44486dcc23d4c074559ca2bb517880b60))
-
-### Bug Fixes
-
-* **account:** show source metadata on empty account and income (WealthLedger/frontend[#55](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/55)) ([#133](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/133)) ([9619dc9](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/9619dc979172dbc16391206e801ed67862d20116))
-* align audit findings for Events, currency and auth (WealthLedger/frontend[#155](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/155)) ([668f2ef](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/668f2ef70e535a1222e7f600b1be4a31fefc6f8b))
-
-### Refactoring
-
-* **api:** consume bank operation oneOf contract (WealthLedger/frontend[#144](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/144)) ([#152](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/152)) ([2d070ce](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/2d070ce2b54bbee466ecf6cc18b437910f0c07f8))
-* drop dead query helpers and simplify read deadline (WealthLedger/frontend[#141](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/141)) ([#149](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/149)) ([5077bd4](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/5077bd4f0baa4a59643e875485c2f08253cc198d))
-* move portfolio structure into account page, drop widgets (WealthLedger/frontend[#139](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/139)) ([#140](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/140)) ([e2d143d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e2d143df46e650139e49b7c80a886008ede86d2a))
-* normalize view models and share breadcrumbs and titles (WealthLedger/frontend[#143](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/143)) ([#153](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/153)) ([2db39f2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/2db39f25d9478350ad56a1b2e2ca6496068257c5))
-* replace repeated lazy page wrappers with lazyPage helper ([#131](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/131)) ([#132](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/132)) ([71fbe77](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/71fbe7774d3ed63fcb84bc644da997921bc049b2))
-* share path-root query predicate (WealthLedger/frontend[#142](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/142)) ([#154](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/154)) ([cadba8d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/cadba8d075daf9b20c0c9de97ad5bd8f5a3e74fc))
-
-### Maintenance
-
-* **api:** update OpenAPI snapshot with UpcomingEventsDto.window (WealthLedger/frontend[#134](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/134)) ([#135](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/135)) ([aaee959](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/aaee9591d7880193ee9b0c14339e8477264e4a94))
-* **deps:** set Renovate release age, PR limit and update groups (WealthLedger/main[#6](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/6)) ([#137](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/137)) ([ad93725](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/ad93725a84615ec329631b71ed8db33337085740))
-
-## [1.3.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.2.1...v1.3.0) (2026-11-01)
-
-### Features
-
-* **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
-
-* keep session when refresh fails on network error or 5xx (WealthLedger/frontend[#97](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/97)) ([3af9df0](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/3af9df0ae2f0fb314c276504ef7d50a7472de680))
-* show snapshot time in browser time zone ([#101](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/101)) ([b009101](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/b009101b7b954e8462672a9da859267ebb71edc4))
-
-### Maintenance
-
-* bump Node to 24.22.1 (WealthLedger/backend[#122](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/122)) ([2cd6b1e](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/2cd6b1e72d97117b0c37465aac3d989b0469c1c3))
-* bump test stack and fix npm audit findings ([#105](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/105)) ([7e6fd95](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/7e6fd95cfaf7d288242fb46ec7091f561e6f3de5))
-* **deps:** update non-major dependencies [#9](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/9) ([b5ceb77](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/b5ceb77208e35a0e389258f3d3c4b85852980042))
-* resolve dev dependency audit findings (WealthLedger/frontend[#103](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/103)) ([7b6f34c](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/7b6f34c776fa3517c93b5c3468e3b277aaa6273f))
-
 ## [1.2.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.1.0...v1.2.0) (2026-10-18)
 
 ### Features

Dockerfile

@@ -5,7 +5,6 @@ COPY package.json package-lock.json ./
 COPY packages/tokens/package.json ./packages/tokens/
 COPY packages/ui/package.json ./packages/ui/
 COPY packages/icons/package.json ./packages/icons/
-COPY scripts/minimatch-compat ./scripts/minimatch-compat
 RUN npm ci
 
 FROM dependencies AS development

README.md

@@ -123,12 +123,10 @@ Chromium при ширинах 375 и 1280 px. Browser project не исполь
 Новый запуск отменяет устаревший для того же PR/ветки и типа события
 (требуется Gitea 1.26+). Ежедневно в 05:17 UTC выполняется только `security`.
 Job `security` проверяет полную доступную историю Gitleaks 8.30.1 и выполняет
-`npm audit --include=dev --audit-level=moderate`. Advisory уровня moderate и выше
+`npm audit --include=dev --audit-level=low`. Любой advisory блокирует security job;
-блокирует security job; low не блокирует, т.к. для них часто нет исправленной версии
+исключений frontend нет. Локально можно выполнить те же команды:
-(например, GHSA-gcqx-w48m-w2h4 в build-only deepmerge). Других исключений нет.
-Локально можно выполнить те же команды:
 `gitleaks git --log-opts=--all --redact=100 --no-banner` и
-`npm audit --include=dev --audit-level=moderate`. Audit требует доступа к npm registry;
+`npm audit --include=dev --audit-level=low`. Audit требует доступа к npm registry;
 проверка секретов выполняется локально и не выводит их значения.
 
 Имена jobs `commits`, `security`, `verify` сохранены, но Gitea включает имя

dependency-cruiser.cjs

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

docker/nginx.conf

@@ -17,21 +17,12 @@ http {
         default $http_x_forwarded_proto;
         '' $scheme;
     }
-    # One shared budget: the external proxy's client-IP forwarding is not verified.
-    map "$request_method:$uri" $auth_admission_key {
-        default "";
-        POST:/api/v1/auth/login auth;
-        POST:/api/v1/auth/register auth;
-    }
-    limit_req_zone $auth_admission_key zone=auth_admission:1m rate=2r/s;
-    limit_req_status 429;
     server {
         listen 8080;
         server_name _;
         root /usr/share/nginx/html;
         resolver 127.0.0.11 valid=5s ipv6=off;
         location /api/ {
-            limit_req zone=auth_admission burst=5 nodelay;
             set $backend http://backend:3000;
             proxy_pass $backend$request_uri;
             proxy_set_header Host $http_host;

eslint-rules.mjs

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

index.html

@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
     <link rel="apple-touch-icon" href="/apple-touch-icon.png" />
     <meta name="theme-color" content="#ffffff" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>WealthLedger</title>
   </head>
   <body>

knip.json

@@ -1,5 +1,5 @@
 {
-	"ignoreDependencies": ["conventional-changelog-conventionalcommits", "minimatch"],
+	"ignoreDependencies": ["conventional-changelog-conventionalcommits"],
 	"workspaces": {
 		".": {
 			"project": ["src/**/*.{ts,tsx}", "!src/shared/api/generated/**"]

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "wealth-ledger-frontend",
 	"private": true,
-	"version": "1.4.0",
+	"version": "1.2.0",
 	"type": "module",
 	"engines": {
 		"node": "24.22.1"
@@ -82,7 +82,7 @@
 		"@vitest/browser": "5.0.5",
 		"@vitest/browser-playwright": "5.0.5",
 		"@vitest/coverage-v8": "5.0.5",
-		"@vitest/eslint-plugin": "1.6.27",
+		"@vitest/eslint-plugin": "1.6.28",
 		"@vitest/ui": "5.0.5",
 		"babel-plugin-react-compiler": "1.0.0",
 		"conventional-changelog-conventionalcommits": "10.4.1",
@@ -106,7 +106,6 @@
 		"jsdom": "30.1.3",
 		"knip": "6.43.0",
 		"lint-staged": "17.6.0",
-		"minimatch": "file:scripts/minimatch-compat",
 		"msw": "2.15.0",
 		"openapi-typescript": "7.13.0",
 		"playwright": "1.64.1",
@@ -115,7 +114,7 @@
 		"typescript": "5.9.3",
 		"typescript-eslint": "8.72.0",
 		"vite": "8.3.5",
-		"vite-plugin-pwa": "2.0.0",
+		"vite-plugin-pwa": "1.3.0",
 		"vitest": "5.0.5"
 	},
 	"overrides": {
@@ -125,9 +124,7 @@
 		},
 		"@vitest/browser": "5.0.5",
 		"@vitest/ui": "5.0.5",
-		"@vitest/mocker": "5.0.5",
+		"@vitest/mocker": "5.0.5"
-		"minimatch": "$minimatch",
-		"glob": "14.0.3"
 	},
 	"allowScripts": {
 		"esbuild@0.28.2": true,

packages/ui/src/EntryCard/EntryCard.tsx

@@ -16,7 +16,7 @@ type EntryCardProps = {
 	tone: "negative"
 		| "neutral"
 		| "positive";
-	value: ReactNode;
+	value: string;
 	valueLabel: string;
 	wrap?: boolean;
 };
@@ -32,7 +32,6 @@ const EntryCard: FC<EntryCardProps> = (props) => {
 
 	const valueContainerClass = props.actions ? classes.valueFooter : undefined;
 	const valueLabelClass = `${classes[props.tone]} ${props.actions ? classes.valueLabel : ""}`;
-	const valueComponent = typeof props.value === "string" ? undefined : "div";
 
 	return (
 		<Paper
@@ -64,11 +63,7 @@ const EntryCard: FC<EntryCardProps> = (props) => {
 			</Stack>
 
 			<Stack className={classes.value} gap={2}>
-				<Text
+				<Text className={classes[props.tone]} fw={700}>
-					className={classes[props.tone]}
-					component={valueComponent}
-					fw={700}
-				>
 					{props.value}
 				</Text>
 

renovate.json

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

scripts/minimatch-compat/index.cjs

@@ -1,9 +0,0 @@
-// ponytail: CommonJS twin of index.js (import-x ships lib/index.cjs too).
-const minimatch = require("minimatch-11");
-
-module.exports = {
-	...minimatch,
-	makeRe: (pattern, options = {}) => ({
-		test: path => minimatch.minimatch(path, pattern, options),
-	}),
-};

scripts/minimatch-compat/index.js

@@ -1,11 +0,0 @@
-// ponytail: shim for eslint-plugin-import-x@4.17.1, which still imports the
-// makeRe export removed in minimatch 11. Its only caller (no-internal-modules)
-// uses the result via .test(), so a matcher object is enough. Delete this
-// package and the override once import-x supports minimatch 11.
-import { minimatch } from "minimatch-11";
-
-export * from "minimatch-11";
-
-export const makeRe = (pattern, options = {}) => ({
-	test: path => minimatch(path, pattern, options),
-});

scripts/minimatch-compat/package.json

@@ -1,14 +0,0 @@
-{
-	"name": "minimatch",
-	"version": "11.0.2-compat.0",
-	"private": true,
-	"description": "minimatch 11 plus the makeRe export eslint-plugin-import-x 4.17.1 still imports. Remove when import-x supports minimatch 11.",
-	"type": "module",
-	"exports": {
-		"import": "./index.js",
-		"require": "./index.cjs"
-	},
-	"dependencies": {
-		"minimatch-11": "npm:minimatch@11.0.2"
-	}
-}

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

@@ -11,7 +11,7 @@ import {
 } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
 import { MemoryRouter, useLocation } from "react-router";
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it } from "vitest";
 
 import type { BrokerageOperation } from "@/entities/broker-operation";
 import type { IncomeAnalytics } from "@/entities/income";
@@ -46,21 +46,19 @@ const position: Portfolio["positions"][number]
 		displayName: "Сбербанк",
 		figi: "SBER",
 		isin: null,
-		issuer: null,
 		logoName: null,
 		quantity: "2",
-		sector: null,
 		ticker: "SBER",
 		type: "STOCK",
 	};
 
 const portfolio: Portfolio = {
-	cash: { currency: "RUB", value: "0" },
+	cashBalances: [],
 	isStale: false,
 	lastSuccessfulAt: "2026-08-15T12:00:00Z",
 	positions: accounts.map(account => ({ ...position, account })),
-	structure: { categories: [], hasNegativeValues: false, totalValue: "0", unvaluedCategories: [] },
+	structure: { currencies: [], unvaluedCategories: [] },
-	totals: { currency: "RUB", value: "1200" },
+	totalsByCurrency: [{ currency: "RUB", value: "1200" }],
 };
 
 const receipt: BrokerageOperation
@@ -106,11 +104,14 @@ const analytics: IncomeAnalytics
 			},
 		],
 		period: { from: "2026-08-01", to: "2026-08-31" },
-		total: {
+		totalsByCurrency: [
+			{
 				coupon: { currency: "RUB", value: "2" },
+				currency: "RUB",
 				dividend: { currency: "RUB", value: "0" },
 				total: { currency: "RUB", value: "2" },
 			},
+		],
 	};
 
 const CurrentLocation: FC = () => {
@@ -144,7 +145,6 @@ function renderPage(path: string) {
 	return client;
 }
 
-afterEach(() => vi.useRealTimers());
 beforeEach(() => {
 	server.use(
 		http.post("*/api/v1/auth/refresh", () =>
@@ -213,8 +213,7 @@ beforeEach(() => {
 								type: "coupon",
 							}),
 					),
-					incomeTotal: { currency: "RUB", value: "0" },
+					incomeTotalsByCurrency: [],
-					window: { from: "2026-09-01", to: "2026-10-01" },
 				}),
 			),
 		),
@@ -224,9 +223,9 @@ beforeEach(() => {
 describe("All accounts routes", () => {
 	it.each([
 		["/accounts/all", "Все счета"],
-		["/accounts/all/operations", "История операций"],
+		["/accounts/all/operations", "Журнал операций"],
 		["/accounts/all/income?from=2026-08-01&to=2026-08-31", "Пассивный доход"],
-		["/accounts/all/events", "Предстоящие события"],
+		["/accounts/all/events", "Будущие события"],
 	])("opens %s directly", async (path, title) => {
 		renderPage(path);
 		expect(
@@ -272,8 +271,6 @@ describe("All accounts routes", () => {
 	);
 
 	it("restores applied dates when switching accounts in events", async () => {
-		vi.useFakeTimers({ toFake: ["Date"] });
-		vi.setSystemTime(new Date("2026-10-15T12:00:00Z"));
 		// The events calendar blocks past dates, so pick within selectable dates.
 		const search = `?from=${defaultPeriod()[0]}&to=${defaultPeriod()[1]}`;
 		renderPage(`/accounts/all/events${search}`);
@@ -306,16 +303,14 @@ describe("All accounts routes", () => {
 				"href",
 				`/accounts/${account.id}`,
 			);
-
+		for (const suffix of ["operations", "income", "events"])
-		for (const [suffix, tab] of [
+			expect(
-			["operations", "История операций"],
+				screen
-			["income", "Доход"],
+					.getAllByRole("link")
-			["events", "Предстоящие события"],
+					.find(
-		]) {
+						link => link.getAttribute("href") === `/accounts/all/${suffix}`,
-			fireEvent.click(screen.getByRole("tab", { name: tab }));
+					),
-			expect(screen.getByRole("link", { name: "Подробнее" }))
+			).toBeInTheDocument();
-				.toHaveAttribute("href", `/accounts/all/${suffix}`);
-		}
 	});
 
 	it("switches accounts within operations with applied filters and a fresh cursor", async () => {

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

@@ -232,8 +232,7 @@ describe("AppRoutes", () => {
 			}),
 		).toBeInTheDocument();
 		expect(
-			screen.getAllByRole("navigation", { name: "Основная навигация" }),
+			screen.getByRole("navigation", { name: "WealthLedger" }),
-		).toHaveLength(2);
+		).toBeInTheDocument();
-		expect(screen.queryByRole("banner")).not.toBeInTheDocument();
 	});
 });

src/app/routes/AppRoutes/AppRoutes.tsx

@@ -1,4 +1,4 @@
-import type { ComponentType, FC } from "react";
+import type { FC } from "react";
 
 import { lazy } from "react";
 import { Navigate, Route, Routes } from "react-router";
@@ -6,35 +6,101 @@ import { Navigate, Route, Routes } from "react-router";
 import { LazyPage } from "../RouteFallback";
 import { Protected, Public } from "../RouteGuards";
 
-// Pages use named exports; React.lazy needs a default export per dynamic import (one chunk each).
+const CardPage = lazy(async () => {
-function lazyPage<Name extends string>(
+	const { CardPage } = await import("@/pages/card");
-	load: () => Promise<Record<Name, ComponentType>>,
-	name: Name,
-) {
-	return lazy(async () => {
-		const page = await load();
 
-		// eslint-disable-next-line security/detect-object-injection -- `name` is a compile-time literal checked against the module's exports.
+	return { default: CardPage };
-		return { default: page[name] };
 });
-}
 
-const CardPage = lazyPage(async () => import("@/pages/card"), "CardPage");
+const CardsPage = lazy(async () => {
-const CardsPage = lazyPage(async () => import("@/pages/cards"), "CardsPage");
+	const { CardsPage } = await import("@/pages/cards");
-const BondPage = lazyPage(async () => import("@/pages/bond"), "BondPage");
+
-const BondsPage = lazyPage(async () => import("@/pages/bonds"), "BondsPage");
+	return { default: CardsPage };
-const StockPage = lazyPage(async () => import("@/pages/stock"), "StockPage");
+});
-const StocksPage = lazyPage(async () => import("@/pages/stocks"), "StocksPage");
+
-const AccountPage = lazyPage(async () => import("@/pages/account"), "AccountPage");
+const BondPage = lazy(async () => {
-const AccountEventsPage = lazyPage(async () => import("@/pages/account-events"), "AccountEventsPage");
+	const { BondPage } = await import("@/pages/bond");
-const AccountOperationsPage = lazyPage(async () => import("@/pages/account-operations"), "AccountOperationsPage");
+
-const AccountIncomePage = lazyPage(async () => import("@/pages/account-income"), "AccountIncomePage");
+	return { default: BondPage };
-const AccountsPage = lazyPage(async () => import("@/pages/accounts"), "AccountsPage");
+});
-const LoginPage = lazyPage(async () => import("@/pages/login"), "LoginPage");
+
-const NotFoundPage = lazyPage(async () => import("@/pages/not-found"), "NotFoundPage");
+const BondsPage = lazy(async () => {
-const RegisterPage = lazyPage(async () => import("@/pages/register"), "RegisterPage");
+	const { BondsPage } = await import("@/pages/bonds");
-const SettingsPage = lazyPage(async () => import("@/pages/settings"), "SettingsPage");
+
-const ProtectedLayout = lazyPage(async () => import("../ProtectedLayout"), "ProtectedLayout");
+	return { default: BondsPage };
+});
+
+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,5 +1,6 @@
 import type { FC } from "react";
 
+import { useDocumentTitle } from "@mantine/hooks";
 import { useTranslation } from "react-i18next";
 
 import { useCurrentRoute } from "@/app/model";
@@ -7,12 +8,12 @@ import { useBankCard } from "@/entities/bank-card";
 import { useBond } from "@/entities/bond";
 import { useBrokerageAccounts } from "@/entities/brokerage-account";
 import { useStock } from "@/entities/stock";
-import { useAppDocumentTitle } from "@/shared/ui";
 
 type DocumentTitleProps = { title: string };
 
 const DocumentTitle: FC<DocumentTitleProps> = (props): undefined => {
-	useAppDocumentTitle(props.title);
+	const { t } = useTranslation();
+	useDocumentTitle(`${props.title} — ${t("appName")}`);
 };
 
 type AccountDocumentTitleProps = {

src/app/routes/RouteErrorBoundary/RouteErrorBoundary.tsx

@@ -1,15 +1,16 @@
 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;
+	routeKey: string;
 }>;
 
 type RouteErrorFallbackProps = {
@@ -25,6 +26,12 @@ class Boundary extends Component<BoundaryProps, State> {
 
 	override state: State = { hasError: false };
 
+	override componentDidUpdate(previousProps: BoundaryProps) {
+		if (previousProps.routeKey !== this.props.routeKey && this.state.hasError) {
+			this.setState({ hasError: false });
+		}
+	}
+
 	override render() {
 		return this.state.hasError
 			? <RouteErrorFallback authenticated={this.props.authenticated} />
@@ -37,7 +44,7 @@ class Boundary extends Component<BoundaryProps, State> {
 const RouteErrorFallback: FC<RouteErrorFallbackProps> = (props) => {
 	const { authenticated } = props;
 	const { t } = useTranslation();
-	useAppDocumentTitle(t("routeError.title"));
+	useDocumentTitle(`${t("routeError.title")} — ${t("appName")}`);
 	const to = authenticated ? "/accounts" : "/login";
 
 	return (
@@ -63,7 +70,10 @@ const RouteErrorBoundary: FC<PropsWithChildren> = (props) => {
 	const { user } = useAuth();
 
 	return (
-		<Boundary authenticated={Boolean(user)} key={`${pathname}${search}:${key}`}>
+		<Boundary
+			authenticated={Boolean(user)}
+			routeKey={`${pathname}${search}:${key}`}
+		>
 			{children}
 		</Boundary>
 	);

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

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

src/app/ui/AppBreadcrumbs/AppBreadcrumbs.tsx

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

src/app/ui/AppBreadcrumbs/BondBreadcrumbs.tsx

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

src/app/ui/AppBreadcrumbs/BreadcrumbTrail.tsx

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

src/app/ui/AppBreadcrumbs/CardBreadcrumbs.tsx

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

src/app/ui/AppBreadcrumbs/EntityBreadcrumbs.tsx

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

src/app/ui/AppBreadcrumbs/StockBreadcrumbs.tsx

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

src/app/ui/AppShell/AppShell.module.css

@@ -1,22 +1,12 @@
-.root {
-	--bottom-nav-height: 56px;
-}
-
 .content {
 	max-width: 1120px;
 	margin-inline: auto;
 }
 
-.brand {
+.header {
 	align-items: center;
-	border-bottom: 1px solid var(--mantine-color-gray-3);
 	display: flex;
-	min-height: 60px;
+	padding: 0 var(--mantine-spacing-md);
-	padding-inline: var(--mantine-spacing-sm);
-}
-
-.navList {
-	padding: var(--mantine-spacing-sm);
 }
 
 .bottomNav {
@@ -62,85 +52,29 @@
 	.bottomNav {
 		background: var(--mantine-color-white);
 		border-top: 1px solid var(--mantine-color-gray-3);
-		display: grid;
+		bottom: 0;
-		grid-template-columns: repeat(5, minmax(0, 1fr));
-		inset: auto 0 0;
-		min-height: calc(var(--bottom-nav-height) + env(safe-area-inset-bottom, 0px));
-		padding-bottom: env(safe-area-inset-bottom, 0px);
-		padding-inline:
-			max(4px, env(safe-area-inset-left, 0px))
-			max(4px, env(safe-area-inset-right, 0px));
-		position: fixed;
-		z-index: var(--mantine-z-index-app);
-	}
-
-	.bottomNavItem {
-		align-items: center;
-		color: var(--mantine-color-gray-7);
 		display: flex;
-		flex-direction: column;
+		justify-content: space-around;
+		left: 0;
+		padding: var(--mantine-spacing-xs) 2px;
 		gap: 2px;
-		justify-content: center;
+		font-size: 11px;
-		min-height: var(--bottom-nav-height);
+		& a {
 			min-width: 0;
-		text-decoration: none;
+			padding: 8px 2px;
-
+			text-align: center;
-		&:active .iconPill {
-			background-color: var(--mantine-color-gray-1);
-		}
-
-		&:focus-visible {
-			outline: 2px solid var(--mantine-primary-color-filled);
-			outline-offset: -2px;
-		}
-	}
-
-	@media (hover: hover) {
-		.bottomNavItem:hover .iconPill {
-			background-color: var(--mantine-color-gray-1);
-		}
-	}
-
-	.iconPill {
-		align-items: center;
-		border-radius: 14px;
-		display: inline-flex;
-		height: 28px;
-		justify-content: center;
-		width: 48px;
-	}
-
-	.bottomNavLabel {
-		font-size: 12px;
-		font-weight: 500;
-		line-height: 16px;
-		max-width: 100%;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-
-	@media (prefers-reduced-motion: no-preference) {
-		.bottomNavItem,
-		.iconPill {
-			transition:
-				background-color 150ms ease-in-out,
-				color 150ms ease-in-out;
 		}
+		position: fixed;
+		right: 0;
+		z-index: 200;
 	}
 
 	.active {
 		color: var(--mantine-primary-color-filled);
-
+		font-weight: 600;
-		& .iconPill {
-			background-color: var(--mantine-primary-color-light);
-		}
 	}
 
 	.main {
-		padding-bottom: calc(
+		padding-bottom: 5rem;
-			var(--bottom-nav-height) + env(safe-area-inset-bottom, 0px) +
-				var(--mantine-spacing-md)
-		);
 	}
 }

src/app/ui/AppShell/AppShell.test.tsx

@@ -1,47 +0,0 @@
-import { MantineProvider } from "@mantine/core";
-import { render, screen, within } from "@testing-library/react";
-import { MemoryRouter } from "react-router";
-import { describe, expect, it } from "vitest";
-
-import { AppShell } from "./AppShell";
-
-function renderShell(path: string) {
-	return render(
-		<MantineProvider>
-			<MemoryRouter initialEntries={[path]}>
-				<AppShell />
-			</MemoryRouter>
-		</MantineProvider>,
-	);
-}
-
-describe("AppShell", () => {
-	it("has no header banner", () => {
-		renderShell("/cards");
-
-		expect(screen.queryByRole("banner")).not.toBeInTheDocument();
-	});
-
-	it("marks only the current bottom navigation item", () => {
-		renderShell("/cards");
-
-		const bottomNav = screen
-			.getAllByRole("navigation", { name: "Основная навигация" })
-			.at(-1);
-
-		if (!bottomNav) {
-			throw new Error("Bottom navigation is not rendered");
-		}
-
-		const links = within(bottomNav).getAllByRole("link");
-
-		expect(links).toHaveLength(5);
-		expect(within(bottomNav).getByRole("link", { name: "Карты" })).toHaveAttribute(
-			"aria-current",
-			"page",
-		);
-		expect(
-			within(bottomNav).getByRole("link", { name: "Счета" }),
-		).not.toHaveAttribute("aria-current");
-	});
-});

src/app/ui/AppShell/AppShell.tsx

@@ -17,12 +17,6 @@ type AppShellProps = {
 	contentAboveOutlet?: ReactNode;
 };
 
-function getBottomNavItemClass({ isActive }: { isActive: boolean }) {
-	return isActive
-		? `${classes.bottomNavItem} ${classes.active}`
-		: classes.bottomNavItem;
-}
-
 const AppShell: FC<AppShellProps> = (props) => {
 	const { contentAboveOutlet } = props;
 	const { t } = useTranslation();
@@ -30,31 +24,31 @@ const AppShell: FC<AppShellProps> = (props) => {
 
 	const items = [
 		{
-			Icon: PortfolioIcon,
+			icon: <PortfolioIcon size={20} />,
 			iconClassName: classes.portfolioIcon,
 			label: t("navigation.accounts"),
 			to: "/accounts",
 		},
 		{
-			Icon: CardsIcon,
+			icon: <CardsIcon size={20} />,
 			iconClassName: classes.cardsIcon,
 			label: t("navigation.cards"),
 			to: "/cards",
 		},
 		{
-			Icon: StocksIcon,
+			icon: <StocksIcon size={20} />,
 			iconClassName: classes.stocksIcon,
 			label: t("navigation.stocks"),
 			to: "/stocks",
 		},
 		{
-			Icon: BondsIcon,
+			icon: <BondsIcon size={20} />,
 			iconClassName: classes.bondsIcon,
 			label: t("navigation.bonds"),
 			to: "/bonds",
 		},
 		{
-			Icon: SettingsIcon,
+			icon: <SettingsIcon size={20} />,
 			iconClassName: classes.settingsIcon,
 			label: t("navigation.settings"),
 			to: "/settings",
@@ -63,16 +57,15 @@ const AppShell: FC<AppShellProps> = (props) => {
 
 	return (
 		<MantineAppShell
-			className={classes.root}
+			header={{ height: 60 }}
 			navbar={{ breakpoint: "sm", collapsed: { mobile: true }, width: 220 }}
 			padding="md"
 		>
-			<MantineAppShell.Navbar aria-label={t("navigation.primary")}>
+			<MantineAppShell.Header className={classes.header}>
-				<div className={classes.brand}>
 				<Text fw={700}>{t("appName")}</Text>
-				</div>
+			</MantineAppShell.Header>
 
-				<div className={classes.navList}>
+			<MantineAppShell.Navbar p="sm">
 				{items.map(item => (
 					<NavLink
 						active={pathname.startsWith(item.to)}
@@ -81,14 +74,15 @@ const AppShell: FC<AppShellProps> = (props) => {
 						key={item.to}
 						label={item.label}
 						leftSection={(
-								<span className={`${classes.navIcon} ${item.iconClassName}`}>
+							<span
-									<item.Icon size={20} />
+								className={`${classes.navIcon} ${item.iconClassName ?? ""}`}
+							>
+								{item.icon}
 							</span>
 						)}
 						to={item.to}
 					/>
 				))}
-				</div>
 			</MantineAppShell.Navbar>
 
 			<MantineAppShell.Main className={classes.main}>
@@ -99,23 +93,22 @@ const AppShell: FC<AppShellProps> = (props) => {
 				</div>
 			</MantineAppShell.Main>
 
-			<nav
+			<nav aria-label={t("appName")} className={classes.bottomNav}>
-				aria-label={t("navigation.primary")}
+				{items.map((item) => {
-				className={classes.bottomNav}
+					const appearanceClass = pathname.startsWith(item.to)
-			>
+						? classes.active
-				{items.map(item => (
+						: undefined;
+
+					return (
 						<RouterNavLink
-						className={getBottomNavItemClass}
+							className={appearanceClass}
 							key={item.to}
 							to={item.to}
 						>
-						<span className={classes.iconPill}>
+							{item.label}
-							<item.Icon size={24} />
-						</span>
-
-						<span className={classes.bottomNavLabel}>{item.label}</span>
 						</RouterNavLink>
-				))}
+					);
+				})}
 			</nav>
 		</MantineAppShell>
 	);

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

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

src/entities/broker-operation/index.ts

@@ -5,7 +5,5 @@ export {
 	type OperationCategory,
 	useBrokerageOperations,
 } from "./api/useBrokerageOperations";
-export { brokerageOperationGroupKey } from "./model/display";
 export { useBrokerageOperationHistory } from "./model/useBrokerageOperationHistory";
 export { LedgerEntryRow } from "./ui/LedgerEntryRow";
-export { OperationGroup } from "./ui/OperationGroup";

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

@@ -1,12 +1,9 @@
-import { describe, expect, it } from "vitest";
+import { expect, it } from "vitest";
 
-import type { BrokerageOperation } from "../api/useBrokerageOperations";
+import { operationLabelKey } from "./display";
-
-import { brokerageOperationGroupKey, operationLabelKey } from "./display";
 
 it.each([
 	["OPERATION_TYPE_BUY", "buy"],
-	["OPERATION_TYPE_COUPON", "other"],
 	["OPERATION_TYPE_BUY_CARD", "buy"],
 	["OPERATION_TYPE_BUY_MARGIN", "buy"],
 	["OPERATION_TYPE_SELL", "sell"],
@@ -24,71 +21,3 @@ it.each([
 ])("preserves the wire operation label for %s", (type, label) => {
 	expect(operationLabelKey(type)).toBe(`ledger.operationType.${label}`);
 });
-
-describe("brokerageOperationGroupKey", () => {
-	const base: BrokerageOperation = {
-		account: { id: "account-1", name: "Брокерский" },
-		accruedInterest: null,
-		category: "income",
-		commission: null,
-		description: "Купон",
-		figi: "FIGI",
-		id: "operation",
-		instrumentType: "bond",
-		instrumentUid: "UID",
-		logoName: null,
-		occurredAt: "2026-08-14T10:00:00Z",
-		payment: null,
-		price: null,
-		quantity: null,
-		ticker: "BOND",
-		type: "OPERATION_TYPE_COUPON",
-	};
-
-	it("uses screen day, preferred identity and exact type, not account", () => {
-		const first = brokerageOperationGroupKey(base);
-
-		const same = brokerageOperationGroupKey({
-			...base,
-			account: { id: "account-2", name: "ИИС" },
-			figi: "OTHER-FIGI",
-			occurredAt: "2026-08-14T11:00:00Z",
-		});
-
-		expect(same).toBe(first);
-		expect(brokerageOperationGroupKey({
-			...base,
-			type: "OPERATION_TYPE_DIVIDEND",
-		})).not.toBe(first);
-	});
-
-	it("keeps buy and sell of one instrument in different groups", () => {
-		expect(brokerageOperationGroupKey({ ...base, type: "OPERATION_TYPE_BUY" }))
-			.not.toBe(brokerageOperationGroupKey({
-				...base,
-				type: "OPERATION_TYPE_SELL",
-			}));
-	});
-
-	it("separates local midnight and joins one local day across UTC dates", () => {
-		const before = new Date(2026, 7, 14, 23, 59).toISOString();
-		const after = new Date(2026, 7, 15, 0, 1).toISOString();
-		const morning = new Date(2026, 7, 14, 1).toISOString();
-		const evening = new Date(2026, 7, 14, 23).toISOString();
-
-		expect(brokerageOperationGroupKey({ ...base, occurredAt: before }))
-			.not.toBe(brokerageOperationGroupKey({ ...base, occurredAt: after }));
-		expect(brokerageOperationGroupKey({ ...base, occurredAt: morning }))
-			.toBe(brokerageOperationGroupKey({ ...base, occurredAt: evening }));
-	});
-
-	it("falls back to FIGI and leaves missing identity ungrouped", () => {
-		expect(brokerageOperationGroupKey({ ...base, instrumentUid: null }))
-			.toBe(brokerageOperationGroupKey({ ...base, instrumentUid: "" }));
-		expect(brokerageOperationGroupKey({
-			...base,
-			figi: null,
-			instrumentUid: null,
-		})).toBeNull();
-	});
-});

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

@@ -1,4 +1,4 @@
-import { formatMoney, formatSnapshotDay } from "@/shared/lib";
+import { formatMoney } from "@/shared/lib";
 
 import type { BrokerageOperation } from "../api/useBrokerageOperations";
 
@@ -27,19 +27,6 @@ type PaymentPresentation = {
 		| "positive";
 };
 
-function brokerageOperationGroupKey(
-	operation: BrokerageOperation,
-): null | string {
-	const identity = operation.instrumentUid || operation.figi;
-	if (!identity) return null;
-
-	return JSON.stringify([
-		formatSnapshotDay(operation.occurredAt),
-		identity,
-		operation.type,
-	]);
-}
-
 function entryLabelKey(operation: BrokerageOperation): string {
 	if (operation.category === "income")
 		return isOperationType(operation.type, OperationType.Coupon)
@@ -49,10 +36,6 @@ function entryLabelKey(operation: BrokerageOperation): string {
 	return `ledger.category.${operation.category}`;
 }
 
-function isCouponPayment(operation: BrokerageOperation): boolean {
-	return isOperationType(operation.type, OperationType.Coupon);
-}
-
 function isIncomePayment(operation: BrokerageOperation): boolean {
 	return [OperationType.Coupon, OperationType.Dividend].some(type =>
 		isOperationType(operation.type, type),
@@ -132,12 +115,4 @@ function paymentPresentation(
 	};
 }
 
-export {
+export { isIncomePayment, operationLabelKey, paymentPresentation };
-	brokerageOperationGroupKey,
-	entryLabelKey,
-	isCouponPayment,
-	isIncomePayment,
-	isZeroDecimal,
-	operationLabelKey,
-	paymentPresentation,
-};

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

@@ -1,138 +0,0 @@
-import { MantineProvider } from "@mantine/core";
-import { render, screen, within } from "@testing-library/react";
-import { MemoryRouter } from "react-router";
-import { describe, expect, it } from "vitest";
-
-import type { BrokerageOperation } from "../api/useBrokerageOperations";
-
-import { OperationGroup } from "./OperationGroup";
-
-function operation(
-	id: string,
-	account: { id: string; name: string },
-	value: null | string,
-	currency = "RUB",
-): BrokerageOperation {
-	return {
-		account,
-		accruedInterest: null,
-		category: "income",
-		commission: null,
-		description: "Купон",
-		figi: "FIGI",
-		id,
-		instrumentType: "bond",
-		instrumentUid: "UID",
-		logoName: null,
-		occurredAt: "2026-08-14T10:00:00Z",
-		payment: value === null ? null : { currency, value },
-		price: null,
-		quantity: null,
-		ticker: "BOND",
-		type: "OPERATION_TYPE_COUPON",
-	};
-}
-
-function renderGroup(
-	operations: BrokerageOperation[],
-	isTotalVisible = true,
-) {
-	return render(
-		<MantineProvider>
-			<MemoryRouter>
-				<ul>
-					<OperationGroup
-						entries={operations.map((operation, index) => ({
-							key: `${operation.id}-${index}`,
-							operation,
-						}))}
-						totalVisible={isTotalVisible}
-					/>
-				</ul>
-			</MemoryRouter>
-		</MantineProvider>,
-	);
-}
-
-describe("OperationGroup", () => {
-	it("shows the received coupon and positive totals in flat account rows", () => {
-		renderGroup([
-			{ ...operation("1", { id: "broker", name: "Брокерский" }, "0.1"), description: "Выплата купонов СФО ВТБ РКС Эталон 04" },
-			operation("2", { id: "iis", name: "ИИС" }, "0.2"),
-		]);
-
-		expect(screen.getByText("Выплата купонов СФО ВТБ РКС Эталон 04")).toBeInTheDocument();
-		expect(screen.getByText("+0,3 ₽")).toBeInTheDocument();
-
-		const accounts = within(screen.getByRole("list", {
-			name: /Выплата купонов СФО ВТБ РКС Эталон 04, Исполнено 14\.08\.2026.*, \+0,3 ₽/,
-		}));
-
-		expect(accounts.getByRole("listitem", { name: "Брокерский, +0,1 ₽" }))
-			.toHaveTextContent("Купон");
-		expect(accounts.getByText("+0,1 ₽")).toHaveClass(/positive/);
-		expect(accounts.getByRole("listitem", { name: "ИИС, +0,2 ₽" }))
-			.toHaveTextContent("Купон");
-		expect(accounts.getByText("+0,2 ₽")).toHaveClass(/positive/);
-		expect(accounts.getByRole("listitem", { name: "ИИС, +0,2 ₽" }))
-			.not.toHaveClass("EntryGroup_accountCardRow");
-		expect(accounts.queryByText(/Исполнено/)).not.toBeInTheDocument();
-		expect(accounts.queryByRole("link")).not.toBeInTheDocument();
-	});
-
-	it("announces the hidden total as unavailable", () => {
-		renderGroup([
-			operation("1", { id: "broker", name: "Брокерский" }, "100"),
-			operation("2", { id: "iis", name: "ИИС" }, null),
-		]);
-
-		expect(screen.getByRole("list", {
-			name: /Выплата купонов BOND, Исполнено .*Итог недоступен/,
-		})).toBeInTheDocument();
-		expect(screen.getByText("Итог недоступен")).toBeInTheDocument();
-		expect(screen.getByText("—")).not.toHaveClass(/positive/);
-	});
-
-	it.each(["0", "0.000"])(
-		"hides the whole total for a zero source amount (%s)",
-		(value) => {
-			renderGroup([
-				operation("1", { id: "broker", name: "Брокерский" }, value),
-				operation("2", { id: "iis", name: "ИИС" }, "100"),
-			]);
-
-			expect(screen.getAllByText("+100 ₽")).toHaveLength(1);
-			expect(screen.getByText("Итог недоступен")).toBeInTheDocument();
-		},
-	);
-
-	it("hides the total for incomplete data but keeps compensated zero", () => {
-		const { unmount } = renderGroup([
-			operation("1", { id: "broker", name: "Брокерский" }, "100"),
-			operation("2", { id: "iis", name: "ИИС" }, "100"),
-		], false);
-
-		expect(screen.queryByText("+200 ₽")).not.toBeInTheDocument();
-		unmount();
-
-		renderGroup([
-			operation("1", { id: "broker", name: "Брокерский" }, "100"),
-			operation("2", { id: "iis", name: "ИИС" }, "-100"),
-		]);
-		expect(screen.getByText("0 ₽")).toBeInTheDocument();
-		expect(screen.getByText("−100 ₽")).toHaveClass(/negative/);
-	});
-
-	it("renders repeated ids inside one group as separate rows", () => {
-		renderGroup([
-			operation("same", { id: "broker", name: "Брокерский" }, "10"),
-			operation("same", { id: "iis", name: "ИИС" }, "20"),
-		]);
-
-		expect(screen.getByText("+30 ₽")).toBeInTheDocument();
-		const accounts = within(screen.getByRole("list", { name: /Выплата купонов/ }));
-		expect(accounts.getAllByText("Брокерский")).toHaveLength(1);
-		expect(accounts.getAllByText("ИИС")).toHaveLength(1);
-		expect(accounts.getAllByRole("listitem")).toHaveLength(2);
-	});
-});

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

@@ -1,113 +0,0 @@
-import type { FC } from "react";
-
-import { EntryCard } from "@wealthledger/ui";
-import { useTranslation } from "react-i18next";
-
-import {
-	formatSnapshotDay,
-	instrumentLogoUrl,
-	sumMoney,
-	totalText,
-} from "@/shared/lib";
-import { AccountCardRow, AccountRow, EntryGroup, EntryGroupTotal } from "@/shared/ui";
-
-import type { BrokerageOperation } from "../api/useBrokerageOperations";
-
-import {
-	entryLabelKey,
-	isCouponPayment,
-	isZeroDecimal,
-	operationLabelKey,
-	paymentPresentation,
-} from "../model/display";
-
-type OperationGroupProps = {
-	entries: { key: string; operation: BrokerageOperation }[];
-	totalVisible: boolean;
-};
-
-const OperationGroup: FC<OperationGroupProps> = (props) => {
-	const { t } = useTranslation();
-	const operations = props.entries.map(entry => entry.operation);
-	const first = operations.at(0);
-
-	// groupItems only emits groups of at least two entries.
-	if (!first) return null;
-
-	const typeLabel = t(first.category === "income"
-		? entryLabelKey(first)
-		: operationLabelKey(first.type));
-
-	const isCoupon = isCouponPayment(first);
-
-	const instrument
-		= first.ticker ?? first.instrumentType ?? t("ledger.noInstrument");
-
-	const amounts = operations.flatMap(operation =>
-		operation.payment ? [operation.payment] : [],
-	);
-
-	const isAmountsKnown = amounts.length === operations.length
-		&& amounts.every(amount => !isZeroDecimal(amount.value));
-
-	const totals = isAmountsKnown && props.totalVisible
-		? sumMoney(amounts)
-		: null;
-
-	const date = formatSnapshotDay(first.occurredAt);
-	const description = first.description.trim();
-	let title = `${typeLabel} · ${instrument}`;
-
-	if (isCoupon) {
-		title = description && description.toLocaleLowerCase() !== "купон"
-			? description
-			: t("ledger.couponPayment", { instrument });
-	}
-
-	const totalsText = totalText(totals, true);
-
-	const totalTone = isCoupon && totals && !isZeroDecimal(totals.value) && !totals.value.startsWith("-")
-		? "positive"
-		: "neutral";
-
-	const accessibleName = [
-		title,
-		t("payout.executedAt", { date }),
-		totalsText || t("entryGroup.totalUnavailable"),
-	].join(", ");
-
-	return (
-		<EntryGroup
-			flat={isCoupon}
-			header={(
-				<EntryCard
-					imageSrc={instrumentLogoUrl(first.logoName)}
-					initial={(first.ticker?.trim()[0] ?? "?").toUpperCase()}
-					metadata={t("payout.executedAt", { date })}
-					title={title}
-					tone={totalTone}
-					value={<EntryGroupTotal isSigned totals={totals} />}
-					valueLabel={typeLabel}
-					wrap
-				/>
-			)}
-			label={accessibleName}
-		>
-			{props.entries.map(({ key, operation }) => {
-				const payment = paymentPresentation(operation);
-
-				const accountRowProps = {
-					accountName: operation.account?.name ?? "—",
-					value: payment.amount,
-					valueLabel: t(payment.label),
-				};
-
-				return isCoupon
-					? <AccountRow key={key} {...accountRowProps} tone={payment.tone} />
-					: <AccountCardRow key={key} {...accountRowProps} />;
-			})}
-		</EntryGroup>
-	);
-};
-
-export { OperationGroup };

src/entities/brokerage-account/model/display.ts

@@ -4,21 +4,22 @@ import type {
 	BrokerageAccount,
 } from "../api/useBrokerageAccounts";
 
+const VISIBLE_CURRENCY_LIMIT = 2;
+
 type BrokerageAccountCard = {
 	account: BrokerageAccount;
-	positionCounts: null | PositionCounts;
+	positionCounts: null
+		| { bonds: number; stocks: number };
 	source?: NonNullable<InvestmentResourceMeta["dependencies"]>[number];
 	summary:
-		| {
+		| { remainingCurrencyCount: number; state: "available"; totals: Money[] }
-			portfolio: NonNullable<BrokerageAccount["portfolioSummary"]>;
-			state: "available";
-			totals: NonNullable<BrokerageAccount["portfolioSummary"]>["totals"];
-		}
 		| { state: "empty" }
 		| { state: "unavailable" };
 };
 
-type PositionCounts = { bonds: number; stocks: number; total: number };
+type Money = NonNullable<
+	BrokerageAccount["portfolioSummary"]
+>["totalsByCurrency"][number];
 
 function accountTypeKey(type: BrokerageAccount["type"]) {
 	return `accounts.types.${type}` as const;
@@ -47,10 +48,9 @@ function brokerageAccountCards(
 		const positionCounts = {
 			bonds: summary.bondPositionCount,
 			stocks: summary.stockPositionCount,
-			total: summary.totalPositionCount,
 		};
 
-		if (Number(summary.totals.value) === 0)
+		if (summary.totalsByCurrency.length === 0)
 			return { account, positionCounts, source, summary: { state: "empty" } };
 
 		return {
@@ -58,9 +58,12 @@ function brokerageAccountCards(
 			positionCounts,
 			source,
 			summary: {
-				portfolio: summary,
+				remainingCurrencyCount: Math.max(
+					summary.totalsByCurrency.length - VISIBLE_CURRENCY_LIMIT,
+					0,
+				),
 				state: "available",
-				totals: summary.totals,
+				totals: summary.totalsByCurrency.slice(0, VISIBLE_CURRENCY_LIMIT),
 			},
 		};
 	});

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

@@ -1,162 +1,166 @@
 .list {
-	display: grid;
 	width: 100%;
-	margin: 0;
-	padding: 0;
-	gap: var(--mantine-spacing-sm);
-	list-style: none;
 }
 
-.row {
+.card {
-	display: grid;
+	min-width: 0;
-	grid-template-areas:
+	gap: var(--mantine-spacing-xl);
-		"identity balance"
+	background: var(--mantine-color-white);
-		"details balance"
+	border-color: var(--mantine-color-gray-3);
-		"structure structure";
+	box-shadow: 0 4px 16px rgb(15 23 42 / 3%);
-	grid-template-columns: minmax(0, 1fr) minmax(0, auto);
-	gap: var(--mantine-spacing-sm) var(--mantine-spacing-xl);
-	align-items: center;
-	padding: var(--mantine-spacing-lg);
-	border: 1px solid var(--wl-color-border);
-	border-left: 3px solid var(--wl-color-primary);
-	border-radius: var(--mantine-radius-md);
-	background: var(--wl-color-surface);
 	color: inherit;
 	text-decoration: none;
-	transition: background-color 160ms ease, border-color 160ms ease;
+	transition:
+		transform 160ms ease,
+		box-shadow 160ms ease,
+		border-color 160ms ease;
 }
 
-.row:hover,
+.card:hover,
-.row:focus-visible {
+.card:focus-visible {
-	border-color: var(--wl-color-primary);
+	border-color: var(--mantine-color-blue-3);
-	background: var(--wl-color-subtle);
+	box-shadow: 0 12px 28px rgb(15 23 42 / 8%);
+	transform: translateY(-3px);
 }
 
-.row:focus-visible {
+.card:focus-visible {
-	outline: 2px solid var(--wl-color-primary);
+	outline: 2px solid var(--mantine-color-blue-6);
-	outline-offset: -2px;
+	outline-offset: 3px;
 }
 
 .identity {
-	grid-area: identity;
 	min-width: 0;
 }
 
+.kicker {
+	padding: 5px 10px;
+	border-radius: var(--mantine-radius-sm);
+	background: var(--mantine-color-blue-0);
+	color: var(--mantine-color-blue-8);
+	letter-spacing: 0.02em;
+}
+
+.accountIcon {
+	width: 28px;
+	height: 28px;
+	flex-shrink: 0;
+	color: var(--mantine-color-blue-5);
+}
+
 .name {
 	margin: 0;
-	color: var(--wl-color-text);
+	font-size: var(--mantine-h3-font-size);
-	font-size: var(--mantine-font-size-md);
+	line-height: 1.3;
-	line-height: var(--mantine-line-height-md);
 	overflow-wrap: anywhere;
 }
 
-.accountType {
-	flex-shrink: 0;
-	align-self: flex-start;
-	padding: 2px var(--mantine-spacing-xs);
-	border-radius: var(--mantine-radius-sm);
-}
-
 .balance {
-	grid-area: balance;
+	flex: 1;
-	min-width: 0;
-	text-align: right;
 }
 
 .summary {
-	font-variant-numeric: tabular-nums lining-nums;
+	font-variant-numeric: tabular-nums;
-	align-items: flex-end;
-}
-
-.currencySummary {
-	min-width: 0;
 }
 
 .total {
-	color: var(--wl-color-text);
+	font-size: clamp(1.5rem, 2.8vw, 2.25rem);
+	letter-spacing: -0.035em;
+	line-height: 1.2;
+	overflow-wrap: anywhere;
+}
+
+.total + .total {
 	font-size: var(--mantine-font-size-lg);
-	line-height: var(--mantine-line-height-lg);
+	font-weight: 500;
-	overflow-wrap: anywhere;
+	letter-spacing: 0;
+	color: var(--mantine-color-gray-7);
 }
 
-.return,
+.positions {
-.cashValue {
+	display: grid;
-	font-variant-numeric: tabular-nums lining-nums;
+	grid-template-columns: repeat(2, minmax(0, 1fr));
-}
-
-.return {
-	justify-content: flex-end;
-	min-width: 0;
-	overflow-wrap: anywhere;
-}
-
-.cashValue {
-	white-space: nowrap;
-}
-
-.positive {
-	color: var(--wl-color-positive);
-}
-
-.negative {
-	color: var(--wl-color-negative);
-}
-
-.neutral {
-	color: var(--wl-color-muted);
-}
-
-.cash {
-	font-variant-numeric: tabular-nums lining-nums;
-}
-
-.details {
-	grid-area: details;
-	min-width: 0;
-	font-variant-numeric: tabular-nums lining-nums;
-}
-
-.structure {
-	grid-area: structure;
-	gap: var(--mantine-spacing-xs);
-}
-
-.structureBar {
-	display: flex;
-	width: 100%;
-	height: 6px;
-	overflow: hidden;
-	border-radius: var(--mantine-radius-xs);
-	background: var(--wl-color-subtle);
-}
-
-.structureSection {
-	flex: none;
-	height: 100%;
-	background: var(--category-color);
-}
-
-@media (max-width: 47.9375em) {
-	.row {
-		grid-template-areas:
-			"identity"
-			"balance"
-			"structure"
-			"details";
-		grid-template-columns: minmax(0, 1fr);
 	gap: var(--mantine-spacing-sm);
+	margin: 0;
+}
+
+.positions > div {
+	display: flex;
+	flex-wrap: wrap;
+	align-items: center;
+	justify-content: space-between;
+	gap: 4px var(--mantine-spacing-sm);
+	padding: var(--mantine-spacing-sm) var(--mantine-spacing-md);
+	border-radius: var(--mantine-radius-md);
+}
+
+.stocks {
+	background: var(--mantine-color-blue-0);
+	color: var(--mantine-color-blue-8);
+}
+
+.bonds {
+	background: var(--mantine-color-grape-0);
+	color: var(--mantine-color-grape-8);
+}
+
+.positions dt {
+	font-size: var(--mantine-font-size-sm);
+	font-weight: 500;
+}
+
+.positions dd {
+	margin: 0;
+	font-size: 1.75rem;
+	font-weight: 700;
+	font-variant-numeric: tabular-nums;
+	line-height: 1.25;
+	overflow-wrap: anywhere;
+}
+
+.footer {
+	border-top: 1px solid var(--mantine-color-gray-2);
+	padding-top: var(--mantine-spacing-md);
+}
+
+.open {
+	display: inline-flex;
+	align-items: center;
+	gap: var(--mantine-spacing-xs);
+	margin-left: auto;
+	color: var(--mantine-color-blue-7);
+}
+
+.arrow {
+	font-size: var(--mantine-font-size-lg);
+	transition: transform 160ms ease;
+}
+
+.card:hover .arrow {
+	transform: translateX(3px);
+}
+
+@media (max-width: 36em) {
+	.card {
 		padding: var(--mantine-spacing-md);
+		gap: var(--mantine-spacing-lg);
 	}
 
-	.balance {
+	.positions > div {
-		text-align: left;
+		flex-direction: column;
-	}
-
-	.summary {
 		align-items: flex-start;
+		padding: var(--mantine-spacing-sm);
+	}
 }
 
-	.return {
+@media (prefers-reduced-motion: reduce) {
-		justify-content: flex-start;
+	.card,
+	.arrow {
+		transition: none;
+	}
+
+	.card:hover,
+	.card:focus-visible,
+	.card:hover .arrow {
+		transform: none;
 	}
 }

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

@@ -2,84 +2,32 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 
 import { MemoryRouter } from "react-router";
 
-import { resource } from "@/test/resource";
-
 import type { BrokerageAccount } from "../../api/useBrokerageAccounts";
 
 import { brokerageAccountCards } from "../../model/display";
 import { BrokerageAccountList } from "./BrokerageAccountList";
 
-type PortfolioSummary = NonNullable<BrokerageAccount["portfolioSummary"]>;
+const syntheticAccount = {
-
+	id: "storybook-account",
-const rubReturn = {
+	name: "Учебный брокерский счёт",
-	absolute: "136900",
-	costBasis: "1103600.50",
-	partial: false,
-	percent: "12.40",
-};
-
-const portfolioSummary = {
-	bondPositionCount: 12,
-	cash: { currency: "RUB", value: "82500.50" },
-	fundPositionCount: 2,
-	stockPositionCount: 5,
-	structure: {
-		categories: [
-			{ sharePercent: "55.000000", type: "STOCK", value: "682500" },
-			{ sharePercent: "25.000000", type: "BOND", value: "310500" },
-			{ sharePercent: "10.000000", type: "OTHER", value: "124200" },
-			{ sharePercent: "10.000000", type: "CASH", value: "124200" },
-		],
-		hasNegativeValues: false,
-		totalValue: "1241400",
-		unvaluedCategories: [],
-	},
-	totalPositionCount: 19,
-	totals: { currency: "RUB", value: "1240500.50" },
-	unrealizedReturn: rubReturn,
-} satisfies PortfolioSummary;
-
-function account(
-	id: string,
-	name: string,
-	summary: null | PortfolioSummary = portfolioSummary,
-	type: BrokerageAccount["type"] = "BROKERAGE",
-): BrokerageAccount {
-	return {
-		id,
-		name,
 	openedOn: "2025-03-15",
-		portfolioSummary: summary,
+	portfolioSummary: {
-		type,
+		bondPositionCount: 12,
-	};
+		stockPositionCount: 5,
-}
+		totalsByCurrency: [
-
+			{ currency: "RUB", value: "125000.50" },
-const negativeSummary: PortfolioSummary = {
+			{ currency: "USD", value: "320" },
-	...portfolioSummary,
+			{ currency: "EUR", value: "210" },
-	unrealizedReturn: {
+		],
-		...rubReturn,
-		absolute: "-4200",
-		percent: "-3.05",
 	},
-};
+	type: "BROKERAGE",
-
+} satisfies BrokerageAccount;
-const emptySummary: PortfolioSummary = {
-	...portfolioSummary,
-	cash: { currency: "RUB", value: "0" },
-	structure: {
-		categories: [],
-		hasNegativeValues: false,
-		totalValue: "0",
-		unvaluedCategories: [],
-	},
-	totalPositionCount: 0,
-	totals: { currency: "RUB", value: "0" },
-	unrealizedReturn: rubReturn,
-};
 
 const meta = {
-	args: { accounts: brokerageAccountCards([account("normal", "Основной ИИС")]) },
+	args: { accounts: brokerageAccountCards([syntheticAccount]) },
-	argTypes: { accounts: { control: false } },
+	argTypes: {
+		accounts: { control: false },
+	},
 	component: BrokerageAccountList,
 	decorators: [
 		Story => (
@@ -92,7 +40,7 @@ const meta = {
 		docs: {
 			description: {
 				component:
-					"Карточки счетов: стоимость и доходность, деньги, структура и свежесть источника. Денежные и процентные значения остаются строками. Все примеры содержат вымышленные данные; ссылки работают только внутри MemoryRouter.",
+					"Карточки счетов WealthLedger со сводкой по валютам и числом наименований акций и облигаций. Используйте на экране выбора счёта; отсутствие сводки и отсутствие сумм имеют разные сообщения. Примеры содержат вымышленные данные. Ссылки меняют только локальный маршрут MemoryRouter; страница назначения в этой истории не отображается.",
 			},
 		},
 	},
@@ -104,78 +52,188 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Normal: Story = {};
+export const Available: Story = {
-
+	name: "Сводка по нескольким валютам",
-export const Negative: Story = {
+	parameters: {
-	args: {
+		docs: {
-		accounts: brokerageAccountCards([
+			description: {
-			account("negative", "Просевший портфель", negativeSummary),
+				story:
-		]),
+					"Показываются первые две валюты и количество остальных. Суммы разных валют не складываются в общий итог.",
+			},
+		},
 	},
 };
 
-export const Partial: Story = {
+export const Unavailable: Story
+	= {
 		args: {
-		accounts: brokerageAccountCards([account("partial", "Частичные данные", {
+			accounts: brokerageAccountCards([
-			...portfolioSummary,
+				{ ...syntheticAccount, openedOn: null, portfolioSummary: null },
-			unrealizedReturn: {
+			]),
-				...rubReturn,
+		},
-				partial: true,
+		name: "Сводка недоступна",
+		parameters: {
+			docs: {
+				description: {
+					story:
+						"Счёт остаётся доступен для открытия, даже если сводка временно недоступна. Неизвестные суммы не заменяются нулём; отсутствующая дата открытия не отображается.",
+				},
 			},
-		})]),
 		},
 	};
 
 export const Empty: Story = {
 	args: {
 		accounts: brokerageAccountCards([
-			account("empty", "Новый пустой счёт", emptySummary),
+			{
+				...syntheticAccount,
+				portfolioSummary: {
+					bondPositionCount: 0,
+					stockPositionCount: 0,
+					totalsByCurrency: [],
+				},
+			},
 		]),
 	},
-};
+	name: "Нет текущих сумм",
-
+	parameters: {
-export const Unavailable: Story = {
+		docs: {
-	args: {
+			description: {
-		accounts: brokerageAccountCards([
+				story:
-			account("unavailable", "Счёт без сводки", null),
+					"Успешно полученная пустая сводка отличается от ошибки получения данных. Карточка сохраняет название, тип счёта и переход.",
-		]),
 			},
-};
-
-export const Stale: Story = {
-	args: {
-		accounts: brokerageAccountCards([
-			account("stale", "Устаревший портфель"),
-		], resource([], {
-			dependencies: [{
-				availability: "available",
-				completeness: "complete",
-				dataRevision: "stale-revision",
-				freshness: "stale",
-				lastAttempt: {
-					finishedAt: null,
-					problems: [],
-					startedAt: null,
-					state: "none",
 		},
-				lastSuccessfulAt: "2026-08-13T00:00:00Z",
-				resourceKey: "portfolio/stale",
-			}],
-			freshness: "stale",
-			lastSuccessfulAt: "2026-08-14T00:00:00Z",
-		}).meta.dependencies),
 	},
 };
 
 export const LongName: Story = {
 	args: {
 		accounts: brokerageAccountCards([
-			account(
+			{
-				"long",
+				...syntheticAccount,
-				"Очень длинное название индивидуального инвестиционного счёта, которое должно корректно переноситься на узком экране",
+				name: "Учебный индивидуальный инвестиционный счёт для долгосрочных накоплений",
-				portfolioSummary,
+				type: "INDIVIDUAL_INVESTMENT",
-				"INDIVIDUAL_INVESTMENT",
+			},
-			),
 		]),
 	},
+	name: "Длинное название счёта",
+	parameters: {
+		docs: {
+			description: {
+				story:
+					"Проверьте перенос длинного названия на узком экране и доступность всей карточки с клавиатуры.",
+			},
+		},
+	},
+};
+
+export const AccountGrid: Story = {
+	args: {
+		accounts: brokerageAccountCards([
+			{
+				...syntheticAccount,
+				name: "Основной",
+				portfolioSummary: {
+					bondPositionCount: 14,
+					stockPositionCount: 8,
+					totalsByCurrency: [{ currency: "RUB", value: "1256430.50" }],
+				},
+			},
+			{
+				...syntheticAccount,
+				id: "storybook-iis",
+				name: "Долгосрочные инвестиции",
+				portfolioSummary: {
+					bondPositionCount: 6,
+					stockPositionCount: 0,
+					totalsByCurrency: [{ currency: "RUB", value: "480250" }],
+				},
+				type: "INDIVIDUAL_INVESTMENT",
+			},
+		]),
+	},
+	name: "Несколько счетов",
+};
+
+export const UnvaluedPositions: Story = {
+	args: {
+		accounts: brokerageAccountCards([
+			{
+				...syntheticAccount,
+				portfolioSummary: {
+					bondPositionCount: 1,
+					stockPositionCount: 2,
+					totalsByCurrency: [],
+				},
+			},
+		]),
+	},
+	name: "Бумаги без текущей оценки",
+};
+
+export const LargeValues: Story = {
+	args: {
+		accounts: brokerageAccountCards([
+			{
+				...syntheticAccount,
+				portfolioSummary: {
+					bondPositionCount: 105,
+					stockPositionCount: 21,
+					totalsByCurrency: [
+						{ currency: "RUB", value: "1234567890123456789.50" },
+						{ currency: "USD", value: "-9876543210987654321.50" },
+					],
+				},
+			},
+		]),
+	},
+	name: "Длинные суммы",
+};
+
+export const IndependentFreshness: Story
+	= {
+		args: {
+			accounts: brokerageAccountCards(
+				[
+					syntheticAccount,
+					{
+						...syntheticAccount,
+						id: "waiting",
+						name: "Новый счёт",
+						portfolioSummary: null,
+					},
+				],
+				[
+					{
+						availability: "available",
+						completeness: "complete",
+						dataRevision: "1",
+						freshness: "stale",
+						lastAttempt: {
+							finishedAt: "2026-09-24T10:31:00Z",
+							problems: [],
+							startedAt: "2026-09-24T10:30:00Z",
+							state: "failed",
+						},
+						lastSuccessfulAt: "2026-09-24T10:30:00Z",
+						resourceKey: "portfolio/storybook-account",
+					},
+					{
+						availability: "initial-loading",
+						completeness: "incomplete",
+						dataRevision: "0",
+						freshness: "unknown",
+						lastAttempt: {
+							finishedAt: null,
+							problems: [],
+							startedAt: "2026-09-24T10:30:00Z",
+							state: "running",
+						},
+						lastSuccessfulAt: null,
+						resourceKey: "portfolio/waiting",
+					},
+				],
+			),
+		},
+		name: "Независимая свежесть и ошибка сводок",
 	};

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

@@ -5,178 +5,122 @@ import { describe, expect, it } from "vitest";
 
 import { resource } from "@/test/resource";
 
-import type { BrokerageAccount } from "../../api/useBrokerageAccounts";
-
 import { brokerageAccountCards } from "../../model/display";
 import { BrokerageAccountList } from "./BrokerageAccountList";
 
-type PortfolioSummary = NonNullable<BrokerageAccount["portfolioSummary"]>;
+describe("BrokerageAccountList", () => {
-
+	it("renders account details and an account link", () => {
-const portfolioSummary = {
+		render(
+			<MantineProvider>
+				<MemoryRouter>
+					<BrokerageAccountList
+						accounts={brokerageAccountCards([
+							{
+								id: "account-1",
+								name: "Основной",
+								openedOn: "2024-08-13",
+								portfolioSummary: {
 									bondPositionCount: 12,
-	cash: { currency: "RUB", value: "82500.5" },
-	fundPositionCount: 0,
 									stockPositionCount: 5,
-	structure: {
+									totalsByCurrency: [
-		categories: [
+										{ currency: "RUB", value: "1500" },
-			{ sharePercent: "50.000000", type: "STOCK", value: "100" },
+										{ currency: "USD", value: "20" },
-			{ sharePercent: "30.000000", type: "BOND", value: "60" },
+										{ currency: "EUR", value: "5" },
-			{ sharePercent: "0.000000", type: "OTHER", value: "0" },
-			{ sharePercent: "20.000000", type: "CASH", value: "40" },
 									],
-		hasNegativeValues: false,
-		totalValue: "200",
-		unvaluedCategories: [],
 								},
-	totalPositionCount: 17,
-	totals: { currency: "RUB", value: "123456789012345678901.995" },
-	unrealizedReturn: {
-		absolute: "136900",
-		costBasis: "1000000",
-		partial: true,
-		percent: "12.40",
-	},
-} satisfies PortfolioSummary;
-
-type BrokerageAccountCardInput = Parameters<typeof BrokerageAccountList>[0][
-	"accounts"
-];
-
-function account(
-	id: string,
-	name: string,
-	summary: null | PortfolioSummary,
-): BrokerageAccount {
-	return {
-		id,
-		name,
-		openedOn: null,
-		portfolioSummary: summary,
 								type: "BROKERAGE",
-	};
-}
 
-function renderList(accounts: BrokerageAccountCardInput) {
+							},
-	return render(
+							{
+								id: "account-2",
+								name: "Недоступный",
+								openedOn: null,
+								portfolioSummary: null,
+								type: "BROKERAGE",
+							},
+							{
+								id: "account-3",
+								name: "Пустой",
+								openedOn: null,
+								portfolioSummary: {
+									bondPositionCount: 0,
+									stockPositionCount: 2,
+									totalsByCurrency: [],
+								},
+								type: "BROKERAGE",
+							},
+						])}
+					/>
+				</MemoryRouter>
+			</MantineProvider>,
+		);
+
+		expect(screen.getByRole("link", { name: /Основной/ })).toHaveAttribute(
+			"href",
+			"/accounts/account-1",
+		);
+		expect(screen.getAllByText("Брокерский счет")).toHaveLength(3);
+		expect(screen.getByText(/^Открыт /)).toBeInTheDocument();
+		expect(screen.getByText("1 500 ₽")).toBeInTheDocument();
+		expect(screen.getByText("20 USD")).toBeInTheDocument();
+		expect(screen.getByText("Еще 1 валюта")).toBeInTheDocument();
+		expect(screen.getByText("Сводка временно недоступна")).toBeInTheDocument();
+		expect(screen.getByText("Нет текущих сумм")).toBeInTheDocument();
+		expect(screen.getAllByText("Открыть счет")).toHaveLength(3);
+		const available = within(screen.getByRole("link", { name: /Основной/ }));
+		expect(available.getAllByRole("definition")[0]).toHaveTextContent("5");
+		expect(available.getAllByRole("definition")[1]).toHaveTextContent("12");
+		const unvalued = within(screen.getByRole("link", { name: /Пустой/ }));
+		expect(unvalued.getAllByRole("definition")[0]).toHaveTextContent("2");
+		expect(unvalued.getAllByRole("definition")[1]).toHaveTextContent("0");
+		expect(
+			within(screen.getByRole("link", { name: /Недоступный/ })).queryByText(
+				"Акции",
+			),
+		).not.toBeInTheDocument();
+	});
+});
+
+it("shows portfolio summary freshness independently for each account", () => {
+	const accounts = brokerageAccountCards(
+		["fresh", "stale"].map(
+
+			id =>
+				({
+					id,
+					name: id,
+					openedOn: null,
+					portfolioSummary: {
+						bondPositionCount: 0,
+						stockPositionCount: 1,
+						totalsByCurrency: [{ currency: "RUB", value: "10" }],
+					},
+					type: "BROKERAGE" as const,
+				}),
+		),
+		[
+			resource(null, { freshness: "fresh", resourceKey: "portfolio/fresh" })
+				.meta,
+			resource(null, { freshness: "stale", resourceKey: "portfolio/stale" })
+				.meta,
+		],
+	);
+
+	render(
 		<MantineProvider>
 			<MemoryRouter>
 				<BrokerageAccountList accounts={accounts} />
 			</MemoryRouter>
 		</MantineProvider>,
 	);
-}
+	expect(
-
+		within(screen.getByRole("link", { name: /stale/ })).getByText(
-describe("BrokerageAccountList", () => {
+			"Данные требуют обновления",
-	it("renders returns, cash and structure with precise totals", () => {
+		),
-		const nullReturnSummary: PortfolioSummary = {
+	).toBeVisible();
-			...portfolioSummary,
+	expect(
-			structure: {
+		within(screen.getByRole("link", { name: /fresh/ })).queryByText(
-				categories: [],
+			"Данные требуют обновления",
-				hasNegativeValues: false,
+		),
-				totalValue: "0",
+	).not.toBeInTheDocument();
-				unvaluedCategories: [],
-			},
-			totals: { currency: "RUB", value: "5" },
-			unrealizedReturn: {
-				absolute: "0",
-				costBasis: "5",
-				partial: false,
-				percent: null,
-			},
-		};
-
-		renderList(brokerageAccountCards([
-			account("account-1", "Основной", portfolioSummary),
-			account("account-2", "Без доходности", nullReturnSummary),
-		]));
-
-		const link = screen.getByRole("link", { name: /Основной/ });
-		expect(link).toHaveAttribute("href", "/accounts/account-1");
-		expect(within(link).getByText("123 456 789 012 345 678 902,00 ₽"))
-			.toBeInTheDocument();
-		expect(within(link).getByText("+12,4 %")).toBeInTheDocument();
-		expect(within(link).getByText("+136 900 ₽")).toBeInTheDocument();
-		const nullReturnLink = screen.getByRole("link", { name: /Без доходности/ });
-		expect(within(nullReturnLink).getByText("—")).toBeInTheDocument();
-		expect(within(link).getByText("частично")).toBeInTheDocument();
-		expect(within(link).getByText("82 500,50 ₽")).toBeInTheDocument();
-		expect(within(link).getByText("17 позиций")).toBeInTheDocument();
-		expect(screen.getByRole("img", {
-			name: "Структура: Акции 50,0 %; Облигации 30,0 %; "
-				+ "Другие активы 0,0 %; Свободные деньги 20,0 %",
-		})).toBeInTheDocument();
-		const stockLegend = within(link).getByText(/Акции 50,0 %/);
-		expect(stockLegend).toHaveTextContent("● Акции 50,0 %");
-		// eslint-disable-next-line testing-library/no-node-access -- The legend is aria-hidden, so only DOM traversal reaches its container.
-		expect(stockLegend.parentElement).toHaveAttribute("aria-hidden", "true");
-		expect(within(link).queryByText(/Другие активы 0,0 %/))
-			.not.toBeInTheDocument();
-		expect(link).toHaveTextContent("По данным брокера");
-		expect(link).toHaveTextContent("Структура: Акции 100");
-	});
-
-	it("preserves empty, unavailable and stale states", () => {
-		const emptySummary: PortfolioSummary = {
-			...portfolioSummary,
-			structure: {
-				categories: [],
-				hasNegativeValues: false,
-				totalValue: "0",
-				unvaluedCategories: [],
-			},
-			totalPositionCount: 0,
-			totals: { currency: "RUB", value: "0" },
-		};
-
-		const cards = brokerageAccountCards([
-			account("empty", "Пустой", emptySummary),
-			account("unavailable", "Недоступный", null),
-			account("stale", "Устаревший", portfolioSummary),
-			account("failed", "Ошибка обновления", null),
-		], resource([], {
-			dependencies: [{
-				availability: "available",
-				completeness: "complete",
-				dataRevision: "stale-revision",
-				freshness: "stale",
-				lastAttempt: {
-					finishedAt: null,
-					problems: [],
-					startedAt: null,
-					state: "none",
-				},
-				lastSuccessfulAt: "2026-08-13T00:00:00Z",
-				resourceKey: "portfolio/stale",
-			}, {
-				availability: "available",
-				completeness: "complete",
-				dataRevision: "failed-revision",
-				freshness: "stale",
-				lastAttempt: {
-					finishedAt: "2026-08-14T00:01:00Z",
-					problems: [],
-					startedAt: "2026-08-14T00:00:00Z",
-					state: "failed",
-				},
-				lastSuccessfulAt: "2026-08-13T00:00:00Z",
-				resourceKey: "portfolio/failed",
-			}],
-			freshness: "stale",
-			lastSuccessfulAt: "2026-08-14T00:00:00Z",
-		}).meta.dependencies);
-
-		renderList(cards);
-
-		expect(screen.getByText("Нет текущих сумм")).toBeInTheDocument();
-		expect(screen.getAllByText("Сводка временно недоступна"))
-			.toHaveLength(2);
-		const staleLink = screen.getByRole("link", { name: /Устаревший/ });
-		expect(within(staleLink).getByText("Данные требуют обновления"))
-			.toBeInTheDocument();
-		expect(within(staleLink).getByText(/Данные на/)).toBeInTheDocument();
-		const failedLink = screen.getByRole("link", { name: /Ошибка обновления/ });
-		expect(within(failedLink).getByText(
-			"Не удалось обновить данные. Показаны последние полученные.",
-		)).toBeInTheDocument();
-	});
 });

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

@@ -1,10 +1,11 @@
-import type { CSSProperties, FC } from "react";
+import type { FC } from "react";
 
-import { Badge, Group, Stack, Text, VisuallyHidden } from "@mantine/core";
+import { Card, Group, SimpleGrid, Stack, Text } from "@mantine/core";
+import { WalletIcon } from "@wealthledger/icons";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
-import { formatMoney, portfolioCategoryPresentation } from "@/shared/lib";
+import { formatDate, formatMoney } from "@/shared/lib";
 import { SourceSyncStatus } from "@/shared/ui";
 
 import type { BrokerageAccountCard } from "../../model/display";
@@ -12,171 +13,12 @@ import type { BrokerageAccountCard } from "../../model/display";
 import { accountTypeKey } from "../../model/display";
 import classes from "./BrokerageAccountList.module.css";
 
-const DECIMAL_PART_COUNT = 2;
-const STRUCTURE_CATEGORY_ORDER = ["STOCK", "BOND", "OTHER", "CASH"] as const;
-
-const percentFormatter = new Intl.NumberFormat("ru-RU", {
-	maximumFractionDigits: 1,
-	minimumFractionDigits: 1,
-});
-
-type AvailableSummary = Extract<
-	BrokerageAccountCard["summary"],
-	{ state: "available" }
->;
-
 type BrokerageAccountListProps = { accounts: BrokerageAccountCard[] };
 
 type BrokerageAccountSummaryProps = {
 	summary: BrokerageAccountCard["summary"];
 };
 
-type PortfolioSummary = AvailableSummary["portfolio"];
-
-type ReturnValueProps = {
-	item: PortfolioSummary["unrealizedReturn"];
-};
-
-type StructureCurrency = PortfolioSummary["structure"];
-
-function formatPercent(value: null | string) {
-	if (value === null) return "—";
-
-	const rounded = percentFormatter.format(Math.abs(Number(value)));
-	let sign = "";
-	if (rounded !== "0,0") sign = value.startsWith("-") ? "−" : "+";
-
-	return `${sign}${rounded}\u{A0}%`;
-}
-
-function formatStructurePercent(value: string) {
-	return percentFormatter.format(Number(value));
-}
-
-function isZero(value: string) {
-	const unsigned = value.startsWith("-") ? value.slice(1) : value;
-	const [integer = "", fraction = ""] = unsigned.split(".", DECIMAL_PART_COUNT);
-
-	return integer.replaceAll("0", "") === ""
-		&& fraction.replaceAll("0", "") === "";
-}
-
-const ReturnValue: FC<ReturnValueProps> = (props) => {
-	const { t } = useTranslation();
-	const { item } = props;
-
-	const displayedPercent = formatPercent(item.percent);
-	const isNegative = displayedPercent.startsWith("−");
-	const isPositive = displayedPercent.startsWith("+");
-
-	let toneClass = classes.neutral;
-	if (isNegative) toneClass = classes.negative;
-	else if (isPositive) toneClass = classes.positive;
-
-	return (
-		<Group className={classes.return} gap="xs" wrap="wrap">
-			<Text className={toneClass} fw={700} size="sm">
-				{displayedPercent}
-			</Text>
-
-			<Text className={toneClass} size="sm">
-				{formatMoney(
-					{ currency: "RUB", value: item.absolute },
-					{ withSign: true },
-				)}
-			</Text>
-
-			{item.partial && (
-				<Text c="dimmed" size="xs">
-					{t("accounts.partial")}
-				</Text>
-			)}
-		</Group>
-	);
-};
-
-type StructureBarProps = { item: StructureCurrency };
-
-const StructureBar: FC<StructureBarProps> = (props) => {
-	const { t } = useTranslation();
-
-	const categories = STRUCTURE_CATEGORY_ORDER.flatMap((type) => {
-		const category = props.item.categories.find(item => item.type === type);
-
-		return category ? [category] : [];
-	});
-
-	const description = categories.map((category) => {
-		const label = t(portfolioCategoryPresentation[category.type].label);
-
-		const percent = category.sharePercent === null
-			? null
-			: formatStructurePercent(category.sharePercent);
-
-		return percent === null
-			? t("accounts.structure.incomplete", { category: label })
-			: t("accounts.structure.category", { category: label, percent });
-	}).join("; ");
-
-	const label = t("accounts.structure.label", {
-		value: description,
-	});
-
-	const legendCategories = categories.filter(category =>
-		category.sharePercent === null || !isZero(category.sharePercent));
-
-	return (
-		<Stack gap={4}>
-			<div
-				aria-label={label}
-				className={classes.structureBar}
-				role="img"
-				title={label}
-			>
-				{categories.map((category) => {
-					const presentation = portfolioCategoryPresentation[category.type];
-
-					const style = {
-						"--category-color": `var(--mantine-color-${presentation.color.replace(".", "-")})`,
-						"width": `${category.sharePercent ?? 0}%`,
-					} as CSSProperties;
-
-					return (
-						<div
-							aria-hidden
-							className={classes.structureSection}
-							key={category.type}
-							style={style}
-						/>
-					);
-				})}
-			</div>
-
-			<Group aria-hidden gap="xs" wrap="wrap">
-				{legendCategories.map((category) => {
-					const presentation = portfolioCategoryPresentation[category.type];
-					const categoryLabel = t(presentation.label);
-
-					const text = category.sharePercent === null
-						? categoryLabel
-						: t("accounts.structure.category", {
-								category: categoryLabel,
-								percent: formatStructurePercent(category.sharePercent),
-							});
-
-					return (
-						<Text c="dimmed" key={category.type} size="xs">
-							<Text c={presentation.color} component="span">●</Text>
-							{" "}
-							{text}
-						</Text>
-					);
-				})}
-			</Group>
-		</Stack>
-	);
-};
-
 const BrokerageAccountSummary: FC<BrokerageAccountSummaryProps> = (props) => {
 	const { summary } = props;
 	const { t } = useTranslation();
@@ -194,26 +36,20 @@ const BrokerageAccountSummary: FC<BrokerageAccountSummaryProps> = (props) => {
 		);
 
 	return (
-		<Stack className={classes.balance} gap="xs">
+		<Stack className={classes.summary} gap={4}>
-			<Stack className={classes.summary} gap="sm">
+			{summary.totals.map(total => (
-				<Stack className={classes.currencySummary} gap={2}>
+				<Text className={classes.total} fw={700} key={total.currency}>
-					<Text className={classes.total} fw={700}>
+					{formatMoney(total)}
-						{formatMoney(summary.totals, { withRoundedCents: true })}
 				</Text>
+			))}
 
-					<ReturnValue item={summary.portfolio.unrealizedReturn} />
+			{!!summary.remainingCurrencyCount && (
-				</Stack>
+				<Text c="dimmed" size="sm">
-			</Stack>
+					{t("accounts.remainingCurrencies", {
-
+						count: summary.remainingCurrencyCount,
-			<Group className={classes.cash} gap="xs" justify="flex-end">
+					})}
-				<Text c="dimmed" size="xs">
-					{t("accounts.cash")}
 				</Text>
-
+			)}
-				<Text className={classes.cashValue} size="sm">
-					{formatMoney(summary.portfolio.cash, { withRoundedCents: true })}
-				</Text>
-			</Group>
 		</Stack>
 	);
 };
@@ -225,13 +61,13 @@ type BrokerageAccountSourceStatusProps = {
 const BrokerageAccountSourceStatus: FC<BrokerageAccountSourceStatusProps> = (
 	props,
 ) => {
-	const { t } = useTranslation();
 	const { source } = props;
+	const { t } = useTranslation();
+
 	const isSyncing = source?.lastAttempt.state === "running";
 
-	const errorText = source?.lastAttempt.state === "failed"
+	const errorText
-		? t("accounts.refreshError")
+		= source?.lastAttempt.state === "failed" ? t("accounts.refreshError") : null;
-		: null;
 
 	return (
 		<>
@@ -251,99 +87,86 @@ const BrokerageAccountSourceStatus: FC<BrokerageAccountSourceStatusProps> = (
 	);
 };
 
-type AccountDescriptionProps = {
-	account: BrokerageAccountCard;
-};
-
-const AccountDescription: FC<AccountDescriptionProps> = (props) => {
-	const { t } = useTranslation();
-	const { account, summary } = props.account;
-	if (summary.state !== "available") return null;
-
-	const returns = [t("accounts.description.return", {
-		absolute: formatMoney(
-			{ currency: "RUB", value: summary.portfolio.unrealizedReturn.absolute },
-			{ withSign: true },
-		),
-		percent: formatPercent(summary.portfolio.unrealizedReturn.percent),
-	})];
-
-	const structures = (() => {
-		const categories = summary.portfolio.structure.categories.map(category =>
-			t("accounts.description.structureCategory", {
-				category: t(portfolioCategoryPresentation[category.type].label),
-				value: formatMoney(
-					{ currency: "RUB", value: category.value },
-					{ withRoundedCents: true },
-				),
-			}),
-		).join(", ");
-
-		return t("accounts.description.structure", { value: categories });
-	})();
-
-	const hasPartialReturn = summary.portfolio.unrealizedReturn.partial;
-
-	const details = [returns, structures].join(". ");
-
-	return (
-		<VisuallyHidden>
-			{t("accounts.description.start", {
-				name: account.name,
-				type: t(accountTypeKey(account.type)),
-			})}
-			{t("accounts.description.currentValue", {
-				value: formatMoney(summary.portfolio.totals),
-			})}
-			{details ? `${details}. ` : ""}
-			{hasPartialReturn ? t("accounts.brokerDescription") : ""}
-		</VisuallyHidden>
-	);
-};
-
 const BrokerageAccountList: FC<BrokerageAccountListProps> = (props) => {
+	const { accounts } = props;
 	const { t } = useTranslation();
 
 	return (
-		<ul className={classes.list}>
+		<SimpleGrid className={classes.list} cols={1} spacing="lg">
-			{props.accounts.map(({ account, positionCounts, source, summary }) => (
+			{accounts.map(({ account, positionCounts, source, summary }) => (
-				<li key={account.id}>
+				<Card
-					<Link className={classes.row} to={`/accounts/${account.id}`}>
+					className={classes.card}
-						<Group className={classes.identity} wrap="nowrap">
+					component={Link}
-							<h2 className={classes.name}>{account.name}</h2>
+					key={account.id}
-
+					padding="xl"
-							<Badge className={classes.accountType} variant="light">
+					radius="lg"
+					to={`/accounts/${account.id}`}
+					withBorder
+				>
+					<Stack className={classes.identity} gap="sm">
+						<Group gap="sm" justify="space-between" wrap="nowrap">
+							<Text className={classes.kicker} fw={700} size="xs">
 								{t(accountTypeKey(account.type))}
-							</Badge>
+							</Text>
+
+							<WalletIcon className={classes.accountIcon} />
 						</Group>
 
-						<BrokerageAccountSummary summary={summary} />
+						<Text className={classes.name} component="h2" fw={700}>
-
+							{account.name}
-						<Stack className={classes.details} gap={2}>
-							{positionCounts && (
-								<Text c="dimmed" size="xs">
-									{t("accounts.positions", {
-										count: positionCounts.total,
-									})}
 						</Text>
-							)}
+					</Stack>
+
+					<Stack className={classes.balance} gap="xs">
+						<Text c="dimmed" size="sm">
+							{t("accounts.currentValue")}
+						</Text>
+
+						<BrokerageAccountSummary summary={summary} />
 
 						<BrokerageAccountSourceStatus source={source} />
 					</Stack>
 
-						{summary.state === "available" && (
+					{!!positionCounts && (
-							<Stack className={classes.structure} gap={4}>
+						<dl className={classes.positions}>
-								<StructureBar item={summary.portfolio.structure} />
+							<div className={classes.stocks}>
-							</Stack>
+								<dt>{t("accounts.stocks")}</dt>
+
+								<dd>
+									{new Intl.NumberFormat("ru-RU").format(positionCounts.stocks)}
+								</dd>
+							</div>
+
+							<div className={classes.bonds}>
+								<dt>{t("accounts.bonds")}</dt>
+
+								<dd>
+									{new Intl.NumberFormat("ru-RU").format(positionCounts.bonds)}
+								</dd>
+							</div>
+						</dl>
 					)}
 
-						<AccountDescription
+					<Group className={classes.footer} gap="sm" justify="space-between">
-							account={{ account, positionCounts, source, summary }}
+						{!!account.openedOn && (
-						/>
+							<Text c="dimmed" size="xs">
-					</Link>
+								{t("accounts.openedOn", {
-				</li>
+									date: formatDate(account.openedOn),
+								})}
+							</Text>
+						)}
+
+						<Text className={classes.open} component="span" fw={600} size="sm">
+							{t("accounts.openAccount")}
+
+							<span aria-hidden="true" className={classes.arrow}>
+								→
+							</span>
+						</Text>
+					</Group>
+				</Card>
 			))}
-		</ul>
+		</SimpleGrid>
 	);
 };
 

src/entities/brokerage-event/index.ts

@@ -2,9 +2,8 @@ export {
 	type BrokerageEvent,
 	useBrokerageEvents,
 } from "./api/useBrokerageEvents";
-export { brokerageEventGroupKey, brokerageEventKey } from "./model/event-key";
+export { brokerageEventKey } from "./model/event-key";
 export { BrokerageEventCard } from "./ui/BrokerageEventCard";
-export { BrokerageEventGroup } from "./ui/BrokerageEventGroup";
 export {
 	BrokerageEventsPreview,
 	type BrokerageEventsPreviewState,

src/entities/brokerage-event/model/event-key.test.ts

@@ -1,57 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import type { BrokerageEvent } from "../api/useBrokerageEvents";
-
-import { brokerageEventGroupKey } from "./event-key";
-
-const base: BrokerageEvent = {
-	account: { id: "account-1", name: "Брокерский" },
-	date: "2026-08-20",
-	dateKind: "event",
-	displayName: "ОФЗ 26238",
-	figi: "FIGI",
-	instrumentUid: "UID",
-	isin: "RU000A0JX0J2",
-	logoName: null,
-	projectedAmount: { currency: "RUB", value: "100" },
-	ticker: "OFZ",
-	type: "coupon",
-};
-
-describe("brokerageEventGroupKey", () => {
-	it("uses date, preferred identity, exact type and dateKind", () => {
-		const key = brokerageEventGroupKey(base);
-
-		expect(brokerageEventGroupKey({
-			...base,
-			account: { id: "account-2", name: "ИИС" },
-			figi: "OTHER-FIGI",
-		})).toBe(key);
-		expect(brokerageEventGroupKey({ ...base, date: "2026-08-21" }))
-			.not.toBe(key);
-		expect(brokerageEventGroupKey({ ...base, dateKind: "registry" }))
-			.not.toBe(key);
-		expect(brokerageEventGroupKey({ ...base, type: "dividend" }))
-			.not.toBe(key);
-	});
-
-	it("falls back through FIGI and ISIN and rejects missing identity", () => {
-		expect(brokerageEventGroupKey({ ...base, instrumentUid: null }))
-			.toBe(brokerageEventGroupKey({ ...base, instrumentUid: "" }));
-		expect(brokerageEventGroupKey({
-			...base,
-			figi: null,
-			instrumentUid: null,
-		})).toBe(brokerageEventGroupKey({
-			...base,
-			figi: "",
-			instrumentUid: null,
-		}));
-		expect(brokerageEventGroupKey({
-			...base,
-			figi: null,
-			instrumentUid: null,
-			isin: null,
-		})).toBeNull();
-	});
-});

src/entities/brokerage-event/model/event-key.ts

@@ -1,13 +1,5 @@
 import type { BrokerageEvent } from "../api/useBrokerageEvents";
 
-function brokerageEventGroupKey(event: BrokerageEvent): null | string {
-	const identity = event.instrumentUid || event.figi || event.isin;
-
-	return identity
-		? JSON.stringify([event.date, identity, event.type, event.dateKind])
-		: null;
-}
-
 function brokerageEventKey(event: BrokerageEvent) {
 	return JSON.stringify([
 		event.account?.id, event.type, event.date, event.instrumentUid,
@@ -15,4 +7,4 @@ function brokerageEventKey(event: BrokerageEvent) {
 	]);
 }
 
-export { brokerageEventGroupKey, brokerageEventKey };
+export { brokerageEventKey };

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

@@ -1,122 +0,0 @@
-import { MantineProvider } from "@mantine/core";
-import { render, screen, within } from "@testing-library/react";
-import { MemoryRouter } from "react-router";
-import { describe, expect, it } from "vitest";
-
-import type { BrokerageEvent } from "../api/useBrokerageEvents";
-
-import { BrokerageEventGroup } from "./BrokerageEventGroup";
-
-function event(
-	account: { id: string; name: string },
-	value: null | string,
-	currency = "RUB",
-): BrokerageEvent {
-	return {
-		account,
-		date: "2026-08-20",
-		dateKind: "registry",
-		displayName: "ОФЗ 26238",
-		figi: "FIGI",
-		instrumentUid: "UID",
-		isin: "RU000A0JX0J2",
-		logoName: null,
-		projectedAmount: value === null ? null : { currency, value },
-		ticker: "OFZ",
-		type: "coupon",
-	};
-}
-
-function renderGroup(
-	events: [BrokerageEvent, BrokerageEvent],
-	isTotalVisible = true,
-) {
-	return render(
-		<MantineProvider>
-			<MemoryRouter>
-				<ul>
-					<BrokerageEventGroup
-						events={events}
-						totalVisible={isTotalVisible}
-					/>
-				</ul>
-			</MemoryRouter>
-		</MantineProvider>,
-	);
-}
-
-describe("BrokerageEventGroup", () => {
-	it("shows an unsigned forecast total and every account forecast", () => {
-		renderGroup([
-			event({ id: "broker", name: "Брокерский" }, "100.5"),
-			event({ id: "iis", name: "ИИС" }, "49.5"),
-		]);
-
-		expect(screen.getByText("Купон · ОФЗ 26238")).toBeInTheDocument();
-		expect(screen.getByText("150 ₽")).toBeInTheDocument();
-		expect(screen.getAllByText("Прогноз").length).toBeGreaterThanOrEqual(3);
-
-		const accounts = within(screen.getByRole("list", {
-			name: /Купон · ОФЗ 26238, 20\.08\.2026 · Дата реестра, 150 ₽/,
-		}));
-
-		expect(accounts.getByText("Брокерский")).toBeInTheDocument();
-		expect(accounts.getByText("ИИС")).toBeInTheDocument();
-		expect(accounts.getByText("100,5 ₽")).toBeInTheDocument();
-		expect(accounts.getByText("49,5 ₽")).toBeInTheDocument();
-		expect(accounts.queryByRole("link")).not.toBeInTheDocument();
-	});
-
-	it("announces an unknown total as unavailable", () => {
-		renderGroup([
-			event({ id: "broker", name: "Брокерский" }, null),
-			event({ id: "iis", name: "ИИС" }, "49.5"),
-		]);
-
-		expect(screen.getByRole("list", {
-			name: /Купон · ОФЗ 26238.*Итог недоступен/,
-		})).toBeInTheDocument();
-		expect(screen.getByText("Сумма неизвестна")).toBeInTheDocument();
-	});
-
-	it("hides the total for incomplete data", () => {
-		renderGroup([
-			event({ id: "broker", name: "Брокерский" }, "100.5"),
-			event({ id: "iis", name: "ИИС" }, "49.5"),
-		], false);
-		expect(screen.queryByText("150 ₽")).not.toBeInTheDocument();
-	});
-
-	it("allows zero source forecasts to produce a visible zero total", () => {
-		renderGroup([
-			event({ id: "broker", name: "Брокерский" }, "0"),
-			event({ id: "iis", name: "ИИС" }, "0.00"),
-		]);
-
-		expect(screen.getAllByText("0 ₽")).toHaveLength(2);
-		expect(screen.getByText("0,00 ₽")).toBeInTheDocument();
-	});
-
-	it("sums forecast totals exactly", () => {
-		renderGroup([
-			event({ id: "broker", name: "Брокерский" }, "10"),
-			event({ id: "iis", name: "ИИС" }, "200"),
-		]);
-
-		expect(screen.getByRole("list", { name: /210 ₽/ }))
-			.toBeInTheDocument();
-	});
-
-	it("shows an offer group without a total", () => {
-		renderGroup([
-			{ ...event({ id: "broker", name: "Брокерский" }, null), type: "offer" },
-			{ ...event({ id: "iis", name: "ИИС" }, null), type: "offer" },
-		]);
-
-		const accounts = within(screen.getByRole("list", {
-			name: /Итог недоступен/,
-		}));
-
-		expect(accounts.getAllByRole("listitem")).toHaveLength(2);
-	});
-});

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

@@ -1,87 +0,0 @@
-import type { FC } from "react";
-
-import { EntryCard } from "@wealthledger/ui";
-import { useTranslation } from "react-i18next";
-
-import {
-	formatDate,
-	formatMoney,
-	instrumentLogoUrl,
-	sumMoney,
-	totalText,
-} from "@/shared/lib";
-import { AccountRow, EntryGroup, EntryGroupTotal } from "@/shared/ui";
-
-import type { BrokerageEvent } from "../api/useBrokerageEvents";
-
-import { brokerageEventKey } from "../model/event-key";
-
-type BrokerageEventGroupProps = {
-	events: [BrokerageEvent, BrokerageEvent, ...BrokerageEvent[]];
-	totalVisible: boolean;
-};
-
-const BrokerageEventGroup: FC<BrokerageEventGroupProps> = (props) => {
-	const { t } = useTranslation();
-	const [first] = props.events;
-	const typeLabel = t(`events.type.${first.type}`);
-
-	const amounts = props.events.flatMap(event =>
-		event.projectedAmount ? [event.projectedAmount] : [],
-	);
-
-	const totals = props.totalVisible && amounts.length === props.events.length
-		? sumMoney(amounts)
-		: null;
-
-	const date = formatDate(first.date);
-
-	const metadata = [
-		date,
-		first.dateKind === "registry" ? t("events.dateKind.registry") : null,
-	].filter(Boolean).join(" · ");
-
-	const title = `${typeLabel} · ${first.displayName}`;
-	const totalsText = totalText(totals, false);
-
-	const accessibleName = [
-		title,
-		metadata,
-		totalsText || t("entryGroup.totalUnavailable"),
-	].join(", ");
-
-	return (
-		<EntryGroup
-			header={(
-				<EntryCard
-					imageSrc={instrumentLogoUrl(first.logoName)}
-					initial={(first.ticker.trim()[0] ?? "?").toUpperCase()}
-					metadata={metadata}
-					title={title}
-					tone="neutral"
-					value={<EntryGroupTotal totals={totals} />}
-					valueLabel={t("payout.forecast")}
-					wrap
-				/>
-			)}
-			label={accessibleName}
-		>
-			{props.events.map((event) => {
-				const value = event.projectedAmount
-					? formatMoney(event.projectedAmount)
-					: t("events.noAmount");
-
-				return (
-					<AccountRow
-						accountName={event.account?.name ?? "—"}
-						key={brokerageEventKey(event)}
-						value={value}
-						valueLabel={t("payout.forecast")}
-					/>
-				);
-			})}
-		</EntryGroup>
-	);
-};
-
-export { BrokerageEventGroup };

src/entities/brokerage-event/ui/BrokerageEventsPreview/BrokerageEventsPreview.tsx

@@ -5,18 +5,13 @@ import { LoadingSkeleton } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
-import { groupItems } from "@/shared/lib";
-
 import type { BrokerageEvent } from "../../api/useBrokerageEvents";
 
-import { brokerageEventGroupKey, brokerageEventKey } from "../../model/event-key";
+import { brokerageEventKey } from "../../model/event-key";
 import { BrokerageEventCard } from "../BrokerageEventCard";
-import { BrokerageEventGroup } from "../BrokerageEventGroup";
 
 type BrokerageEventsPreviewProps = {
-	allAccounts?: boolean;
 	events: BrokerageEventsPreviewState;
-	moreLabel?: string;
 };
 
 type BrokerageEventsPreviewState
@@ -24,7 +19,6 @@ type BrokerageEventsPreviewState
 		items: BrokerageEvent[];
 		state: "loaded" | "partial";
 		to: string;
-		totalVisible?: boolean;
 	}
 	| { state: "empty"
 		| "error"
@@ -48,35 +42,16 @@ const BrokerageEventsPreview: FC<BrokerageEventsPreviewProps> = (props) => {
 
 			{events.state === "partial" && <Text role="status">{t("investment.partial")}</Text>}
 
-			{(events.state === "loaded" || events.state === "partial") && (
+			{(events.state === "loaded" || events.state === "partial")
-				<Stack
+				&& events.items.map(event => (
-					component="ul"
+					<BrokerageEventCard
-					gap="sm"
+						event={event}
-					m={0}
+						key={brokerageEventKey(event)}
-					p={0}
-					style={{ listStyle: "none" }}
-				>
-					{groupItems(
-						events.items,
-						props.allAccounts ? brokerageEventGroupKey : () => null,
-					).map(entry => entry.type === "group"
-						? (
-								<BrokerageEventGroup
-									events={entry.items}
-									key={entry.key}
-									totalVisible={events.totalVisible === true}
 					/>
-							)
-						: (
-								<li key={brokerageEventKey(entry.item)}>
-									<BrokerageEventCard event={entry.item} />
-								</li>
 				))}
-				</Stack>
-			)}
 
 			<Button component={Link} to={events.to} variant="subtle">
-				{props.moreLabel ?? t("events.open")}
+				{t("events.open")}
 			</Button>
 		</Stack>
 	);

src/entities/performance/api/usePerformance.ts

@@ -1,20 +0,0 @@
-import { apiQueryClient, type paths, useAuthenticatedQuery } from "@/shared/api";
-
-type Performance = NonNullable<
-	paths["/api/v1/brokerage-accounts/{accountId}/performance"]["get"]["responses"][200]["content"]["application/json"]["data"]
->;
-
-function usePerformance(accountId: string) {
-	return useAuthenticatedQuery({
-		meta: { accessGroup: "brokerage" },
-		...apiQueryClient.queryOptions(
-			"get",
-			"/api/v1/brokerage-accounts/{accountId}/performance",
-			{ params: { path: { accountId } } },
-		),
-		enabled: Boolean(accountId),
-		staleTime: 30_000,
-	});
-}
-
-export { type Performance, usePerformance };

src/entities/performance/index.ts

@@ -1 +0,0 @@
-export { type Performance, usePerformance } from "./api/usePerformance";

src/entities/portfolio/model/display.ts

@@ -2,7 +2,7 @@ import type { Portfolio } from "../api/usePortfolio";
 
 const PERCENT_SCALE = 100;
 
-type Money = Portfolio["totals"];
+type Money = Portfolio["totalsByCurrency"][number];
 
 function formatShare(
 	numerator: Money | null,

src/features/auth/model/auth.test.tsx

@@ -3,9 +3,8 @@ import type { FC, PropsWithChildren } from "react";
 import { QueryClientProvider, useQueryClient } from "@tanstack/react-query";
 import { act, renderHook, waitFor } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
-import { describe, expect, it, onTestFinished, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 
-import * as sharedApi from "@/shared/api";
 import { apiClient, apiQueryClient, useAuthenticatedQuery } from "@/shared/api";
 import { createTestQueryClient } from "@/test/query";
 import { resource } from "@/test/resource";
@@ -399,23 +398,4 @@ describe("AuthProvider", () => {
 			expect(result.current.cards.data?.[0]?.id).toBe("b-card"),
 		);
 	});
-
-	it("registers auth handlers once until unmount", async () => {
-		const configure = vi.spyOn(sharedApi, "configureAuthClient");
-		onTestFinished(() => configure.mockRestore());
-
-		const { rerender, result, unmount } = renderHook(useAuth, {
-			wrapper: createAuthWrapper(createTestQueryClient()),
-		});
-
-		await waitFor(() => expect(result.current.ready).toBe(true));
-		const registrations = configure.mock.calls.length;
-
-		rerender();
-		expect(configure).toHaveBeenCalledTimes(registrations);
-
-		unmount();
-		expect(configure).toHaveBeenCalledTimes(registrations + 1);
-		expect(configure).toHaveBeenLastCalledWith();
-	});
 });

src/features/auth/model/auth.vm.ts

@@ -161,8 +161,7 @@ function useAuthProviderVm() {
 			refresh,
 			unavailable: () => unavailableRef.current,
 		});
-		// `user` tracks access-token changes, which configureAuthClient publishes as session state.
+	});
-	}, [clearSession, refresh, user]);
 	useEffect(() => () => configureAuthClient(), []);
 
 	const authContextValue = {

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

@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, expect, it } from "vitest";
 
 import { resource } from "@/test/resource";
 
@@ -76,29 +76,4 @@ 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,11 +1,10 @@
-import { type InvestmentResourceMeta, readRetry } from "@/shared/api";
+import type { InvestmentResourceMeta } from "@/shared/api";
 
 type SectionState = {
 	error: boolean;
 	hasData: boolean;
 	loading: boolean;
 	partial?: boolean;
-	readRetry?: ReturnType<typeof readRetry>;
 };
 
 function hasSectionData(data: unknown) {
@@ -14,11 +13,8 @@ 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);
@@ -28,17 +24,6 @@ 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/InstrumentChart/InstrumentChart.vm.ts

@@ -19,6 +19,7 @@ function useInstrumentChartVm(props: InstrumentChartProps) {
 	const average = vm.position?.averagePurchasePrice;
 
 	const averageLine = average && props.priceUnit !== "percent"
+		&& average.currency === vm.candles?.currency
 		? Number(average.value)
 		: null;
 
@@ -46,7 +47,7 @@ function useInstrumentChartVm(props: InstrumentChartProps) {
 			currency:
 				props.priceUnit === "percent"
 					? t("bond.percentOfNominal")
-					: "₽",
+					: (vm.candles?.currency ?? ""),
 		},
 	);
 

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

@@ -12,8 +12,6 @@ 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";
@@ -83,8 +81,6 @@ const InstrumentSection: FC<InstrumentSectionProps> = (props) => {
 				</Alert>
 			)}
 
-			{!!props.state.readRetry && <ReadRetry {...props.state.readRetry} />}
-
 			{sectionContent}
 		</Paper>
 	);

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

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

src/features/tbank-connection/model/screen-sync.test.tsx

@@ -10,9 +10,6 @@ import { server } from "@/test/server";
 
 import { useScreenSync } from "../index";
 
-const TRANSPORT_ATTEMPTS = 3;
-const TRANSPORT_RECOVERY_MS = 3000;
-
 function auth() {
 	configureAuthClient({
 		accessToken: () => "synthetic",
@@ -31,13 +28,11 @@ describe("read-only screen synchronization", () => {
 				gets += 1;
 				syncModes.push(new URL(request.url).searchParams.get("sync"));
 
-				// The transport retries a transient read twice (1 s, 2 s) on its own.
+				return gets === 1
-				return gets <= TRANSPORT_ATTEMPTS
 					? HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 })
 					: HttpResponse.json(resource([]));
 			}),
 		);
-		vi.useFakeTimers();
 
 		const { result } = renderHook(
 			() => {
@@ -51,26 +46,12 @@ describe("read-only screen synchronization", () => {
 			{ wrapper: createQueryWrapper().wrapper },
 		);
 
-		try {
+		await waitFor(() => expect(gets).toBe(1));
-			// Exhaust the transport back-off so the query settles in error.
-			await vi.waitFor(async () => {
-				await act(() => vi.advanceTimersByTimeAsync(TRANSPORT_RECOVERY_MS));
-				expect(result.current.sync.transportError).toBe(true);
-			});
-			expect(gets).toBe(TRANSPORT_ATTEMPTS);
-
 		await act(async () => result.current.sync.retry());
-			await vi.waitFor(async () => {
+		await waitFor(() => expect(result.current.accounts.data).toEqual([]));
-				await act(() => vi.advanceTimersByTimeAsync(0));
-				expect(result.current.accounts.data).toEqual([]);
-			});
-		}
-		finally {
-			vi.useRealTimers();
-		}
 
-		expect(gets).toBe(TRANSPORT_ATTEMPTS + 1);
+		expect(gets).toBe(2);
-		expect(syncModes).toEqual(Array.from({ length: gets }, () => null));
+		expect(syncModes).toEqual([null, null]);
 	});
 
 	it("refreshes the currently open resources together", async () => {

src/features/tbank-connection/ui/InvestmentRefreshState/InvestmentRefreshState.stories.tsx

@@ -23,7 +23,7 @@ const meta = {
 	},
 	render: arguments_ => (
 		<Stack>
-			<Text>125 000,50 ₽</Text>
+			<Text>125 000,50 ₽ · 320 USD</Text>
 
 			<InvestmentRefreshState {...arguments_} />
 		</Stack>

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

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

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

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

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

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

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

@@ -1,167 +0,0 @@
-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",
-		},
-	],
-	incomeTotal: { 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,7 +47,6 @@ describe("AccountEventsPage", () => {
 					accountId: "account",
 					calculatedAt: "2026-08-14T00:00:00Z",
 					events: [],
-					window: { from: "2026-08-14", to: "2026-09-13" },
 				},
 				isError: false,
 				isLoading: false,
@@ -137,7 +136,6 @@ describe("AccountEventsPage", () => {
 							type: "offer",
 						},
 					],
-					window: { from: "2026-08-14", to: "2026-09-13" },
 				},
 				isError: false,
 				isLoading: false,
@@ -171,18 +169,15 @@ describe("AccountEventsPage", () => {
 		expect(screen.getAllByText("O")).toHaveLength(2);
 	});
 
-	it("renders empty and error states with retry", async () => {
+	it("renders empty and quiet error states", async () => {
 		const { rerender } = renderPage();
 		expect(
-			screen.getByText("На выбранный период предстоящих событий не найдено"),
+			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>
@@ -192,7 +187,7 @@ describe("AccountEventsPage", () => {
 			</MantineProvider>,
 		);
 		expect(await screen.findByRole("button", { name: "Сбросить" })).toBeVisible();
-		expect(screen.getByRole("button", { name: "Повторить" })).toBeVisible();
+		expect(screen.queryByRole("button", { name: "Повторить" })).not.toBeInTheDocument();
 	});
 
 	it("shows a structural busy state before events are available", () => {
@@ -239,83 +234,7 @@ describe("AccountEventsPage", () => {
 			"true",
 		);
 		expect(
-			screen.queryByText("На выбранный период предстоящих событий не найдено"),
+			screen.queryByText("За выбранный период событий не найдено"),
 		).not.toBeInTheDocument();
 	});
-
-	it("groups same-day instrument events only in all-account mode", () => {
-		const events = [
-			{
-				account: { id: "broker", name: "Брокерский" },
-				date: "2026-08-20",
-				dateKind: "event",
-				displayName: "ОФЗ 26238",
-				figi: "FIGI",
-				instrumentUid: "UID",
-				isin: "RU000A0JX0J2",
-				logoName: null,
-				projectedAmount: { currency: "RUB", value: "200" },
-				ticker: "OFZ",
-				type: "coupon",
-			},
-			{
-				account: { id: "iis", name: "ИИС" },
-				date: "2026-08-20",
-				dateKind: "event",
-				displayName: "ОФЗ 26238",
-				figi: "FIGI",
-				instrumentUid: "UID",
-				isin: "RU000A0JX0J2",
-				logoName: null,
-				projectedAmount: { currency: "RUB", value: "100" },
-				ticker: "OFZ",
-				type: "coupon",
-			},
-		] as const;
-
-		query.mockReturnValue({
-			data: {
-				accountId: "all",
-				calculatedAt: "2026-08-14T00:00:00Z",
-				events: [...events],
-				window: { from: "2026-08-14", to: "2026-09-13" },
-			},
-			isError: false,
-			isLoading: false,
-			meta: {
-				availability: "available",
-				completeness: "complete",
-				lastAttempt: {
-					finishedAt: null,
-					problems: [],
-					startedAt: null,
-					state: "none",
-				},
-			},
-			refetch: vi.fn(),
-		} as never);
-
-		render(
-			<MantineProvider>
-				<MemoryRouter initialEntries={["/accounts/all/events"]}>
-					<Routes>
-						<Route
-							element={<AccountEventsPage />}
-							path="/accounts/:accountId/events"
-						/>
-					</Routes>
-				</MemoryRouter>
-			</MantineProvider>,
-		);
-
-		expect(screen.getByText("Купон · ОФЗ 26238")).toBeInTheDocument();
-		expect(screen.getByText("300 ₽")).toBeInTheDocument();
-
-		const accounts = within(screen.getByRole("list", {
-			name: /Купон · ОФЗ 26238, 20\.08\.2026, 300 ₽/,
-		}));
-
-		expect(accounts.getByText("Брокерский")).toBeInTheDocument();
-		expect(accounts.getByText("ИИС")).toBeInTheDocument();
-	});
 });

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

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

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

@@ -1,12 +1,13 @@
 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,
@@ -17,8 +18,6 @@ import {
 
 type AccountEventsPageViewModel
 	= | {
-		allAccounts: boolean;
-		calculatedAt: string;
 		canApply: boolean;
 		draftPeriod: [null | string, null | string];
 		events: BrokerageEvent[];
@@ -28,20 +27,13 @@ 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 useAccountEventsPageVm(): AccountEventsPageViewModel {
+function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 	const { accountId = "" } = useParams();
 
 	const {
@@ -89,8 +81,6 @@ function useAccountEventsPageVm(): AccountEventsPageViewModel {
 		isFetching: events.isFetching,
 	});
 
-	const retry = readRetry([events]);
-
 	if (availability === "loading" && events.isLoading)
 		return { state: "loading" };
 
@@ -102,17 +92,14 @@ function useAccountEventsPageVm(): AccountEventsPageViewModel {
 	if ((events.isError || events.meta?.lastAttempt.state === "failed") && !events.data)
 		return {
 			onReset,
-			readRetry: retry,
 			state: "error",
 		};
 	if (!events.data)
 		return availability === "unavailable"
-			? { onReset, readRetry: retry, state: "error" }
+			? { onReset, state: "error" }
 			: { state: "loading" };
 
 	return {
-		allAccounts: accountId === "all",
-		calculatedAt: events.data.calculatedAt,
 		canApply:
 			(draftFrom !== appliedFrom || draftTo !== appliedTo)
 			&& isValidPeriod(draftFrom, draftTo),
@@ -132,12 +119,9 @@ function useAccountEventsPageVm(): 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, useAccountEventsPageVm };
+export { type AccountEventsPageViewModel, useAccountEventsPageViewModel };

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

@@ -4,12 +4,7 @@ import { Button, Group } from "@mantine/core";
 import { StateView } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
-import { ReadRetryButton, type ReadRetryProps } from "@/shared/ui";
+type AccountEventsPageErrorProps = { onReset: () => void };
-
-type AccountEventsPageErrorProps = {
-	onReset: () => void;
-	readRetry: ReadRetryProps;
-};
 
 const AccountEventsPageError: FC<AccountEventsPageErrorProps> = (props) => {
 	const { t } = useTranslation();
@@ -18,13 +13,6 @@ 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

@@ -13,12 +13,9 @@ import { useTranslation } from "react-i18next";
 
 import {
 	BrokerageEventCard,
-	BrokerageEventGroup,
-	brokerageEventGroupKey,
 	brokerageEventKey,
 } from "@/entities/brokerage-event";
-import { formatDate, formatSnapshotTime, groupItems } from "@/shared/lib";
+import { SourceSyncStatus } from "@/shared/ui";
-import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
 
 import type { AccountEventsPageViewModel } from "../AccountEventsPage.vm";
 
@@ -33,31 +30,13 @@ const AccountEventsPageLoadedEvents: FC<AccountEventsPageLoadedProps> = (
 	props,
 ) => {
 	if (props.events.length > 0) {
-		const entries = groupItems(
-			props.events,
-			props.allAccounts ? brokerageEventGroupKey : () => null,
-		);
-
 		return (
-			<Stack
+			<Stack gap="sm">
-				component="ul"
+				{props.events.map(event => (
-				gap="sm"
+					<BrokerageEventCard
-				m={0}
+						event={event}
-				p={0}
+						key={brokerageEventKey(event)}
-				style={{ listStyle: "none" }}
-			>
-				{entries.map(entry => entry.type === "group"
-					? (
-							<BrokerageEventGroup
-								events={entry.items}
-								key={entry.key}
-								totalVisible={props.totalVisible}
 					/>
-						)
-					: (
-							<li key={brokerageEventKey(entry.item)}>
-								<BrokerageEventCard event={entry.item} />
-							</li>
 				))}
 			</Stack>
 		);
@@ -83,20 +62,10 @@ 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,7 +26,6 @@ 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";
@@ -34,14 +33,10 @@ import { server } from "@/test/server";
 import { toIncomeDisplayModel } from "../../model/display";
 import { AccountIncomePage } from "./AccountIncomePage";
 import {
-	useAccountIncomePageVm,
+	useAccountIncomePageViewModel,
 } from "./AccountIncomePage.vm";
 import { IncomePayments } from "./components/IncomePayments.view";
 
-// 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",
@@ -49,7 +44,7 @@ const analytics
 		buckets: [
 			{
 				period: { from: "2026-08-01", to: "2026-08-01" },
-				total: summary("10", "2"),
+				totalsByCurrency: [summary("RUB", "10", "2")],
 			},
 		],
 		calculatedAt: "2026-08-27T00:00:00Z",
@@ -77,7 +72,7 @@ const analytics
 			},
 		],
 		period: { from: "2026-08-01", to: "2026-08-27" },
-		total: summary("10", "2"),
+		totalsByCurrency: [summary("RUB", "10", "2")],
 	} satisfies IncomeAnalytics & { instruments: [unknown] };
 
 function entry(): IncomeAnalytics["entries"][number] {
@@ -105,10 +100,7 @@ function money(currency: string, value: string) {
 	return { currency, value };
 }
 
-function renderPage(
+function renderPage(search = "from=2026-08-01&to=2026-08-27") {
-	search = "from=2026-08-01&to=2026-08-27",
-	accountId = "account-1",
-) {
 	configureAuthClient({
 		accessToken: () => "token",
 		clear: vi.fn(),
@@ -121,7 +113,7 @@ function renderPage(
 			<DatesProvider settings={{ locale: "ru" }}>
 				<QueryClientProvider client={queryClient}>
 					<MemoryRouter
-						initialEntries={[`/accounts/${accountId}/income?${search}`]}
+						initialEntries={[`/accounts/account-1/income?${search}`]}
 					>
 						<LocationProbe />
 
@@ -145,11 +137,12 @@ function renderPage(
 	return { ...view, queryClient };
 }
 
-function summary(coupon: string, dividend: string) {
+function summary(currency: string, coupon: string, dividend: string) {
 	return {
-		coupon: money("RUB", coupon),
+		coupon: money(currency, coupon),
-		dividend: money("RUB", dividend),
+		currency,
-		total: money("RUB", String(Number(coupon) + Number(dividend))),
+		dividend: money(currency, dividend),
+		total: money(currency, String(Number(coupon) + Number(dividend))),
 	};
 }
 
@@ -170,7 +163,7 @@ describe("AccountIncomePage", () => {
 		);
 		const queryClient = createTestQueryClient();
 
-		const { result } = renderHook(() => useAccountIncomePageVm(), {
+		const { result } = renderHook(() => useAccountIncomePageViewModel(), {
 			wrapper: ({ children }) => (
 				<QueryClientProvider client={queryClient}>
 					<MemoryRouter initialEntries={["?from=2024-02-29&to=2024-03-01"]}>
@@ -307,7 +300,7 @@ describe("AccountIncomePage", () => {
 						buckets: [],
 						entries: [],
 						instruments: [],
-						total: summary("0", "0"),
+						totalsByCurrency: [],
 					}),
 				),
 			),
@@ -407,124 +400,21 @@ describe("AccountIncomePage", () => {
 		expect(screen.queryByText(/Сравнение с/)).not.toBeInTheDocument();
 	});
 
-	it.each([
+	it("shows a quiet realized error", async () => {
-		["full", analytics],
-		["empty", { ...analytics, buckets: [], entries: [], instruments: [], total: summary("0", "0") }],
-	])("shows the server source time and last attempt for a %s result", async (_name, data) => {
 		server.use(
-			http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
+			http.get(
-				HttpResponse.json(
+				"*/api/v1/brokerage-accounts/account-1/income-analytics",
-					resource(data, {
+				() => new HttpResponse(null, { status: 503 }),
-						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(await screen.findByText(/^Данные на /)).toHaveTextContent(
+		expect(
-			formatSnapshotTime("2026-08-26T12:00:00Z"),
+			await screen.findByText("Не удалось рассчитать пассивный доход", undefined, {
-		);
+				timeout: 4000,
-		expect(screen.getByText("Обновление не удалось")).toBeInTheDocument();
+			}),
-		expect(screen.getByText("Данные требуют обновления")).toBeInTheDocument();
+		).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 = () => {
@@ -736,11 +626,11 @@ describe("income period and snapshot boundary", () => {
 		const instruments = [
 			{
 				...analytics.instruments[0],
-				coupon: money("RUB", "10"),
+				coupon: money("USD", "10"),
-				dividend: money("RUB", "0"),
+				dividend: money("USD", "0"),
-				key: "rub-positive",
+				key: "usd",
 				receiptCount: 1,
-				total: money("RUB", "10"),
+				total: money("USD", "10"),
 			},
 			{
 				...analytics.instruments[0],
@@ -769,7 +659,7 @@ describe("income period and snapshot boundary", () => {
 				payment: instrument.total,
 			})),
 			instruments,
-			total: summary("-5", "0"),
+			totalsByCurrency: [summary("RUB", "-5", "0"), summary("USD", "10", "0")],
 		});
 
 		render(
@@ -781,118 +671,13 @@ describe("income period and snapshot boundary", () => {
 			screen.getByRole("heading", { name: "Выплаты" }),
 		).toBeInTheDocument();
 		expect(screen.queryByText("RUB")).not.toBeInTheDocument();
+		expect(screen.queryByText("USD")).not.toBeInTheDocument();
 		const cards = screen.getAllByRole("listitem");
 		expect(cards).toHaveLength(3);
-		expect(cards[0]).toHaveTextContent("+10 ₽");
+		expect(cards[0]).toHaveTextContent("+10 USD");
 		expect(cards[1]).toHaveTextContent("−2 ₽");
 		expect(cards[2]).toHaveTextContent("−3 ₽");
 		expect(screen.queryByText(/Итого:|Выплат:/)).not.toBeInTheDocument();
 		expect(screen.queryByRole("button")).not.toBeInTheDocument();
 	});
-
-	it("groups all-account payouts by instrument with an exact total", async () => {
-		server.use(
-			http.get(
-				"*/api/v1/brokerage-accounts/:accountId/income-analytics",
-				() => HttpResponse.json(resource({
-					...analytics,
-					accountId: "all",
-					entries: [
-						{
-							...entry(),
-							account: { id: "broker", name: "Брокерский" },
-							payment: money("RUB", "10"),
-						},
-						{
-							...entry(),
-							account: { id: "iis", name: "ИИС" },
-							id: "coupon-2",
-							payment: money("RUB", "20"),
-						},
-					],
-				})),
-			),
-		);
-		renderPage(undefined, "all");
-
-		expect(await screen.findByText("Выплата купонов BOND")).toBeInTheDocument();
-		expect(screen.getByText("+30 ₽")).toBeInTheDocument();
-
-		const accounts = within(screen.getByRole("list", {
-			name: /Выплата купонов BOND, Исполнено/,
-		}));
-
-		expect(accounts.getByText("Брокерский")).toBeInTheDocument();
-		expect(accounts.getByText("ИИС")).toBeInTheDocument();
-		expect(accounts.queryByRole("link")).not.toBeInTheDocument();
-	});
-
-	it("keeps repeated payout ids inside one group as separate cards", async () => {
-		server.use(
-			http.get(
-				"*/api/v1/brokerage-accounts/:accountId/income-analytics",
-				() => HttpResponse.json(resource({
-					...analytics,
-					accountId: "all",
-					entries: [
-						{
-							...entry(),
-							account: { id: "broker", name: "Брокерский" },
-							payment: money("RUB", "10"),
-						},
-						{
-							...entry(),
-							account: { id: "iis", name: "ИИС" },
-							payment: money("RUB", "20"),
-						},
-					],
-				})),
-			),
-		);
-		renderPage(undefined, "all");
-
-		expect(await screen.findByText("+30 ₽")).toBeInTheDocument();
-
-		const accounts = within(screen.getByRole("list", {
-			name: /Выплата купонов BOND/,
-		}));
-
-		expect(accounts.getAllByRole("listitem")).toHaveLength(2);
-	});
-
-	it("shows the group total after completeness changes to complete", async () => {
-		let completeness: "complete" | "incomplete" = "incomplete";
-
-		const entries = [
-			{
-				...entry(),
-				account: { id: "broker", name: "Брокерский" },
-				payment: money("RUB", "10"),
-			},
-			{
-				...entry(),
-				account: { id: "iis", name: "ИИС" },
-				id: "coupon-2",
-				payment: money("RUB", "20"),
-			},
-		];
-
-		server.use(
-			http.get(
-				"*/api/v1/brokerage-accounts/:accountId/income-analytics",
-				() => HttpResponse.json(
-					resource({ ...analytics, accountId: "all", entries }, { completeness }),
-				),
-			),
-		);
-		const view = renderPage(undefined, "all");
-
-		await screen.findByText("Выплата купонов BOND");
-		expect(screen.queryByText("+30 ₽")).not.toBeInTheDocument();
-		view.unmount();
-
-		completeness = "complete";
-		renderPage(undefined, "all");
-		expect(await screen.findByText("+30 ₽")).toBeInTheDocument();
-	});
 });

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

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

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

@@ -5,7 +5,6 @@ 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 {
@@ -31,19 +30,15 @@ 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 useAccountIncomePageVm = (): AccountIncomePageViewModel => {
+const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
 	const { accountId = "" } = useParams();
 	const [searchParameters, setSearchParameters] = useSearchParams();
 
@@ -88,14 +83,12 @@ const useAccountIncomePageVm = (): AccountIncomePageViewModel => {
 		isFetching: analytics.isFetching,
 	});
 
-	const retry = readRetry([analytics]);
-
 	if (availability === "loading" && analytics.isLoading)
 		return { state: "loading" };
 
 	if (!analytics.data)
 		return availability === "unavailable"
-			? { period, readRetry: retry, state: "error" }
+			? { period, state: "error" }
 			: { state: "loading" };
 
 	const display = toIncomeDisplayModel(analytics.data);
@@ -122,10 +115,7 @@ const useAccountIncomePageVm = (): AccountIncomePageViewModel => {
 		onReset,
 		onSubmit,
 		partial: analytics.meta?.completeness === "incomplete",
-		readRetry: retry,
-		source: analytics.meta,
 		state: "loaded",
-		totalVisible: analytics.meta?.completeness === "complete",
 	};
 };
 
@@ -146,5 +136,5 @@ function isValidIncomePeriod(period: IncomePeriod): boolean {
 
 export {
 	type AccountIncomePageViewModel,
-	useAccountIncomePageVm,
+	useAccountIncomePageViewModel,
 };

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

@@ -3,27 +3,15 @@ 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> = (props) => {
+const AccountIncomePageError: FC<ErrorProps> = () => {
 	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

@@ -5,11 +5,10 @@ import {
 	Stack,
 	Title,
 } from "@mantine/core";
+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";
@@ -24,9 +23,13 @@ const AccountIncomePageLoadedSummary: FC<LoadedProps> = (props) => {
 
 	const { analytics } = props;
 
-	return props.partial
+	if (props.partial) {
-		? <Alert role="status">{t("investment.partial")}</Alert>
+		return <Alert role="status">{t("investment.partial")}</Alert>;
-		: <IncomeSummary totals={analytics.total} />;
+	}
+
+	return analytics.totalsByCurrency.length > 0
+		? <IncomeSummary totals={analytics.totalsByCurrency} />
+		: <StateView text={t("income.emptyText")} title={t("income.emptyTitle")} />;
 };
 
 const AccountIncomePageLoaded: FC<LoadedProps> = (props) => {
@@ -46,23 +49,11 @@ 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>
 
-			<IncomePayments
+			<IncomePayments entries={display.entries} />
-				allAccounts={props.analytics.accountId === "all"}
-				entries={display.entries}
-				totalVisible={props.totalVisible}
-			/>
 		</Stack>
 	);
 };

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

@@ -3,22 +3,13 @@ import type { FC } from "react";
 import { Stack, Title } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
-import {
+import { LedgerEntryRow } from "@/entities/broker-operation";
-	brokerageOperationGroupKey,
-	LedgerEntryRow,
-	OperationGroup,
-} from "@/entities/broker-operation";
-import { groupItems } from "@/shared/lib";
 
 import type { IncomeDisplayModel } from "../../../model/display";
 
 import classes from "../AccountIncomePage.module.css";
 
-type IncomePaymentsProps = {
+type IncomePaymentsProps = { entries: IncomeDisplayModel["entries"] };
-	allAccounts?: boolean;
-	entries: IncomeDisplayModel["entries"];
-	totalVisible?: boolean;
-};
 
 const IncomePayments: FC<IncomePaymentsProps> = (props) => {
 	const { t } = useTranslation();
@@ -28,22 +19,9 @@ const IncomePayments: FC<IncomePaymentsProps> = (props) => {
 			<Title order={2}>{t("income.payments")}</Title>
 
 			<Stack className={classes.entries} component="ul" gap="sm">
-				{groupItems(
+				{props.entries.map(({ key, operation }) => (
-					props.entries,
+					<li key={key}>
-					entry => props.allAccounts
+						<LedgerEntryRow operation={operation} wrap />
-						? brokerageOperationGroupKey(entry.operation)
-						: null,
-				).map(entry => entry.type === "group"
-					? (
-							<OperationGroup
-								entries={entry.items}
-								key={entry.key}
-								totalVisible={props.totalVisible === true}
-							/>
-						)
-					: (
-							<li key={entry.item.key}>
-								<LedgerEntryRow operation={entry.item.operation} wrap />
 					</li>
 				))}
 			</Stack>

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

@@ -7,7 +7,7 @@ import type { IncomeAnalytics } from "@/entities/income";
 
 import { formatMoney } from "@/shared/lib";
 
-type IncomeSummaryProps = { totals: IncomeAnalytics["total"] };
+type IncomeSummaryProps = { totals: IncomeAnalytics["totalsByCurrency"] };
 
 const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
 	const { t } = useTranslation();
@@ -16,14 +16,16 @@ const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
 		<Stack>
 			<Title order={2}>{t("income.summaryTitle")}</Title>
 
-			<Paper p="md" radius="md" withBorder>
+			{props.totals.map(total => (
-				<Text fw={700}>{formatMoney(props.totals.total)}</Text>
+				<Paper key={total.currency} p="md" radius="md" withBorder>
+					<Text fw={700}>{formatMoney(total.total)}</Text>
 
 					<Text c="dimmed" size="sm">
-					{t("income.coupon")}: {formatMoney(props.totals.coupon)} ·{" "}
+						{t("income.coupon")}: {formatMoney(total.coupon)} ·{" "}
-					{t("income.dividend")}: {formatMoney(props.totals.dividend)}
+						{t("income.dividend")}: {formatMoney(total.dividend)}
 					</Text>
 				</Paper>
+			))}
 		</Stack>
 	);
 };

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

@@ -2,7 +2,7 @@ import type { FC } from "react";
 
 import { MantineProvider } from "@mantine/core";
 import { QueryClientProvider } from "@tanstack/react-query";
-import { fireEvent, render, screen, waitFor, within } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
 import {
 	MemoryRouter,
@@ -44,25 +44,6 @@ const operation: BrokerageOperation
 		type: "OPERATION_TYPE_BUY",
 	};
 
-function coupon(
-	id: string,
-	accountId: string,
-	accountName: string,
-	value: string,
-): BrokerageOperation {
-	return {
-		...operation,
-		account: { id: accountId, name: accountName },
-		category: "income",
-		description: "Купон",
-		id,
-		instrumentUid: "UID",
-		payment: { currency: "RUB", value },
-		ticker: "BOND",
-		type: "OPERATION_TYPE_COUPON",
-	};
-}
-
 const Navigation: FC = () => {
 	const location = useLocation();
 	const navigate = useNavigate();
@@ -90,16 +71,12 @@ function configureTestAuth() {
 	});
 }
 
-function renderPage(
+function renderPage(search = "") {
-	search = "",
-	accountId = "account-1",
-	queryClient = createTestQueryClient(),
-) {
 	return render(
-		<QueryClientProvider client={queryClient}>
+		<QueryClientProvider client={createTestQueryClient()}>
 			<MantineProvider>
 				<MemoryRouter
-					initialEntries={[`/accounts/${accountId}/operations${search}`]}
+					initialEntries={[`/accounts/account-1/operations${search}`]}
 				>
 					<Routes>
 						<Route
@@ -113,18 +90,6 @@ function renderPage(
 	);
 }
 
-// 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(
@@ -252,27 +217,6 @@ describe("LedgerEntryRow", () => {
 	});
 });
 
-const historyStateResource = (historyState: "loading" | "partial") =>
-	HttpResponse.json(
-		resource(
-			{
-				hasNext: false,
-				items: [operation],
-				nextCursor: null,
-			},
-			{
-				coverage: {
-					asOf: null,
-					completeRanges: [],
-					historyBoundary: "unknown",
-					historyState,
-					missingRanges: [],
-					requested: [],
-				},
-			},
-		),
-	);
-
 describe("AccountOperationsPage", () => {
 	it.each(["account-1", "all"])(
 		"normalizes invalid periods and history, preserves one-sided UTC dates and resets cursors for %s",
@@ -440,7 +384,7 @@ describe("AccountOperationsPage", () => {
 		renderPage();
 
 		expect(
-			await screen.findByRole("heading", { name: "История операций" }),
+			await screen.findByRole("heading", { name: "Журнал операций" }),
 		).toBeInTheDocument();
 		expect(
 			screen.queryByRole("link", { name: "К счету" }),
@@ -482,7 +426,7 @@ describe("AccountOperationsPage", () => {
 		renderPage();
 
 		expect(
-			await screen.findByRole("heading", { name: "История операций" }),
+			await screen.findByRole("heading", { name: "Журнал операций" }),
 		).toBeInTheDocument();
 		await waitFor(() => expect(searches.length).toBeGreaterThan(0));
 		const countBefore = searches.length;
@@ -521,7 +465,7 @@ describe("AccountOperationsPage", () => {
 		renderPage();
 
 		expect(
-			await screen.findByRole("heading", { name: "История операций" }),
+			await screen.findByRole("heading", { name: "Журнал операций" }),
 		).toBeInTheDocument();
 		fireEvent.click(screen.getByRole("combobox", { name: "Категории" }));
 		fireEvent.click(await screen.findByText("Налог"));
@@ -534,115 +478,21 @@ describe("AccountOperationsPage", () => {
 		expect(screen.getByRole("button", { name: "Применить" })).toBeDisabled();
 	});
 
-	it("does not show the history loading alert when coverage is partial", async () => {
+	it("renders an error state", async () => {
 		configureTestAuth();
 		server.use(
-			http.get(
+			http.get("*/api/v1/brokerage-accounts/:accountId/operations", () =>
-				"*/api/v1/brokerage-accounts/:accountId/operations",
+				HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 }),
-				() => historyStateResource("partial"),
-			),
-		);
-		renderPage();
-		await screen.findByText("Покупка акций");
-		expect(screen.queryByText("История догружается")).not.toBeInTheDocument();
-	});
-
-	it("shows the history loading alert while historyState is loading", async () => {
-		configureTestAuth();
-		server.use(
-			http.get(
-				"*/api/v1/brokerage-accounts/:accountId/operations",
-				() => historyStateResource("loading"),
 			),
 		);
 		renderPage();
 		expect(
-			await screen.findByText("История догружается"),
+			await screen.findByText("Не удалось загрузить журнал", undefined, {
-		).toBeInTheDocument();
+				timeout: 4000,
-	});
-
-	it(
-		"renders an error state with retry that recovers in place",
-		{ timeout: TEST_MS },
-		async () => {
-			configureTestAuth();
-			let isFailing = true;
-			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));
-				}),
-			);
-			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();
 		server.use(
@@ -752,73 +602,3 @@ it("recovers an invalid cursor at the first page without clearing applied filter
 	for (const key of ["from", "to", "categories"])
 		expect(searches[2].get(key)).toBe(searches[0].get(key));
 });
-
-describe("all-account operation groups", () => {
-	it("groups only the current page and rebuilds the group at its boundary", async () => {
-		configureTestAuth();
-		server.use(
-			http.get(
-				"*/api/v1/brokerage-accounts/:accountId/operations",
-				({ request }) => {
-					const cursor = new URL(request.url).searchParams.get("cursor");
-
-					const items = cursor
-						? [
-								coupon("X2", "iis", "ИИС", "150"),
-								coupon("X3", "broker", "Брокерский", "50"),
-								operation,
-							]
-						: [coupon("X1", "broker", "Брокерский", "100")];
-
-					return HttpResponse.json(resource({
-						accountId: "all",
-						hasNext: !cursor,
-						items,
-						nextCursor: cursor ? null : "page-2",
-					}));
-				},
-			),
-		);
-		renderPage("", "all");
-
-		await screen.findAllByText("Купон");
-		expect(screen.queryByRole("list", { name: "Разбивка по счетам" }))
-			.not.toBeInTheDocument();
-		fireEvent.click(screen.getByRole("button", { name: "Далее" }));
-
-		const accounts = await screen.findByRole("list", {
-			name: /Выплата купонов BOND, Исполнено/,
-		});
-
-		expect(screen.getByText("Выплата купонов BOND")).toBeInTheDocument();
-		expect(screen.getByText("+200 ₽")).toBeInTheDocument();
-		expect(within(accounts).getAllByRole("listitem")).toHaveLength(2);
-
-		fireEvent.click(screen.getByRole("button", { name: "Назад" }));
-		await screen.findAllByText("Купон");
-		expect(screen.queryByRole("list", { name: "Разбивка по счетам" }))
-			.not.toBeInTheDocument();
-	});
-
-	it("leaves repeated operations ungrouped for one account", async () => {
-		configureTestAuth();
-		server.use(
-			http.get("*/api/v1/brokerage-accounts/:accountId/operations", () =>
-				HttpResponse.json(resource({
-					accountId: "account-1",
-					hasNext: false,
-					items: [
-						coupon("X1", "account-1", "Брокерский", "100"),
-						coupon("X2", "account-1", "Брокерский", "150"),
-					],
-					nextCursor: null,
-				})),
-			),
-		);
-		renderPage();
-
-		await screen.findAllByText("Купон");
-		expect(screen.queryByRole("list", { name: /Разбивка|Исполнено/ }))
-			.not.toBeInTheDocument();
-	});
-});

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

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

src/pages/account-operations/ui/AccountOperationsPage/AccountOperationsPage.vm.ts

@@ -12,12 +12,7 @@ import {
 	useBrokerageOperationHistory,
 } from "@/entities/broker-operation";
 import { useScreenSync } from "@/features/tbank-connection";
-import {
+import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "@/shared/api";
-	ApiErrorCode,
-	apiErrorCode,
-	isApiErrorCode,
-	readRetry,
-} from "@/shared/api";
 import {
 	defaultPeriod,
 	isValidPeriod,
@@ -30,7 +25,6 @@ const operationCategorySet = new Set<string>(operationCategories);
 
 type AccountOperationsPageViewModel
 	= | {
-		allAccounts: boolean;
 		canApply: boolean;
 		draftCategories: OperationCategory[];
 		draftPeriod: [null | string, null | string];
@@ -47,16 +41,10 @@ type AccountOperationsPageViewModel
 		onPrevious: () => void;
 		onReset: () => void;
 		partial?: boolean;
-		readRetry: ReturnType<typeof readRetry>;
 		source?: InvestmentResourceMeta;
 		state: "loaded";
-		totalVisible: boolean;
-	}
-	| {
-		onReset: () => void;
-		readRetry: ReturnType<typeof readRetry>;
-		state: "error";
 	}
+	| { onReset: () => void; state: "error" }
 	| { state: "loading" };
 
 const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
@@ -117,8 +105,6 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
 		isFetching: operations.isFetching,
 	});
 
-	const retry = readRetry([operations]);
-
 	if (availability === "loading" && operations.isLoading)
 		return { state: "loading" };
 
@@ -146,11 +132,11 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
 		(isInvalidCursor || !operations.data)
 		&& (operations.isError || operations.meta?.lastAttempt.state === "failed")
 	)
-		return { onReset, readRetry: retry, state: "error" };
+		return { onReset, state: "error" };
 
 	if (!operations.data)
 		return availability === "unavailable"
-			? { onReset, readRetry: retry, state: "error" }
+			? { onReset, state: "error" }
 			: { state: "loading" };
 
 	const nextCursor = operations.data.nextCursor;
@@ -161,13 +147,14 @@ const useAccountOperationsPageVm = (): AccountOperationsPageViewModel => {
 			|| !isSameCategories(draftCategories, appliedCategories);
 
 	return {
-		allAccounts: accountId === "all",
 		canApply: isDirty && isValidPeriod(draftFrom, draftTo),
 		draftCategories,
 		draftPeriod,
 		hasNext: Boolean(nextCursor && operations.data.hasNext),
 		hasPrevious: history.hasPrevious,
-		historyLoading: operations.meta?.coverage?.historyState === "loading",
+		historyLoading:
+			operations.meta?.coverage?.historyState === "loading"
+			|| operations.meta?.coverage?.historyState === "partial",
 		items: operations.data.items,
 		maxDate,
 		onApply: () => {
@@ -194,10 +181,8 @@ 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,11 +1,9 @@
 import type { FC } from "react";
 
-import { Button, Group } from "@mantine/core";
+import { Button } 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<
@@ -21,18 +19,9 @@ const AccountOperationsPageError: FC<AccountOperationsPageErrorProps> = (
 	return (
 		<StateView
 			action={(
-				<Group gap="sm" justify="center">
-					{props.readRetry.exhausted && (
-						<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

@@ -12,14 +12,8 @@ import { DatePickerInput } from "@mantine/dates";
 import { StateView } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
-import {
+import { LedgerEntryRow, operationCategories } from "@/entities/broker-operation";
-	brokerageOperationGroupKey,
+import { SourceSyncStatus } from "@/shared/ui";
-	LedgerEntryRow,
-	operationCategories,
-	OperationGroup,
-} from "@/entities/broker-operation";
-import { groupItems } from "@/shared/lib";
-import { ReadRetry, SourceSyncStatus } from "@/shared/ui";
 
 import type { AccountOperationsPageViewModel } from "../AccountOperationsPage.vm";
 
@@ -30,49 +24,22 @@ type AccountOperationsPageLoadedProps = Extract<
 
 const AccountOperationsPageLoadedOperations: FC<
 	AccountOperationsPageLoadedProps
-> = (props) => {
+> = (props) => { // eslint-disable-line sonarjs/function-return-type -- React renders elements and lists.
 	const { t } = useTranslation();
 
 	const { items } = props;
 
 	if (items.length > 0) {
-		const entries = groupItems(
+		return items.map(operation => (
-			items.map(operation => ({
+			<LedgerEntryRow
-				key: JSON.stringify([
+				key={JSON.stringify([
 					operation.account?.id,
 					operation.id,
 					operation.logoName,
-				]),
+				])}
-				operation,
+				operation={operation}
-			})),
-			entry => props.allAccounts
-				? brokerageOperationGroupKey(entry.operation)
-				: null,
-		);
-
-		return (
-			<Stack
-				component="ul"
-				gap="lg"
-				m={0}
-				p={0}
-				style={{ listStyle: "none" }}
-			>
-				{entries.map(entry => entry.type === "group"
-					? (
-							<OperationGroup
-								entries={entry.items}
-								key={entry.key}
-								totalVisible={props.totalVisible}
 			/>
-						)
+		));
-					: (
-							<li key={entry.item.key}>
-								<LedgerEntryRow operation={entry.item.operation} />
-							</li>
-						))}
-			</Stack>
-		);
 	}
 
 	if (props.partial) {
@@ -102,8 +69,6 @@ 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

@@ -1,173 +0,0 @@
-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),
-		]), "stocks", labels);
-
-		expect(model.total).toBe("16");
-		expect(model.items.map(item => item.share)).toEqual(["93,8 %", "6,3 %"]);
-		expect(model.unaccounted).toBe(2);
-		const negative = snapshot([stock("A", "-3")]);
-		expect(toConcentration(negative, "stocks", 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", 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", 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", 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", labels)
-			.items.map(item => item.amount)).toEqual(["500", "100", "50"]);
-		expect(toConcentration(snapshot(positions), "issuers", 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", 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", 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", 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", labels)
-			.items[0]?.logo?.subtitle).toBe("RU000A0JX0J2");
-	});
-});

src/pages/account/model/concentration.ts

@@ -1,276 +0,0 @@
-import type { Portfolio } from "@/entities/portfolio";
-
-import {
-	type Decimal,
-	decimalFromString,
-	decimalToString,
-	instrumentLogoUrl,
-	sumDecimals,
-} from "@/shared/lib";
-
-type Concentration = {
-	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,
-): number {
-	if (!isIncluded(slice, position.type)) return 0;
-	if (!position.currentValue) return 1;
-	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 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,
-	labels: ConcentrationLabels,
-): Concentration {
-	const groups = new Map<string, Group>();
-	let unaccounted = 0;
-
-	for (const [index, position] of portfolio.positions.entries()) {
-		unaccounted += addPosition(groups, position, index, slice, labels);
-	}
-
-	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 {
-		empty: !total,
-		items: other ? entries.slice(0, TOP) : entries,
-		other,
-		top5Share: top5 && total ? share(top5, total) : null,
-		total: total && decimalToString(total),
-		unaccounted,
-	};
-}
-
-export {
-	toConcentration,
-};
-export type {
-	Concentration,
-	ConcentrationItem,
-	ConcentrationLabels,
-	Slice,
-};

src/pages/account/model/performance.ts

@@ -1,104 +0,0 @@
-import type { Performance } from "@/entities/performance";
-
-import { formatDate, formatMoney, formatPercentagePoints, formatSignedPercent } from "@/shared/lib";
-
-type TextValue = { tone: Tone; value: string };
-
-type Tone
-	= | "negative"
-		| "neutral"
-		| "positive";
-
-const reasonLabels: Record<string, string> = {
-	ACCOUNT_VALUATION_DATES_DIFFER: "Оценки счетов сделаны в разные дни",
-	AMBIGUOUS_RETURN: "У расчёта доходности несколько возможных решений",
-	HISTORY_START_UNKNOWN: "Начало истории счёта неизвестно",
-	INDEX_HISTORY_UNAVAILABLE: "История индекса временно недоступна",
-	NO_SOLUTION: "Расчёт доходности не сходится",
-	OPERATIONS_HISTORY_INCOMPLETE: "История операций ещё не получена полностью",
-	PORTFOLIO_VALUATION_INCOMPLETE: "Нет полной оценки портфеля",
-	UNCONFIRMED_TRANSFER: "Перевод между счетами не удалось подтвердить",
-	UNVALUED_SECURITIES_TRANSFER: "Бумаги переведены без денежной оценки",
-};
-
-const unknownReason = "Причину недоступности не удалось определить";
-
-function performanceVm(data: Performance) {
-	return {
-		basis: data.return.basis,
-		comparison: data.outperformance
-			? {
-					money: signedMoney(data.outperformance.money),
-					points: valueText(
-						data.outperformance.percentagePoints,
-						formatPercentagePoints,
-					),
-				}
-			: null,
-		current: formatMoney(data.currentValue),
-		currentPoint: data.series.length > 0
-			? { date: formatDate(`${data.series.at(-1)?.date ?? data.period.to}T00:00:00Z`) }
-			: null,
-		days: data.period.days,
-		excluded: data.excludedAccounts.map(item => ({
-			id: item.accountId,
-			name: item.name,
-			reason: reasonText(item.reason),
-		})),
-		from: data.period.from,
-		indexReason: data.benchmark.unavailableReason
-			? reasonText(data.benchmark.unavailableReason)
-			: null,
-		indexReturn: valueText(data.benchmark.return.value, formatSignedPercent),
-		indexValue: data.benchmark.value ? formatMoney(data.benchmark.value) : "—",
-		invested: formatMoney(data.netInvested),
-		profit: signedMoney(data.profit),
-		returnReason: data.return.unavailableReason
-			? reasonText(data.return.unavailableReason)
-			: null,
-		returnValue: valueText(data.return.value, formatSignedPercent),
-		series: data.series.map(item => ({
-			benchmarkValue: Number(item.benchmarkValue),
-			date: item.date,
-			label: formatDate(`${item.date}T00:00:00Z`),
-			netInvested: Number(item.netInvested),
-			referenceValue: item.referenceValue === null
-				? null
-				: Number(item.referenceValue),
-		})),
-		to: data.period.to,
-	};
-}
-
-function reasonText(reason: string): string {
-	// eslint-disable-next-line security/detect-object-injection -- Lookup accepts only an API reason, with a safe fallback.
-	return reasonLabels[reason] ?? unknownReason;
-}
-
-function signedMoney(value: Performance["profit"]): TextValue {
-	return {
-		tone: tone(value.value),
-		value: formatMoney(value, { withSign: true }),
-	};
-}
-
-function tone(value: string): Tone {
-	const number = Number(value);
-	if (number > 0) return "positive";
-
-	return number < 0 ? "negative" : "neutral";
-}
-
-// Tone follows the displayed text, so "0,0 %" is never coloured.
-function valueText(
-	value: null | string,
-	format: (value: string) => string,
-): TextValue {
-	if (value === null) return { tone: "neutral", value: "—" };
-	const text = format(value);
-	if (text.startsWith("+")) return { tone: "positive", value: text };
-
-	return { tone: text.startsWith("−") ? "negative" : "neutral", value: text };
-}
-
-export { performanceVm, reasonText };

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

@@ -2,7 +2,7 @@ import type { Portfolio } from "@/entities/portfolio";
 
 const portfolio
 	= {
-		cash: { currency: "RUB", value: "1" },
+		cashBalances: [{ currency: "USD", value: "1" }],
 		isStale: true,
 		lastSuccessfulAt: "2026-08-13T10:00:00Z",
 		positions: [
@@ -13,10 +13,8 @@ const portfolio
 				displayName: "Акция",
 				figi: "FIGI-STOCK",
 				isin: null,
-				issuer: null,
 				logoName: "akciya.png",
 				quantity: "2",
-				sector: null,
 				ticker: null,
 				type: "STOCK",
 			},
@@ -27,10 +25,8 @@ const portfolio
 				displayName: "Облигация",
 				figi: "FIGI-BOND",
 				isin: "RU000A0JX0J2",
-				issuer: null,
 				logoName: null,
 				quantity: "1",
-				sector: null,
 				ticker: null,
 				type: "BOND",
 			},
@@ -41,21 +37,14 @@ const portfolio
 				displayName: "Фонд",
 				figi: "FIGI-FUND",
 				isin: null,
-				issuer: null,
 				logoName: "fond.png",
 				quantity: "3",
-				sector: null,
 				ticker: null,
 				type: "FUND",
 			},
 		] satisfies [Portfolio["positions"][number], ...Portfolio["positions"]],
-		structure: {
+		structure: { currencies: [], unvaluedCategories: [] },
-			categories: [],
+		totalsByCurrency: [{ currency: "RUB", value: "150" }],
-			hasNegativeValues: false,
-			totalValue: "0",
-			unvaluedCategories: [],
-		},
-		totals: { currency: "RUB", value: "150" },
 	} satisfies Portfolio;
 
 const position: Portfolio["positions"][number] = {

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

@@ -2,19 +2,9 @@ import { describe, expect, it } from "vitest";
 
 import type { Portfolio } from "@/entities/portfolio";
 
-import {
+import { toAccountPagePositionSections } from "./positions";
-	formatPositionReturnPercent,
-	toAccountPagePositionSections,
-	toUnrealizedReturns,
-} from "./positions";
 import { portfolio, position, second } from "./positions.fixtures";
 
-function makePosition(
-	overrides: Partial<Portfolio["positions"][number]>,
-): Portfolio["positions"][number] {
-	return { ...position, ...overrides };
-}
-
 function sections(positions: Portfolio["positions"]) {
 	return toAccountPagePositionSections({
 		...portfolio,
@@ -23,7 +13,7 @@ function sections(positions: Portfolio["positions"]) {
 }
 
 describe("account position sections", () => {
-	it("excludes currency mirrors from display and share denominators", () => {
+	it("excludes currency instruments only from display, preserving order and share denominators", () => {
 		const otherTypes = [
 			"OPTION",
 			"OTHER",
@@ -35,7 +25,7 @@ describe("account position sections", () => {
 
 		const snapshot: Portfolio = {
 			...portfolio,
-			cash: { currency: "RUB", value: "1000" },
+			cashBalances: [{ currency: "RUB", value: "1000" }],
 			positions: [
 				...portfolio.positions,
 				{
@@ -56,8 +46,8 @@ describe("account position sections", () => {
 						}),
 				),
 			],
-			structure: { categories: [], hasNegativeValues: false, totalValue: "0", unvaluedCategories: [] },
+			structure: { currencies: [], unvaluedCategories: [] },
-			totals: { currency: "RUB", value: "1250" },
+			totalsByCurrency: [{ currency: "RUB", value: "1250" }],
 		};
 
 		const original = structuredClone(snapshot);
@@ -73,30 +63,12 @@ describe("account position sections", () => {
 			"FIGI-FUND",
 			...otherTypes.map(type => `FIGI-${type}-NEXT`),
 		]);
-		expect(sections[0]?.groups[0]?.positions[0].shareText).toBe("50 %");
+		expect(sections[0]?.groups[0]?.positions[0].shareText).toBe("40 %");
-		expect(sections[1]?.groups[0]?.positions[0].shareText).toBe("25 %");
+		expect(sections[1]?.groups[0]?.positions[0].shareText).toBe("20 %");
-		expect(sections[2]?.groups[1]?.positions[0].shareText).toBe("25 %");
+		expect(sections[2]?.groups[1]?.positions[0].shareText).toBe("20 %");
 		expect(snapshot).toEqual(original);
 	});
 
-	it("keeps all-account positions from both accounts without counting mirrored cash", () => {
-		const result = sections([
-			makePosition({ account: { id: "a", name: "Основной" }, currentValue: { currency: "RUB", value: "100" } }),
-			makePosition({ account: { id: "a", name: "Основной" }, currentValue: { currency: "RUB", value: "50" }, type: "CURRENCY" }),
-			makePosition({ account: { id: "b", name: "ИИС" }, currentValue: { currency: "RUB", value: "100" } }),
-		]);
-
-		const visible = result.flatMap(section =>
-			section.groups.flatMap(group => group.positions));
-
-		expect(visible)
-			.toEqual(expect.arrayContaining([
-				expect.objectContaining({ account: { id: "a", name: "Основной" }, shareText: "50 %" }),
-				expect.objectContaining({ account: { id: "b", name: "ИИС" }, shareText: "50 %" }),
-			]));
-		expect(visible).toHaveLength(2);
-	});
-
 	it("prepares grouped position sections with derived display data", () => {
 		expect(
 			toAccountPagePositionSections(portfolio).map(({ groups, kind }) => ({
@@ -110,8 +82,6 @@ describe("account position sections", () => {
 					{
 						displayName: "Акция",
 						logoSrc: "https://invest-brands.cdn-tinkoff.ru/akciyax160.png",
-						returnPercent: null,
-						returnPercentText: null,
 						returnText: "+10 ₽",
 						returnTone: "positive",
 						shareText: "66,7 %",
@@ -125,8 +95,6 @@ describe("account position sections", () => {
 					{
 						displayName: "Облигация",
 						logoSrc: null,
-						returnPercent: "-11.111111",
-						returnPercentText: "-11,11 %",
 						returnText: "-5 ₽",
 						returnTone: "negative",
 						shareText: "33,3 %",
@@ -139,8 +107,6 @@ describe("account position sections", () => {
 					{
 						displayName: "Фонд",
 						logoSrc: null,
-						returnPercent: null,
-						returnPercentText: null,
 						returnText: null,
 						returnTone: undefined,
 						shareText: null,
@@ -193,13 +159,13 @@ describe("account position sections", () => {
 		).toHaveLength(2);
 	});
 
-	it("keeps values and purchase prices attached to their source positions", () => {
+	it("keeps currencies and purchase prices attached to their source positions", () => {
 		const source = [
 			position,
 			{
 				...second,
-				averagePurchasePrice: { currency: "RUB", value: "0.99" },
+				averagePurchasePrice: { currency: "USD", value: "0.99" },
-				currentValue: { currency: "RUB", value: "1.01" },
+				currentValue: { currency: "USD", value: "1.01" },
 			},
 		];
 
@@ -221,100 +187,3 @@ describe("account position sections", () => {
 		expect(source).toEqual(before);
 	});
 });
-
-describe("account position returns", () => {
-	it.each([
-		{
-			absoluteReturn: { currency: "RUB", value: "25" },
-			averagePurchasePrice: { currency: "RUB", value: "280" },
-			expected: "7.142857",
-			name: "gain",
-			quantity: "1.25",
-			type: "STOCK",
-		},
-		{
-			absoluteReturn: { currency: "RUB", value: "-25" },
-			averagePurchasePrice: { currency: "RUB", value: "280" },
-			expected: "-7.142857",
-			name: "loss",
-			quantity: "1.25",
-			type: "STOCK",
-		},
-		{
-			absoluteReturn: { currency: "RUB", value: "-5" },
-			averagePurchasePrice: { currency: "RUB", value: "45" },
-			expected: "-11.111111",
-			name: "bond without accrued interest",
-			quantity: "1",
-			type: "BOND",
-		},
-	] as const)("calculates $name from the clean purchase cost", (testCase) => {
-		const result = sections([makePosition({
-			absoluteReturn: testCase.absoluteReturn,
-			averagePurchasePrice: testCase.averagePurchasePrice,
-			quantity: testCase.quantity,
-			type: testCase.type,
-		})]);
-
-		expect(result[0]?.groups[0]?.positions[0].returnPercent)
-			.toBe(testCase.expected);
-	});
-
-	it.each([
-		{ name: "zero quantity", overrides: { quantity: "0" } },
-		{ name: "negative quantity", overrides: { quantity: "-1" } },
-		{ name: "missing average price", overrides: { averagePurchasePrice: null } },
-		{ name: "zero cost", overrides: { averagePurchasePrice: { currency: "RUB", value: "0" } } },
-	])("returns null for $name", ({ overrides }) => {
-		const result = sections([makePosition({
-			absoluteReturn: { currency: "RUB", value: "25" },
-			averagePurchasePrice: { currency: "RUB", value: "280" },
-			quantity: "1.25",
-			...overrides,
-		})]);
-
-		expect(result[0]?.groups[0]?.positions[0].returnPercent).toBeNull();
-	});
-
-	it.each([
-		{ absoluteReturn: "1", expected: "0.000001" },
-		{ absoluteReturn: "-1", expected: "-0.000001" },
-	])("rounds an exact half away from zero for $absoluteReturn", (testCase) => {
-		const result = sections([makePosition({
-			absoluteReturn: { currency: "RUB", value: testCase.absoluteReturn },
-			averagePurchasePrice: { currency: "RUB", value: "200000000" },
-			quantity: "1",
-		})]);
-
-		expect(result[0]?.groups[0]?.positions[0].returnPercent)
-			.toBe(testCase.expected);
-	});
-
-	it.each([
-		{ expected: "+1.01", value: "1.005" },
-		{ expected: "-1.01", value: "-1.005" },
-	])("formats $value for display with a sign and two decimals", (testCase) => {
-		expect(formatPositionReturnPercent(testCase.value)).toBe(testCase.expected);
-	});
-
-	it("sums complete unrealized returns", () => {
-		const result = toUnrealizedReturns([
-			makePosition({ absoluteReturn: { currency: "RUB", value: "0.1" } }),
-			makePosition({ absoluteReturn: { currency: "RUB", value: "0.2" } }),
-		]);
-
-		expect(result).toEqual({ currency: "RUB", value: "0.3" });
-	});
-
-	it("returns null when any return is incomplete", () => {
-		const result = toUnrealizedReturns([
-			makePosition({ absoluteReturn: { currency: "RUB", value: "10" } }),
-			makePosition({
-				absoluteReturn: null,
-				currentValue: { currency: "RUB", value: "100" },
-			}),
-		]);
-
-		expect(result).toBeNull();
-	});
-});

src/pages/account/model/positions.ts

@@ -1,19 +1,9 @@
 import { formatShare, type Portfolio } from "@/entities/portfolio";
-import {
+import { formatMoney, instrumentLogoUrl } from "@/shared/lib";
-	type Decimal,
-	decimalFromString,
-	decimalToString,
-	formatDecimal,
-	formatMoney,
-	instrumentLogoUrl,
-	sumDecimals,
-} from "@/shared/lib";
 
 type AccountPagePosition = Portfolio["positions"][number] & {
 	instrumentTo?: string;
 	logoSrc: null | string;
-	returnPercent: null | string;
-	returnPercentText: null | string;
 	returnText: null | string;
 	returnTone?: AccountPageReturnTone;
 	shareText: null | string;
@@ -31,44 +21,10 @@ type AccountPagePositionSection = {
 
 type AccountPageReturnTone = "negative" | "positive";
 
-type Money = NonNullable<Portfolio["positions"][number]["absoluteReturn"]>;
-
 type PositionSectionKind = "bonds"
 	| "other"
 	| "stocks";
 
-const RADIX = 10n;
-const PERCENT_SCALE = 6;
-const DISPLAY_PERCENT_SCALE = 2;
-const PERCENT_FACTOR = 100n;
-const ROUNDING_FACTOR = 2n;
-
-function formatPositionReturnPercent(value: string): string {
-	const decimal = decimalFromString(value);
-	let rounded = decimal.value;
-
-	if (decimal.scale > DISPLAY_PERCENT_SCALE) {
-		const divisor = RADIX ** BigInt(decimal.scale - DISPLAY_PERCENT_SCALE);
-		const remainder = rounded % divisor;
-		const absoluteRemainder = remainder < 0n ? -remainder : remainder;
-		rounded /= divisor;
-
-		if (absoluteRemainder * ROUNDING_FACTOR >= divisor) {
-			rounded += decimal.value < 0n ? -1n : 1n;
-		}
-	}
-	else {
-		rounded *= RADIX ** BigInt(DISPLAY_PERCENT_SCALE - decimal.scale);
-	}
-
-	const sign = rounded > 0n ? "+" : "";
-
-	return `${sign}${decimalToString({
-		scale: DISPLAY_PERCENT_SCALE,
-		value: rounded,
-	})}`;
-}
-
 function groupPositions(
 	positions: AccountPagePosition[],
 ): AccountPagePositionGroup[] {
@@ -111,48 +67,13 @@ function positionIdentity(position: AccountPagePosition) {
 	return position.isin?.trim() ? ["isin", position.isin.trim()] : undefined;
 }
 
-function returnPercent(
-	position: Portfolio["positions"][number],
-): null | string {
-	const result = position.absoluteReturn;
-	const price = position.averagePurchasePrice;
-	if (!result || !price || result.currency !== price.currency) return null;
-
-	const quantity = decimalFromString(position.quantity);
-	const purchasePrice = decimalFromString(price.value);
-
-	const cost = {
-		scale: quantity.scale + purchasePrice.scale,
-		value: quantity.value * purchasePrice.value,
-	};
-
-	if (quantity.value <= 0n || cost.value <= 0n) return null;
-
-	const absoluteReturn = decimalFromString(result.value);
-
-	const numerator = absoluteReturn.value * PERCENT_FACTOR
-		* RADIX ** BigInt(cost.scale + PERCENT_SCALE);
-
-	const denominator = cost.value * RADIX ** BigInt(absoluteReturn.scale);
-	const remainder = numerator % denominator;
-
-	const isRoundsUp = (remainder < 0n ? -remainder : remainder) * ROUNDING_FACTOR
-		>= denominator;
-
-	const rounding = isRoundsUp ? 1n : 0n;
-	const signedRounding = numerator < 0n ? -rounding : rounding;
-	const rounded = numerator / denominator + signedRounding;
-
-	return decimalToString({ scale: PERCENT_SCALE, value: rounded });
-}
-
 function toAccountPagePositionSections(
 	portfolio: Portfolio,
 ): AccountPagePositionSection[] {
 	const denominators = new Map<string, number>();
 
 	for (const position of portfolio.positions) {
-		if (position.type === "CURRENCY" || !position.currentValue) continue;
+		if (!position.currentValue) continue;
 		const currency = position.currentValue.currency;
 		denominators.set(
 			currency,
@@ -190,8 +111,6 @@ function toPosition(
 	const returnPrefix
 		= isExpanded && returnValue !== null && returnValue > 0 ? "+" : "";
 
-	const percent = returnPercent(position);
-
 	return {
 		...position,
 		instrumentTo:
@@ -201,10 +120,6 @@ function toPosition(
 		logoSrc: isExpanded
 			? instrumentLogoUrl(position.logoName)
 			: null,
-		returnPercent: percent,
-		returnPercentText: percent
-			? `${formatDecimal(formatPositionReturnPercent(percent))} %`
-			: null,
 		returnText: position.absoluteReturn
 			? `${returnPrefix}${formatMoney(position.absoluteReturn)}`
 			: null,
@@ -247,32 +162,9 @@ function toSection(
 	};
 }
 
-function toUnrealizedReturns(
-	positions: Portfolio["positions"],
-): Money | null {
-	const values: Decimal[] = [];
-
-	for (const position of positions) {
-		if (!position.absoluteReturn) {
-			// A position without any valuation has nothing to contribute.
-
-			if (!position.averagePurchasePrice && !position.currentValue)
-				continue;
-
-			return null;
-		}
-
-		values.push(decimalFromString(position.absoluteReturn.value));
-	}
-
-	return { currency: "RUB", value: decimalToString(sumDecimals(values)) };
-}
-
 export {
 	type AccountPagePosition,
 	type AccountPagePositionGroup,
 	type AccountPagePositionSection,
-	formatPositionReturnPercent,
 	toAccountPagePositionSections,
-	toUnrealizedReturns,
 };

src/pages/account/model/previews.ts

@@ -33,7 +33,6 @@ type AccountPageRecentOperations
 		stale?: boolean;
 		state: "loaded" | "partial";
 		to: string;
-		totalVisible?: boolean;
 	}
 	| {
 		state: "empty"
@@ -64,7 +63,7 @@ function toIncomeSummary(
 	if (income.meta?.completeness === "incomplete") return { state: "partial", to };
 	if (!income.data && (income.isError || income.meta?.lastAttempt.state === "failed"))
 		return { state: "error", to };
-	if (!income.data) return { state: "empty", to };
+	if (!income.data?.totalsByCurrency.length) return { state: "empty", to };
 
 	return {
 		state: "loaded",
@@ -85,7 +84,6 @@ function toRecentEvents(
 			items: events.data?.events.slice(0, RECENT_EVENTS_LIMIT) ?? [],
 			state: "partial",
 			to,
-			totalVisible: false,
 		};
 	if (!events.data && (events.isError || events.meta?.lastAttempt.state === "failed"))
 		return { state: "error", to };
@@ -96,7 +94,6 @@ function toRecentEvents(
 		items,
 		state: "loaded",
 		to,
-		totalVisible: events.meta?.completeness === "complete",
 	};
 }
 
@@ -112,12 +109,7 @@ function toRecentOperations(
 	)
 		return { state: "loading", to };
 	if (operations.meta?.completeness === "incomplete")
-		return {
+		return { items: operations.data?.items ?? [], state: "partial", to };
-			items: operations.data?.items ?? [],
-			state: "partial",
-			to,
-			totalVisible: false,
-		};
 	if (
 		!operations.data
 		&& (operations.isError || operations.meta?.lastAttempt.state === "failed")
@@ -133,7 +125,6 @@ function toRecentOperations(
 		stale: operations.meta?.freshness === "stale",
 		state: "loaded",
 		to,
-		totalVisible: operations.meta?.completeness === "complete",
 	};
 }
 

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

@@ -98,13 +98,21 @@
 	font-family: var(--mantine-font-family-monospace);
 }
 
-.tabsList {
+.accordionControl {
-	flex-wrap: nowrap;
+	transition:
-	overflow-x: auto;
+		background-color 150ms ease,
+		color 150ms ease;
 }
 
-.positionFilter {
+.accordionLabel {
-	overflow-x: auto;
+	font-size: var(--mantine-h2-font-size);
+	font-weight: var(--mantine-h2-font-weight);
+	line-height: var(--mantine-h2-line-height);
+}
+
+.accordionPanel {
+	padding-left: 0;
+	padding-right: 0;
 }
 
 .accountPositions {

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

@@ -1,46 +1,36 @@
 import type { FC } from "react";
 
-import { useAccountPageVm } from "./AccountPage.vm";
+import { useAccountPageViewModel } from "./AccountPage.vm";
 import { AccountPageEmpty } from "./components/AccountPageEmpty.view";
 import { AccountPageError } from "./components/AccountPageError.view";
 import { AccountPageLoaded } from "./components/AccountPageLoaded.view";
 import { AccountPageLoading } from "./components/AccountPageLoading/AccountPageLoading.view";
 
 const AccountPage: FC = () => {
-	const vm = useAccountPageVm();
+	const viewModel = useAccountPageViewModel();
-	if (vm.state === "loading") return <AccountPageLoading />;
+	if (viewModel.state === "loading") return <AccountPageLoading />;
-	if (vm.state === "error") return <AccountPageError {...vm} />;
+	if (viewModel.state === "error") return <AccountPageError {...viewModel} />;
-	if (vm.state === "empty")
+	if (viewModel.state === "empty")
 		return (
 			<AccountPageEmpty
-				account={vm.account}
+				account={viewModel.account}
-				accountId={vm.accountId}
+				accountId={viewModel.accountId}
-				incomeSummary={vm.incomeSummary}
+				incomeSummary={viewModel.incomeSummary}
-				readRetry={vm.readRetry}
+				recentEvents={viewModel.recentEvents}
-				recentEvents={vm.recentEvents}
+				recentOperations={viewModel.recentOperations}
-				recentOperations={vm.recentOperations}
-				source={vm.source}
 			/>
 		);
 
 	return (
 		<AccountPageLoaded
-			account={vm.account}
+			account={viewModel.account}
-			accountId={vm.accountId}
+			accountId={viewModel.accountId}
-			concentration={vm.concentration}
+			incomeSummary={viewModel.incomeSummary}
-			incomeSummary={vm.incomeSummary}
+			partial={viewModel.partial}
-			onSliceChange={vm.onSliceChange}
+			portfolio={viewModel.portfolio}
-			onTabChange={vm.onTabChange}
+			positionSections={viewModel.positionSections}
-			partial={vm.partial}
+			recentEvents={viewModel.recentEvents}
-			portfolio={vm.portfolio}
+			recentOperations={viewModel.recentOperations}
-			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 { useAccountPageVm } from "./AccountPage.vm";
+import { useAccountPageViewModel } from "./AccountPage.vm";
 
 function configureTestAuth() {
 	configureAuthClient({
@@ -102,12 +102,12 @@ function mockLoadedAccountPage() {
 	);
 }
 
-describe("useAccountPageVm", () => {
+describe("useAccountPageViewModel", () => {
 	it("prepares recent operations and events state for presentation views", async () => {
 		configureTestAuth();
 		mockLoadedAccountPage();
 
-		const { result } = renderHook(() => useAccountPageVm(), {
+		const { result } = renderHook(() => useAccountPageViewModel(), {
 			wrapper: createWrapper(),
 		});
 
@@ -154,7 +154,7 @@ describe("useAccountPageVm", () => {
 			),
 		);
 
-		const { result } = renderHook(() => useAccountPageVm(), {
+		const { result } = renderHook(() => useAccountPageViewModel(), {
 			wrapper: createWrapper(),
 		});
 
@@ -187,14 +187,14 @@ it("keeps overview sections independent when their source data is incomplete", a
 		http.get("*/api/v1/brokerage-accounts/:accountId/events", () =>
 			HttpResponse.json(
 				resource(
-					{ events: [], incomeTotal: { currency: "RUB", value: "0" } },
+					{ events: [], incomeTotalsByCurrency: [] },
 					{ completeness: "incomplete" },
 				),
 			),
 		),
 	);
 
-	const { result } = renderHook(() => useAccountPageVm(), {
+	const { result } = renderHook(() => useAccountPageViewModel(), {
 		wrapper: createWrapper(),
 	});
 
@@ -213,8 +213,8 @@ it("keeps overview sections loaded without exposing technical retry", async () =
 
 	const sections: Record<string, unknown>
 		= {
-			"events": { events: [], incomeTotal: { currency: "RUB", value: "0" } },
+			"events": { events: [], incomeTotalsByCurrency: [] },
-			"income-summary": { total: { coupon: { currency: "RUB", value: "0" }, dividend: { currency: "RUB", value: "0" }, total: { currency: "RUB", value: "0" } } },
+			"income-summary": { totalsByCurrency: [] },
 			"operations": { hasNext: false, items: [], nextCursor: null },
 			portfolio,
 		};
@@ -232,13 +232,13 @@ it("keeps overview sections loaded without exposing technical retry", async () =
 		),
 	);
 
-	const { result } = renderHook(() => useAccountPageVm(), {
+	const { result } = renderHook(() => useAccountPageViewModel(), {
 		wrapper: createWrapper(),
 	});
 
 	await waitFor(() =>
 		expect(result.current).toMatchObject({
-			incomeSummary: { state: "loaded" },
+			incomeSummary: { state: "empty" },
 			recentEvents: { state: "empty" },
 			recentOperations: { state: "empty" },
 			state: "loaded",

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

@@ -1,5 +1,3 @@
-import { useState } from "react";
-import { useTranslation } from "react-i18next";
 import { useParams } from "react-router";
 
 import type { Portfolio } from "@/entities/portfolio";
@@ -16,19 +14,12 @@ import {
 import { useIncomeSummary } from "@/entities/income";
 import { usePortfolio } from "@/entities/portfolio";
 import { useScreenSync } from "@/features/tbank-connection";
-import { apiErrorCode, isBrokerageAccessLoss, readRetry } from "@/shared/api";
+import { ApiErrorCode, apiErrorCode, isApiErrorCode } from "@/shared/api";
 import { useInitialAvailability } from "@/shared/lib";
 
-import {
-	type Concentration,
-	type ConcentrationLabels,
-	type Slice,
-	toConcentration,
-} from "../../model/concentration";
 import {
 	type AccountPagePositionSection,
 	toAccountPagePositionSections,
-	toUnrealizedReturns,
 } from "../../model/positions";
 import {
 	type AccountPageIncomeSummary,
@@ -44,10 +35,8 @@ type AccountPageContent = {
 	accountId?: string;
 	incomeSummary: AccountPageIncomeSummary;
 	partial?: boolean;
-	readRetry: AccountPageReadRetry;
 	recentEvents: AccountPageRecentEvents;
 	recentOperations: AccountPageRecentOperations;
-	source?: InvestmentResourceMeta;
 };
 
 type AccountPageEmptyViewModel = AccountPageContent & {
@@ -55,46 +44,27 @@ type AccountPageEmptyViewModel = AccountPageContent & {
 };
 
 type AccountPageLoadedViewModel = AccountPageContent & {
-	concentration: Concentration | null;
-	onSliceChange: (slice: Slice) => void;
-	onTabChange: (tab: null | string) => void;
 	portfolio: Portfolio;
 	positionSections: AccountPagePositionSection[];
-	slice: Slice;
+	source?: InvestmentResourceMeta;
 	state: "loaded";
-	tab: string;
-	unrealizedReturns:
-		| null
-		| { currency: string; value: string };
 };
 
-type AccountPageReadRetry = ReturnType<typeof readRetry>;
-
 type AccountPageViewModel
 	= | AccountPageEmptyViewModel
 		| AccountPageLoadedViewModel
-		| { code?: string; readRetry: AccountPageReadRetry; state: "error" }
+		| { code?: string; state: "error" }
 		| { state: "loading" };
 
-function useAccountPageVm(): AccountPageViewModel {
+function isPortfolioAccessFailure(code?: string) {
+	return isApiErrorCode(code, ApiErrorCode.Forbidden)
+		|| 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;
-		slice: Slice;
-		tab: string;
-	}>({ accountId, slice: "stocks", tab: "positions" });
-
-	const current = selection.accountId === accountId
-		? selection
-		: {
-				accountId, slice: "stocks" as const, tab: "positions",
-			};
-
-	const updateSelection = (change: Partial<typeof selection>) =>
-		setSelection({ ...current, ...change });
-
 	const portfolio = usePortfolio(accountId);
 
 	const operations = useBrokerageOperations(accountId, {
@@ -114,9 +84,7 @@ function useAccountPageVm(): AccountPageViewModel {
 	]);
 
 	const code = apiErrorCode(portfolio.error);
-	// The portfolio drives this screen; the retry repeats only its GET.
+	const isAccessFailure = isPortfolioAccessFailure(code);
-	const retry = readRetry([portfolio]);
-	const isAccessFailure = isBrokerageAccessLoss(code);
 
 	const availability = useInitialAvailability({
 		hasContent: !!portfolio.data,
@@ -125,13 +93,12 @@ function useAccountPageVm(): AccountPageViewModel {
 		isFetching: portfolio.isFetching,
 	});
 
-	if (isAccessFailure)
+	if (isAccessFailure) return { code, state: "error" as const };
-		return { code, readRetry: retry, state: "error" as const };
 
 	if (!portfolio.data)
-		return availability === "unavailable"
+		return {
-			? { code, readRetry: retry, state: "error" as const }
+			state: availability === "unavailable" ? "error" : "loading",
-			: { state: "loading" as const };
+		} as const;
 
 	const account = accounts.data?.find(item => item.id === accountId);
 	const recentOperations = toRecentOperations(accountId, operations);
@@ -142,52 +109,31 @@ function useAccountPageVm(): AccountPageViewModel {
 	if (
 		portfolio.meta?.availability === "available"
 		&& portfolio.data.positions.length === 0
-		&& Number(portfolio.data.cash.value) === 0
+		&& portfolio.data.cashBalances.length === 0
 	)
 		return {
 			account,
 			accountId,
 			incomeSummary,
-			readRetry: retry,
 			recentEvents,
 			recentOperations,
-			source: portfolio.meta,
 			state: "empty" as const,
 		};
 
 	const isPartial = portfolio.meta?.completeness === "incomplete";
 
-	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, labels)
-		: null;
-
 	return {
 		account,
 		accountId,
-		concentration,
 		incomeSummary,
-		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 { useAccountPageVm };
+export { useAccountPageViewModel };

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

@@ -5,10 +5,9 @@ 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 { ReadRetry, type ReadRetryProps, SourceSyncStatus } from "@/shared/ui";
+import { PortfolioStructure } from "@/widgets/portfolio-structure";
 
 import type {
 	AccountPageIncomeSummary,
@@ -18,17 +17,14 @@ 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) => {
@@ -44,34 +40,15 @@ 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
-				structure={{
+				structure={{ currencies: [], unvaluedCategories: [] }}
-					categories: [],
-					hasNegativeValues: false,
-					totalValue: "0",
-					unvaluedCategories: [],
-				}}
 			/>
 
-			<RecentOperations
+			<RecentOperations operations={props.recentOperations} />
-				allAccounts={props.accountId === "all"}
-				operations={props.recentOperations}
-			/>
 
-			<BrokerageEventsPreview
+			<BrokerageEventsPreview events={props.recentEvents} />
-				allAccounts={props.accountId === "all"}
-				events={props.recentEvents}
-			/>
 
 			{!!props.incomeSummary && <IncomeSummary {...props.incomeSummary} />}
 		</Stack>

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

@@ -6,12 +6,8 @@ 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 = {
+type AccountPageErrorProps = { code?: string };
-	code?: string;
-	readRetry?: ReadRetryProps;
-};
 
 const AccountPageError: FC<AccountPageErrorProps> = (props) => {
 	const { code } = props;
@@ -47,18 +43,8 @@ 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

@@ -1,12 +1,6 @@
-import {
+import type { FC } from "react";
-	Alert,
+
-	Group,
+import { Accordion, Alert, Stack } from "@mantine/core";
-	SegmentedControl,
-	Stack,
-	Tabs,
-	Text,
-} from "@mantine/core";
-import { type FC, useState } from "react";
 import { useTranslation } from "react-i18next";
 
 import type { BrokerageAccount } from "@/entities/brokerage-account";
@@ -14,10 +8,9 @@ import type { Portfolio } from "@/entities/portfolio";
 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,55 +20,33 @@ 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 { PerformanceTab } from "./Performance/PerformanceTab";
-import { PortfolioStructure } from "./PortfolioStructure/PortfolioStructure";
 import { PositionSection } from "./PositionSection.view";
 import { RecentOperations } from "./RecentOperations.view";
 
 type AccountPageLoadedProps = {
 	account?: BrokerageAccount;
 	accountId?: string;
-	concentration: ConcentrationModel | null;
 	incomeSummary?: AccountPageIncomeSummary;
-	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:
-		| null
-		| { currency: string; value: string };
 };
 
 const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 	const { t } = useTranslation();
-	const [filter, setFilter] = useState<string>();
-	const tab = props.tab;
 
-	const onTabChange = props.onTabChange;
+	const defaultValue = [
-
+		...props.positionSections.map(section => section.kind),
-	const activeSection = props.positionSections.find(
+		"cash",
-		section => section.kind === filter,
+		"recentOperations",
-	) ?? props.positionSections[0];
+		"recentEvents",
-
+		"incomeSummary",
-	const positionKindLabels: Record<AccountPagePositionSection["kind"], string> = {
+	];
-		bonds: t("portfolio.positionKinds.bonds"),
-		other: t("portfolio.positionKinds.other"),
-		stocks: t("portfolio.positionKinds.stocks"),
-	};
-
-	const filterOptions = props.positionSections.map(section => ({
-		label: positionKindLabels[section.kind],
-		value: section.kind,
-	}));
 
 	return (
 		<Stack gap="lg">
@@ -87,45 +58,9 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 				stale={props.source?.freshness === "stale"}
 			/>
 
-			{!!props.readRetry && <ReadRetry {...props.readRetry} />}
-
 			{props.partial
-				? tab !== "concentration" && (
+				? <Alert role="status">{t("investment.partial")}</Alert>
-					<Alert role="status">{t("investment.partial")}</Alert>
+				: <CurrencyCards amounts={props.portfolio.totalsByCurrency} />}
-				)
-				: (
-						<Stack component="dl" gap={4} m={0}>
-							<dt>
-								<Text fw={600}>{t("portfolio.total")}</Text>
-							</dt>
-
-							<dd style={{ margin: 0 }}>
-								<Text className={classes.totalAmount}>
-									{formatMoney(props.portfolio.totals, {
-										withRoundedCents: true,
-									})}
-								</Text>
-							</dd>
-						</Stack>
-					)}
-
-			{!props.partial && props.unrealizedReturns && (
-				<Stack
-					aria-label={t("portfolio.unrealizedResult")}
-					component="section"
-					gap={4}
-				>
-					<Text fw={600}>{t("portfolio.unrealizedResult")}</Text>
-
-					<Group gap="md">
-						<Text>{formatMoney(props.unrealizedReturns)}</Text>
-					</Group>
-
-					<Text c="dimmed" size="xs">
-						{t("portfolio.unrealizedResultCaption")}
-					</Text>
-				</Stack>
-			)}
 
 			{!props.partial && (
 				<PortfolioStructure
@@ -134,112 +69,70 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 				/>
 			)}
 
-			<Tabs
+			<Accordion
-				classNames={{ list: classes.tabsList }}
+				classNames={{
-				keepMounted={false}
+					chevron: classes.accordionChevron,
-				onChange={onTabChange}
+					control: classes.accordionControl,
-				value={tab}
+					label: classes.accordionLabel,
+					panel: classes.accordionPanel,
+				}}
+				defaultValue={defaultValue}
+				multiple
 			>
-				<Tabs.List aria-label={t("portfolio.sections")} mb="md">
+				{props.positionSections.map(section => (
-					<Tabs.Tab value="positions">
+					<Accordion.Item key={section.kind} value={section.kind}>
-						{t("portfolio.tabs.positions")}
+						<Accordion.Control>
-					</Tabs.Tab>
+							{t(positionSectionTitleKey(section.kind))}
+						</Accordion.Control>
 
-					{props.accountId !== "all" && (
+						<Accordion.Panel>
-						<Tabs.Tab value="concentration">
+							<PositionSection section={section} />
-							{t("portfolio.concentration.title")}
+						</Accordion.Panel>
-						</Tabs.Tab>
+					</Accordion.Item>
-					)}
+				))}
 
-					<Tabs.Tab value="cash">{t("portfolio.tabs.cash")}</Tabs.Tab>
+				<Accordion.Item value="cash">
+					<Accordion.Control>{t("portfolio.cashBalances")}</Accordion.Control>
 
-					<Tabs.Tab value="operations">
+					<Accordion.Panel>
-						{t("portfolio.tabs.operations")}
+						<CurrencyCards amounts={props.portfolio.cashBalances} />
-					</Tabs.Tab>
+					</Accordion.Panel>
+				</Accordion.Item>
 
-					<Tabs.Tab value="events">{t("portfolio.tabs.events")}</Tabs.Tab>
+				<Accordion.Item value="recentOperations">
+					<Accordion.Control>{t("ledger.recentTitle")}</Accordion.Control>
 
-					<Tabs.Tab value="income">{t("portfolio.tabs.income")}</Tabs.Tab>
+					<Accordion.Panel>
+						<RecentOperations operations={props.recentOperations} />
+					</Accordion.Panel>
+				</Accordion.Item>
 
-					<Tabs.Tab value="performance">{t("portfolio.tabs.performance")}</Tabs.Tab>
+				<Accordion.Item value="recentEvents">
-				</Tabs.List>
+					<Accordion.Control>{t("events.recentTitle")}</Accordion.Control>
 
-				<Tabs.Panel value="positions">
+					<Accordion.Panel>
-					<Stack gap="md">
+						<BrokerageEventsPreview events={props.recentEvents} />
-						{props.positionSections.length > 1 && (
+					</Accordion.Panel>
-							<div className={classes.positionFilter}>
+				</Accordion.Item>
-								<SegmentedControl
-									aria-label={t("portfolio.positionFilter")}
-									data={filterOptions}
-									onChange={setFilter}
-									value={activeSection?.kind}
-								/>
-							</div>
-						)}
 
-						{activeSection && <PositionSection section={activeSection} />}
+				<Accordion.Item value="incomeSummary">
-					</Stack>
+					<Accordion.Control>{t("income.summaryTitle")}</Accordion.Control>
-				</Tabs.Panel>
 
-				{props.accountId !== "all" && (
+					<Accordion.Panel>
-					<Tabs.Panel value="concentration">
-						{props.concentration && (
-							<Concentration
-								key={props.slice}
-								model={props.concentration}
-								onSliceChange={props.onSliceChange}
-								partial={!!props.partial}
-								slice={props.slice}
-							/>
-						)}
-					</Tabs.Panel>
-				)}
-
-				<Tabs.Panel value="cash">
-					<Stack component="dl" gap={4} m={0}>
-						<dt>
-							<Text fw={600}>{t("portfolio.cashTitle")}</Text>
-						</dt>
-
-						<dd style={{ margin: 0 }}>
-							<Text>
-								{formatMoney(props.portfolio.cash, { withRoundedCents: true })}
-							</Text>
-						</dd>
-					</Stack>
-				</Tabs.Panel>
-
-				<Tabs.Panel value="operations">
-					<RecentOperations
-						allAccounts={props.accountId === "all"}
-						moreLabel={t("portfolio.more")}
-						operations={props.recentOperations}
-					/>
-				</Tabs.Panel>
-
-				<Tabs.Panel value="events">
-					<BrokerageEventsPreview
-						allAccounts={props.accountId === "all"}
-						events={props.recentEvents}
-						moreLabel={t("portfolio.more")}
-					/>
-				</Tabs.Panel>
-
-				<Tabs.Panel value="income">
 						{!!props.incomeSummary && (
-						<IncomeSummary
+							<IncomeSummary {...props.incomeSummary} />
-							{...props.incomeSummary}
-							moreLabel={t("portfolio.more")}
-						/>
 						)}
-				</Tabs.Panel>
+					</Accordion.Panel>
-
+				</Accordion.Item>
-				<Tabs.Panel value="performance">
+			</Accordion>
-					{props.accountId && <PerformanceTab accountId={props.accountId} />}
-				</Tabs.Panel>
-			</Tabs>
 		</Stack>
 	);
 };
 
+function positionSectionTitleKey(kind: AccountPagePositionSection["kind"]) {
+	if (kind === "stocks") return "portfolio.stocks";
+
+	return kind === "bonds" ? "portfolio.bonds" : "portfolio.otherPositions";
+}
+
 export { AccountPageLoaded };

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

@@ -34,9 +34,7 @@ const AccountPageLoading: FC = () => {
 
 			<Skeleton height={260} radius="sm" />
 
-			<Skeleton height={40} radius="sm" />
+			{["first", "second", "third"].map(placeholder => <Skeleton height={52} key={placeholder} radius="sm" />)}
-
-			<Skeleton height={220} radius="sm" />
 		</LoadingSkeleton>
 	);
 };

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

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