fix: round money to currency minor units without negative zero (WealthLedger/frontend#118)

Reviewed-on: #80

.ai/conventions/data.md

@@ -30,7 +30,8 @@ backend checkout и не проверяют backend runtime OpenAPI; измен
 shape/status/route сохраняет
 публичный контракт предоставленного snapshot.
 Одна UI-модель не требует менять API. `openapi:generate` работает offline от snapshot;
-`openapi:check` генерирует во временный каталог и сравнивает, не меняя tracked files.
+`openapi:check` запускает native `--check` того же CLI и падает при устаревших
+generated types, не меняя tracked files.
 
 ## Auth и invalidation
 
@@ -39,6 +40,11 @@ Authorization. Auth endpoints исключены из Bearer/retry middleware. R
 координируется single-flight; после `401` с `UNAUTHORIZED` возможен один retry.
 Не добавляй собственный refresh/retry loop в caller.
 
+Refresh, завершившийся `401`, очищает session. Сетевая ошибка и `5xx`
+(например, деплой backend) не доказывают конец session: она сохраняется,
+`unavailable` показывает retry-экран вместо login, а следующий `401` снова
+запускает refresh. Retry/backoff внутри refresh не добавляется.
+
 Cookie-writing requests упорядочены только в текущей вкладке. Cross-tab auth
 synchronization не требуется; допустим reload/re-login. Web Locks и отдельные
 token stores не добавляются.

.ai/conventions/engineering.md

@@ -71,6 +71,7 @@ Peer-конфликт решай совместимыми версиями бе
 | Итерация | Адресные тесты, typecheck и lint по затронутому поведению и риску. При изменении поведения добавь/обнови содержательную регрессию, если существующая проверка не ловит её; для косметики не создавай искусственный тест. |
 | Итоговый code/dependency diff | Перед объявлением готовности и передачей к интеграции выполни один полный `npm run verify` на итоговых входах. Дополнительные risk checks из testing convention и явно утверждённые task checks обязательны; CI проверяет независимо. |
 | Только Markdown | Проверь тексты, ссылки/якоря, маршруты чтения и `git diff --check`; application build не нужен. При изменении verification-контура проверь его работу. |
+| Pre-commit | Hook не скачивает tools: вызывай установленные бинарники из `node_modules/.bin` (не `npx`). Full graph не входит в hook; он выполняется в `npm run verify` и CI. |
 
 Повтори routing по staged/unstaged/new files. В отчёте по задаче/PR запиши
 проверенные входы, команду, exit code, результат и ограничения. Повторяй
@@ -88,4 +89,9 @@ Commits и PR titles — Conventional Commits с parser-recognized Issue referen
 содержит одну связанную задачу. Исключения release и правила ссылки — в
 Engineering Workflow из AGENTS. Root другого checkout не управляет этим repo.
 Прямой push в `main`, force-push и перенос опубликованных тегов не входят в
-обычную работу. Перед release/hotfix прочитай местный README, раздел «Релизы».
+обычную работу. PR сливается squash или rebase-merge; merge-коммит не
+используется. `main` обновляется только fast-forward из `develop`, поэтому
+`origin/main` всегда предок `origin/develop`:
+`git merge-base --is-ancestor origin/main origin/develop`. Срочный fix —
+обычная ветка `fix/*` от `develop`; пути hotfix от `main` нет.
+Перед релизом прочитай местный README, раздел «Релизы».

.gitea/workflows/pr-title.yml

@@ -0,0 +1,34 @@
+name: Frontend verify
+
+# Metadata-only: refreshes only the `commits` context after a PR title edit.
+# Same workflow name keeps the required context; `security` and `verify`
+# statuses of the head revision stay untouched (no skipped overwrite).
+on:
+  pull_request:
+    types: [edited]
+
+concurrency:
+  group: frontend-pr-title-${{ gitea.event.pull_request.number }}
+  cancel-in-progress: true
+
+jobs:
+  commits:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    steps:
+      - uses: https://github.com/actions/checkout@v4
+        with:
+          ref: ${{ github.event.pull_request.head.sha }}
+          fetch-depth: 0
+      - uses: https://github.com/actions/setup-node@v4
+        with:
+          node-version-file: .nvmrc
+      - run: npm ci --ignore-scripts
+      - name: Check PR title and commits
+        env:
+          PR_TITLE: ${{ github.event.pull_request.title }}
+          BASE_SHA: ${{ github.event.pull_request.base.sha }}
+          HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        run: |
+          printf '%s\n' "$PR_TITLE" | npm run commitlint -- --strict
+          npm run commitlint -- --strict --from "$BASE_SHA" --to "$HEAD_SHA"

.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=low
+        run: npm audit --include=dev --audit-level=moderate
 
   verify:
     needs: [commits, security]

.husky/pre-commit

@@ -1,3 +1,6 @@
 gitleaks git --pre-commit --staged --redact=100 --no-banner || exit $?
-npx lint-staged
+if [ ! -x node_modules/.bin/lint-staged ]; then
-npm run deps
+	echo "lint-staged is not installed; run npm ci" >&2
+	exit 1
+fi
+node_modules/.bin/lint-staged

.nvmrc

@@ -1 +1 @@
-24.21.0
+24.22.1

CHANGELOG.md

@@ -1,5 +1,58 @@
 # Changelog
 
+## [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
+
+* unify income payment cards and remove comparisons (WealthLedger/main[#33](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/33)) ([#74](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/74)) ([43b0f55](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/43b0f5574a79e26de0abae35de16d8aa8700f718))
+
+### Bug Fixes
+
+* align password validation with backend ASCII policy (WealthLedger/backend[#60](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/60)) ([#89](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/89)) ([ebe9268](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/ebe92684a74b4e2617b04ef00d9406b8a0f674ea))
+* **auth,bank:** guard switch-auth nav and surface banking retry ([e38ecd8](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e38ecd87d6f69968bb56e6035ceeb6cfda208a3f)), closes [#56](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/56) [#57](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/57)
+* **bank:** break BankFeedback's shared/api edge for stories ([#80](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/80)) ([2336804](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/233680448f97dc3ec57d7665ec14c68ac92410e5))
+* deliver screener OpenAPI constraints (WealthLedger/backend[#70](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/70)) ([#85](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/85)) ([ed63ada](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/ed63adad94f5d0e20f7d0d1446a235f953d10ec2))
+* **events:** seven-date default period and picker from today (WealthLedger/frontend[#63](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/63)) ([612ab62](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/612ab6250979bf8d9b57f4feb6e1476ed3d759e4))
+* respect query eligibility in screen sync (WealthLedger/frontend[#54](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/54)) ([f295dea](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/f295dea6a6a33c597c753b52aff629d5382c963a))
+
+### Refactoring
+
+* derive payment-system options from schema tuple ([#58](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/58)) ([#75](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/75)) ([e67c47b](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e67c47b102329877eb5d9c9d8bb4ea7c0bc70883))
+
+### Build
+
+* use native openapi-typescript --check ([#60](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/60)) ([#77](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/77)) ([df05c8c](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/df05c8c7dbb5d6816fb95d54ca43cd0d83eecd48))
+
+### CI
+
+* keep pre-commit proportionate and avoid tool downloads (WealthLedger/frontend[#62](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/62)) ([#86](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/86)) ([d409a29](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/d409a297e5f9ae5658d4efa958bda9a012a859a1))
+* recheck PR title on edited without the full pipeline (WealthLedger/frontend[#64](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/64)) ([bc28973](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/bc28973d1ad5e15bfbc2e5b73b00ba63449933db))
+
+### Tests
+
+* await client settlement in late-response cases (WealthLedger/frontend[#61](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/61)) ([#81](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/81)) ([f3725c2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/f3725c202bd8cef4ba711085df82a921a2da6b7d))
+* cover non-retry of INVALID_TBANK_TOKEN reads (WealthLedger/backend[#59](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/59)) ([#90](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/90)) ([5134106](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/513410669680480a1f68f5720744cc85e43c8286))
+* cover null events and income envelopes on account pages ([#72](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/72)) ([#79](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/79)) ([e5f8bbe](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/e5f8bbe33cd438f432281818c5276abe9a425646))
+* cover null resource envelopes for account pages ([#70](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/70)) ([#71](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/71)) ([#78](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/78)) ([f7f53ff](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/f7f53ff8e4de3c1d06fac6063974ff9667145ed6))
+
+### Maintenance
+
+* adopt linear git model in frontend docs ([#91](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/91)) ([eefdde2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/eefdde29f8da269581e90bd797078e10a39e472f))
+
 ## [1.1.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v1.0.0...v1.1.0) (2026-10-12)
 
 ### Features

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24.21.0-bookworm-slim AS dependencies
+FROM node:24.22.1-bookworm-slim AS dependencies
 WORKDIR /app
 ENV HUSKY=0
 COPY package.json package-lock.json ./
@@ -19,7 +19,7 @@ COPY . .
 ENV VITE_API_BASE_URL=""
 RUN npm run build
 
-FROM nginx:1.28.0-alpine AS production
+FROM nginx:1.31.8-alpine AS production
 ARG VERSION
 ARG REVISION
 LABEL org.opencontainers.image.version=$VERSION \

README.md

@@ -19,8 +19,10 @@ npm run dev
 
 Для commits установите [Gitleaks](https://github.com/gitleaks/gitleaks/releases/tag/v8.30.1)
 8.30.1 в `PATH` (macOS: `brew install gitleaks`). Pre-commit сначала проверяет
-staged diff с полной редакцией секретов, затем запускает formatting и FSD checks.
+staged diff с полной редакцией секретов, затем запускает установленный
-Находка или отсутствие Gitleaks блокирует commit.
+`node_modules/.bin/lint-staged` только для staged JS/TS. Hook не скачивает tools и
+не запускает full graph: полный `npm run verify` выполняется в CI и перед передачей.
+Находка или отсутствие Gitleaks либо lint-staged блокирует commit.
 Проверка этого поведения: `node --test scripts/test-pre-commit.mjs`.
 
 ## Контейнерный image
@@ -116,14 +118,17 @@ Chromium при ширинах 375 и 1280 px. Browser project не исполь
 Единый `.gitea/workflows/verify.yml` запускает `commits → security → verify`
 последовательно на PR; на push в `develop`/`main` — `security → verify`.
 Рабочие ветки проверяются после открытия PR, без дублирующего push-запуска.
-Изменение заголовка PR тоже повторяет проверки Conventional Commits.
+Изменение заголовка PR запускает `.gitea/workflows/pr-title.yml` (то же имя workflow,
+только job `commits`): статусы `security` и `verify` на HEAD не перезаписываются.
 Новый запуск отменяет устаревший для того же PR/ветки и типа события
 (требуется Gitea 1.26+). Ежедневно в 05:17 UTC выполняется только `security`.
 Job `security` проверяет полную доступную историю Gitleaks 8.30.1 и выполняет
-`npm audit --include=dev --audit-level=low`. Любой advisory блокирует security job;
+`npm audit --include=dev --audit-level=moderate`. Advisory уровня moderate и выше
-исключений frontend нет. Локально можно выполнить те же команды:
+блокирует security job; low не блокирует, т.к. для них часто нет исправленной версии
+(например, GHSA-gcqx-w48m-w2h4 в build-only deepmerge). Других исключений нет.
+Локально можно выполнить те же команды:
 `gitleaks git --log-opts=--all --redact=100 --no-banner` и
-`npm audit --include=dev --audit-level=low`. Audit требует доступа к npm registry;
+`npm audit --include=dev --audit-level=moderate`. Audit требует доступа к npm registry;
 проверка секретов выполняется локально и не выводит их значения.
 
 Имена jobs `commits`, `security`, `verify` сохранены, но Gitea включает имя
@@ -214,36 +219,59 @@ preset по имени из `.release-it.json`. Версия preset закреп
 Репозиторий выпускается независимо. `develop` — интеграция, `main` — принятые
 релизы. Обычная работа: issue-linked ветка от актуального `develop`, PR в `develop`;
 общие правила — в Engineering Workflow по ссылке из AGENTS.
-Обычные PR допускают squash; release и обратная синхронизация сохраняют историю.
+PR сливается squash или rebase-merge; merge-коммит не используется. `main`
+обновляется только fast-forward из `develop`, поэтому история линейна:
+
+```text
+<type>/<issue>-<slug> --squash--> develop --ff-only--> main --> tag vX.Y.Z
+```
+
+Инвариант: `origin/main` всегда предок `origin/develop`. Проверка:
+
+```bash
+git fetch -q origin
+git merge-base --is-ancestor origin/main origin/develop && echo ok || echo BROKEN
+```
+
 Commits и PR titles — Conventional Commits со ссылкой на Issue (кроме release),
 включая `spec:`. Версии вручную не повышай.
 
-1. Получи `main`, `develop` и теги: `git fetch origin --tags`. Убедись, что
+1. Получи `main`, `develop` и теги: `git fetch origin --tags`. Проверь
-   `develop` содержит последний релиз. Создай `release/<name>` от проверенного
+   инвариант. Создай `release/X.Y.Z` от проверенного `develop`;
-   `develop`; `nvm use --silent`, `npm ci`. Hotfix начинается от `main` в
+   `nvm use --silent`, `npm ci`.
-   `release/hotfix-<name>` и проходит тот же процесс.
 2. На чистой ветке выполни `npm run release:preview`, просмотри версию/changelog,
    затем `npm run release:prepare`. Команда создаёт `chore(release): X.Y.Z`,
    обновляет manifest/lockfile/CHANGELOG; тег и push не выполняет. Не обходи
    guards ветки, чистого дерева, отсутствующих тегов или уже подготовленной версии.
 3. Проверь diff и штатные gates этого репозитория. Отправь только release-ветку,
-   открой PR в `main` с заголовком `chore(release): X.Y.Z`. После зелёных
+   открой PR в **`develop`** с заголовком `chore(release): X.Y.Z`. После зелёных
-   `verify`, `security`, `commits` выполни fast-forward-only merge. Если `main`
+   `verify`, `security`, `commits` выполни fast-forward-only merge. Если
-   изменился, согласуй историю и повтори проверки кандидата.
+   `develop` изменился, обнови release-ветку и повтори проверки кандидата.
-4. Получи удалённый `main`, сравни его HEAD с проверенным release SHA и версией
+4. Открой PR `develop → main` с тем же заголовком и слей fast-forward-only.
+5. Получи удалённый `main`, сравни его HEAD с проверенным release SHA и версией
    manifest/lockfile. Создай аннотированный `vX.Y.Z` именно на этом SHA:
    `git tag -a vX.Y.Z <release-sha> -m "Release X.Y.Z"`, затем отправь только
    `git push origin refs/tags/vX.Y.Z`. Не запускай release-it повторно на `main`.
-5. Верни release-коммит через PR `main → develop` без squash/rebase; проверь,
+
-   что `develop` содержит тег. Опубликованные теги не перемещай. При сбое после
+Обратная синхронизация не нужна: release-коммит попал в `develop` на шаге 3.
-   merge создай отсутствующий тег без нового bump; до merge исправь и проверь
+Опубликованные теги не перемещай. При сбое после merge создай отсутствующий тег
-   существующий кандидат без повторного повышения версии.
+без нового bump; до merge исправь и проверь существующий кандидат без
+повторного повышения версии.
+
+Freeze релиза не поддерживается: пока открыт релизный PR, `develop` не двигают.
+Срочный fix — обычная ветка `fix/*` от `develop` с последующим релизом;
+пути от `main` нет, он сделал бы `main` не-предком `develop`. Исключение
+требует явного решения: `release/hotfix-<name>` от `main`, PR в `main`, тег,
+затем merge `main → develop` для восстановления инварианта.
 
 `feat:` повышает minor, `fix:`/`perf:` и прочие разрешённые типы — patch;
 `!`/`BREAKING CHANGE:` — major, включая версии до 1.0. `chore(release):`
 исключён из рекомендации и changelog. Конфигурация — `.release-it.json`.
 В Gitea для `main`/`develop` должны быть запрещены прямой/force push и обход
-администратором, обязательны `verify`, `security`, `commits`; теги `v*` защищены.
+администратором, включена блокировка устаревшей ветки, обязательны `verify`,
+`security`, `commits`; теги `v*` защищены. Линейность обеспечивают merge styles
+репозитория: merge-коммиты и rebase `--no-ff` выключены, доступны squash,
+rebase-merge и fast-forward-only; стиль по умолчанию — squash.
 Workflow сам не включает эти настройки. Отдельное review approval для одного
 владельца не требуется. Npm publishing, deploy и Gitea Releases не включены.
 

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" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, viewport-fit=cover" />
     <title>WealthLedger</title>
   </head>
   <body>

package.json

@@ -1,10 +1,10 @@
 {
 	"name": "wealth-ledger-frontend",
 	"private": true,
-	"version": "1.1.0",
+	"version": "1.2.1",
 	"type": "module",
 	"engines": {
-		"node": "24.21.0"
+		"node": "24.22.1"
 	},
 	"scripts": {
 		"dev": "npm run build:packages && vite",
@@ -20,7 +20,7 @@
 		"test:coverage": "npm run build:packages && vitest run --coverage",
 		"test:lint": "node --test scripts/test-eslint.mjs",
 		"openapi:generate": "openapi-typescript src/shared/api/spec/openapi.json -o src/shared/api/generated/schema.d.ts",
-		"openapi:check": "node scripts/check-openapi.mjs",
+		"openapi:check": "openapi-typescript src/shared/api/spec/openapi.json -o src/shared/api/generated/schema.d.ts --check",
 		"knip": "npm run build:packages && knip",
 		"deps": "npm run build:packages && depcruise src packages --config dependency-cruiser.cjs --output-type err-long",
 		"verify": "npm run build:packages && npm run openapi:check && tsc -b --noEmit && eslint . --max-warnings=0 && npm run test:lint && vitest run --coverage && knip && depcruise src packages --config dependency-cruiser.cjs --output-type err-long && depcruise src packages .storybook/preview.tsx --config .storybook/dependency-cruiser.cjs --output-type err-long && tsc -b && vite build && storybook build --output-dir storybook-static --disable-telemetry",
@@ -37,89 +37,94 @@
 		"*.{js,mjs,cjs,ts,tsx}": "eslint --fix --max-warnings=0 --no-warn-ignored"
 	},
 	"dependencies": {
-		"@hookform/resolvers": "5.9.1",
+		"@hookform/resolvers": "5.9.2",
-		"@mantine/charts": "9.6.1",
+		"@mantine/charts": "9.7.3",
-		"@mantine/core": "9.6.1",
+		"@mantine/core": "9.7.3",
-		"@mantine/dates": "9.6.1",
+		"@mantine/dates": "9.7.3",
-		"@mantine/hooks": "9.6.1",
+		"@mantine/hooks": "9.7.3",
-		"@mantine/notifications": "9.6.1",
+		"@mantine/notifications": "9.7.3",
-		"@tanstack/react-query": "5.102.8",
+		"@tanstack/react-query": "5.104.5",
 		"@wealthledger/icons": "file:packages/icons",
 		"@wealthledger/tokens": "file:packages/tokens",
 		"@wealthledger/ui": "file:packages/ui",
 		"dayjs": "1.11.23",
-		"i18next": "26.4.2",
+		"i18next": "26.5.10",
-		"motion": "13.2.0",
+		"motion": "13.5.1",
 		"openapi-fetch": "0.17.0",
 		"openapi-react-query": "0.5.4",
-		"react": "19.3.0",
+		"react": "19.3.1",
-		"react-dom": "19.3.0",
+		"react-dom": "19.3.1",
-		"react-hook-form": "7.88.0",
+		"react-hook-form": "7.91.0",
-		"react-i18next": "17.0.14",
+		"react-i18next": "17.1.8",
-		"react-is": "19.3.0",
+		"react-is": "19.3.1",
-		"react-router": "8.3.1",
+		"react-router": "8.5.0",
 		"recharts": "3.10.1",
-		"zod": "4.6.4"
+		"zod": "4.6.7"
 	},
 	"devDependencies": {
-		"@babel/core": "8.0.5",
+		"@babel/core": "8.0.9",
-		"@commitlint/cli": "21.2.2",
+		"@commitlint/cli": "21.2.4",
-		"@commitlint/config-conventional": "21.2.2",
+		"@commitlint/config-conventional": "21.2.4",
-		"@eslint-react/eslint-plugin": "5.21.0",
+		"@eslint-react/eslint-plugin": "5.28.8",
 		"@eslint/js": "10.0.1",
-		"@release-it/conventional-changelog": "12.0.0",
+		"@release-it/conventional-changelog": "12.0.2",
 		"@rolldown/plugin-babel": "0.2.4",
-		"@storybook/addon-docs": "10.6.0",
+		"@storybook/addon-docs": "10.6.3",
-		"@storybook/react-vite": "10.6.0",
+		"@storybook/react-vite": "10.6.3",
 		"@stylistic/eslint-plugin": "5.10.0",
-		"@tanstack/eslint-plugin-query": "5.104.0",
+		"@tanstack/eslint-plugin-query": "5.104.5",
 		"@testing-library/jest-dom": "7.0.1",
 		"@testing-library/react": "16.3.3",
-		"@types/node": "24.13.4",
+		"@types/node": "24.19.2",
 		"@types/react": "19.3.0",
 		"@types/react-dom": "19.3.0",
-		"@vitejs/plugin-react": "6.1.1",
+		"@vitejs/plugin-react": "6.1.2",
-		"@vitest/browser-playwright": "5.0.0",
+		"@vitest/browser": "5.0.5",
-		"@vitest/coverage-v8": "5.0.0",
+		"@vitest/browser-playwright": "5.0.5",
+		"@vitest/coverage-v8": "5.0.5",
 		"@vitest/eslint-plugin": "1.6.27",
+		"@vitest/ui": "5.0.5",
 		"babel-plugin-react-compiler": "1.0.0",
-		"conventional-changelog-conventionalcommits": "10.4.0",
+		"conventional-changelog-conventionalcommits": "10.4.1",
-		"dependency-cruiser": "18.2.0",
+		"dependency-cruiser": "18.7.0",
-		"eslint": "10.11.0",
+		"eslint": "10.13.0",
 		"eslint-import-resolver-typescript": "4.4.5",
 		"eslint-plugin-import-x": "4.17.1",
 		"eslint-plugin-jest-dom": "5.10.1",
 		"eslint-plugin-no-unsanitized": "4.1.5",
-		"eslint-plugin-perfectionist": "5.12.1",
+		"eslint-plugin-perfectionist": "5.13.0",
 		"eslint-plugin-react-hooks": "7.1.1",
 		"eslint-plugin-react-refresh": "0.5.7",
 		"eslint-plugin-regexp": "3.3.1",
-		"eslint-plugin-security": "4.1.0",
+		"eslint-plugin-security": "4.2.0",
-		"eslint-plugin-sonarjs": "4.2.1",
+		"eslint-plugin-sonarjs": "4.2.2",
-		"eslint-plugin-storybook": "10.6.0",
+		"eslint-plugin-storybook": "10.6.3",
 		"eslint-plugin-testing-library": "7.16.2",
 		"eslint-plugin-unicorn": "76.0.0",
-		"globals": "17.12.0",
+		"globals": "17.13.0",
 		"husky": "9.1.7",
-		"jsdom": "30.0.1",
+		"jsdom": "30.1.3",
-		"knip": "6.35.1",
+		"knip": "6.43.0",
-		"lint-staged": "17.5.1",
+		"lint-staged": "17.6.0",
 		"msw": "2.15.0",
 		"openapi-typescript": "7.13.0",
-		"playwright": "1.63.0",
+		"playwright": "1.64.1",
-		"release-it": "21.0.2",
+		"release-it": "21.1.1",
-		"storybook": "10.6.0",
+		"storybook": "10.6.3",
 		"typescript": "5.9.3",
-		"typescript-eslint": "8.70.1",
+		"typescript-eslint": "8.72.0",
-		"vite": "8.3.0",
+		"vite": "8.3.5",
 		"vite-plugin-pwa": "1.3.0",
-		"vitest": "5.0.0"
+		"vitest": "5.0.5"
 	},
 	"overrides": {
 		"release-it": {
-			"basic-ftp": "6.2.1",
+			"basic-ftp": "6.2.3",
-			"undici": "7.29.1"
+			"undici": "8.12.3"
-		}
+		},
+		"@vitest/browser": "5.0.5",
+		"@vitest/ui": "5.0.5",
+		"@vitest/mocker": "5.0.5"
 	},
 	"allowScripts": {
 		"esbuild@0.28.2": true,

packages/icons/package.json

@@ -20,14 +20,14 @@
 		"build": "vite build && tsc -p tsconfig.json"
 	},
 	"peerDependencies": {
-		"react": "19.3.0"
+		"react": "19.3.1"
 	},
 	"devDependencies": {
-		"@storybook/react-vite": "10.6.0",
+		"@storybook/react-vite": "10.6.3",
 		"@testing-library/react": "16.3.3",
 		"@types/react": "19.3.0",
 		"typescript": "5.9.3",
-		"vite": "8.3.0",
+		"vite": "8.3.5",
-		"vitest": "5.0.0"
+		"vitest": "5.0.5"
 	}
 }

packages/ui/package.json

@@ -27,18 +27,18 @@
 		"@wealthledger/tokens": "0.3.0"
 	},
 	"peerDependencies": {
-		"@mantine/core": "9.6.1",
+		"@mantine/core": "9.7.3",
-		"@mantine/hooks": "9.6.1",
+		"@mantine/hooks": "9.7.3",
-		"react": "19.3.0",
+		"react": "19.3.1",
-		"react-dom": "19.3.0"
+		"react-dom": "19.3.1"
 	},
 	"devDependencies": {
-		"@storybook/react-vite": "10.6.0",
+		"@storybook/react-vite": "10.6.3",
 		"@testing-library/react": "16.3.3",
 		"@types/react": "19.3.0",
-		"storybook": "10.6.0",
+		"storybook": "10.6.3",
 		"typescript": "5.9.3",
-		"vite": "8.3.0",
+		"vite": "8.3.5",
-		"vitest": "5.0.0"
+		"vitest": "5.0.5"
 	}
 }

scripts/check-openapi.mjs

@@ -1,45 +0,0 @@
-import { spawnSync } from "node:child_process";
-import { mkdtemp, readFile, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import nodePath from "node:path";
-
-const temporaryDirectory = await mkdtemp(
-	nodePath.join(tmpdir(), "wealth-ledger-openapi-"),
-);
-
-const generatedPath = nodePath.join(temporaryDirectory, "schema.d.ts");
-const committedPath = nodePath.resolve("src/shared/api/generated/schema.d.ts");
-const cliPath = nodePath.resolve("node_modules/openapi-typescript/bin/cli.js");
-let exitCode = 0;
-
-try {
-	const generated = spawnSync(
-		process.execPath,
-		[cliPath, "src/shared/api/spec/openapi.json", "-o", generatedPath],
-		{ encoding: "utf8" },
-	);
-
-	if (generated.status === 0) {
-		const [committed, current] = await Promise.all([
-			readFile(committedPath, "utf8"),
-			// eslint-disable-next-line security/detect-non-literal-fs-filename -- Path is built from this check’s private mkdtemp directory and fixed filenames.
-			readFile(generatedPath, "utf8"),
-		]);
-
-		if (committed !== current) {
-			console.error(
-				"Generated OpenAPI types are stale. Run `npm run openapi:generate` and commit the result.",
-			);
-			exitCode = 1;
-		}
-	}
-	else {
-		process.stderr.write(generated.stderr || generated.stdout);
-		exitCode = generated.status ?? 1;
-	}
-}
-finally {
-	await rm(temporaryDirectory, { force: true, recursive: true });
-}
-
-process.exitCode = exitCode;

scripts/test-eslint.mjs

@@ -85,7 +85,7 @@ test("ESLint enforces the frontend profile and excludes generated artifacts", as
 			"security/detect-non-literal-regexp",
 		],
 		[
-			"scripts/check-openapi.mjs",
+			"scripts/test-pre-commit.mjs",
 			"import { exec } from \"node:child_process\"; exec(process.argv[2]);",
 			"security/detect-child-process",
 		],

scripts/test-pre-commit.mjs

@@ -47,6 +47,12 @@ test("pre-commit scans the index, redacts findings and fails closed", () => {
 		}
 
 		git("init", "--quiet");
+		// The hook must run the installed lint-staged binary, never download one.
+		const localBin = nodePath.join(cwd, "node_modules", ".bin");
+		// eslint-disable-next-line security/detect-non-literal-fs-filename -- Path is built from this check’s private mkdtemp directory and fixed filenames.
+		mkdirSync(localBin, { recursive: true });
+		// eslint-disable-next-line security/detect-non-literal-fs-filename -- Path is built from this check’s private mkdtemp directory and fixed filenames.
+		writeFileSync(nodePath.join(localBin, "lint-staged"), "#!/bin/sh\necho ran >> downstream\n", { mode: 0o755 });
 		// eslint-disable-next-line security/detect-non-literal-fs-filename -- Path is built from this check’s private mkdtemp directory and fixed filenames.
 		writeFileSync(nodePath.join(cwd, "sample.txt"), "safe staged content\n");
 		git("add", "sample.txt");
@@ -77,3 +83,37 @@ test("pre-commit scans the index, redacts findings and fails closed", () => {
 		rmSync(cwd, { force: true, recursive: true });
 	}
 });
+
+test("pre-commit never downloads tools and blocks when lint-staged is missing", () => {
+	const hook = nodePath.resolve(".husky/pre-commit");
+	const cwd = mkdtempSync(nodePath.join(tmpdir(), "frontend-hook-"));
+	const bin = nodePath.join(cwd, "bin");
+	const marker = nodePath.join(cwd, "downstream");
+
+	try {
+		// eslint-disable-next-line security/detect-non-literal-fs-filename -- Path is built from this check’s private mkdtemp directory and fixed filenames.
+		mkdirSync(bin);
+		// Gitleaks passes; npx/npm must never be reached, even if present on PATH.
+		// eslint-disable-next-line security/detect-non-literal-fs-filename -- Path is built from this check’s private mkdtemp directory and fixed filenames.
+		writeFileSync(nodePath.join(bin, "gitleaks"), "#!/bin/sh\nexit 0\n", { mode: 0o755 });
+
+		for (const command of ["npx", "npm"]) {
+			// eslint-disable-next-line security/detect-non-literal-fs-filename -- Path is built from this check’s private mkdtemp directory and fixed filenames.
+			writeFileSync(nodePath.join(bin, command), "#!/bin/sh\necho ran >> downstream\n", { mode: 0o755 });
+		}
+
+		const result = spawnSync("/bin/sh", ["-e", hook], {
+			cwd,
+			encoding: "utf8",
+			env: { ...process.env, PATH: `${bin}${nodePath.delimiter}${process.env.PATH}` },
+		});
+
+		assert.notEqual(result.status, 0, "missing lint-staged must block commit");
+		assert.match(result.stderr, /lint-staged is not installed/);
+		// eslint-disable-next-line security/detect-non-literal-fs-filename -- Path is built from this check’s private mkdtemp directory and fixed filenames.
+		assert.ok(!existsSync(marker), "hook must not invoke npx or npm");
+	}
+	finally {
+		rmSync(cwd, { force: true, recursive: true });
+	}
+});

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

@@ -11,19 +11,28 @@ import {
 } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
 import { MemoryRouter, useLocation } from "react-router";
-import { beforeEach, describe, expect, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import type { BrokerageOperation } from "@/entities/broker-operation";
 import type { IncomeAnalytics } from "@/entities/income";
 import type { Portfolio } from "@/entities/portfolio";
 
 import { AuthProvider } from "@/features/auth";
+import { defaultPeriod, formatDate } from "@/shared/lib";
 import { createTestQueryClient } from "@/test/query";
 import { resource } from "@/test/resource";
 import { server } from "@/test/server";
 
 import { AppRoutes } from "./AppRoutes";
 
+// Mantine calendar labels follow dayjs default (English) locale.
+function dayLabel(date: string) {
+	const monthName = new Intl.DateTimeFormat("en", { month: "long" })
+		.format(new Date(`${date}T12:00:00Z`));
+
+	return `${Number(date.slice(8))} ${monthName} ${date.slice(0, 4)}`;
+}
+
 const accounts = [
 	{ id: "a", name: "Основной" },
 	{ id: "b", name: "ИИС" },
@@ -95,10 +104,6 @@ const analytics: IncomeAnalytics
 			},
 		],
 		period: { from: "2026-08-01", to: "2026-08-31" },
-		previous: {
-			period: { from: "2026-07-01", to: "2026-07-31" },
-			totalsByCurrency: [],
-		},
 		totalsByCurrency: [
 			{
 				coupon: { currency: "RUB", value: "2" },
@@ -107,7 +112,6 @@ const analytics: IncomeAnalytics
 				total: { currency: "RUB", value: "2" },
 			},
 		],
-		yearComparison: null,
 	};
 
 const CurrentLocation: FC = () => {
@@ -141,6 +145,7 @@ function renderPage(path: string) {
 	return client;
 }
 
+afterEach(() => vi.useRealTimers());
 beforeEach(() => {
 	server.use(
 		http.post("*/api/v1/auth/refresh", () =>
@@ -238,7 +243,7 @@ describe("All accounts routes", () => {
 		);
 	});
 
-	it.each(["operations", "events", "income"])(
+	it.each(["operations", "income"])(
 		"restores applied dates when switching accounts in %s",
 		async (section) => {
 			const search = "?from=2026-08-01&to=2026-08-31";
@@ -266,6 +271,33 @@ 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}`);
+		const picker = await screen.findByLabelText("Период");
+		fireEvent.click(picker);
+		const [fromDate, toDate] = defaultPeriod();
+		fireEvent.click(
+			await screen.findByRole("button", { name: dayLabel(fromDate) }),
+		);
+		fireEvent.click(
+			await screen.findByRole("button", { name: dayLabel(toDate) }),
+		);
+		expect(screen.getByLabelText("Период")).toHaveTextContent(
+			`${formatDate(fromDate)} – ${formatDate(toDate)}`,
+		);
+		fireEvent.click(screen.getByRole("combobox", { name: "Счёт" }));
+		fireEvent.click(await screen.findByRole("option", { name: "ИИС" }));
+		await waitFor(() =>
+			expect(screen.getByLabelText("Текущий путь")).toHaveTextContent(
+				`/accounts/b/events${search}`,
+			),
+		);
+	});
+
 	it("groups the same security and links its accounts and overview sections", async () => {
 		renderPage("/accounts/all");
 		expect(await screen.findAllByText("Сбербанк")).toHaveLength(1);
@@ -274,14 +306,16 @@ describe("All accounts routes", () => {
 				"href",
 				`/accounts/${account.id}`,
 			);
-		for (const suffix of ["operations", "income", "events"])
+
-			expect(
+		for (const [suffix, tab] of [
-				screen
+			["operations", "Операции"],
-					.getAllByRole("link")
+			["income", "Доход"],
-					.find(
+			["events", "События"],
-						link => link.getAttribute("href") === `/accounts/all/${suffix}`,
+		]) {
-					),
+			fireEvent.click(screen.getByRole("tab", { name: tab }));
-			).toBeInTheDocument();
+			expect(screen.getByRole("link", { name: "Подробнее" }))
+				.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

@@ -190,6 +190,30 @@ describe("AppRoutes", () => {
 		expect(document.title).toBe("Карты — WealthLedger");
 	});
 
+	it("offers a retry instead of the login form while the server is unreachable, then restores the route", async () => {
+		let isOutage = true;
+		server.use(
+			http.post("*/api/v1/auth/refresh", () =>
+				isOutage
+					? new HttpResponse(null, { status: 502 })
+					: HttpResponse.json({
+							accessToken: "test-token",
+							user: { email: "user@example.com", id: "user-1" },
+						}),
+			),
+		);
+		renderRoutes("/accounts");
+
+		expect(await screen.findByRole("alert")).toHaveTextContent("Не удалось подключиться");
+		expect(screen.queryByRole("heading", { name: "Вход" })).not.toBeInTheDocument();
+		isOutage = false;
+		fireEvent.click(screen.getByRole("button", { name: "Повторить" }));
+
+		expect(
+			await screen.findByRole("heading", { level: 2, name: "Нет инвестиционных счетов" }),
+		).toBeVisible();
+	});
+
 	it("lazy-loads the protected shell for an authenticated accounts route", async () => {
 		server.use(
 			http.post("*/api/v1/auth/refresh", () =>
@@ -208,7 +232,8 @@ describe("AppRoutes", () => {
 			}),
 		).toBeInTheDocument();
 		expect(
-			screen.getByRole("navigation", { name: "WealthLedger" }),
+			screen.getAllByRole("navigation", { name: "Основная навигация" }),
-		).toBeInTheDocument();
+		).toHaveLength(2);
+		expect(screen.queryByRole("banner")).not.toBeInTheDocument();
 	});
 });

src/app/routes/RouteErrorBoundary/RouteErrorBoundary.tsx

@@ -10,7 +10,6 @@ import { useAuth } from "@/features/auth";
 
 type BoundaryProps = PropsWithChildren<{
 	authenticated: boolean;
-	routeKey: string;
 }>;
 
 type RouteErrorFallbackProps = {
@@ -26,12 +25,6 @@ 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} />
@@ -70,10 +63,7 @@ const RouteErrorBoundary: FC<PropsWithChildren> = (props) => {
 	const { user } = useAuth();
 
 	return (
-		<Boundary
+		<Boundary authenticated={Boolean(user)} key={`${pathname}${search}:${key}`}>
-			authenticated={Boolean(user)}
-			routeKey={`${pathname}${search}:${key}`}
-		>
 			{children}
 		</Boundary>
 	);

src/app/routes/RouteGuards.tsx

@@ -1,4 +1,7 @@
+import { Button, Container } from "@mantine/core";
+import { StateView } from "@wealthledger/ui";
 import { type FC, type PropsWithChildren, useState } from "react";
+import { useTranslation } from "react-i18next";
 import { Navigate, useLocation } from "react-router";
 
 import { useAuth } from "@/features/auth";
@@ -7,12 +10,26 @@ import { RouteSkeleton } from "./RouteFallback";
 
 const Protected: FC<PropsWithChildren> = (props) => {
 	const { children } = props;
-	const { ready, signedOut, user } = useAuth();
+	const { ready, retry, signedOut, unavailable, user } = useAuth();
+	const { t } = useTranslation();
 	const location = useLocation();
 	const [wasAuthenticated, setWasAuthenticated] = useState(false);
 	if (user && !wasAuthenticated) setWasAuthenticated(true);
 	if (!ready) return <RouteSkeleton variant="shell" />;
 
+	// The server was unreachable (e.g. mid-deploy), so the session is unproven, not gone.
+	if (!user && unavailable)
+		return (
+			<Container py="xl" size={560}>
+				<StateView
+					action={<Button onClick={retry}>{t("auth.retry")}</Button>}
+					error
+					text={t("auth.unavailableText")}
+					title={t("auth.unavailableTitle")}
+				/>
+			</Container>
+		);
+
 	const loginState = signedOut && wasAuthenticated
 		? undefined
 		: { returnTo: `${location.pathname}${location.search}` };

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

@@ -1,12 +1,22 @@
+.root {
+	--bottom-nav-height: 56px;
+}
+
 .content {
 	max-width: 1120px;
 	margin-inline: auto;
 }
 
-.header {
+.brand {
 	align-items: center;
+	border-bottom: 1px solid var(--mantine-color-gray-3);
 	display: flex;
-	padding: 0 var(--mantine-spacing-md);
+	min-height: 60px;
+	padding-inline: var(--mantine-spacing-sm);
+}
+
+.navList {
+	padding: var(--mantine-spacing-sm);
 }
 
 .bottomNav {
@@ -52,29 +62,85 @@
 	.bottomNav {
 		background: var(--mantine-color-white);
 		border-top: 1px solid var(--mantine-color-gray-3);
-		bottom: 0;
+		display: grid;
-		display: flex;
+		grid-template-columns: repeat(5, minmax(0, 1fr));
-		justify-content: space-around;
+		inset: auto 0 0;
-		left: 0;
+		min-height: calc(var(--bottom-nav-height) + env(safe-area-inset-bottom, 0px));
-		padding: var(--mantine-spacing-xs) 2px;
+		padding-bottom: env(safe-area-inset-bottom, 0px);
-		gap: 2px;
+		padding-inline:
-		font-size: 11px;
+			max(4px, env(safe-area-inset-left, 0px))
-		& a {
+			max(4px, env(safe-area-inset-right, 0px));
-			min-width: 0;
-			padding: 8px 2px;
-			text-align: center;
-		}
 		position: fixed;
-		right: 0;
+		z-index: var(--mantine-z-index-app);
-		z-index: 200;
+	}
+
+	.bottomNavItem {
+		align-items: center;
+		color: var(--mantine-color-gray-7);
+		display: flex;
+		flex-direction: column;
+		gap: 2px;
+		justify-content: center;
+		min-height: var(--bottom-nav-height);
+		min-width: 0;
+		text-decoration: none;
+
+		&: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;
+		}
 	}
 
 	.active {
 		color: var(--mantine-primary-color-filled);
-		font-weight: 600;
+
+		& .iconPill {
+			background-color: var(--mantine-primary-color-light);
+		}
 	}
 
 	.main {
-		padding-bottom: 5rem;
+		padding-bottom: calc(
+			var(--bottom-nav-height) + env(safe-area-inset-bottom, 0px) +
+				var(--mantine-spacing-md)
+		);
 	}
 }

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

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

src/entities/bank-card/model/error-code.ts

@@ -0,0 +1,7 @@
+function errorCode(error: unknown): string | undefined {
+	return typeof error === "object" && error !== null && "code" in error
+		? String(error.code)
+		: undefined;
+}
+
+export { errorCode };

src/entities/bank-card/model/form.schema.ts

@@ -6,6 +6,7 @@ import { calendarDate } from "@/shared/lib";
 import { bankToday } from "./form-validation";
 import { moneyCents } from "./money";
 const MAX_CARD_NAME_LENGTH = 100;
+const paymentSystemValues = ["mir", "visa", "mastercard"] as const;
 const MIN_BALANCE_KOPECKS = -9_223_372_036_854_775_808n;
 const MAX_BALANCE_KOPECKS = 9_223_372_036_854_775_807n;
 
@@ -63,7 +64,7 @@ const bankCardSchema = z.object({
 	openingBalance: moneySchema,
 	openingDate: bankDateSchema,
 	paymentSystem: z
-		.enum(["", "mir", "visa", "mastercard"], {
+		.enum(["", ...paymentSystemValues], {
 			error: validationMessage("bank.validation.paymentSystem"),
 		})
 		.optional(),
@@ -75,5 +76,6 @@ export {
 	bankCardSchema,
 	type BankCardValues,
 	bankDateSchema,
+	paymentSystemValues,
 	positiveMoneySchema,
 };

src/entities/bank-card/ui/BankCardForm/BankCardFields.vm.ts

@@ -1,8 +1,7 @@
 import { useController, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import type { BankCardValues } from "../../model/form.schema";
+import { type BankCardValues, paymentSystemValues } from "../../model/form.schema";
-
 import { bankDateField } from "../bankDateField";
 
 function useBankCardFieldsVm() {
@@ -16,7 +15,7 @@ function useBankCardFieldsVm() {
 	const { field: openingDateField } = useController({ control, name: "openingDate" });
 	const { field: paymentSystemField } = useController({ control, name: "paymentSystem" });
 
-	const paymentSystems = ["mir", "visa", "mastercard"].map(value => ({
+	const paymentSystems = paymentSystemValues.map(value => ({
 		label: t(`bank.paymentSystems.${value}`),
 		value,
 	}));

src/entities/bank-card/ui/BankFeedback.tsx

@@ -3,7 +3,7 @@ import type { FC } from "react";
 import { Alert, Button, Group, Text } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
-import { apiErrorCode } from "@/shared/api";
+import { errorCode } from "../model/error-code";
 
 type BankFeedbackProps = {
 	cached?: boolean;
@@ -14,7 +14,7 @@ type BankFeedbackProps = {
 
 const BankFeedback: FC<BankFeedbackProps> = (props) => {
 	const { t } = useTranslation();
-	const code = apiErrorCode(props.error);
+	const code = errorCode(props.error);
 
 	return (
 		<Alert color="orange" role="alert">

src/entities/bank-card/ui/BankSummary/BankSummary.view.tsx

@@ -10,6 +10,7 @@ import { formatMoney } from "@/shared/lib";
 import type { BankSummary } from "../../api/types";
 
 import { bankOperationAppearance } from "../../model/operation-appearance";
+import { BankFeedback } from "../BankFeedback";
 import classes from "./BankSummary.module.css";
 
 const CATEGORY_COLUMNS = 2;
@@ -17,9 +18,10 @@ const CATEGORY_COLUMNS = 2;
 type BankSummaryViewProps = {
 	all?: boolean;
 	data?: BankSummary;
-	error: boolean;
+	error: unknown;
 	fetching: boolean;
 	loading: boolean;
+	retry?: () => void;
 };
 
 const BankSummaryViewCategories: FC<BankSummaryViewProps> = (props) => {
@@ -122,7 +124,14 @@ const BankSummaryView: FC<BankSummaryViewProps> = (props) => {
 
 			<BankSummaryViewCategories {...props} />
 
-			{props.error && !props.data && <Text role="alert">{t("bank.error")}</Text>}
+			{Boolean(props.error) && (
+				<BankFeedback
+					cached={Boolean(props.data)}
+					error={props.error}
+					loadingError={!props.data}
+					retry={props.retry}
+				/>
+			)}
 		</Stack>
 	);
 };

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

@@ -36,6 +36,12 @@ function entryLabelKey(operation: BrokerageOperation): string {
 	return `ledger.category.${operation.category}`;
 }
 
+function isIncomePayment(operation: BrokerageOperation): boolean {
+	return [OperationType.Coupon, OperationType.Dividend].some(type =>
+		isOperationType(operation.type, type),
+	);
+}
+
 function isOperationType(value: unknown, expected: OperationType): boolean {
 	return value === expected;
 }
@@ -109,4 +115,4 @@ function paymentPresentation(
 	};
 }
 
-export { operationLabelKey, paymentPresentation };
+export { isIncomePayment, operationLabelKey, paymentPresentation };

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

@@ -11,10 +11,11 @@ import {
 	formatSnapshotTime,
 	instrumentLogoUrl,
 } from "@/shared/lib";
+import { PayoutCard } from "@/shared/ui";
 
 import type { BrokerageOperation } from "../api/useBrokerageOperations";
 
-import { operationLabelKey, paymentPresentation } from "../model/display";
+import { isIncomePayment, operationLabelKey, paymentPresentation } from "../model/display";
 
 type LedgerEntryRowProps = {
 	operation: BrokerageOperation;
@@ -75,6 +76,28 @@ const LedgerEntryRow: FC<LedgerEntryRowProps> = (props) => {
 	}
 	else details = undefined;
 
+	if (isIncomePayment(operation)) {
+		const extraMetadata = [
+			instrument,
+			props.withDetails ? null : operation.account?.name,
+		].filter(Boolean).join(" · ");
+
+		return (
+			<PayoutCard
+				details={details}
+				extraMetadata={extraMetadata}
+				imageSrc={instrumentLogoUrl(operation.logoName)}
+				initial={(instrument.trim()[0] ?? "?").toUpperCase()}
+				kind="executed"
+				occurredAt={formatSnapshotTime(operation.occurredAt)}
+				payment={operation.payment}
+				title={operation.description || t(operationLabelKey(operation.type))}
+				typeLabel={t(paymentPresentation(operation).label)}
+				wrap={props.wrap}
+			/>
+		);
+	}
+
 	return (
 		<EntryCard
 			details={details}

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

@@ -8,11 +8,15 @@ const VISIBLE_CURRENCY_LIMIT = 2;
 
 type BrokerageAccountCard = {
 	account: BrokerageAccount;
-	positionCounts: null
+	positionCounts: null | PositionCounts;
-		| { bonds: number; stocks: number };
 	source?: NonNullable<InvestmentResourceMeta["dependencies"]>[number];
 	summary:
-		| { remainingCurrencyCount: number; state: "available"; totals: Money[] }
+		| {
+			portfolio: NonNullable<BrokerageAccount["portfolioSummary"]>;
+			remainingCurrencyCount: number;
+			state: "available";
+			totals: Money[];
+		}
 		| { state: "empty" }
 		| { state: "unavailable" };
 };
@@ -21,6 +25,8 @@ type Money = NonNullable<
 	BrokerageAccount["portfolioSummary"]
 >["totalsByCurrency"][number];
 
+type PositionCounts = { bonds: number; stocks: number; total: number };
+
 function accountTypeKey(type: BrokerageAccount["type"]) {
 	return `accounts.types.${type}` as const;
 }
@@ -48,6 +54,7 @@ function brokerageAccountCards(
 		const positionCounts = {
 			bonds: summary.bondPositionCount,
 			stocks: summary.stockPositionCount,
+			total: summary.totalPositionCount,
 		};
 
 		if (summary.totalsByCurrency.length === 0)
@@ -58,6 +65,7 @@ function brokerageAccountCards(
 			positionCounts,
 			source,
 			summary: {
+				portfolio: summary,
 				remainingCurrencyCount: Math.max(
 					summary.totalsByCurrency.length - VISIBLE_CURRENCY_LIMIT,
 					0,

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

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

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

@@ -2,32 +2,86 @@ 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";
 
-const syntheticAccount = {
+type PortfolioSummary = NonNullable<BrokerageAccount["portfolioSummary"]>;
-	id: "storybook-account",
+
-	name: "Учебный брокерский счёт",
+const rubReturn = {
-	openedOn: "2025-03-15",
+	absolute: "136900",
-	portfolioSummary: {
+	costBasis: "1103600.50",
-		bondPositionCount: 12,
+	currency: "RUB",
-		stockPositionCount: 5,
+	partial: false,
-		totalsByCurrency: [
+	percent: "12.40",
-			{ currency: "RUB", value: "125000.50" },
+};
-			{ currency: "USD", value: "320" },
+
-			{ currency: "EUR", value: "210" },
+const portfolioSummary = {
-		],
+	bondPositionCount: 12,
+	cashBalances: [
+		{ currency: "RUB", value: "82500.50" },
+		{ currency: "USD", value: "1500" },
+	],
+	fundPositionCount: 2,
+	stockPositionCount: 5,
+	structure: {
+		currencies: [{
+			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" },
+			],
+			currency: "RUB",
+			hasNegativeValues: false,
+			totalValue: "1241400",
+		}],
+		unvaluedCategories: [],
 	},
-	type: "BROKERAGE",
+	totalPositionCount: 19,
-} satisfies BrokerageAccount;
+	totalsByCurrency: [{ currency: "RUB", value: "1240500.50" }],
+	unrealizedReturnByCurrency: [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,
+		type,
+	};
+}
+
+const negativeSummary: PortfolioSummary = {
+	...portfolioSummary,
+	unrealizedReturnByCurrency: [{
+		...rubReturn,
+		absolute: "-4200",
+		percent: "-3.05",
+	}],
+};
+
+const emptySummary: PortfolioSummary = {
+	...portfolioSummary,
+	cashBalances: [],
+	structure: { currencies: [], unvaluedCategories: [] },
+	totalPositionCount: 0,
+	totalsByCurrency: [],
+	unrealizedReturnByCurrency: [],
+};
 
 const meta = {
-	args: { accounts: brokerageAccountCards([syntheticAccount]) },
+	args: { accounts: brokerageAccountCards([account("normal", "Основной ИИС")]) },
-	argTypes: {
+	argTypes: { accounts: { control: false } },
-		accounts: { control: false },
-	},
 	component: BrokerageAccountList,
 	decorators: [
 		Story => (
@@ -40,7 +94,7 @@ const meta = {
 		docs: {
 			description: {
 				component:
-					"Карточки счетов WealthLedger со сводкой по валютам и числом наименований акций и облигаций. Используйте на экране выбора счёта; отсутствие сводки и отсутствие сумм имеют разные сообщения. Примеры содержат вымышленные данные. Ссылки меняют только локальный маршрут MemoryRouter; страница назначения в этой истории не отображается.",
+					"Карточки счетов: стоимость и доходность по валютам, деньги, структура и свежесть источника. Денежные и процентные значения остаются строками. Все примеры содержат вымышленные данные; ссылки работают только внутри MemoryRouter.",
 			},
 		},
 	},
@@ -52,188 +106,112 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const Available: Story = {
+export const Normal: Story = {};
-	name: "Сводка по нескольким валютам",
+
-	parameters: {
+export const MultiCurrency: Story = {
-		docs: {
+	args: {
-			description: {
+		accounts: brokerageAccountCards([account("multi", "Мультивалютный", {
-				story:
+			...portfolioSummary,
-					"Показываются первые две валюты и количество остальных. Суммы разных валют не складываются в общий итог.",
+			cashBalances: [
-			},
+				{ currency: "RUB", value: "82500.50" },
-		},
+				{ currency: "USD", value: "1500" },
+			],
+			totalsByCurrency: [
+				{ currency: "RUB", value: "1240500.50" },
+				{ currency: "USD", value: "3200" },
+				{ currency: "EUR", value: "900" },
+			],
+			unrealizedReturnByCurrency: [
+				...portfolioSummary.unrealizedReturnByCurrency,
+				{
+					absolute: "20",
+					costBasis: "3180",
+					currency: "USD",
+					partial: false,
+					percent: "2.10",
+				},
+				{
+					absolute: "0",
+					costBasis: "900",
+					currency: "EUR",
+					partial: false,
+					percent: null,
+				},
+			],
+		})]),
 	},
 };
 
-export const Unavailable: Story
+export const Negative: Story = {
-	= {
+	args: {
-		args: {
+		accounts: brokerageAccountCards([
-			accounts: brokerageAccountCards([
+			account("negative", "Просевший портфель", negativeSummary),
-				{ ...syntheticAccount, openedOn: null, portfolioSummary: null },
+		]),
-			]),
+	},
-		},
+};
-		name: "Сводка недоступна",
+
-		parameters: {
+export const Partial: Story = {
-			docs: {
+	args: {
-				description: {
+		accounts: brokerageAccountCards([account("partial", "Частичные данные", {
-					story:
+			...portfolioSummary,
-						"Счёт остаётся доступен для открытия, даже если сводка временно недоступна. Неизвестные суммы не заменяются нулём; отсутствующая дата открытия не отображается.",
+			unrealizedReturnByCurrency: [{
-				},
+				...rubReturn,
-			},
+				partial: true,
-		},
+			}],
-	};
+		})]),
+	},
+};
 
 export const Empty: Story = {
 	args: {
 		accounts: brokerageAccountCards([
-			{
+			account("empty", "Новый пустой счёт", emptySummary),
-				...syntheticAccount,
-				portfolioSummary: {
-					bondPositionCount: 0,
-					stockPositionCount: 0,
-					totalsByCurrency: [],
-				},
-			},
 		]),
 	},
-	name: "Нет текущих сумм",
+};
-	parameters: {
+
-		docs: {
+export const Unavailable: Story = {
-			description: {
+	args: {
-				story:
+		accounts: brokerageAccountCards([
-					"Успешно полученная пустая сводка отличается от ошибки получения данных. Карточка сохраняет название, тип счёта и переход.",
+			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(
-				...syntheticAccount,
+				"long",
-				name: "Учебный индивидуальный инвестиционный счёт для долгосрочных накоплений",
+				"Очень длинное название индивидуального инвестиционного счёта, которое должно корректно переноситься на узком экране",
-				type: "INDIVIDUAL_INVESTMENT",
+				portfolioSummary,
-			},
+				"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,122 +5,202 @@ 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";
 
-describe("BrokerageAccountList", () => {
+type PortfolioSummary = NonNullable<BrokerageAccount["portfolioSummary"]>;
-	it("renders account details and an account link", () => {
-		render(
-			<MantineProvider>
-				<MemoryRouter>
-					<BrokerageAccountList
-						accounts={brokerageAccountCards([
-							{
-								id: "account-1",
-								name: "Основной",
-								openedOn: "2024-08-13",
-								portfolioSummary: {
-									bondPositionCount: 12,
-									stockPositionCount: 5,
-									totalsByCurrency: [
-										{ currency: "RUB", value: "1500" },
-										{ currency: "USD", value: "20" },
-										{ currency: "EUR", value: "5" },
-									],
-								},
-								type: "BROKERAGE",
 
-							},
+const portfolioSummary = {
-							{
+	bondPositionCount: 12,
-								id: "account-2",
+	cashBalances: [
-								name: "Недоступный",
+		{ currency: "RUB", value: "82500.5" },
-								openedOn: null,
+		{ currency: "USD", value: "20" },
-								portfolioSummary: null,
+	],
-								type: "BROKERAGE",
+	fundPositionCount: 0,
-							},
+	stockPositionCount: 5,
-							{
+	structure: {
-								id: "account-3",
+		currencies: [{
-								name: "Пустой",
+			categories: [
-								openedOn: null,
+				{ sharePercent: "50.000000", type: "STOCK", value: "100" },
-								portfolioSummary: {
+				{ sharePercent: "30.000000", type: "BOND", value: "60" },
-									bondPositionCount: 0,
+				{ sharePercent: "0.000000", type: "OTHER", value: "0" },
-									stockPositionCount: 2,
+				{ sharePercent: "20.000000", type: "CASH", value: "40" },
-									totalsByCurrency: [],
+			],
-								},
+			currency: "RUB",
-								type: "BROKERAGE",
+			hasNegativeValues: false,
-							},
+			totalValue: "200",
-						])}
+		}],
-					/>
+		unvaluedCategories: [],
-				</MemoryRouter>
+	},
-			</MantineProvider>,
+	totalPositionCount: 17,
-		);
+	totalsByCurrency: [
+		{ currency: "RUB", value: "123456789012345678901.995" },
+		{ currency: "USD", value: "20" },
+		{ currency: "EUR", value: "5" },
+	],
+	unrealizedReturnByCurrency: [
+		{
+			absolute: "136900",
+			costBasis: "1000000",
+			currency: "RUB",
+			partial: true,
+			percent: "12.40",
+		},
+		{
+			absolute: "-4.2",
+			costBasis: "24.2",
+			currency: "USD",
+			partial: false,
+			percent: "-3.05",
+		},
+		{
+			absolute: "0",
+			costBasis: "5",
+			currency: "EUR",
+			partial: false,
+			percent: null,
+		},
+	],
+} satisfies PortfolioSummary;
 
-		expect(screen.getByRole("link", { name: /Основной/ })).toHaveAttribute(
+type BrokerageAccountCardInput = Parameters<typeof BrokerageAccountList>[0][
-			"href",
+	"accounts"
-			"/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", () => {
+function account(
-	const accounts = brokerageAccountCards(
+	id: string,
-		["fresh", "stale"].map(
+	name: string,
+	summary: null | PortfolioSummary,
+): BrokerageAccount {
+	return {
+		id,
+		name,
+		openedOn: null,
+		portfolioSummary: summary,
+		type: "BROKERAGE",
+	};
+}
 
-			id =>
+function renderList(accounts: BrokerageAccountCardInput) {
-				({
+	return render(
-					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", () => {
-	).toBeVisible();
+		const nullReturnSummary: PortfolioSummary = {
-	expect(
+			...portfolioSummary,
-		within(screen.getByRole("link", { name: /fresh/ })).queryByText(
+			cashBalances: [],
-			"Данные требуют обновления",
+			structure: { currencies: [], unvaluedCategories: [] },
-		),
+			totalsByCurrency: [{ currency: "EUR", value: "5" }],
-	).not.toBeInTheDocument();
+			unrealizedReturnByCurrency: [{
+				absolute: "0",
+				costBasis: "5",
+				currency: "EUR",
+				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("Еще 1 валюта")).toBeInTheDocument();
+		expect(within(link).getByText("+12,40 %")).toBeInTheDocument();
+		expect(within(link).getByText("+136 900 ₽")).toBeInTheDocument();
+		expect(within(link).getByText("−3,05 %")).toBeInTheDocument();
+		expect(within(link).getByText("−4,2 USD")).toBeInTheDocument();
+		const nullReturnLink = screen.getByRole("link", { name: /Без доходности/ });
+		expect(within(nullReturnLink).getByText("—")).toBeInTheDocument();
+		expect(within(link).getByText("частично")).toBeInTheDocument();
+		expect(within(link).getByText("82 500,50 ₽")).toBeInTheDocument();
+		expect(within(link).getAllByText("20,00 USD")).not.toHaveLength(0);
+		expect(within(link).getByText("17 позиций")).toBeInTheDocument();
+		expect(screen.getByRole("img", {
+			name: "Структура в RUB: Акции 50 %; Облигации 30 %; "
+				+ "Другие активы 0 %; Свободные деньги 20 %",
+		})).toBeInTheDocument();
+		const stockLegend = within(link).getByText(/Акции 50 %/);
+		expect(stockLegend).toHaveTextContent("● Акции 50 %");
+		// eslint-disable-next-line testing-library/no-node-access -- The legend is aria-hidden, so only DOM traversal reaches its container.
+		expect(stockLegend.parentElement).toHaveAttribute("aria-hidden", "true");
+		expect(within(link).queryByText(/Другие активы 0 %/)).not.toBeInTheDocument();
+		expect(link).toHaveTextContent("По данным брокера");
+		expect(link).toHaveTextContent("Структура RUB: Акции 100");
+	});
+
+	it("preserves empty, unavailable and stale states", () => {
+		const emptySummary: PortfolioSummary = {
+			...portfolioSummary,
+			cashBalances: [],
+			structure: { currencies: [], unvaluedCategories: [] },
+			totalPositionCount: 0,
+			totalsByCurrency: [],
+			unrealizedReturnByCurrency: [],
+		};
+
+		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,11 +1,10 @@
-import type { FC } from "react";
+import type { CSSProperties, FC } from "react";
 
-import { Card, Group, SimpleGrid, Stack, Text } from "@mantine/core";
+import { Badge, Group, Stack, Text, VisuallyHidden } from "@mantine/core";
-import { WalletIcon } from "@wealthledger/icons";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
-import { formatDate, formatMoney } from "@/shared/lib";
+import { formatMoney, portfolioCategoryPresentation } from "@/shared/lib";
 import { SourceSyncStatus } from "@/shared/ui";
 
 import type { BrokerageAccountCard } from "../../model/display";
@@ -13,12 +12,176 @@ 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;
+
+type AvailableSummary = Extract<
+	BrokerageAccountCard["summary"],
+	{ state: "available" }
+>;
+
 type BrokerageAccountListProps = { accounts: BrokerageAccountCard[] };
 
 type BrokerageAccountSummaryProps = {
 	summary: BrokerageAccountCard["summary"];
 };
 
+type PortfolioSummary = AvailableSummary["portfolio"];
+
+type ReturnValueProps = {
+	item: PortfolioSummary["unrealizedReturnByCurrency"][number];
+};
+
+type StructureCurrency = PortfolioSummary["structure"]["currencies"][number];
+
+function formatPercent(value: null | string) {
+	if (value === null) return "—";
+
+	const formatted = `${value.replace(".", ",")}\u{A0}%`;
+	if (isZero(value))
+		return value.startsWith("-") ? formatted.slice(1) : formatted;
+
+	return value.startsWith("-") ? `−${formatted.slice(1)}` : `+${formatted}`;
+}
+
+function formatStructurePercent(value: string) {
+	let trimmed = value;
+	while (trimmed.includes(".") && trimmed.endsWith("0"))
+		trimmed = trimmed.slice(0, -1);
+	if (trimmed.endsWith(".")) trimmed = trimmed.slice(0, -1);
+
+	return trimmed.replace(".", ",");
+}
+
+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 isNegative = item.percent !== null
+		&& item.percent.startsWith("-")
+		&& !isZero(item.percent);
+
+	const isPositive = item.percent !== null
+		&& !item.percent.startsWith("-")
+		&& !isZero(item.percent);
+
+	let toneClass = classes.neutral;
+	if (isNegative) toneClass = classes.negative;
+	else if (isPositive) toneClass = classes.positive;
+
+	return (
+		<Group className={classes.return} gap="xs" wrap="nowrap">
+			<Text className={toneClass} fw={700} size="sm">
+				{formatPercent(item.percent)}
+			</Text>
+
+			<Text className={toneClass} size="sm">
+				{formatMoney(
+					{ currency: item.currency, 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", {
+		currency: props.item.currency,
+		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();
@@ -36,19 +199,51 @@ const BrokerageAccountSummary: FC<BrokerageAccountSummaryProps> = (props) => {
 		);
 
 	return (
-		<Stack className={classes.summary} gap={4}>
+		<Stack className={classes.balance} gap="xs">
-			{summary.totals.map(total => (
+			<Group align="flex-start" gap="lg" justify="flex-end" wrap="nowrap">
-				<Text className={classes.total} fw={700} key={total.currency}>
+				<Stack className={classes.summary} gap={4}>
-					{formatMoney(total)}
+					{summary.totals.map(total => (
-				</Text>
+						<Text className={classes.total} fw={700} key={total.currency}>
-			))}
+							{formatMoney(total, { withRoundedCents: true })}
+						</Text>
+					))}
 
-			{!!summary.remainingCurrencyCount && (
+					{!!summary.remainingCurrencyCount && (
-				<Text c="dimmed" size="sm">
+						<Text c="dimmed" size="sm">
-					{t("accounts.remainingCurrencies", {
+							{t("accounts.remainingCurrencies", {
-						count: summary.remainingCurrencyCount,
+								count: summary.remainingCurrencyCount,
+							})}
+						</Text>
+					)}
+				</Stack>
+
+				<Stack gap={4}>
+					{summary.totals.map((total) => {
+						const item = summary.portfolio.unrealizedReturnByCurrency.find(
+							returnItem => returnItem.currency === total.currency,
+						);
+
+						return item
+							? <ReturnValue item={item} key={total.currency} />
+							: null;
 					})}
-				</Text>
+				</Stack>
+			</Group>
+
+			{summary.portfolio.cashBalances.length > 0 && (
+				<Group className={classes.cash} gap="xs" justify="flex-end">
+					<Text c="dimmed" size="xs">
+						{t("accounts.cash")}
+					</Text>
+
+					<Stack gap={0}>
+						{summary.portfolio.cashBalances.map(cash => (
+							<Text className={classes.cashValue} key={cash.currency} size="sm">
+								{formatMoney(cash, { withRoundedCents: true })}
+							</Text>
+						))}
+					</Stack>
+				</Group>
 			)}
 		</Stack>
 	);
@@ -61,13 +256,13 @@ type BrokerageAccountSourceStatusProps = {
 const BrokerageAccountSourceStatus: FC<BrokerageAccountSourceStatusProps> = (
 	props,
 ) => {
-	const { source } = props;
 	const { t } = useTranslation();
-
+	const { source } = props;
 	const isSyncing = source?.lastAttempt.state === "running";
 
-	const errorText
+	const errorText = source?.lastAttempt.state === "failed"
-		= source?.lastAttempt.state === "failed" ? t("accounts.refreshError") : null;
+		? t("accounts.refreshError")
+		: null;
 
 	return (
 		<>
@@ -87,86 +282,110 @@ 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 = summary.portfolio.unrealizedReturnByCurrency.map(item =>
+		t("accounts.description.return", {
+			absolute: formatMoney(
+				{ currency: item.currency, value: item.absolute },
+				{ withSign: true },
+			),
+			currency: item.currency,
+			percent: formatPercent(item.percent),
+		}),
+	);
+
+	const structures = summary.portfolio.structure.currencies.map((item) => {
+		const categories = item.categories.map(category =>
+			t("accounts.description.structureCategory", {
+				category: t(portfolioCategoryPresentation[category.type].label),
+				value: formatMoney(
+					{ currency: item.currency, value: category.value },
+					{ withRoundedCents: true },
+				),
+			}),
+		).join(", ");
+
+		return t("accounts.description.structure", {
+			currency: item.currency,
+			value: categories,
+		});
+	});
+
+	const hasPartialReturn = summary.portfolio.unrealizedReturnByCurrency.some(
+		item => item.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: summary.portfolio.totalsByCurrency
+					.map(total => formatMoney(total)).join(", "),
+			})}
+			{details ? `${details}. ` : ""}
+			{hasPartialReturn ? t("accounts.brokerDescription") : ""}
+		</VisuallyHidden>
+	);
+};
+
 const BrokerageAccountList: FC<BrokerageAccountListProps> = (props) => {
-	const { accounts } = props;
 	const { t } = useTranslation();
 
 	return (
-		<SimpleGrid className={classes.list} cols={1} spacing="lg">
+		<ul className={classes.list}>
-			{accounts.map(({ account, positionCounts, source, summary }) => (
+			{props.accounts.map(({ account, positionCounts, source, summary }) => (
-				<Card
+				<li key={account.id}>
-					className={classes.card}
+					<Link className={classes.row} to={`/accounts/${account.id}`}>
-					component={Link}
+						<Group className={classes.identity} wrap="nowrap">
-					key={account.id}
+							<h2 className={classes.name}>{account.name}</h2>
-					padding="xl"
+
-					radius="lg"
+							<Badge className={classes.accountType} variant="light">
-					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))}
-							</Text>
+							</Badge>
-
-							<WalletIcon className={classes.accountIcon} />
 						</Group>
 
-						<Text className={classes.name} component="h2" fw={700}>
-							{account.name}
-						</Text>
-					</Stack>
-
-					<Stack className={classes.balance} gap="xs">
-						<Text c="dimmed" size="sm">
-							{t("accounts.currentValue")}
-						</Text>
-
 						<BrokerageAccountSummary summary={summary} />
 
-						<BrokerageAccountSourceStatus source={source} />
+						<Stack className={classes.details} gap={2}>
-					</Stack>
+							{positionCounts && (
+								<Text c="dimmed" size="xs">
+									{t("accounts.positions", {
+										count: positionCounts.total,
+									})}
+								</Text>
+							)}
 
-					{!!positionCounts && (
+							<BrokerageAccountSourceStatus source={source} />
-						<dl className={classes.positions}>
+						</Stack>
-							<div className={classes.stocks}>
-								<dt>{t("accounts.stocks")}</dt>
 
-								<dd>
+						{summary.state === "available" && (
-									{new Intl.NumberFormat("ru-RU").format(positionCounts.stocks)}
+							<Stack className={classes.structure} gap={4}>
-								</dd>
+								{summary.portfolio.structure.currencies.map(item => (
-							</div>
+									<StructureBar item={item} key={item.currency} />
-
+								))}
-							<div className={classes.bonds}>
+							</Stack>
-								<dt>{t("accounts.bonds")}</dt>
-
-								<dd>
-									{new Intl.NumberFormat("ru-RU").format(positionCounts.bonds)}
-								</dd>
-							</div>
-						</dl>
-					)}
-
-					<Group className={classes.footer} gap="sm" justify="space-between">
-						{!!account.openedOn && (
-							<Text c="dimmed" size="xs">
-								{t("accounts.openedOn", {
-									date: formatDate(account.openedOn),
-								})}
-							</Text>
 						)}
 
-						<Text className={classes.open} component="span" fw={600} size="sm">
+						<AccountDescription
-							{t("accounts.openAccount")}
+							account={{ account, positionCounts, source, summary }}
-
+						/>
-							<span aria-hidden="true" className={classes.arrow}>
+					</Link>
-								→
+				</li>
-							</span>
-						</Text>
-					</Group>
-				</Card>
 			))}
-		</SimpleGrid>
+		</ul>
 	);
 };
 

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

@@ -4,6 +4,7 @@ import { EntryCard } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
 import { formatDate, formatMoney, instrumentLogoUrl } from "@/shared/lib";
+import { PayoutCard } from "@/shared/ui";
 
 import type { BrokerageEvent } from "../api/useBrokerageEvents";
 
@@ -15,6 +16,27 @@ const BrokerageEventCard: FC<BrokerageEventCardProps> = (props) => {
 
 	const date = formatDate(event.date);
 
+	if (event.type === "coupon" || event.type === "dividend") {
+		const title = [t(`events.type.${event.type}`), event.displayName].join(" · ");
+
+		const extraMetadata = [event.isin, event.account?.name]
+			.filter(Boolean)
+			.join(" · ");
+
+		return (
+			<PayoutCard
+				date={date}
+				dateKind={event.dateKind}
+				extraMetadata={extraMetadata}
+				imageSrc={instrumentLogoUrl(event.logoName)}
+				initial={(event.ticker.trim()[0] ?? "?").toUpperCase()}
+				kind="forecast"
+				projectedAmount={event.projectedAmount}
+				title={title}
+			/>
+		);
+	}
+
 	const metadata = [
 		date,
 		event.dateKind === "registry"
@@ -40,7 +62,7 @@ const BrokerageEventCard: FC<BrokerageEventCardProps> = (props) => {
 			title={[t(`events.type.${event.type}`), event.displayName].join(" · ")}
 			tone="neutral"
 			value={projectedAmount}
-			valueLabel={t("events.projectedAmount")}
+			valueLabel={t("payout.forecast")}
 		/>
 	);
 };

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

@@ -12,6 +12,7 @@ import { BrokerageEventCard } from "../BrokerageEventCard";
 
 type BrokerageEventsPreviewProps = {
 	events: BrokerageEventsPreviewState;
+	moreLabel?: string;
 };
 
 type BrokerageEventsPreviewState
@@ -51,7 +52,7 @@ const BrokerageEventsPreview: FC<BrokerageEventsPreviewProps> = (props) => {
 				))}
 
 			<Button component={Link} to={events.to} variant="subtle">
-				{t("events.open")}
+				{props.moreLabel ?? t("events.open")}
 			</Button>
 		</Stack>
 	);

src/entities/income/api/useIncome.ts

@@ -4,9 +4,6 @@ type IncomeAnalytics = NonNullable<
 	paths["/api/v1/brokerage-accounts/{accountId}/income-analytics"]["get"]["responses"][200]["content"]["application/json"]["data"]
 >;
 
-type IncomeAnalyticsMeta
-	= paths["/api/v1/brokerage-accounts/{accountId}/income-analytics"]["get"]["responses"][200]["content"]["application/json"]["meta"];
-
 type IncomeSummary = NonNullable<
 	paths["/api/v1/brokerage-accounts/{accountId}/income-summary"]["get"]["responses"][200]["content"]["application/json"]["data"]
 >;
@@ -47,7 +44,6 @@ function useIncomeSummary(accountId?: string) {
 
 export {
 	type IncomeAnalytics,
-	type IncomeAnalyticsMeta,
 	type IncomeSummary,
 	useIncomeAnalytics,
 	useIncomeSummary,

src/entities/income/index.ts

@@ -1,6 +1,5 @@
 export {
 	type IncomeAnalytics,
-	type IncomeAnalyticsMeta,
 	type IncomeSummary,
 	useIncomeAnalytics,
 	useIncomeSummary,

src/features/auth/model/auth-context.ts

@@ -7,7 +7,12 @@ type AuthContextValue = {
 	logout: () => Promise<void>;
 	ready: boolean;
 	register: (email: string, password: string) => Promise<void>;
+	retry: () => void;
 	signedOut: boolean;
+	/**
+	Refresh failed with a network error or 5xx; the refresh cookie may still be valid.
+	*/
+	unavailable: boolean;
 	user: undefined | User;
 };
 

src/features/auth/model/auth.schema.test.ts

@@ -0,0 +1,55 @@
+import { describe, expect, it } from "vitest";
+
+import { loginSchema, registerSchema } from "./auth.schema";
+
+const email = "user@example.com";
+
+function canLogIn(password: string) {
+	return loginSchema.safeParse({ email, password }).success;
+}
+
+function canRegister(password: string, confirmation = password) {
+	return registerSchema.safeParse({
+		email,
+		password,
+		passwordConfirmation: confirmation,
+	}).success;
+}
+
+// Register policy: 8..72 printable ASCII (bcrypt reads 72 bytes, so non-ASCII could be
+// truncated). Login stays lenient so accounts created under the old policy still sign in.
+describe("auth password policy", () => {
+	it.each([
+		["7 chars", "a".repeat(7), false],
+		["8 chars", "a".repeat(8), true],
+		["72 chars", "a".repeat(72), true],
+		["73 chars", "a".repeat(73), false],
+		["printable symbols and space", "Aa1 !~\"#$%&'()*+,-./:;<=>?@", true],
+		["Cyrillic, 8+ chars", "пароль-пароль", false],
+		["emoji", "passw😀rd", false],
+		["tab", "pass\tword1", false],
+		["newline", "password1\n", false],
+		["DEL", "password\u{7F}1", false],
+	])("register: %s", (_, password, accepted) => {
+		expect(canRegister(password)).toBe(accepted);
+	});
+
+	it("register compares the raw password with its confirmation", () => {
+		const padded = "  spaced pass  ";
+
+		expect(canRegister(padded)).toBe(true);
+		expect(canRegister(padded, padded.trim())).toBe(false);
+	});
+
+	it.each([
+		["legacy Cyrillic password", "пароль-пароль", true],
+		["short legacy password", "short", true],
+		["72 bytes", "a".repeat(72), true],
+		["73 bytes", "a".repeat(73), false],
+		["36 Cyrillic letters = 72 bytes", "я".repeat(36), true],
+		["37 Cyrillic letters = 74 bytes", "я".repeat(37), false],
+		["empty", "", false],
+	])("login: %s", (_, password, accepted) => {
+		expect(canLogIn(password)).toBe(accepted);
+	});
+});

src/features/auth/model/auth.schema.ts

@@ -7,8 +7,10 @@ const EMAIL_PART_COUNT = 2;
 const ASCII_SPACE = 32;
 const ASCII_DELETE = 127;
 const MAX_EMAIL_LENGTH = 254;
-const MIN_PASSWORD_BYTES = 12;
+const MIN_PASSWORD_LENGTH = 8;
 const MAX_PASSWORD_BYTES = 72;
+// Printable ASCII keeps characters == bytes, within the bcrypt 72-byte limit.
+const ASCII_TILDE = 126;
 
 function isEmailCharacterInvalid(character: string): boolean {
 	const codePoint = character.codePointAt(0);
@@ -20,6 +22,14 @@ function isEmailCharacterInvalid(character: string): boolean {
 	);
 }
 
+function isPrintableAscii(value: string): boolean {
+	return value.split("").every((character) => {
+		const code = character.codePointAt(0) ?? 0;
+
+		return code >= ASCII_SPACE && code <= ASCII_TILDE;
+	});
+}
+
 const email = z
 	.string()
 	.trim()
@@ -33,28 +43,42 @@ const email = z
 		{ error: validationMessage("auth.validation.invalidEmail") },
 	);
 
-const password = z
+// Login stays lenient: accounts created under an older policy must still sign in.
+const loginPassword = z
 	.string()
+	.min(1)
 	.refine(
-		value =>
+		value => new TextEncoder().encode(value).length <= MAX_PASSWORD_BYTES,
-			new TextEncoder().encode(value).length >= MIN_PASSWORD_BYTES
+		{ error: validationMessage("auth.validation.passwordTooLong") },
-				&& new TextEncoder().encode(value).length <= MAX_PASSWORD_BYTES,
-		{ error: validationMessage("auth.validation.invalidPasswordLength") },
 	);
 
+const registerPassword = z
+	.string()
+	.min(MIN_PASSWORD_LENGTH, {
+		error: validationMessage("auth.validation.invalidPasswordLength"),
+	})
+	.max(MAX_PASSWORD_BYTES, {
+		error: validationMessage("auth.validation.invalidPasswordLength"),
+	})
+	.refine(isPrintableAscii, {
+		error: validationMessage("auth.validation.invalidPasswordLength"),
+	});
+
 const loginSchema = z.object({
 	email,
-	password,
+	password: loginPassword,
 	passwordConfirmation: z.string().optional(),
 });
 
-const registerSchema = loginSchema.refine(
+const registerSchema = loginSchema
-	value => value.password === value.passwordConfirmation,
+	.extend({ password: registerPassword })
-	{
+	.refine(
-		error: validationMessage("auth.validation.passwordsDoNotMatch"),
+		value => value.password === value.passwordConfirmation,
-		path: ["passwordConfirmation"],
+		{
-	},
+			error: validationMessage("auth.validation.passwordsDoNotMatch"),
-);
+			path: ["passwordConfirmation"],
+		},
+	);
 
 type AuthFormValues = z.input<typeof loginSchema>;
 

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

@@ -92,8 +92,10 @@ describe("AuthProvider", () => {
 		);
 	});
 
-	it("settles unauthenticated and clears cached data when cold-start refresh has a transport error", async () => {
+	it("settles unauthenticated and clears cached data when cold-start refresh is rejected with 401", async () => {
-		server.use(http.post("*/api/v1/auth/refresh", () => HttpResponse.error()));
+		server.use(http.post("*/api/v1/auth/refresh", () =>
+			HttpResponse.json({ code: "UNAUTHORIZED" }, { status: 401 }),
+		));
 		const queryClient = createTestQueryClient();
 		queryClient.setQueryData(["cached-query"], { value: "stale" });
 		queryClient.setQueryData(bankCardsKey, [{ id: "bank-card-1" }]);
@@ -103,12 +105,54 @@ describe("AuthProvider", () => {
 		await waitFor(() => expect(result.current.ready).toBe(true));
 
 		expect(result.current.user).toBeUndefined();
+		expect(result.current.unavailable).toBe(false);
 		expect(await requestAuthorization()).toBeNull();
 		expect(queryClient.getQueryData(["cached-query"])).toBeUndefined();
 		expect(queryClient.getQueryData(bankCardsKey)).toBeUndefined();
 	});
 
-	it("keeps the original protected 401 when serialized refresh has a transport error", async () => {
+	it.each([
+		["a transport error", () => HttpResponse.error()],
+		["a 502 from the proxy", () => new HttpResponse(null, { status: 502 })],
+		["a 503 problem", () => HttpResponse.json({ code: "INTERNAL_SERVER_ERROR" }, { status: 503 })],
+	])("settles as unavailable and keeps cached data when cold-start refresh gets %s", async (_name, failure) => {
+		server.use(http.post("*/api/v1/auth/refresh", failure));
+		const queryClient = createTestQueryClient();
+		queryClient.setQueryData(["cached-query"], { value: "kept" });
+		const wrapper: FC<PropsWithChildren> = createAuthWrapper(queryClient);
+		const { result } = renderHook(() => useAuth(), { wrapper });
+
+		await waitFor(() => expect(result.current.ready).toBe(true));
+
+		expect(result.current.user).toBeUndefined();
+		expect(result.current.unavailable).toBe(true);
+		expect(queryClient.getQueryData(["cached-query"])).toEqual({ value: "kept" });
+	});
+
+	it("restores the session when retry succeeds after an outage", async () => {
+		let isOutage = true;
+		server.use(http.post("*/api/v1/auth/refresh", () =>
+			isOutage
+				? new HttpResponse(null, { status: 502 })
+				: HttpResponse.json({
+						accessToken: "restored-token",
+						user: { email: "user@example.com", id: "user-1" },
+					}),
+		));
+		const queryClient = createTestQueryClient();
+		const wrapper: FC<PropsWithChildren> = createAuthWrapper(queryClient);
+		const { result } = renderHook(() => useAuth(), { wrapper });
+
+		await waitFor(() => expect(result.current.unavailable).toBe(true));
+		isOutage = false;
+		act(() => result.current.retry());
+
+		await waitFor(() => expect(result.current.user?.id).toBe("user-1"));
+		expect(result.current.unavailable).toBe(false);
+		expect(await requestAuthorization()).toBe("Bearer restored-token");
+	});
+
+	it("keeps the original protected 401 and the session when serialized refresh has a transport error", async () => {
 		let refreshCalls = 0;
 		server.use(
 			http.post("*/api/v1/auth/refresh", () => {
@@ -137,10 +181,11 @@ describe("AuthProvider", () => {
 		const response = await apiClient.GET("/api/v1/brokerage-accounts");
 
 		expect(response.response.status).toBe(401);
-		await waitFor(() => expect(result.current.user).toBeUndefined());
+		// An unreachable server does not prove the session ended; the next 401 refreshes again.
-		expect(await requestAuthorization()).toBeNull();
+		await waitFor(() => expect(result.current.unavailable).toBe(true));
-		expect(queryClient.getQueryData(["cached-query"])).toBeUndefined();
+		expect(result.current.user?.id).toBe("user-1");
-		expect(queryClient.getQueryData(bankCardsKey)).toBeUndefined();
+		expect(queryClient.getQueryData(["cached-query"])).toEqual({ value: "stale" });
+		expect(queryClient.getQueryData(bankCardsKey)).toEqual([{ id: "bank-card-1" }]);
 	});
 
 	it("clears connection status and financial cache independently on logout", async () => {

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

@@ -5,6 +5,9 @@ import { apiClient, configureAuthClient, type paths } from "@/shared/api";
 
 import { type User } from "./auth-context";
 
+// A 5xx or network error means the server is unreachable, not that the session ended.
+const HTTP_SERVER_ERROR = 500;
+
 type Authentication
 	= paths["/api/v1/auth/login"]["post"]["responses"][200]["content"]["application/json"];
 
@@ -32,6 +35,8 @@ function useAuthProviderVm() {
 	const accessTokenRef = useRef<string | undefined>(undefined);
 	const [ready, setReady] = useState(false);
 	const [signedOut, setSignedOut] = useState(false);
+	const [unavailable, setUnavailable] = useState(false);
+	const unavailableRef = useRef(false);
 
 	const generationRef = useRef(0);
 	const userRef = useRef<undefined | User>(undefined);
@@ -49,12 +54,18 @@ function useAuthProviderVm() {
 		return next;
 	}, []);
 
+	const markUnavailable = useCallback((isUnavailable: boolean) => {
+		unavailableRef.current = isUnavailable;
+		setUnavailable(isUnavailable);
+	}, []);
+
 	const applyAuthentication = useCallback(
 		(authentication: Authentication) => {
 			const changedIdentity
 				= userRef.current && userRef.current.id !== authentication.user.id;
 
 			setSignedOut(false);
+			markUnavailable(false);
 			accessTokenRef.current = authentication.accessToken;
 
 			if (changedIdentity) {
@@ -67,16 +78,17 @@ function useAuthProviderVm() {
 			userRef.current = authentication.user;
 			setUser(authentication.user);
 		},
-		[queryClient],
+		[markUnavailable, queryClient],
 	);
 
 	const clearSession = useCallback(() => {
+		markUnavailable(false);
 		generationRef.current += 1;
 		userRef.current = undefined;
 		setUser(undefined);
 		accessTokenRef.current = undefined;
 		queryClient.clear();
-	}, [queryClient]);
+	}, [markUnavailable, queryClient]);
 
 	const refresh = useCallback((): Promise<boolean> => {
 		if (refreshPromiseRef.current) return refreshPromiseRef.current;
@@ -86,11 +98,12 @@ function useAuthProviderVm() {
 			if (started !== generationRef.current) return false;
 
 			try {
-				const { data } = await apiClient.POST("/api/v1/auth/refresh");
+				const { data, response } = await apiClient.POST("/api/v1/auth/refresh");
 				if (started !== generationRef.current) return false;
 
 				if (!data) {
-					clearSession();
+					if (response.status >= HTTP_SERVER_ERROR) markUnavailable(true);
+					else clearSession();
 
 					return false;
 				}
@@ -100,7 +113,7 @@ function useAuthProviderVm() {
 				return true;
 			}
 			catch {
-				if (started === generationRef.current) clearSession();
+				if (started === generationRef.current) markUnavailable(true);
 
 				return false;
 			}
@@ -112,7 +125,7 @@ function useAuthProviderVm() {
 		refreshPromiseRef.current = pending;
 
 		return pending;
-	}, [applyAuthentication, clearSession, serialize]);
+	}, [applyAuthentication, clearSession, markUnavailable, serialize]);
 
 	useEffect(() => {
 		void refresh().finally(() => setReady(true));
@@ -146,6 +159,7 @@ function useAuthProviderVm() {
 			clear: clearSession,
 			generation: () => generationRef.current,
 			refresh,
+			unavailable: () => unavailableRef.current,
 		});
 	});
 	useEffect(() => () => configureAuthClient(), []);
@@ -157,7 +171,9 @@ function useAuthProviderVm() {
 		ready,
 		register: (email: string, password: string) =>
 			authenticate("/api/v1/auth/register", email, password),
+		retry: () => void refresh(),
 		signedOut,
+		unavailable,
 		user,
 	};
 

src/features/auth/ui/AuthForm/AuthForm.test.tsx

@@ -30,4 +30,79 @@ describe("AuthForm", () => {
 		await waitFor(() => expect(onSubmit).not.toHaveBeenCalled());
 		expect(await screen.findByText("Пароли не совпадают")).toBeInTheDocument();
 	});
+
+	it.each([
+		["register", "Регистрация", "Уже есть аккаунт? Войти"],
+		["login", "Вход", "Нет аккаунта? Зарегистрироваться"],
+	])("blocks the switch-auth link while %s is submitting", async (_mode, submitLabel, linkLabel) => {
+		const { promise, resolve } = Promise.withResolvers<void>();
+		const onSubmit = vi.fn(() => promise);
+		render(
+			<MantineProvider>
+				<MemoryRouter>
+					<AuthForm
+						onSubmit={onSubmit}
+						register={_mode === "register"}
+					/>
+				</MemoryRouter>
+			</MantineProvider>,
+		);
+
+		fireEvent.change(screen.getByLabelText("Email"), {
+			target: { value: "user@example.com" },
+		});
+		fireEvent.change(screen.getByLabelText("Пароль"), {
+			target: { value: "a secure password" },
+		});
+
+		if (_mode === "register") {
+			fireEvent.change(screen.getByLabelText("Подтвердите пароль"), {
+				target: { value: "a secure password" },
+			});
+		}
+
+		fireEvent.click(screen.getByRole("button", { name: submitLabel }));
+
+		await waitFor(() => expect(onSubmit).toHaveBeenCalled());
+		expect(screen.queryByRole("link", { name: linkLabel })).not.toBeInTheDocument();
+		expect(screen.getByRole("button", { name: linkLabel })).toBeDisabled();
+
+		resolve();
+		await screen.findByRole("link", { name: linkLabel });
+	});
+
+	// Register policy is 8..72 printable ASCII; login accepts legacy passwords.
+	it.each([
+		["register", "Регистрация", "пароль-пароль", false],
+		["register", "Регистрация", "passw😀rd", false],
+		["register", "Регистрация", "a".repeat(7), false],
+		["register", "Регистрация", "a".repeat(8), true],
+		["register", "Регистрация", "a".repeat(72), true],
+		["register", "Регистрация", "a".repeat(73), false],
+		["login", "Вход", "пароль-пароль", true],
+	])("%s submits password %j: %s", async (mode, submitLabel, password, submitted) => {
+		const onSubmit = vi.fn().mockResolvedValue(undefined);
+
+		render(
+			<MantineProvider>
+				<MemoryRouter>
+					<AuthForm onSubmit={onSubmit} register={mode === "register"} />
+				</MemoryRouter>
+			</MantineProvider>,
+		);
+
+		fireEvent.change(screen.getByLabelText("Email"), { target: { value: "user@example.com" } });
+		fireEvent.change(screen.getByLabelText("Пароль"), { target: { value: password } });
+
+		if (mode === "register") {
+			fireEvent.change(screen.getByLabelText("Подтвердите пароль"), { target: { value: password } });
+		}
+
+		fireEvent.click(screen.getByRole("button", { name: submitLabel }));
+
+		await waitFor(() => expect(
+			screen.queryByText(/Пароль: от 8 до 72 символов/) === null,
+		).toBe(submitted));
+		expect(onSubmit).toHaveBeenCalledTimes(submitted ? 1 : 0);
+	});
 });

src/features/auth/ui/AuthForm/AuthForm.tsx

@@ -1,4 +1,4 @@
-import type { FC } from "react";
+import type { FC, ReactNode } from "react";
 
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Alert, Button, Fieldset, PasswordInput, Stack, TextInput } from "@mantine/core";
@@ -15,7 +15,7 @@ import {
 
 type AuthFormProps = {
 	onSubmit: (email: string, password: string) => Promise<void>;
-	register?: true;
+	register?: boolean;
 };
 
 const AuthForm: FC<AuthFormProps> = (props) => {
@@ -45,6 +45,24 @@ const AuthForm: FC<AuthFormProps> = (props) => {
 	});
 
 	const to = register ? "/login" : "/register";
+	const switchLabel = t(register ? "auth.haveAccount" : "auth.noAccount");
+
+	let switchLink: ReactNode;
+
+	if (isSubmitting) {
+		switchLink = (
+			<Button aria-disabled disabled variant="subtle">
+				{switchLabel}
+			</Button>
+		);
+	}
+	else {
+		switchLink = (
+			<Button component={Link} to={to} variant="subtle">
+				{switchLabel}
+			</Button>
+		);
+	}
 
 	return (
 		<FormProvider {...methods}>
@@ -77,9 +95,7 @@ const AuthForm: FC<AuthFormProps> = (props) => {
 							{t(register ? "auth.register" : "auth.login")}
 						</Button>
 
-						<Button component={Link} to={to} variant="subtle">
+						{switchLink}
-							{t(register ? "auth.haveAccount" : "auth.noAccount")}
-						</Button>
 					</Stack>
 				</Fieldset>
 			</form>

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

@@ -78,4 +78,35 @@ describe("read-only screen synchronization", () => {
 		await act(async () => result.current.refresh());
 		await waitFor(() => expect(gets).toBe(2));
 	});
+
+	it("does not manually refetch disabled resources", async () => {
+		vi.useFakeTimers();
+		const refetch = vi.fn(() => Promise.resolve());
+
+		const resource = {
+			isEnabled: false,
+			isError: true,
+			isFetching: false,
+			queryKey: [],
+			refetch,
+		};
+
+		try {
+			const { result, unmount } = renderHook(() =>
+				useScreenSync({ screen: "accounts" }, [resource]),
+			);
+
+			await act(async () => {
+				await result.current.refresh();
+				await result.current.retry();
+			});
+			await act(() => vi.advanceTimersByTime(1_800_000));
+
+			expect(refetch).not.toHaveBeenCalled();
+			unmount();
+		}
+		finally {
+			vi.useRealTimers();
+		}
+	});
 });

src/features/tbank-connection/model/screen-sync.ts

@@ -5,6 +5,7 @@ import { useEffect, useRef } from "react";
 import type { InvestmentResourceMeta } from "@/shared/api";
 
 type ScreenResource = {
+	isEnabled: boolean;
 	isError: boolean;
 	isFetching: boolean;
 	meta?: InvestmentResourceMeta;
@@ -27,23 +28,31 @@ function useScreenSync(_scope: ScreenScope, resources: ScreenResource[]) {
 
 	useEffect(() => {
 		const timer = setInterval(() => {
-			for (const resource of resourcesRef.current)
+			for (const resource of resourcesRef.current) {
+				if (!resource.isEnabled || resource.isFetching) continue;
 				void resource.refetch().catch(() => {});
+			}
 		}, READ_INTERVAL_MS);
 
 		return () => clearInterval(timer);
 	}, []);
 
-	const isRefreshing = resources.some(resource => resource.isFetching);
+	const isRefreshing = resources.some(
+		resource => resource.isEnabled && resource.isFetching,
+	);
+
+	const eligible = resources.filter(
+		resource => resource.isEnabled && !resource.isFetching,
+	);
 
 	const refresh = async () => {
 		if (isRefreshing) return;
-		await Promise.allSettled(resources.map(resource => resource.refetch()));
+		await Promise.allSettled(eligible.map(resource => resource.refetch()));
 	};
 
 	// Retry only the HTTP read; source attempts are reported in resource metadata.
 	const retry = async () => {
-		const failed = resources.filter(resource => resource.isError);
+		const failed = eligible.filter(resource => resource.isError);
 
 		if (failed.length > 0)
 			await Promise.allSettled(failed.map(resource => resource.refetch()));

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

@@ -17,10 +17,10 @@ import {
 	useLocation,
 	useNavigate,
 } from "react-router";
-import { beforeEach, describe, expect, it, vi } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import { configureAuthClient } from "@/shared/api";
-import { defaultPeriod, formatDate } from "@/shared/lib";
+import { defaultPeriod, formatDate, moscowDate } from "@/shared/lib";
 import { createTestQueryClient } from "@/test/query";
 import { resource } from "@/test/resource";
 import { server } from "@/test/server";
@@ -72,7 +72,14 @@ function renderEvents(accountId: string, searches: string[]) {
 }
 
 describe("Upcoming event date filters", () => {
+	afterEach(() => {
+		vi.useRealTimers();
+	});
 	beforeEach(() => {
+		// Pin "today": the test picks today + 10 days, which must be inside the visible calendar grid.
+		// Real dates can push it beyond the grid (e.g. 2026-10-23 -> 2 November).
+		vi.useFakeTimers({ toFake: ["Date"] });
+		vi.setSystemTime(new Date("2026-08-10T09:00:00Z"));
 		configureAuthClient({
 			accessToken: () => "token",
 			clear: vi.fn(),
@@ -80,6 +87,8 @@ describe("Upcoming event date filters", () => {
 		});
 	});
 
+	afterEach(() => vi.useRealTimers());
+
 	it("keeps reads and sync disabled without an account scope", async () => {
 		const requests: string[] = [];
 		server.use(
@@ -229,6 +238,10 @@ describe("Upcoming event date filters", () => {
 	it.each(["account-1", "all"])(
 		"applies dates only on submit, restores URL dates, and resets from empty results for %s",
 		async (accountId) => {
+			// Pin "today" mid-month so "today + 10 days" stays in the calendar's
+			// visible month regardless of the real date.
+			vi.useFakeTimers({ toFake: ["Date"] });
+			vi.setSystemTime(new Date("2026-10-15T12:00:00+03:00"));
 			const [defaultFrom, defaultTo] = defaultPeriod();
 			const searches: string[] = [];
 			server.use(
@@ -253,37 +266,58 @@ describe("Upcoming event date filters", () => {
 			expect(from).toHaveTextContent("01.02.2026 – 28.02.2026");
 			expect(screen.getByRole("button", { name: "Применить" })).toBeDisabled();
 			expect(searches).toEqual(["?from=2026-02-01&to=2026-02-28"]);
-			fireEvent.click(from);
+
+			// The calendar opens on the applied month, so reset to the default
+			// range first, then pick today and a future date.
+			fireEvent.click(screen.getByRole("button", { name: "Сбросить" }));
+			await waitFor(() => expect(screen.getByLabelText("URL")).toBeEmptyDOMElement());
+			const picker = await screen.findByLabelText("Период");
+
+			const [today] = defaultPeriod();
+			const [year = 1970, month = 0, day = 1] = today.split("-").map(Number);
+
+			const future = moscowDate(new Date(
+				Date.UTC(year, month - 1, day + 10, 12),
+			));
+
+			// Mantine calendar labels follow dayjs default (English) locale.
+			const calendarLabel = (date: string) => {
+				const monthName = new Intl.DateTimeFormat("en", { month: "long" })
+					.format(new Date(`${date}T12:00:00Z`));
+
+				const pattern = `${Number(date.slice(8))} ${monthName} ${date.slice(0, 4)}`;
+
+				// Dates are constructed above from validated defaultPeriod output.
+				// eslint-disable-next-line security/detect-non-literal-regexp -- see comment above
+				return new RegExp(pattern, "i");
+			};
+
+			fireEvent.click(picker);
 			fireEvent.click(
-				await screen.findByRole("button", { name: /10 February 2026/i }),
+				await screen.findByRole("button", { name: calendarLabel(today) }),
 			);
 			fireEvent.click(
-				await screen.findByRole("button", { name: /28 February 2026/i }),
+				await screen.findByRole("button", { name: calendarLabel(future) }),
 			);
-			expect(searches).toHaveLength(1);
+			// The reset itself fetched the default range; picking dates applies only on submit.
+			expect(searches).toEqual([
+				"?from=2026-02-01&to=2026-02-28",
+				`?from=${defaultFrom}&to=${defaultTo}`,
+			]);
 			fireEvent.click(screen.getByRole("button", { name: "Применить" }));
 			await waitFor(() =>
-				expect(searches.at(-1)).toBe("?from=2026-02-10&to=2026-02-28"),
+				expect(searches.at(-1)).toBe(`?from=${today}&to=${future}`),
 			);
 			expect(await screen.findByLabelText("Период")).toHaveTextContent(
-				"10.02.2026 – 28.02.2026",
+				`${formatDate(today)} – ${formatDate(future)}`,
 			);
 			fireEvent.click(screen.getByRole("button", { name: "History back" }));
 			await waitFor(() =>
 				expect(screen.getByLabelText("Период")).toHaveTextContent(
-					"01.02.2026 – 28.02.2026",
+					`${formatDate(defaultFrom)} – ${formatDate(defaultTo)}`,
 				),
 			);
-			expect(screen.getByLabelText("URL")).toHaveTextContent(
+			expect(screen.getByLabelText("URL")).toBeEmptyDOMElement();
-				"?from=2026-02-01&to=2026-02-28",
-			);
-			fireEvent.click(screen.getByRole("button", { name: "Сбросить" }));
-			await waitFor(() =>
-				expect(searches.at(-1)).toBe(`?from=${defaultFrom}&to=${defaultTo}`),
-			);
-			expect(await screen.findByLabelText("Период")).toHaveTextContent(
-				`${formatDate(defaultFrom)} – ${formatDate(defaultTo)}`,
-			);
 			expect(screen.getByRole("button", { name: "Применить" })).toBeDisabled();
 			expect(
 				screen.getByText("За выбранный период событий не найдено"),

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

@@ -156,7 +156,7 @@ describe("AccountEventsPage", () => {
 		expect(screen.getAllByText(/RU000A0JX0J2$/)).toHaveLength(1);
 		expect(screen.getByText("25.08.2026")).toBeVisible();
 		expect(screen.queryByText(/Дата события/)).not.toBeInTheDocument();
-		expect(screen.getAllByText("Ожидаемая сумма")).toHaveLength(2);
+		expect(screen.getAllByText("Прогноз")).toHaveLength(2);
 		const logo = screen.queryByAltText("");
 		expect(logo).toHaveAttribute(
 			"src",
@@ -211,4 +211,30 @@ describe("AccountEventsPage", () => {
 		expect(status).toHaveAttribute("aria-busy", "true");
 		expect(within(status).queryByRole("button")).not.toBeInTheDocument();
 	});
+
+	it("keeps a null events envelope loading instead of an empty period", () => {
+		query.mockReturnValue(
+			{
+				data: null,
+				isError: false,
+				isLoading: false,
+				meta: {
+					availability: "available",
+					completeness: "complete",
+					lastAttempt: { finishedAt: null, problems: [], startedAt: null, state: "none" },
+				},
+				refetch: vi.fn(),
+			} as never,
+		);
+
+		renderPage();
+
+		expect(screen.getByRole("status", { name: "Загрузка" })).toHaveAttribute(
+			"aria-busy",
+			"true",
+		);
+		expect(
+			screen.queryByText("За выбранный период событий не найдено"),
+		).not.toBeInTheDocument();
+	});
 });

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

@@ -21,7 +21,7 @@ type AccountEventsPageViewModel
 		canApply: boolean;
 		draftPeriod: [null | string, null | string];
 		events: BrokerageEvent[];
-		maxDate: string;
+		minDate: string;
 		onApply: () => void;
 		onPeriodChange: (value: [null | string, null | string]) => void;
 		onPeriodPopoverOpen: () => void;
@@ -49,7 +49,7 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 
 	const [draftFrom, draftTo] = draftPeriod;
 
-	const [maxDate, setMaxDate] = useState(() => moscowDate(new Date()));
+	const [minDate, setMinDate] = useState(() => moscowDate(new Date()));
 
 	const scope = JSON.stringify([accountId, appliedFrom, appliedTo]);
 	const [previousScope, setPreviousScope] = useState(scope);
@@ -105,7 +105,7 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 			&& isValidPeriod(draftFrom, draftTo),
 		draftPeriod,
 		events: events.data.events,
-		maxDate,
+		minDate,
 		onApply: () => {
 			if (!isValidPeriod(draftFrom, draftTo)) return;
 			setSearchParameters({
@@ -116,7 +116,7 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 		onPeriodChange: value => setDraftPeriod(
 			value[0] === null && value[1] === null ? defaultPeriod() : value,
 		),
-		onPeriodPopoverOpen: () => setMaxDate(moscowDate(new Date())),
+		onPeriodPopoverOpen: () => setMinDate(moscowDate(new Date())),
 		onReset,
 		partial: events.meta?.completeness === "incomplete",
 		source: events.meta,

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

@@ -72,7 +72,7 @@ const AccountEventsPageLoaded: FC<AccountEventsPageLoadedProps> = (props) => {
 					clearable
 					clearButtonProps={{ "aria-label": t("ledger.clearPeriod") }}
 					label={t("ledger.period")}
-					maxDate={props.maxDate}
+					minDate={props.minDate}
 					onChange={props.onPeriodChange}
 					popoverProps={{
 						middlewares: { shift: { crossAxis: true } },

src/pages/account-income/model/display.test.ts

@@ -2,168 +2,25 @@ import { describe, expect, it } from "vitest";
 
 import type { IncomeAnalytics } from "@/entities/income";
 
-import { resource } from "@/test/resource";
-
 import { toIncomeDisplayModel } from "./display";
 
-const analytics: IncomeAnalytics = {
+describe("income payments display", () => {
-	accountId: "account-1",
+	it("keeps repeated IDs, order and logo revisions without reconstructing financial data", () => {
-	bucketGranularity: "day",
+		const payment = {
-	buckets: [],
+			id: "same",
-	calculatedAt: "2026-08-27T00:00:00Z",
+			instrumentKey: "bond:RUB",
-	entries: [],
+			logoName: null,
-	instruments: [],
+		} as IncomeAnalytics["entries"][number];
-	period: { from: "2026-08-01", to: "2026-08-27" },
-	previous: {
-		period: { from: "2026-07-01", to: "2026-07-31" },
-		totalsByCurrency: [comparison("RUB")],
-	},
-	totalsByCurrency: [],
-	yearComparison: null,
-};
 
-function comparison(currency: string) {
+		const analytics = {
-	return {
+			entries: [payment, payment, { ...payment, logoName: "bond.png" }],
-		compared: summary(currency, "1", "0"),
+		} as IncomeAnalytics;
-		currency,
-		difference: summary(currency, "9", "2"),
-		selected: summary(currency, "10", "2"),
-	};
-}
 
-function money(currency: string, value: string) {
+		const display = toIncomeDisplayModel(analytics);
-	return { currency, value };
-}
 
-function summary(currency: string, coupon: string, dividend: string) {
+		expect(display.entries.map(({ operation }) => operation)).toEqual(
-	return {
+			analytics.entries,
-		coupon: money(currency, coupon),
-		currency,
-		dividend: money(currency, dividend),
-		total: money(currency, String(Number(coupon) + Number(dividend))),
-	};
-}
-
-describe("income comparison display", () => {
-	it.each([
-		["25", "100", "+25 %"],
-		["-25", "100", "-25 %"],
-		["0", "100", "0 %"],
-		["-0.000", "100", "0 %"],
-		["0.0001", "100", "0 %"],
-		["1", "3", "+33,3 %"],
-		["0.01", "0.04", "+25 %"],
-		["123456789012345678.123456789", "123456789012345678.123456789", "+100 %"],
-		[
-			"10",
-			"0",
-			null,
-		],
-		[
-			"0",
-			"0",
-			null,
-		],
-		[
-			"10",
-			"-0.00",
-			null,
-		],
-		[
-			"10",
-			"-100",
-			null,
-		],
-		[
-			"9".repeat(400),
-			"1",
-			null,
-		],
-		[
-			"1",
-			"9".repeat(400),
-			null,
-		],
-	])("formats change %s against base %s", (difference, base, expected) => {
-		const value = comparison("RUB");
-		value.difference.coupon = money("RUB", difference);
-		value.compared.coupon = money("RUB", base);
-
-		const display = toIncomeDisplayModel({
-			...analytics,
-			yearComparison: {
-				period: { from: "2025-08-01", to: "2025-08-27" },
-				totalsByCurrency: [value],
-			},
-		});
-
-		const result = display?.comparison?.values[0];
-		expect(
-			result?.percentages.coupon?.replaceAll("\u{A0}", " ")
-
-			?? null,
-		).toBe(expected);
-		expect(result?.difference.coupon.value).toBe(difference);
-		expect(result?.compared.coupon.value).toBe(base);
-	});
-
-	it("formats calendar ranges across years and preserves separate currencies", () => {
-		const display = toIncomeDisplayModel({
-			...analytics,
-			period: { from: "2025-12-01", to: "2026-01-09" },
-			yearComparison: {
-				period: { from: "2024-12-01", to: "2025-01-09" },
-				totalsByCurrency: [comparison("RUB"), comparison("USD")],
-			},
-		});
-
-		expect(display?.comparison?.selectedPeriod.replaceAll(/\s/g, " ")).toBe(
-			"01.12.2025 – 09.01.2026",
 		);
-		expect(display?.comparison?.comparedPeriod.replaceAll(/\s/g, " ")).toBe(
+		expect(new Set(display.entries.map(({ key }) => key)).size).toBe(3);
-			"01.12.2024 – 09.01.2025",
-		);
-		expect(display?.comparison?.values.map(value => value.currency)).toEqual([
-			"RUB",
-			"USD",
-		]);
 	});
 });
-
-it("maps comparison notices by role regardless of dependency order or resource key", () => {
-	const selected = { ...resource(analytics).meta, role: "selected" as const };
-
-	const previous
-		= {
-			...resource(null).meta,
-			lastAttempt: {
-				finishedAt: "2026-08-14T00:01:00Z",
-				problems: [],
-				startedAt: "2026-08-14T00:00:00Z",
-				state: "failed" as const,
-			},
-			resourceKey: "opaque/year-looking-key",
-			role: "previous" as const,
-		};
-
-	const year = {
-		...resource(null).meta,
-		resourceKey: "opaque/previous-looking-key",
-		role: "year" as const,
-		unavailableReason: "CALENDAR_OR_ACCOUNT_HISTORY",
-	};
-
-	for (const dependencies of [
-		[selected, previous, year],
-		[year, selected, previous],
-	]) {
-		const display = toIncomeDisplayModel(analytics, {
-			...resource(analytics).meta,
-			dependencies,
-		});
-
-		expect(display?.previousNotice).toBe("comparisonFailed");
-		expect(display?.yearNotice).toBe("yearUnavailable");
-		expect(display?.previousComparison).not.toBeNull();
-	}
-});

src/pages/account-income/model/display.ts

@@ -1,102 +1,11 @@
-import type { IncomeAnalytics, IncomeAnalyticsMeta } from "@/entities/income";
+import type { IncomeAnalytics } from "@/entities/income";
-
-import { formatDate } from "@/shared/lib";
-
-import type { IncomePeriod } from "./period";
-
-type ComparisonNotice
-	= | "comparisonFailed"
-		| "comparisonPending"
-		| "previousUnavailable"
-		| "yearUnavailable";
 
 type IncomeDisplayModel = {
-	comparison: null
-		| {
-			comparedPeriod: string;
-			selectedPeriod: string;
-			values: (NonNullable<
-				IncomeAnalytics["yearComparison"]
-			>["totalsByCurrency"][number] & {
-				percentages: Record<"coupon"
-				| "dividend"
-				| "total", null | string>;
-			})[];
-		};
 	entries: { key: string; operation: IncomeAnalytics["entries"][number] }[];
-	previousComparison: IncomeDisplayModel["comparison"];
-	previousNotice: ComparisonNotice;
-	yearNotice: ComparisonNotice;
 };
 
-function comparisonDisplay(
-	period: IncomePeriod,
-	comparison: IncomeAnalytics["yearComparison"],
-): IncomeDisplayModel["comparison"] {
-	if (!comparison)
-		return null;
-
-	return {
-		comparedPeriod: formatComparisonPeriod(comparison.period),
-		selectedPeriod: formatComparisonPeriod(period),
-		values: comparison.totalsByCurrency.map(value => ({
-			...value,
-			percentages: {
-				coupon: formatIncomeChange(
-					value.difference.coupon.value,
-					value.compared.coupon.value,
-				),
-				dividend: formatIncomeChange(
-					value.difference.dividend.value,
-					value.compared.dividend.value,
-				),
-				total: formatIncomeChange(
-					value.difference.total.value,
-					value.compared.total.value,
-				),
-			},
-		})),
-	};
-}
-
-function comparisonNotice(
-	dependency:
-		IncomeAnalyticsMeta["dependencies"][number] | undefined,
-	unavailable: "previousUnavailable" | "yearUnavailable",
-): ComparisonNotice {
-	if (!dependency || dependency.unavailableReason) return unavailable;
-
-	return dependency.lastAttempt.state === "failed"
-		? "comparisonFailed"
-		: "comparisonPending";
-}
-
-function formatComparisonPeriod(period: IncomePeriod): string {
-	return `${formatDate(period.from)} – ${formatDate(period.to)}`;
-}
-
-function formatIncomeChange(
-	difference: string,
-	compared: string,
-): null | string {
-	// Display-only ratio; server-provided Money values remain exact decimal strings.
-	const base = Number(compared);
-	if (!Number.isFinite(base) || base <= 0)
-		return null;
-	const ratio = Number(difference) / base;
-	if (!Number.isFinite(ratio))
-		return null;
-
-	return new Intl.NumberFormat("ru-RU", {
-		maximumFractionDigits: 1,
-		signDisplay: "exceptZero",
-		style: "percent",
-	}).format(ratio);
-}
-
 function toIncomeDisplayModel(
 	analytics: IncomeAnalytics,
-	meta?: IncomeAnalyticsMeta,
 ): IncomeDisplayModel {
 	const entries: IncomeDisplayModel["entries"] = [];
 	const occurrences = new Map<string, number>();
@@ -116,17 +25,7 @@ function toIncomeDisplayModel(
 		});
 	}
 
-	const dependencies = meta?.dependencies ?? [];
+	return { entries };
-	const previous = dependencies.find(({ role }) => role === "previous");
-	const year = dependencies.find(({ role }) => role === "year");
-
-	return {
-		comparison: comparisonDisplay(analytics.period, analytics.yearComparison),
-		entries,
-		previousComparison: comparisonDisplay(analytics.period, analytics.previous),
-		previousNotice: comparisonNotice(previous, "previousUnavailable"),
-		yearNotice: comparisonNotice(year, "yearUnavailable"),
-	};
 }
 
 export { type IncomeDisplayModel, toIncomeDisplayModel };

src/pages/account-income/ui/AccountIncomePage/AccountIncomePage.module.css

@@ -22,123 +22,6 @@
 	min-width: 0;
 }
 
-.comparison {
-	container-type: inline-size;
-}
-
-.comparisonGrid {
-	display: grid;
-	grid-template-columns: minmax(0, 1fr);
-	gap: var(--mantine-spacing-sm);
-}
-
-.comparisonPanel {
-	min-width: 0;
-	padding: var(--mantine-spacing-md);
-	border-radius: var(--mantine-radius-md);
-	border-top: 3px solid var(--mantine-color-gray-4);
-	background: var(--mantine-color-gray-0);
-}
-
-.comparisonPanel[data-kind="selected"] {
-	border-color: var(--mantine-color-blue-6);
-	background: var(--mantine-color-blue-0);
-}
-
-.comparisonPanel[data-tone="positive"] {
-	border-color: var(--mantine-color-green-8);
-	background: var(--mantine-color-green-0);
-}
-
-.comparisonPanel[data-tone="negative"] {
-	border-color: var(--mantine-color-red-8);
-	background: var(--mantine-color-red-0);
-}
-
-.comparisonLabel,
-.comparisonValues dt {
-	color: var(--mantine-color-gray-7);
-}
-
-.comparisonValues {
-	margin: var(--mantine-spacing-md) 0 0;
-	font-size: var(--mantine-font-size-sm);
-}
-
-.comparisonValues dd {
-	min-width: 0;
-	margin: 0;
-	font-weight: 600;
-	font-variant-numeric: tabular-nums;
-	overflow-wrap: anywhere;
-}
-
-.comparisonTotal {
-	margin-bottom: var(--mantine-spacing-md);
-	padding-bottom: var(--mantine-spacing-md);
-	border-bottom: 1px solid var(--mantine-color-gray-3);
-}
-
-.comparisonTotal dd {
-	margin-top: 4px;
-	font-size: var(--mantine-h2-font-size);
-	line-height: 1.3;
-	font-weight: 700;
-	letter-spacing: -0.025em;
-}
-
-.comparisonValues dd[data-tone="positive"] {
-	color: color-mix(
-		in srgb,
-		var(--mantine-color-green-9) 85%,
-		var(--mantine-color-black)
-	);
-}
-
-.comparisonValues dd[data-tone="negative"] {
-	color: var(--mantine-color-red-9);
-}
-
-.comparisonValues dd[data-tone="neutral"] {
-	color: var(--mantine-color-gray-7);
-}
-
-.comparisonPanel[data-kind="selected"] .comparisonTotal dd {
-	color: var(--mantine-color-blue-8);
-}
-
-.comparisonDetail {
-	display: flex;
-	flex-wrap: wrap;
-	justify-content: space-between;
-	gap: 4px var(--mantine-spacing-xs);
-	margin-top: var(--mantine-spacing-xs);
-}
-
-.comparisonPercent {
-	display: inline-block;
-	margin-left: var(--mantine-spacing-xs);
-	padding: 2px 6px;
-	border-radius: var(--mantine-radius-sm);
-	background: var(--mantine-color-white);
-	font-size: var(--mantine-font-size-xs);
-	font-weight: 600;
-	line-height: 1.5;
-	letter-spacing: normal;
-	vertical-align: middle;
-}
-
-.comparisonNotice {
-	background: var(--mantine-color-gray-0);
-	border-left: 3px solid var(--mantine-color-gray-4);
-}
-
-@container (min-width: 42em) {
-	.comparisonGrid {
-		grid-template-columns: repeat(3, minmax(0, 1fr));
-	}
-}
-
 @media (max-width: 35.999em) {
 	.fields {
 		grid-template-columns: minmax(0, 1fr);

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

@@ -72,23 +72,9 @@ const analytics
 			},
 		],
 		period: { from: "2026-08-01", to: "2026-08-27" },
-		previous: {
-			period: { from: "2026-07-01", to: "2026-07-31" },
-			totalsByCurrency: [comparison("RUB")],
-		},
 		totalsByCurrency: [summary("RUB", "10", "2")],
-		yearComparison: null,
 	} satisfies IncomeAnalytics & { instruments: [unknown] };
 
-function comparison(currency: string) {
-	return {
-		compared: summary(currency, "1", "0"),
-		currency,
-		difference: summary(currency, "9", "2"),
-		selected: summary(currency, "10", "2"),
-	};
-}
-
 function entry(): IncomeAnalytics["entries"][number] {
 	return {
 		accruedInterest: null,
@@ -328,6 +314,24 @@ describe("AccountIncomePage", () => {
 		).not.toBeInTheDocument();
 	});
 
+	it("keeps a null analytics envelope loading instead of an empty page", async () => {
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
+				HttpResponse.json(resource(null)),
+			),
+		);
+		renderPage();
+		expect(
+			await screen.findByRole("status", { name: "Загрузка" }, { timeout: 4000 }),
+		).toBeVisible();
+		expect(
+			screen.queryByRole("heading", { name: "Пассивный доход" }),
+		).not.toBeInTheDocument();
+		expect(
+			screen.queryByRole("button", { name: "Повторить" }),
+		).not.toBeInTheDocument();
+	});
+
 	it("renders the signed drill-down using opaque membership rather than instrument identity", async () => {
 		const response
 			= {
@@ -372,19 +376,11 @@ describe("AccountIncomePage", () => {
 		expect(within(panel).getByText("−2 ₽")).toBeInTheDocument();
 	});
 
-	it("renders realized text and comparisons without subscribing to events", async () => {
+	it("renders realized income without comparison blocks or event requests", async () => {
 		const eventsRequest = vi.fn(() => new HttpResponse(null, { status: 503 }));
 		server.use(
 			http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
-				HttpResponse.json(
+				HttpResponse.json(resource(analytics)),
-					resource({
-						...analytics,
-						yearComparison: {
-							period: { from: "2025-08-01", to: "2025-08-27" },
-							totalsByCurrency: [comparison("RUB")],
-						},
-					}),
-				),
 			),
 			http.get("*/api/v1/brokerage-accounts/account-1/events", eventsRequest),
 		);
@@ -399,72 +395,9 @@ describe("AccountIncomePage", () => {
 		expect(screen.queryByText("Динамика")).not.toBeInTheDocument();
 		expect(eventsRequest).not.toHaveBeenCalled();
 		expect(screen.getByRole("region", { name: "Выплаты" })).toBeInTheDocument();
-		const year = screen.getByRole("region", { name: "Годом ранее" });
+		expect(screen.queryByText("Предыдущий период")).not.toBeInTheDocument();
-
+		expect(screen.queryByText("Годом ранее")).not.toBeInTheDocument();
-		const selected = within(year).getByRole("region", {
+		expect(screen.queryByText(/Сравнение с/)).not.toBeInTheDocument();
-			name: "01.08.2026 – 27.08.2026",
-		});
-
-		expect(
-			screen.getByRole("region", { name: "01.08.2025 – 27.08.2025" }),
-		).toBeInTheDocument();
-		expect(
-			screen.getByRole("heading", { name: "Предыдущий период" }),
-		).toBeVisible();
-		expect(screen.queryByText("Выбранный период")).not.toBeInTheDocument();
-		expect(screen.queryByText("Сравниваемый период")).not.toBeInTheDocument();
-		expect(
-			screen.getByRole("heading", { level: 2, name: "Годом ранее" }),
-		).toBeInTheDocument();
-		expect(screen.queryByText("Сравнения")).not.toBeInTheDocument();
-		expect(screen.queryByText("RUB", { exact: true })).not.toBeInTheDocument();
-
-		for (const amount of ["10 ₽", "2 ₽", "12 ₽"]) {
-			expect(within(selected).getByText(amount)).toBeInTheDocument();
-		}
-
-		const difference = within(year).getByRole("region", { name: "Разница" });
-
-		for (const amount of ["+9 ₽", "+2 ₽", "+11 ₽"]) {
-			expect(within(difference).getByText(amount)).toBeInTheDocument();
-		}
-
-		expect(within(difference).getByText("+900 %")).toBeInTheDocument();
-		expect(within(difference).getByText("+1 100 %")).toBeInTheDocument();
-		expect(within(difference).queryByText("нет базы")).not.toBeInTheDocument();
-		expect(within(difference).getAllByText(/%$/)).toHaveLength(2);
-		expect(
-			// eslint-disable-next-line testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
-			within(difference).getByText("+2 ₽").closest("dd"),
-		).toHaveTextContent(/^\+2 ₽$/);
-	});
-
-	it("shows the unavailable year state without falling back to the previous period", async () => {
-		const dependencies = [
-			{ ...resource(analytics).meta, role: "selected" as const },
-			{ ...resource(analytics).meta, role: "previous" as const },
-			{
-				...resource(null).meta,
-				role: "year" as const,
-				unavailableReason: "CALENDAR_OR_ACCOUNT_HISTORY",
-			},
-		];
-
-		server.use(
-			http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
-				HttpResponse.json(resource(analytics, { dependencies })),
-			),
-		);
-		renderPage();
-		expect(
-			await screen.findByText("Сравнение с годом ранее недоступно."),
-		).toBeInTheDocument();
-		expect(
-			screen.queryByRole("region", { name: "Годом ранее" }),
-		).not.toBeInTheDocument();
-		expect(
-			screen.getByRole("region", { name: "Предыдущий период" }),
-		).toBeVisible();
 	});
 
 	it("shows a quiet realized error", async () => {
@@ -748,120 +681,3 @@ describe("income period and snapshot boundary", () => {
 		expect(screen.queryByRole("button")).not.toBeInTheDocument();
 	});
 });
-
-it.each([false, true])(
-	"shows unavailable comparisons for absent roles without positional fallback (legacy=%s)",
-	async (legacy) => {
-		server.use(
-			http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
-				HttpResponse.json(
-
-					resource(
-						{ ...analytics, previous: null, yearComparison: null },
-						{
-							dependencies: legacy
-								? [
-										resource(null).meta,
-										resource(null).meta,
-										resource(null).meta,
-									]
-								: [],
-						},
-					),
-				),
-			),
-		);
-		renderPage();
-		expect(
-			await screen.findByText("Сравнение с предыдущим периодом недоступно."),
-		).toBeVisible();
-		expect(
-			screen.getByText("Сравнение с годом ранее недоступно."),
-		).toBeVisible();
-		expect(
-			screen.queryByText("Период сравнения ещё не загружен полностью."),
-		).not.toBeInTheDocument();
-		expect(screen.getByRole("region", { name: "Выплаты" })).toBeVisible();
-	},
-);
-
-it("shows selected income before comparison coverage without inventing a zero baseline", async () => {
-	const dependencies = (["year", "selected", "previous"] as const).map(
-
-		role =>
-			({
-				...resource(role === "selected" ? analytics : null).meta,
-				role,
-			}),
-	);
-
-	server.use(
-		http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
-			HttpResponse.json(
-
-				resource(
-					{ ...analytics, previous: null, yearComparison: null },
-					{ dependencies },
-				),
-			),
-		),
-	);
-	renderPage();
-	expect(await screen.findByRole("region", { name: "Выплаты" })).toBeVisible();
-	expect(
-		screen.queryByRole("region", { name: "Год назад" }),
-	).not.toBeInTheDocument();
-	expect(screen.getAllByText("12 ₽").length).toBeGreaterThan(0);
-	expect(
-		screen.getAllByText("Период сравнения ещё не загружен полностью."),
-	).toHaveLength(2);
-	expect(
-		screen.queryByText("Сравнение с годом ранее недоступно."),
-	).not.toBeInTheDocument();
-	expect(
-		screen.queryByRole("region", { name: "Разница" }),
-	).not.toBeInTheDocument();
-	expect(screen.getByLabelText("Период")).toBeVisible();
-});
-
-it("keeps complete previous comparison while year source failed without inventing its amounts", async () => {
-	const dependencies = [
-		{
-			...resource(analytics).meta,
-			role: "previous" as const,
-
-		},
-		{
-			...resource(null).meta,
-			lastAttempt: {
-				finishedAt: "2026-08-14T00:01:00Z",
-				problems: [],
-				startedAt: "2026-08-14T00:00:00Z",
-				state: "failed" as const,
-			},
-			role: "year" as const,
-		},
-		{
-			...resource(analytics).meta,
-			role: "selected" as const,
-		},
-	];
-
-	server.use(
-		http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
-			HttpResponse.json(resource(analytics, { dependencies })),
-		),
-	);
-	renderPage();
-	expect(
-		await screen.findByRole("region", { name: "Предыдущий период" }),
-	).toBeVisible();
-	expect(
-		screen.getByText(
-			"Не удалось загрузить период сравнения. Повторите обновление.",
-		),
-	).toBeVisible();
-	expect(
-		screen.queryByRole("region", { name: "Годом ранее" }),
-	).not.toBeInTheDocument();
-});

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

@@ -91,7 +91,7 @@ const useAccountIncomePageViewModel = (): AccountIncomePageViewModel => {
 			? { period, state: "error" }
 			: { state: "loading" };
 
-	const display = toIncomeDisplayModel(analytics.data, analytics.meta);
+	const display = toIncomeDisplayModel(analytics.data);
 
 	const onSubmit = (values: IncomeForm) => {
 		const from = parseDraftDate(values.from);

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

@@ -12,7 +12,6 @@ import { useTranslation } from "react-i18next";
 import type { AccountIncomePageViewModel } from "../AccountIncomePage.vm";
 
 import classes from "../AccountIncomePage.module.css";
-import { IncomeComparisons } from "./IncomeComparisons.view";
 import { IncomePayments } from "./IncomePayments.view";
 import { IncomePeriodForm } from "./IncomePeriodForm/IncomePeriodForm.view";
 import { IncomeSummary } from "./IncomeSummary.view";
@@ -54,18 +53,6 @@ const AccountIncomePageLoaded: FC<LoadedProps> = (props) => {
 
 			<Alert color="blue">{t("income.taxBoundary")}</Alert>
 
-			<IncomeComparisons
-				comparison={display.previousComparison}
-				notice={t(`income.${display.previousNotice}`)}
-				title={t("income.previousPeriod")}
-			/>
-
-			<IncomeComparisons
-				comparison={display.comparison}
-				notice={t(`income.${display.yearNotice}`)}
-				title={t("income.yearAgo")}
-			/>
-
 			<IncomePayments entries={display.entries} />
 		</Stack>
 	);

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

@@ -1,167 +0,0 @@
-import type { FC } from "react";
-
-import { Paper, Stack, Text, Title } from "@mantine/core";
-import { useTranslation } from "react-i18next";
-
-import { formatMoney } from "@/shared/lib";
-
-import type { IncomeDisplayModel } from "../../../model/display";
-
-import classes from "../AccountIncomePage.module.css";
-
-type ComparisonProps = NonNullable<IncomeDisplayModel["comparison"]> & {
-	title: string;
-};
-
-type ComparisonValuesProps = {
-	kind: "compared"
-		| "difference"
-		| "selected";
-	label: string;
-	percentages?: ComparisonProps["values"][number]["percentages"];
-	values: ComparisonProps["values"][number]["selected"];
-};
-
-type IncomeComparisonsProps = {
-	comparison: IncomeDisplayModel["comparison"];
-	notice: string;
-	title: string;
-};
-
-const IncomeComparisons: FC<IncomeComparisonsProps> = (props) => {
-	return (
-		<Stack>
-			<Title order={2}>{props.title}</Title>
-
-			{props.comparison
-				? <Comparison {...props.comparison} title={props.title} />
-				: (
-						<Paper className={classes.comparisonNotice} p="sm" radius="md">
-							<Text aria-live="polite" c="gray.7" role="status" size="sm">
-								{props.notice}
-							</Text>
-						</Paper>
-					)}
-		</Stack>
-	);
-};
-
-const Comparison: FC<ComparisonProps> = (props) => {
-	const { t } = useTranslation();
-
-	return (
-		<section aria-label={props.title} className={classes.comparison}>
-			<Stack gap="md">
-				{props.values.map(value => (
-					<Stack
-						aria-label={value.currency}
-						gap="xs"
-						key={value.currency}
-						role="group"
-					>
-						<div className={classes.comparisonGrid}>
-							<ComparisonValues
-								kind="selected"
-								label={props.selectedPeriod}
-								values={value.selected}
-							/>
-
-							<ComparisonValues
-								kind="compared"
-								label={props.comparedPeriod}
-								values={value.compared}
-							/>
-
-							<ComparisonValues
-								kind="difference"
-								label={t("income.difference")}
-								percentages={value.percentages}
-								values={value.difference}
-							/>
-						</div>
-					</Stack>
-				))}
-
-				{props.values.length === 0 && (
-					<Text c="gray.7" size="sm">
-						{t("income.comparisonEmpty")}
-					</Text>
-				)}
-			</Stack>
-		</section>
-	);
-};
-
-const ComparisonValues: FC<ComparisonValuesProps> = (props) => {
-	const { t } = useTranslation();
-
-	const data_tone
-		= props.kind === "difference"
-			? differenceTone(props.values.total.value)
-			: undefined;
-
-	return (
-		<section
-			aria-label={props.label}
-			className={classes.comparisonPanel}
-			data-kind={props.kind}
-			data-tone={data_tone}
-		>
-			<Text className={classes.comparisonLabel} fw={600} size="sm">
-				{props.label}
-			</Text>
-
-			<dl className={classes.comparisonValues}>
-				{(["total", "coupon", "dividend"] as const).map((key) => {
-					const money
-						// eslint-disable-next-line security/detect-object-injection -- This lookup uses a fixed typed key set, not an arbitrary external property name.
-						= props.values[key];
-
-					const percentage
-						// eslint-disable-next-line security/detect-object-injection -- This lookup uses a fixed typed key set, not an arbitrary external property name.
-						= props.percentages?.[key];
-
-					const tone
-						= props.kind === "difference"
-							? differenceTone(money.value)
-							: undefined;
-
-					const appearanceClass
-						= key === "total"
-							? classes.comparisonTotal
-							: classes.comparisonDetail;
-
-					return (
-						<div className={appearanceClass} key={key}>
-							<dt>{t(`income.${key}`)}</dt>
-
-							<dd data-tone={tone}>
-								<span>
-									{tone === "positive" ? "+" : ""}
-
-									{formatMoney(money)}
-								</span>
-
-								{!!percentage && (
-									<span className={classes.comparisonPercent}>
-										{percentage}
-									</span>
-								)}
-							</dd>
-						</div>
-					);
-				})}
-			</dl>
-		</section>
-	);
-};
-
-function differenceTone(value: string): "negative"
-	| "neutral"
-	| "positive" {
-	if (!/[1-9]/.test(value)) return "neutral";
-
-	return value.startsWith("-") ? "negative" : "positive";
-}
-
-export { IncomeComparisons };

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

@@ -1,6 +1,6 @@
 import type { FC, SubmitEventHandler } from "react";
 
-import { Button, Paper, Stack, Text } from "@mantine/core";
+import { Button, Stack } from "@mantine/core";
 import { DatePickerInput } from "@mantine/dates";
 
 import classes from "../../AccountIncomePage.module.css";
@@ -27,15 +27,8 @@ const IncomePeriodForm: FC<IncomePeriodFormProps> = (props) => {
 	} = useIncomePeriodFormVm();
 
 	return (
-		<Paper
+		<form onSubmit={props.onSubmit}>
-			component="form"
-			onSubmit={props.onSubmit}
-			p="md"
-			radius="md"
-			withBorder
-		>
 			<Stack gap="sm">
-				<Text fw={700}>{t("income.period")}</Text>
 
 				<div className={classes.fields}>
 					<DatePickerInput
@@ -71,7 +64,7 @@ const IncomePeriodForm: FC<IncomePeriodFormProps> = (props) => {
 					</Button>
 				</div>
 			</Stack>
-		</Paper>
+		</form>
 	);
 };
 

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

@@ -492,6 +492,20 @@ describe("AccountOperationsPage", () => {
 			}),
 		).toBeInTheDocument();
 	});
+
+	it("keeps a null operations envelope loading instead of a confirmed empty period", async () => {
+		configureTestAuth();
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/operations", () =>
+				HttpResponse.json(resource(null)),
+			),
+		);
+		renderPage();
+		expect(
+			await screen.findByRole("status", { name: "Загрузка" }, { timeout: 4000 }),
+		).toBeVisible();
+		expect(screen.queryByText("Операций нет")).not.toBeInTheDocument();
+	});
 });
 
 it("keeps UTC operation boundaries in GET and source sync requests", async () => {

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

@@ -2,9 +2,19 @@ import { describe, expect, it } from "vitest";
 
 import type { Portfolio } from "@/entities/portfolio";
 
-import { toAccountPagePositionSections } from "./positions";
+import {
+	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,
@@ -82,6 +92,8 @@ 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 %",
@@ -95,6 +107,8 @@ describe("account position sections", () => {
 					{
 						displayName: "Облигация",
 						logoSrc: null,
+						returnPercent: "-11.111111",
+						returnPercentText: "-11,11 %",
 						returnText: "-5 ₽",
 						returnTone: "negative",
 						shareText: "33,3 %",
@@ -107,6 +121,8 @@ describe("account position sections", () => {
 					{
 						displayName: "Фонд",
 						logoSrc: null,
+						returnPercent: null,
+						returnPercentText: null,
 						returnText: null,
 						returnTone: undefined,
 						shareText: null,
@@ -187,3 +203,109 @@ 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: "currency mismatch",
+			overrides: { averagePurchasePrice: { currency: "USD", value: "280" } },
+		},
+		{ 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 by currency", () => {
+		const result = toUnrealizedReturns([
+			makePosition({ absoluteReturn: { currency: "RUB", value: "0.1" } }),
+			makePosition({ absoluteReturn: { currency: "RUB", value: "0.2" } }),
+			makePosition({ absoluteReturn: { currency: "USD", value: "-2.5" } }),
+		]);
+
+		expect(result).toEqual([
+			{ currency: "RUB", value: "0.3" },
+			{ currency: "USD", value: "-2.5" },
+		]);
+	});
+
+	it("omits only currencies with incomplete returns", () => {
+		const result = toUnrealizedReturns([
+			makePosition({ absoluteReturn: { currency: "RUB", value: "10" } }),
+			makePosition({
+				absoluteReturn: null,
+				currentValue: { currency: "RUB", value: "100" },
+			}),
+			makePosition({ absoluteReturn: { currency: "USD", value: "2" } }),
+		]);
+
+		expect(result).toEqual([{ currency: "USD", value: "2" }]);
+	});
+});

src/pages/account/model/positions.ts

@@ -1,9 +1,11 @@
 import { formatShare, type Portfolio } from "@/entities/portfolio";
-import { formatMoney, instrumentLogoUrl } from "@/shared/lib";
+import { formatDecimal, formatMoney, instrumentLogoUrl } 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;
@@ -21,10 +23,73 @@ type AccountPagePositionSection = {
 
 type AccountPageReturnTone = "negative" | "positive";
 
+type Decimal = { scale: number; value: bigint };
+
+type Money = NonNullable<Portfolio["positions"][number]["absoluteReturn"]>;
+
 type PositionSectionKind = "bonds"
 	| "other"
 	| "stocks";
 
+const RADIX = 10n;
+const DECIMAL_PARTS = 2;
+const PERCENT_SCALE = 6;
+const DISPLAY_PERCENT_SCALE = 2;
+const PERCENT_FACTOR = 100n;
+const ROUNDING_FACTOR = 2n;
+
+function decimalFromString(value: string): Decimal {
+	const [whole = "0", fraction = ""] = value.split(".", DECIMAL_PARTS);
+
+	return { scale: fraction.length, value: BigInt(`${whole}${fraction}`) };
+}
+
+function decimalToString(decimal: Decimal): string {
+	const sign = decimal.value < 0n ? "-" : "";
+
+	const digits = (decimal.value < 0n ? -decimal.value : decimal.value)
+		.toString()
+		.padStart(decimal.scale + 1, "0");
+
+	const whole = decimal.scale
+		? digits.slice(0, -decimal.scale)
+		: digits;
+
+	let fraction = decimal.scale ? digits.slice(-decimal.scale) : "";
+
+	while (fraction.endsWith("0")) fraction = fraction.slice(0, -1);
+
+	const suffix = fraction ? `.${fraction}` : "";
+
+	return `${sign}${whole}${suffix}`;
+}
+
+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[] {
@@ -67,6 +132,53 @@ 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 sumDecimals(values: Decimal[]): Decimal {
+	const scale = Math.max(...values.map(value => value.scale));
+
+	const sum = values.reduce(
+		(total, value) => total
+			+ value.value * RADIX ** BigInt(scale - value.scale),
+		0n,
+	);
+
+	return { scale, value: sum };
+}
+
 function toAccountPagePositionSections(
 	portfolio: Portfolio,
 ): AccountPagePositionSection[] {
@@ -111,6 +223,8 @@ function toPosition(
 	const returnPrefix
 		= isExpanded && returnValue !== null && returnValue > 0 ? "+" : "";
 
+	const percent = returnPercent(position);
+
 	return {
 		...position,
 		instrumentTo:
@@ -120,6 +234,10 @@ function toPosition(
 		logoSrc: isExpanded
 			? instrumentLogoUrl(position.logoName)
 			: null,
+		returnPercent: percent,
+		returnPercentText: percent
+			? `${formatDecimal(formatPositionReturnPercent(percent))} %`
+			: null,
 		returnText: position.absoluteReturn
 			? `${returnPrefix}${formatMoney(position.absoluteReturn)}`
 			: null,
@@ -162,9 +280,46 @@ function toSection(
 	};
 }
 
+function toUnrealizedReturns(
+	positions: Portfolio["positions"],
+): Money[] {
+	const totals = new Map<string, {
+		complete: boolean;
+		values: Decimal[];
+	}>();
+
+	for (const position of positions) {
+		const currencies = position.absoluteReturn
+			? [position.absoluteReturn.currency]
+			: [...new Set([
+					position.averagePurchasePrice?.currency,
+					position.currentValue?.currency,
+				].filter((currency): currency is string => !!currency))];
+
+		for (const currency of currencies) {
+			const total = totals.get(currency) ?? { complete: true, values: [] };
+
+			if (position.absoluteReturn) {
+				total.values.push(decimalFromString(position.absoluteReturn.value));
+			}
+			else {
+				total.complete = false;
+			}
+
+			totals.set(currency, total);
+		}
+	}
+
+	return [...totals].flatMap(([currency, total]) => total.complete
+		? [{ currency, value: decimalToString(sumDecimals(total.values)) }]
+		: []);
+}
+
 export {
 	type AccountPagePosition,
 	type AccountPagePositionGroup,
 	type AccountPagePositionSection,
+	formatPositionReturnPercent,
 	toAccountPagePositionSections,
+	toUnrealizedReturns,
 };

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

@@ -98,21 +98,13 @@
 	font-family: var(--mantine-font-family-monospace);
 }
 
-.accordionControl {
+.tabsList {
-	transition:
+	flex-wrap: nowrap;
-		background-color 150ms ease,
+	overflow-x: auto;
-		color 150ms ease;
 }
 
-.accordionLabel {
+.positionFilter {
-	font-size: var(--mantine-h2-font-size);
+	overflow-x: auto;
-	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.test.tsx

@@ -1,6 +1,7 @@
 import { MantineProvider } from "@mantine/core";
 import { type QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import {
+	fireEvent,
 	render,
 	screen,
 	waitFor,
@@ -23,7 +24,10 @@ import type {
 	AccountPageRecentOperations,
 } from "../../model/previews";
 
-import { toAccountPagePositionSections } from "../../model/positions";
+import {
+	toAccountPagePositionSections,
+	toUnrealizedReturns,
+} from "../../model/positions";
 import { AccountPage } from "./AccountPage";
 import { AccountPageEmpty } from "./components/AccountPageEmpty.view";
 import { AccountPageError } from "./components/AccountPageError.view";
@@ -142,6 +146,7 @@ function loadedProps(nextPortfolio: Portfolio = portfolio) {
 		positionSections: toAccountPagePositionSections(nextPortfolio),
 		recentEvents: emptyRecentEvents,
 		recentOperations: emptyRecentOperations,
+		unrealizedReturns: toUnrealizedReturns(nextPortfolio.positions),
 	};
 }
 
@@ -246,7 +251,7 @@ describe("AccountPage states", () => {
 		).toHaveTextContent("Данные о структуре портфеля пока недоступны.");
 		expect(
 			screen.getAllByRole("definition").map(node => node.textContent),
-		).toEqual(["1 234,5 ₽", "0,5 $"]);
+		).toEqual(["1 234,5 ₽"]);
 	});
 	it("keeps initial placeholders decorative without amounts or focus targets", () => {
 		const { container } = renderPage(<AccountPageLoading />);
@@ -309,8 +314,10 @@ describe("AccountPage states", () => {
 			/>,
 		);
 
+		fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
+
 		const balances = within(
-			screen.getByRole("region", { name: "Денежные остатки" }),
+			screen.getByRole("tabpanel", { name: "Деньги" }),
 		);
 
 		expect(
@@ -318,7 +325,12 @@ describe("AccountPage states", () => {
 		).toEqual(["234,500000000000000001 ₽", "-0,5 $", "3,00 XYZ"]);
 		expect(
 			screen.getAllByRole("definition").map(node => node.textContent),
-		).toEqual(["1 234,5 ₽", "234,500000000000000001 ₽", "-0,5 $", "3,00 XYZ"]);
+		).toEqual([
+			"1 234,5 ₽",
+			"234,500000000000000001 ₽",
+			"-0,5 $",
+			"3,00 XYZ",
+		]);
 		expect(screen.queryByText("Торгуемая валюта")).not.toBeInTheDocument();
 		expect(
 			screen.queryByText(/полная оценка|общая стоимость/i),
@@ -341,6 +353,7 @@ describe("AccountPage states", () => {
 			);
 			renderAccountRoute(createTestQueryClient());
 			await screen.findByRole("heading", { level: 1, name: "Портфель" });
+			fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
 			expect(screen.getByRole("definition")).toHaveTextContent("0,5 $");
 			expect(screen.queryByText("Портфель пока пуст")).not.toBeInTheDocument();
 		},
@@ -381,9 +394,10 @@ describe("AccountPage states", () => {
 			).not.toBeInTheDocument();
 			expect(screen.queryByText("Торгуемая валюта")).not.toBeInTheDocument();
 			expect(screen.queryByText("Портфель пока пуст")).not.toBeInTheDocument();
+			fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
 			expect(
 				within(
-					screen.getByRole("region", { name: "Денежные остатки" }),
+					screen.getByRole("tabpanel", { name: "Деньги" }),
 				).queryByRole("definition"),
 			).not.toBeInTheDocument();
 			expect(
@@ -395,11 +409,69 @@ describe("AccountPage states", () => {
 		},
 	);
 
-	it("renders the empty state", () => {
+	it("renders the empty state with self-descriptive preview links", () => {
-		renderPage(<AccountPageEmpty {...emptyProps()} />);
+		renderPage(
+			<AccountPageEmpty
+				{...emptyProps()}
+				incomeSummary={{
+					state: "empty",
+					to: "/accounts/account-1/income",
+				}}
+			/>,
+		);
 		expect(
 			screen.getByRole("heading", { name: "Портфель пока пуст" }),
 		).toBeInTheDocument();
+		expect(screen.getByRole("link", { name: "Открыть журнал" }))
+			.toBeInTheDocument();
+		expect(screen.getByRole("link", { name: "Открыть будущие события" }))
+			.toBeInTheDocument();
+		expect(screen.getByRole("link", { name: "Открыть пассивный доход" }))
+			.toBeInTheDocument();
+	});
+
+	it("keeps a null portfolio envelope loading instead of an empty portfolio", async () => {
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () =>
+				HttpResponse.json(resource(null)),
+			),
+		);
+		const queryClient = createTestQueryClient();
+		renderAccountRoute(queryClient);
+
+		expect(
+			await screen.findByRole("status", { name: "Загрузка" }, { timeout: 4000 }),
+		).toBeVisible();
+		expect(screen.queryByText("Портфель пока пуст")).not.toBeInTheDocument();
+		expect(
+			queryClient.getQueryData(portfolioQueryOptions("account-1").queryKey),
+		).toMatchObject({ data: null });
+	});
+
+	it("keeps null events and income envelopes loading in the previews", async () => {
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/events", () =>
+				HttpResponse.json(resource(null)),
+			),
+			http.get("*/api/v1/brokerage-accounts/:accountId/income-summary", () =>
+				HttpResponse.json(resource(null)),
+			),
+		);
+		renderAccountRoute(createTestQueryClient());
+
+		expect(
+			await screen.findByText("Портфель пока пуст", undefined, {
+				timeout: 4000,
+			}),
+		).toBeVisible();
+		expect(
+			screen.getByRole("status", { name: "Загрузка будущих событий" }),
+		).toBeVisible();
+		expect(
+			screen.queryByText("На ближайшие 30 дней событий не найдено."),
+		).not.toBeInTheDocument();
+		expect(screen.getByText("Загрузка дохода текущего месяца")).toBeVisible();
+		expect(screen.queryByText("Нет текущих сумм")).not.toBeInTheDocument();
 	});
 
 	it("renders a stale portfolio in upstream order with nullable values hidden", () => {
@@ -411,18 +483,22 @@ describe("AccountPage states", () => {
 		expect(screen.queryByText(/T-Bank временно недоступен/))
 			.not.toBeInTheDocument();
 		expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
-		expect(screen.getByRole("button", { name: "Акции" })).toBeInTheDocument();
+		expect(screen.getByRole("radio", { name: "Акции" })).toBeInTheDocument();
 		expect(
-			screen.getByRole("button", { name: "Облигации" }),
+			screen.getByRole("radio", { name: "Облигации" }),
 		).toBeInTheDocument();
 
-		const positions = screen
+		expect(
-			.getAllByText(/Вторая|Первая/)
+			screen.getAllByRole<HTMLInputElement>("radio").map(radio => radio.value),
-			.map(element => element.textContent);
+		).toEqual(["stocks", "bonds"]);
-
+		expect(screen.getByText("Вторая")).toBeInTheDocument();
-		expect(positions).toEqual(["Вторая", "Первая"]);
-		expect(screen.getByText("10 ₽")).toBeInTheDocument();
 		expect(screen.getByText("-1 ₽")).toBeInTheDocument();
+		expect(screen.getByRole("img", { name: "Вторая" })).toHaveAttribute(
+			"src",
+			"https://invest-brands.cdn-tinkoff.ru/vtorayax160.png",
+		);
+		fireEvent.click(screen.getByRole("radio", { name: "Облигации" }));
+		expect(screen.getByText("10 ₽")).toBeInTheDocument();
 		expect(screen.queryByText(/Доход:/)).not.toBeInTheDocument();
 		expect(
 			screen.getByText("Средняя цена: 11 ₽ · Доля: 100 %"),
@@ -431,10 +507,6 @@ describe("AccountPage states", () => {
 			screen.getByText("Количество: 1 · RU000A0JX0J2"),
 		).toBeInTheDocument();
 		expect(screen.queryByText("—")).not.toBeInTheDocument();
-		expect(screen.getByRole("img", { name: "Вторая" })).toHaveAttribute(
-			"src",
-			"https://invest-brands.cdn-tinkoff.ru/vtorayax160.png",
-		);
 	});
 
 	it.each(["STOCK", "BOND"] as const)(
@@ -471,8 +543,11 @@ describe("AccountPage states", () => {
 			expect(screen.getByText("Б")).toBeInTheDocument();
 			expect(screen.getByText("Н")).toBeInTheDocument();
 			expect(screen.getAllByRole("img")).toHaveLength(1);
-			for (const value of ["+3 ₽", "+2 ₽", "0 ₽"])
+
+			for (const value of ["+3 ₽", "+2 ₽", "0 ₽"]) {
 				expect(screen.getByText(value)).toBeInTheDocument();
+			}
+
 			expect(screen.queryByText(/Доход:/)).not.toBeInTheDocument();
 		},
 	);
@@ -520,6 +595,7 @@ describe("AccountPage states", () => {
 		expect(screen.queryByText("STOCK-ISIN")).not.toBeInTheDocument();
 		expect(screen.getByText("Количество: 2 · FALLBACK-ISIN"))
 			.toBeInTheDocument();
+		fireEvent.click(screen.getByRole("radio", { name: "Облигации" }));
 		expect(screen.getByText("Количество: 3 · BOND-ISIN"))
 			.toBeInTheDocument();
 		expect(screen.queryByText("OFZ")).not.toBeInTheDocument();
@@ -573,9 +649,11 @@ describe("AccountPage states", () => {
 			/>,
 		);
 
+		fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
 		expect(
 			screen.getByText("Пока недоступно"),
 		).toBeInTheDocument();
+		fireEvent.click(screen.getByRole("tab", { name: "Позиции" }));
 		expect(screen.getByText("Вторая")).toBeInTheDocument();
 	});
 
@@ -610,6 +688,7 @@ describe("AccountPage states", () => {
 			/>,
 		);
 
+		fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
 		expect(screen.getByText("Сделка")).toBeInTheDocument();
 		expect(screen.getByText("−12 ₽")).toBeInTheDocument();
 	});
@@ -663,7 +742,8 @@ describe("AccountPage states", () => {
 			/>,
 		);
 
-		const section = screen.getByRole("region", { name: "Будущие события" });
+		fireEvent.click(screen.getByRole("tab", { name: "События" }));
+		const section = screen.getByRole("tabpanel", { name: "События" });
 		const content = within(section);
 		const text = section.textContent ?? "";
 
@@ -686,11 +766,11 @@ describe("AccountPage states", () => {
 		).toBeVisible();
 		for (const amount of ["850,50 ₽", "0 USD", "1 000 ₽", "Сумма неизвестна"])
 			expect(content.getByText(amount)).toBeVisible();
-		expect(content.getAllByText("Ожидаемая сумма")).toHaveLength(4);
+		expect(content.getAllByText("Прогноз")).toHaveLength(4);
 		expect(content.queryByText("Без движения денег")).not.toBeInTheDocument();
 		expect(content.queryByText(/^\+/)).not.toBeInTheDocument();
 		expect(
-			content.getByRole("link", { name: "Открыть будущие события" }),
+			content.getByRole("link", { name: "Подробнее" }),
 		).toHaveAttribute("href", "/accounts/account-1/events");
 	});
 
@@ -704,8 +784,10 @@ describe("AccountPage states", () => {
 				/>,
 			);
 
+			fireEvent.click(screen.getByRole("tab", { name: "События" }));
+
 			const content = within(
-				screen.getByRole("region", { name: "Будущие события" }),
+				screen.getByRole("tabpanel", { name: "События" }),
 			);
 
 			if (state === "loading") {
@@ -726,7 +808,7 @@ describe("AccountPage states", () => {
 			}
 
 			expect(
-				content.getByRole("link", { name: "Открыть будущие события" }),
+				content.getByRole("link", { name: "Подробнее" }),
 			).toHaveAttribute("href", "/accounts/account-1/events");
 		},
 	);
@@ -742,9 +824,11 @@ describe("AccountPage states", () => {
 			/>,
 		);
 
+		fireEvent.click(screen.getByRole("tab", { name: "События" }));
 		expect(
 			screen.getByText("Данные появятся здесь, когда чтение восстановится."),
 		).toBeInTheDocument();
+		fireEvent.click(screen.getByRole("tab", { name: "Позиции" }));
 		expect(screen.getByText("Вторая")).toBeInTheDocument();
 	});
 
@@ -813,7 +897,7 @@ describe("AccountPage states", () => {
 			expect(screen.getByText("Вторая")).toBeInTheDocument();
 			expect(
 				screen.getAllByRole("definition").map(node => node.textContent),
-			).toEqual(["1 234,5 ₽", "0,5 $"]);
+			).toEqual(["1 234,5 ₽"]);
 			expect(screen.queryByRole("button", { name: "Повторить" }))
 				.not.toBeInTheDocument();
 			void queryClient.invalidateQueries({
@@ -823,7 +907,7 @@ describe("AccountPage states", () => {
 			expect(structure).toHaveTextContent("10 ₽");
 			expect(
 				screen.getAllByRole("definition").map(node => node.textContent),
-			).toEqual(["1 234,5 ₽", "0,5 $"]);
+			).toEqual(["1 234,5 ₽"]);
 			resolveRetry?.(
 				HttpResponse.json(
 					resource(
@@ -842,7 +926,7 @@ describe("AccountPage states", () => {
 			await waitFor(() =>
 				expect(
 					screen.getAllByRole("definition").map(node => node.textContent),
-				).toEqual(["-0,5 $", "2,50 €"]),
+				).toEqual(["-0,5 $"]),
 			);
 			expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
 			expect(structure).not.toHaveTextContent("10 ₽");
@@ -884,7 +968,7 @@ describe("AccountPage states", () => {
 		expect(screen.getByText("Вторая")).toBeInTheDocument();
 		expect(
 			screen.getAllByRole("definition").map(node => node.textContent),
-		).toEqual(["1 234,5 ₽", "0,5 $"]);
+		).toEqual(["1 234,5 ₽"]);
 		expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
 		expect(
 			screen.queryByRole("status", { name: "Загрузка" }),
@@ -894,4 +978,96 @@ describe("AccountPage states", () => {
 
 		resolveRefresh?.(HttpResponse.json(resource(portfolio)));
 	});
+
+	it("opens positions by default and switches between local tabs", () => {
+		renderPage(<AccountPageLoaded {...loadedProps()} />);
+
+		expect(screen.getByRole("tab", { name: "Позиции" }))
+			.toHaveAttribute("aria-selected", "true");
+		expect(screen.getByText("Вторая")).toBeVisible();
+
+		fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
+		expect(screen.getByRole("tabpanel", { name: "Деньги" }))
+			.toBeVisible();
+		expect(screen.queryByText("Вторая")).not.toBeInTheDocument();
+
+		fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
+		expect(screen.getByText("Последних событий пока нет.")).toBeVisible();
+	});
+
+	it("links operation, event and income previews to their detail pages", () => {
+		renderPage(
+			<AccountPageLoaded
+				{...loadedProps()}
+				incomeSummary={{
+					state: "empty",
+					to: "/accounts/account-1/income",
+				}}
+			/>,
+		);
+
+		for (const [tab, href] of [
+			["Операции", "/accounts/account-1/operations"],
+			["События", "/accounts/account-1/events"],
+			["Доход", "/accounts/account-1/income"],
+		]) {
+			fireEvent.click(screen.getByRole("tab", { name: tab }));
+			expect(screen.getByRole("link", { name: "Подробнее" }))
+				.toHaveAttribute("href", href);
+		}
+	});
+
+	it("filters positions by the kinds present in the portfolio", () => {
+		renderPage(<AccountPageLoaded {...loadedProps()} />);
+
+		expect(
+			screen.getAllByRole<HTMLInputElement>("radio").map(radio => radio.value),
+		).toEqual(["stocks", "bonds"]);
+		expect(screen.getByText("Вторая")).toBeVisible();
+		expect(screen.queryByText("Первая")).not.toBeInTheDocument();
+		fireEvent.click(screen.getByRole("radio", { name: "Облигации" }));
+		expect(screen.getByText("Первая")).toBeVisible();
+		expect(screen.queryByText("Вторая")).not.toBeInTheDocument();
+	});
+
+	it("hides the position filter when only one kind exists", () => {
+		renderPage(
+			<AccountPageLoaded
+				{...loadedProps({
+					...portfolio,
+					positions: [portfolio.positions[0]],
+				})}
+			/>,
+		);
+
+		expect(screen.queryByRole("radiogroup", { name: "Тип позиции" }))
+			.not.toBeInTheDocument();
+	});
+
+	it("hides unrealized returns for a partial portfolio", () => {
+		renderPage(<AccountPageLoaded {...loadedProps()} partial />);
+
+		expect(screen.queryByRole("region", { name: "Нереализованный результат" }))
+			.not.toBeInTheDocument();
+	});
+
+	it("omits an unrealized currency total when any return is incomplete", () => {
+		renderPage(
+			<AccountPageLoaded
+				{...loadedProps({
+					...portfolio,
+					positions: [
+						position({ absoluteReturn: { currency: "RUB", value: "10" } }),
+						position({
+							absoluteReturn: null,
+							currentValue: { currency: "RUB", value: "100" },
+						}),
+					],
+				})}
+			/>,
+		);
+
+		expect(screen.queryByRole("region", { name: "Нереализованный результат" }))
+			.not.toBeInTheDocument();
+	});
 });

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

@@ -31,6 +31,7 @@ const AccountPage: FC = () => {
 			positionSections={viewModel.positionSections}
 			recentEvents={viewModel.recentEvents}
 			recentOperations={viewModel.recentOperations}
+			unrealizedReturns={viewModel.unrealizedReturns}
 		/>
 	);
 };

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

@@ -20,6 +20,7 @@ import { useInitialAvailability } from "@/shared/lib";
 import {
 	type AccountPagePositionSection,
 	toAccountPagePositionSections,
+	toUnrealizedReturns,
 } from "../../model/positions";
 import {
 	type AccountPageIncomeSummary,
@@ -48,6 +49,7 @@ type AccountPageLoadedViewModel = AccountPageContent & {
 	positionSections: AccountPagePositionSection[];
 	source?: InvestmentResourceMeta;
 	state: "loaded";
+	unrealizedReturns: Portfolio["totalsByCurrency"];
 };
 
 type AccountPageViewModel
@@ -133,6 +135,7 @@ function useAccountPageViewModel(): AccountPageViewModel {
 		recentOperations,
 		source: portfolio.meta,
 		state: "loaded" as const,
+		unrealizedReturns: toUnrealizedReturns(portfolio.data.positions),
 	};
 }
 

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

@@ -1,6 +1,12 @@
-import type { FC } from "react";
+import {
-
+	Alert,
-import { Accordion, Alert, Stack } from "@mantine/core";
+	Group,
+	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";
@@ -8,6 +14,7 @@ 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 { PortfolioStructure } from "@/widgets/portfolio-structure";
 
@@ -35,18 +42,27 @@ type AccountPageLoadedProps = {
 	recentEvents: AccountPageRecentEvents;
 	recentOperations: AccountPageRecentOperations;
 	source?: InvestmentResourceMeta;
+	unrealizedReturns: Portfolio["totalsByCurrency"];
 };
 
 const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 	const { t } = useTranslation();
+	const [filter, setFilter] = useState<string>();
 
-	const defaultValue = [
+	const activeSection = props.positionSections.find(
-		...props.positionSections.map(section => section.kind),
+		section => section.kind === filter,
-		"cash",
+	) ?? props.positionSections[0];
-		"recentOperations",
+
-		"recentEvents",
+	const positionKindLabels: Record<AccountPagePositionSection["kind"], string> = {
-		"incomeSummary",
+		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">
@@ -62,6 +78,26 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 				? <Alert role="status">{t("investment.partial")}</Alert>
 				: <CurrencyCards amounts={props.portfolio.totalsByCurrency} />}
 
+			{!props.partial && props.unrealizedReturns.length > 0 && (
+				<Stack
+					aria-label={t("portfolio.unrealizedResult")}
+					component="section"
+					gap={4}
+				>
+					<Text fw={600}>{t("portfolio.unrealizedResult")}</Text>
+
+					<Group gap="md">
+						{props.unrealizedReturns.map(total => (
+							<Text key={total.currency}>{formatMoney(total)}</Text>
+						))}
+					</Group>
+
+					<Text c="dimmed" size="xs">
+						{t("portfolio.unrealizedResultCaption")}
+					</Text>
+				</Stack>
+			)}
+
 			{!props.partial && (
 				<PortfolioStructure
 					key={props.accountId}
@@ -69,70 +105,73 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
 				/>
 			)}
 
-			<Accordion
+			<Tabs
-				classNames={{
+				classNames={{ list: classes.tabsList }}
-					chevron: classes.accordionChevron,
+				defaultValue="positions"
-					control: classes.accordionControl,
+				keepMounted={false}
-					label: classes.accordionLabel,
-					panel: classes.accordionPanel,
-				}}
-				defaultValue={defaultValue}
-				multiple
 			>
-				{props.positionSections.map(section => (
+				<Tabs.List aria-label={t("portfolio.sections")} mb="md">
-					<Accordion.Item key={section.kind} value={section.kind}>
+					<Tabs.Tab value="positions">
-						<Accordion.Control>
+						{t("portfolio.tabs.positions")}
-							{t(positionSectionTitleKey(section.kind))}
+					</Tabs.Tab>
-						</Accordion.Control>
 
-						<Accordion.Panel>
+					<Tabs.Tab value="cash">{t("portfolio.tabs.cash")}</Tabs.Tab>
-							<PositionSection section={section} />
-						</Accordion.Panel>
-					</Accordion.Item>
-				))}
 
-				<Accordion.Item value="cash">
+					<Tabs.Tab value="operations">
-					<Accordion.Control>{t("portfolio.cashBalances")}</Accordion.Control>
+						{t("portfolio.tabs.operations")}
+					</Tabs.Tab>
 
-					<Accordion.Panel>
+					<Tabs.Tab value="events">{t("portfolio.tabs.events")}</Tabs.Tab>
-						<CurrencyCards amounts={props.portfolio.cashBalances} />
-					</Accordion.Panel>
-				</Accordion.Item>
 
-				<Accordion.Item value="recentOperations">
+					<Tabs.Tab value="income">{t("portfolio.tabs.income")}</Tabs.Tab>
-					<Accordion.Control>{t("ledger.recentTitle")}</Accordion.Control>
+				</Tabs.List>
 
-					<Accordion.Panel>
+				<Tabs.Panel value="positions">
-						<RecentOperations operations={props.recentOperations} />
+					<Stack gap="md">
-					</Accordion.Panel>
+						{props.positionSections.length > 1 && (
-				</Accordion.Item>
+							<div className={classes.positionFilter}>
-
+								<SegmentedControl
-				<Accordion.Item value="recentEvents">
+									aria-label={t("portfolio.positionFilter")}
-					<Accordion.Control>{t("events.recentTitle")}</Accordion.Control>
+									data={filterOptions}
-
+									onChange={setFilter}
-					<Accordion.Panel>
+									value={activeSection?.kind}
-						<BrokerageEventsPreview events={props.recentEvents} />
+								/>
-					</Accordion.Panel>
+							</div>
-				</Accordion.Item>
-
-				<Accordion.Item value="incomeSummary">
-					<Accordion.Control>{t("income.summaryTitle")}</Accordion.Control>
-
-					<Accordion.Panel>
-						{!!props.incomeSummary && (
-							<IncomeSummary {...props.incomeSummary} />
 						)}
-					</Accordion.Panel>
+
-				</Accordion.Item>
+						{activeSection && <PositionSection section={activeSection} />}
-			</Accordion>
+					</Stack>
+				</Tabs.Panel>
+
+				<Tabs.Panel value="cash">
+					<CurrencyCards amounts={props.portfolio.cashBalances} />
+				</Tabs.Panel>
+
+				<Tabs.Panel value="operations">
+					<RecentOperations
+						moreLabel={t("portfolio.more")}
+						operations={props.recentOperations}
+					/>
+				</Tabs.Panel>
+
+				<Tabs.Panel value="events">
+					<BrokerageEventsPreview
+						events={props.recentEvents}
+						moreLabel={t("portfolio.more")}
+					/>
+				</Tabs.Panel>
+
+				<Tabs.Panel value="income">
+					{!!props.incomeSummary && (
+						<IncomeSummary
+							{...props.incomeSummary}
+							moreLabel={t("portfolio.more")}
+						/>
+					)}
+				</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,7 +34,9 @@ const AccountPageLoading: FC = () => {
 
 			<Skeleton height={260} radius="sm" />
 
-			{["first", "second", "third"].map(placeholder => <Skeleton height={52} key={placeholder} radius="sm" />)}
+			<Skeleton height={40} radius="sm" />
+
+			<Skeleton height={220} radius="sm" />
 		</LoadingSkeleton>
 	);
 };

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

@@ -9,8 +9,8 @@ import type { IncomeSummary as IncomeSummaryData } from "@/entities/income";
 
 import { formatMoney } from "@/shared/lib";
 
-type IncomeSummaryProps
+type IncomeSummaryProps = { moreLabel?: string } & (
-	= | {
+	| {
 		state: "empty";
 		to: string;
 	}
@@ -27,7 +27,8 @@ type IncomeSummaryProps
 	| {
 		state: "partial";
 		to: string;
-	};
+	}
+);
 
 const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
 	const { t } = useTranslation();
@@ -56,7 +57,7 @@ const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
 				<Text c="dimmed">{t("income.summaryEmpty")}</Text>
 
 				<Button component={Link} to={props.to} variant="subtle">
-					{t("income.open")}
+					{props.moreLabel ?? t("income.open")}
 				</Button>
 			</Stack>
 		);
@@ -75,7 +76,7 @@ const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
 			))}
 
 			<Button component={Link} to={props.to} variant="subtle">
-				{t("income.open")}
+				{props.moreLabel ?? t("income.open")}
 			</Button>
 		</Stack>
 	);

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

@@ -15,6 +15,8 @@ const syntheticPosition
 		logoName: null,
 		logoSrc: null,
 		quantity: "100",
+		returnPercent: "25",
+		returnPercentText: "+25,00 %",
 		returnText: "+5 000 ₽",
 		returnTone: "positive",
 		shareText: "20%",
@@ -73,6 +75,8 @@ export const BondLoss: Story
 					"Учебные облигации для долгосрочных накоплений, выпуск 2030",
 				isin: "DEMO-BOND-2030",
 				quantity: "10",
+				returnPercent: "-5",
+				returnPercentText: "-5,00 %",
 				returnText: "−500 ₽",
 				returnTone: "negative",
 				shareText: "7,6%",
@@ -123,6 +127,8 @@ export const MissingValuation: Story
 				averagePurchasePrice: null,
 				currentValue: null,
 				displayName: "Учебная позиция без текущей оценки",
+				returnPercent: null,
+				returnPercentText: null,
 				returnText: null,
 				returnTone: undefined,
 				shareText: null,

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

@@ -6,7 +6,10 @@ import { Link } from "react-router";
 
 import { formatMoney } from "@/shared/lib";
 
-import type { AccountPagePosition, AccountPagePositionSection } from "../../../../model/positions";
+import type {
+	AccountPagePosition,
+	AccountPagePositionSection,
+} from "../../../../model/positions";
 
 import classes from "../../AccountPage.module.css";
 import { PositionLogo } from "../PositionLogo.view";
@@ -26,8 +29,15 @@ const PositionCard: FC<PositionCardProps> = (props) => {
 		: undefined;
 
 	let returnText = position.returnText;
-	if (returnText && !isExpanded)
+
+	if (returnText && position.returnPercentText) {
+		returnText += ` · ${position.returnPercentText}`;
+	}
+
+	if (returnText && !isExpanded) {
 		returnText = t("portfolio.return", { value: returnText });
+	}
+
 	const instrumentTo = position.instrumentTo;
 
 	const identifier

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

@@ -6,7 +6,10 @@ import { Link } from "react-router";
 
 import { formatMoney } from "@/shared/lib";
 
-import type { AccountPagePositionGroup, AccountPagePositionSection } from "../../../model/positions";
+import type {
+	AccountPagePositionGroup,
+	AccountPagePositionSection,
+} from "../../../model/positions";
 
 import classes from "../AccountPage.module.css";
 import { PositionLogo } from "./PositionLogo.view";
@@ -60,6 +63,16 @@ const PositionGroupCard: FC<PositionGroupCardProps> = (props) => {
 						? classes[position.returnTone]
 						: undefined;
 
+					const returnPercent = position.returnPercentText
+						? ` · ${position.returnPercentText}`
+						: "";
+
+					const returnValue = `${position.returnText ?? ""}${returnPercent}`;
+
+					const returnText = kind === "other"
+						? t("portfolio.return", { value: returnValue })
+						: returnValue;
+
 					return (
 						<Stack
 							className={classes.accountPosition}
@@ -89,9 +102,7 @@ const PositionGroupCard: FC<PositionGroupCardProps> = (props) => {
 
 								{!!position.returnText && (
 									<Text className={appearanceClass} size="sm">
-										{kind === "other"
+										{returnText}
-											? t("portfolio.return", { value: position.returnText })
-											: position.returnText}
 									</Text>
 								)}
 							</Group>

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

@@ -10,6 +10,7 @@ import { LedgerEntryRow } from "@/entities/broker-operation";
 import type { AccountPageRecentOperations } from "../../../model/previews";
 
 type RecentOperationsProps = {
+	moreLabel?: string;
 	operations: AccountPageRecentOperations;
 };
 
@@ -44,7 +45,7 @@ const RecentOperations: FC<RecentOperationsProps> = (props) => {
 				))}
 
 			<Button component={Link} to={operations.to} variant="subtle">
-				{t("ledger.open")}
+				{props.moreLabel ?? t("ledger.open")}
 			</Button>
 		</Stack>
 	);

src/pages/account/ui/AccountPage/position-groups.test.tsx

@@ -36,6 +36,8 @@ describe("Positions grouped by security", () => {
 		).toHaveAttribute("href", "/accounts/a");
 		expect(within(rows[0]).getByText("Количество: 1.25")).toBeInTheDocument();
 		expect(within(rows[0]).getByText("375 ₽")).toBeInTheDocument();
+		expect(within(rows[0]).getByText("+25 ₽ · +7,14 %"))
+			.toBeInTheDocument();
 		expect(
 			within(rows[0]).getByText("Средняя цена: 280 ₽"),
 		).toBeInTheDocument();

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

@@ -40,6 +40,8 @@ it("keeps expanded positions vertical while other positions adapt to the viewpor
 					logoName: null,
 					logoSrc: null,
 					quantity: "10",
+					returnPercent: null,
+					returnPercentText: null,
 					returnText: null,
 					shareText: null,
 					ticker: null,

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

@@ -31,6 +31,19 @@ function configureTestAuth() {
 	});
 }
 
+function portfolioSummary(totals: { currency: string; value: string }[]) {
+	return {
+		bondPositionCount: 1,
+		cashBalances: [],
+		fundPositionCount: 0,
+		stockPositionCount: 0,
+		structure: { currencies: [], unvaluedCategories: [] },
+		totalPositionCount: 1,
+		totalsByCurrency: totals,
+		unrealizedReturnByCurrency: [],
+	};
+}
+
 function renderPage(queryClient: QueryClient) {
 	configureTestAuth();
 
@@ -46,6 +59,65 @@ function renderPage(queryClient: QueryClient) {
 }
 
 describe("AccountsPage", () => {
+	it("summarizes currencies separately and reports excluded accounts", async () => {
+		server.use(http.get("*/api/v1/brokerage-accounts", () =>
+			HttpResponse.json(resource([
+				{
+					...account,
+					portfolioSummary: portfolioSummary([
+						{ currency: "RUB", value: "100.10" },
+						{ currency: "USD", value: "20" },
+					]),
+				},
+				{
+					...account,
+					id: "account-2",
+					name: "Второй",
+					portfolioSummary: portfolioSummary([
+						{ currency: "RUB", value: "50.20" },
+					]),
+				},
+				{
+					...account,
+					id: "account-3",
+					name: "Без сводки",
+					portfolioSummary: null,
+				},
+				{
+					...account,
+					id: "account-4",
+					name: "Только деньги",
+					portfolioSummary: {
+						...portfolioSummary([{ currency: "RUB", value: "25" }]),
+						bondPositionCount: 0,
+						cashBalances: [{ currency: "RUB", value: "25" }],
+						totalPositionCount: 0,
+					},
+				},
+				{
+					...account,
+					id: "account-5",
+					name: "Без сумм",
+					portfolioSummary: {
+						...portfolioSummary([]),
+						totalPositionCount: 0,
+					},
+				},
+			])),
+		));
+		const client = createTestQueryClient();
+
+		renderPage(client);
+
+		expect(await screen.findByText("175,30 ₽")).toBeInTheDocument();
+		expect(screen.getAllByText("20,00 USD")).not.toHaveLength(0);
+		expect(screen.getByText("5 счетов")).toBeInTheDocument();
+		expect(screen.getByText("Нет текущих сумм")).toBeInTheDocument();
+		expect(screen.getByText(
+			"Ещё 1 счёт не включён: нет актуального портфеля",
+		)).toBeInTheDocument();
+	});
+
 	it("loads accounts after retrying an initial HTTP failure", async () => {
 		const modes: (null | string)[] = [];
 		server.use(

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

@@ -1,6 +1,6 @@
 import type { FC } from "react";
 
-import { Button, Stack, Text, Title } from "@mantine/core";
+import { Button, SimpleGrid, Stack, Text, Title } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
@@ -10,15 +10,82 @@ import {
 	type BrokerageAccountCard,
 	BrokerageAccountList,
 } from "@/entities/brokerage-account";
+import { formatMoney } from "@/shared/lib";
 import { SourceSyncStatus } from "@/shared/ui";
 
+const DECIMAL_BASE = 10n;
+const DECIMAL_PART_COUNT = 2;
+const ZERO = 0n;
+
 type AccountsPageLoadedProps = {
 	accounts: BrokerageAccountCard[];
 	meta: InvestmentResourceMeta;
 };
 
+type Money = { currency: string; value: string };
+
+function accountTotals(accounts: BrokerageAccountCard[]) {
+	const values = new Map<string, string[]>();
+	let excludedCount = 0;
+
+	for (const { summary } of accounts) {
+		if (summary.state === "empty") continue;
+
+		if (summary.state === "unavailable") {
+			excludedCount += 1;
+			continue;
+		}
+
+		for (const total of summary.portfolio.totalsByCurrency) {
+			values.set(total.currency, [
+				...values.get(total.currency) ?? [],
+				total.value,
+			]);
+		}
+	}
+
+	const totals: Money[] = Array.from(values, ([currency, amounts]) => ({
+		currency,
+		value: sumDecimals(amounts),
+	}));
+
+	return { excludedCount, totals };
+}
+
+function sumDecimals(values: string[]) {
+	const scale = Math.max(
+		0,
+		...values.map(value =>
+			value.split(".", DECIMAL_PART_COUNT)[1]?.length ?? 0),
+	);
+
+	const factor = DECIMAL_BASE ** BigInt(scale);
+	let sum = ZERO;
+
+	for (const value of values) {
+		const isNegative = value.startsWith("-");
+
+		const [integer = "0", fraction = ""] = (isNegative
+			? value.slice(1)
+			: value).split(".", DECIMAL_PART_COUNT);
+
+		const units = BigInt(integer) * factor
+			+ BigInt(fraction.padEnd(scale, "0") || "0");
+
+		sum += isNegative ? -units : units;
+	}
+
+	const isNegative = sum < ZERO;
+	const digits = (isNegative ? -sum : sum).toString().padStart(scale + 1, "0");
+	const integer = scale ? digits.slice(0, -scale) : digits;
+	const fraction = scale ? `.${digits.slice(-scale)}` : "";
+
+	return `${isNegative ? "-" : ""}${integer}${fraction}`;
+}
+
 const AccountsPageLoaded: FC<AccountsPageLoadedProps> = (props) => {
 	const { t } = useTranslation();
+	const { excludedCount, totals } = accountTotals(props.accounts);
 
 	return (
 		<Stack gap="lg">
@@ -28,6 +95,37 @@ const AccountsPageLoaded: FC<AccountsPageLoadedProps> = (props) => {
 				<Text c="dimmed" size="sm">
 					{t("accounts.subtitle")}
 				</Text>
+			</Stack>
+
+			<Stack gap="xs">
+				<SimpleGrid cols={{ base: 1, xs: 2 }} spacing="xs">
+					<Stack gap={4}>
+						<Text c="dimmed" size="sm">
+							{t("accounts.currentValue")}
+						</Text>
+
+						{totals.length > 0
+							? totals.map(total => (
+									<Text fw={700} key={total.currency} size="lg">
+										{formatMoney(total, { withRoundedCents: true })}
+									</Text>
+								))
+							: <Text c="dimmed">{t("accounts.summaryNoTotals")}</Text>}
+					</Stack>
+
+					<Stack gap={4}>
+						<Text fw={600}>{t("accounts.count", {
+							count: props.accounts.length,
+						})}
+						</Text>
+
+						{excludedCount > 0 && (
+							<Text c="dimmed" size="sm">
+								{t("accounts.summaryExcluded", { count: excludedCount })}
+							</Text>
+						)}
+					</Stack>
+				</SimpleGrid>
 
 				<SourceSyncStatus
 					lastAttempt={props.meta.lastAttempt}

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

@@ -88,7 +88,6 @@ const quote
 function setup(
 	options: {
 		ambiguousTicker?: boolean;
-		failBond?: boolean;
 		failCoupons?: boolean;
 		noPosition?: boolean;
 		path?: string;
@@ -100,11 +99,7 @@ function setup(
 	const resolved = { ...bond, slug: options.slug ?? uid };
 	let isFailQuote = false;
 	server.use(
-		http.get("*/api/v1/bonds/:uid", () =>
+		http.get("*/api/v1/bonds/:uid", () => HttpResponse.json(resource(resolved))),
-			options.failBond
-				? HttpResponse.json({ code: "NOT_FOUND" }, { status: 404 })
-				: HttpResponse.json(resource(resolved)),
-		),
 		http.get("*/api/v1/bonds/by-ticker/:ticker", ({ request }) => {
 			requests.push(new URL(request.url));
 

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

@@ -191,8 +191,10 @@ const BondPageView: FC<BondPageViewProps> = (props) => {
 
 			<BondCoupons
 				coupons={vm.coupons}
+				logoName={bond.logoName}
 				pastCoupons={vm.pastCoupons}
 				state={vm.couponsState}
+				ticker={bond.ticker}
 				upcoming={vm.upcoming}
 			/>
 

src/pages/bond/ui/BondPage/components/BondCoupons.view.tsx

@@ -1,17 +1,20 @@
 import type { FC } from "react";
 
-import { Accordion, Alert, Badge, Group, Paper, Stack, Text } from "@mantine/core";
+import { Accordion, Alert, Badge, Group, Stack, Text } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
 import type { BondCoupons as Coupons } from "@/entities/bond";
 
-import { InstrumentMetric, InstrumentSection, type SectionState } from "@/features/instrument-details";
+import { InstrumentSection, type SectionState } from "@/features/instrument-details";
-import { formatDate, formatMoney, formatSnapshotTime } from "@/shared/lib";
+import { formatDate, formatSnapshotTime, instrumentLogoUrl } from "@/shared/lib";
+import { PayoutCard } from "@/shared/ui";
 
 type BondCouponsProps = {
 	coupons?: Coupons;
+	logoName?: null | string;
 	pastCoupons: Coupons["coupons"];
 	state: SectionState;
+	ticker?: null | string;
 	upcoming: Coupons["coupons"];
 };
 
@@ -39,6 +42,8 @@ const BondCoupons: FC<BondCouponsProps> = (props) => {
 									<Coupon
 										coupon={coupon}
 										key={`${coupon.number}:${coupon.paymentDate}`}
+										logoName={props.logoName}
+										ticker={props.ticker}
 									/>
 								))
 							)
@@ -75,6 +80,8 @@ const BondCoupons: FC<BondCouponsProps> = (props) => {
 													<Coupon
 														coupon={coupon}
 														key={`${coupon.number}:${coupon.paymentDate}`}
+														logoName={props.logoName}
+														ticker={props.ticker}
 													/>
 												))
 											)
@@ -91,59 +98,48 @@ const BondCoupons: FC<BondCouponsProps> = (props) => {
 
 type CouponProps = {
 	coupon: Coupons["coupons"][number];
+	logoName?: null | string;
+	ticker?: null | string;
 };
 
 const Coupon: FC<CouponProps> = (props) => {
 	const { coupon } = props;
 	const { t } = useTranslation();
+	const title = `${t("events.type.coupon")} · ${props.ticker || t("bond.instrument")}`;
+
+	const metadata = [
+		coupon.paymentDate ? formatDate(coupon.paymentDate) : t("stock.dateUnknown"),
+		t("bond.couponNumber", { number: coupon.number ?? t("bond.unknown") }),
+	].join(" · ");
+
+	const conditions = (
+		<Group gap="md" mt="sm">
+			<Badge color="gray" variant="light">
+				{t(`bond.couponTypes.${coupon.couponType}`, { defaultValue: t("bond.unknown") })}
+			</Badge>
+
+			{coupon.periodDays != undefined && (
+				<Text c="dimmed" size="xs">{t("bond.couponDays", { count: coupon.periodDays })}</Text>
+			)}
+
+			{coupon.recordDate && (
+				<Text c="dimmed" size="xs">{t("stock.record")}: {formatDate(coupon.recordDate)}</Text>
+			)}
+		</Group>
+	);
 
 	return (
-		<Paper p="md" radius="md" withBorder>
+		<PayoutCard
-			<Group align="start" justify="space-between">
+			conditions={conditions}
-				<div>
+			estimate={coupon.estimatedAmount}
-					<Text fw={600}>
+			imageSrc={instrumentLogoUrl(props.logoName)}
-						{coupon.paymentDate
+			initial={(props.ticker?.trim()[0] ?? "?").toUpperCase()}
-							? formatDate(coupon.paymentDate)
+			kind="schedule"
-							: t("stock.dateUnknown")}
+			metadata={metadata}
-					</Text>
+			perSecurity={coupon.perBond}
-
+			perSecurityLabel={t("bond.perBond")}
-					<Text c="dimmed" size="xs">
+			title={title}
-						{t("bond.couponNumber", {
+		/>
-							number: coupon.number ?? t("bond.unknown"),
-						})}
-					</Text>
-				</div>
-
-				<InstrumentMetric label={t("bond.perBond")} value={formatMoney(coupon.perBond)} />
-
-				{!!coupon.estimatedAmount && (
-					<InstrumentMetric
-						label={t("stock.yourEstimate")}
-						value={formatMoney(coupon.estimatedAmount)}
-					/>
-				)}
-			</Group>
-
-			<Group gap="md" mt="sm">
-				<Badge color="gray" variant="light">
-					{t(`bond.couponTypes.${coupon.couponType}`, {
-						defaultValue: t("bond.unknown"),
-					})}
-				</Badge>
-
-				{coupon.periodDays != undefined && (
-					<Text c="dimmed" size="xs">
-						{t("bond.couponDays", { count: coupon.periodDays })}
-					</Text>
-				)}
-
-				{!!coupon.recordDate && (
-					<Text c="dimmed" size="xs">
-						{t("stock.record")}: {formatDate(coupon.recordDate)}
-					</Text>
-				)}
-			</Group>
-		</Paper>
 	);
 };
 

src/pages/card/ui/CardPage/CardHistory.view.tsx

@@ -17,6 +17,7 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
 import {
+	BankFeedback,
 	bankOperationAppearance,
 } from "@/entities/bank-card";
 
@@ -108,6 +109,17 @@ const CardHistory: FC<CardHistoryProps> = (props) => {
 		return <Text>{t("bank.noOperations")}</Text>;
 	}
 
+	if (vm.history.error) {
+		return (
+			<BankFeedback
+				cached={Boolean(vm.rows)}
+				error={vm.history.error}
+				loadingError={!vm.rows}
+				retry={vm.history.refetch}
+			/>
+		);
+	}
+
 	if (vm.history.loading) {
 		return (
 			<LoadingSkeleton label={t("bank.loadingHistory")}>

src/pages/card/ui/CardPage/CardPage.test.tsx

@@ -316,12 +316,47 @@ describe("CardPage", () => {
 		setup({ summaryError: true });
 		await screen.findByRole("heading", { name: "Повседневная" });
 		expect(
-			screen.queryByRole("alert"),
+			await screen.findByText("Перевод на «Запасная»"),
-		).not.toBeInTheDocument();
+		).toBeInTheDocument();
+		expect(await screen.findByRole("alert", {}, { timeout: 5000 })).toHaveTextContent(
+			"Не удалось загрузить данные карт.",
+		);
+		expect(screen.queryByText("0 ₽")).not.toBeInTheDocument();
+	});
+
+	it("recovers summary with retry while keeping card and journal", async () => {
+		const { summaryRequests } = setup({ summaryError: true });
+		await screen.findByRole("heading", { name: "Повседневная" });
 		expect(
 			await screen.findByText("Перевод на «Запасная»"),
 		).toBeInTheDocument();
-		expect(screen.queryByText("0 ₽")).not.toBeInTheDocument();
+
+		const retry = await screen.findByRole(
+			"button",
+			{ name: "Повторить" },
+			{ timeout: 5000 },
+		);
+
+		const requestsBefore = summaryRequests.length;
+		server.use(
+			http.get("*/api/v1/bank-cards/summary", ({ request }) => {
+				summaryRequests.push(new URL(request.url).search);
+
+				return HttpResponse.json({
+					cardId: "a",
+					categories: [],
+					expenses: money("0"),
+					net: money("-50"),
+					refunds: money("50"),
+				});
+			}),
+		);
+		fireEvent.click(retry);
+
+		await waitFor(() =>
+			expect(screen.queryByRole("alert")).not.toBeInTheDocument(),
+		);
+		expect(summaryRequests).toHaveLength(requestsBefore + 1);
 	});
 	it("keeps cached card and history after refetch failure", async () => {
 		const { client } = setup();
@@ -331,9 +366,8 @@ describe("CardPage", () => {
 			http.get("*/api/v1/bank-cards/a/operations", () => HttpResponse.error()),
 		);
 		await client.invalidateQueries();
-		await waitFor(() => {
+		const alerts = await screen.findAllByRole("alert", {}, { timeout: 5000 });
-			expect(screen.queryByRole("alert")).not.toBeInTheDocument();
+		expect(alerts.length).toBeGreaterThanOrEqual(1);
-		});
 		expect(
 			screen.getByRole("heading", { name: "Повседневная" }),
 		).toBeInTheDocument();
@@ -401,11 +435,11 @@ describe("CardPage", () => {
 		]);
 	});
 	it("recovers the prerequisite card list while preserving the visible balance and journal", async () => {
-		setup({ cardsError: true });
+		const { client } = setup({ cardsError: true });
 		await screen.findByText("Перевод на «Запасная»");
 		expect(
-			screen.queryByRole("alert"),
+			await screen.findByRole("alert", {}, { timeout: 5000 }),
-		).not.toBeInTheDocument();
+		).toHaveTextContent("Не удалось загрузить данные карт.");
 		expect(
 			screen.getByRole("button", { name: "Добавить операцию" }),
 		).toBeDisabled();
@@ -414,6 +448,7 @@ describe("CardPage", () => {
 				HttpResponse.json([card, { ...card, id: "b", name: "Запасная" }]),
 			),
 		);
+		await client.invalidateQueries();
 		await waitFor(() =>
 			expect(
 				screen.getByRole("button", { name: "Добавить операцию" }),

src/pages/card/ui/CardPage/CardPage.view.tsx

@@ -75,6 +75,11 @@ const CardPageView: FC<CardPageViewProps> = (props) => {
 							{t("bank.back")}
 						</Button>
 
+						{!vm.notFound && (
+							<Button onClick={vm.cardRetry} variant="default">
+								{t("bank.retry")}
+							</Button>
+						)}
 					</Group>
 				)}
 				error
@@ -128,18 +133,27 @@ const CardPageView: FC<CardPageViewProps> = (props) => {
 				)}
 
 				{card.archivedAt && <Text>{t("bank.archiveHint")}</Text>}
+
+				{vm.cardError && vm.card && (
+					<BankFeedback
+						cached
+						error={vm.cardError}
+						retry={vm.cardRetry}
+					/>
+				)}
 			</Stack>
 
 			{vm.cardsFeedback && (
 				<BankFeedback
 					{...vm.cardsFeedback}
 					loadingError
+					retry={vm.cardsRetry}
 				/>
 			)}
 
 			<BankPeriodPicker onChange={vm.setPeriod} period={vm.period} />
 
-			<BankSummaryView {...vm.summary} />
+			<BankSummaryView {...vm.summary} retry={vm.summary.refetch} />
 
 			<Group align="end" justify="space-between">
 				<Group gap="xs">
@@ -183,8 +197,6 @@ const CardPageView: FC<CardPageViewProps> = (props) => {
 				<CardHistory history={vm.history} period={vm.period} rows={vm.rows} />
 			</Stack>
 
-			{vm.history.error && !vm.rows && <Text role="alert">{t("bank.error")}</Text>}
-
 			{vm.history.page !== undefined && vm.pageSize !== "all" && (
 				<Group
 					aria-label={t("bank.pagination")}

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

@@ -97,13 +97,16 @@ function useCardPageVm() {
 		archivePending: updateCard.isPending,
 		canAddOperation: !card.data?.archivedAt && Boolean(cards.data),
 		card: card.data,
+		cardError: card.error,
 		cardLoading: card.isLoading,
 		cardRefreshError: card.isError,
 		cardRefreshing: card.isFetching,
+		cardRetry: () => card.refetch(),
 		cards: cards.data,
 		cardsFeedback: cards.isError
 			? { cached: Boolean(cards.data), error: cards.error }
 			: undefined,
+		cardsRetry: () => cards.refetch(),
 		closeDeletion: () => setDeleting(null),
 		closeEditing: () => setEditingCard(false),
 		closeOperation: () => setOperation(null),
@@ -112,9 +115,10 @@ function useCardPageVm() {
 		editingCard,
 		history: {
 			changingPage: history.isPlaceholderData,
-			error: history.isError,
+			error: history.error,
 			loading: history.isLoading,
 			page: history.data?.page,
+			refetch: () => history.refetch(),
 		},
 		notFound: isApiErrorCode(
 			apiErrorCode(card.error),
@@ -139,9 +143,10 @@ function useCardPageVm() {
 		},
 		summary: {
 			data: summary.data,
-			error: summary.isError,
+			error: summary.error,
 			fetching: summary.isFetching,
 			loading: summary.isLoading,
+			refetch: () => summary.refetch(),
 		},
 		toggleArchive: () => {
 			if (!card.data) return;

src/pages/cards/ui/CardsPage/CardsPage.test.tsx

@@ -47,8 +47,9 @@ function renderCards(isFail = false, hasCategoryFailure = false) {
 		),
 	);
 
-	return render(
+	const client = createTestQueryClient();
-		<QueryClientProvider client={createTestQueryClient()}>
+	render(
+		<QueryClientProvider client={client}>
 			<MantineProvider env="test">
 				<MemoryRouter initialEntries={["/cards?month=2026-09"]}>
 					<CardsPage />
@@ -56,6 +57,8 @@ function renderCards(isFail = false, hasCategoryFailure = false) {
 			</MantineProvider>
 		</QueryClientProvider>,
 	);
+
+	return client;
 }
 
 describe("CardsPage", () => {
@@ -232,4 +235,76 @@ describe("CardsPage", () => {
 		});
 		expect(screen.queryByRole("alert")).not.toBeInTheDocument();
 	});
+
+	it("shows a cold cards error with retry", async () => {
+		renderCards(true);
+
+		expect(
+			await screen.findByRole("alert", {}, { timeout: 5000 }),
+		).toHaveTextContent("Не удалось загрузить данные карт.");
+		expect(
+			screen.getByRole("button", { name: "Повторить" }),
+		).toBeInTheDocument();
+
+		server.use(
+			http.get("*/api/v1/bank-cards", () =>
+				HttpResponse.json([
+					{
+						archivedAt: null,
+						balance: money("10000"),
+						bankName: null,
+						id: "a",
+						lastFour: null,
+						name: "Повседневная",
+						openingBalance: money("10000"),
+						openingDate: "2026-01-01",
+						version: 1,
+					},
+				]),
+			),
+		);
+		fireEvent.click(screen.getByRole("button", { name: "Повторить" }));
+
+		await waitFor(() =>
+			expect(screen.queryByRole("alert")).not.toBeInTheDocument(),
+		);
+		expect(
+			screen.getByRole("link", { name: /Повседневная/ }),
+		).toBeInTheDocument();
+	});
+
+	it("shows a cached cards error while keeping the grid", async () => {
+		const view = renderCards();
+
+		await screen.findByRole("heading", { name: "Добавьте первую карту" });
+		server.use(
+			http.get("*/api/v1/bank-cards", () =>
+				HttpResponse.json([
+					{
+						archivedAt: null,
+						balance: money("10000"),
+						bankName: null,
+						id: "a",
+						lastFour: null,
+						name: "Повседневная",
+						openingBalance: money("10000"),
+						openingDate: "2026-01-01",
+						version: 1,
+					},
+				]),
+			),
+		);
+		await view.invalidateQueries();
+		await screen.findByRole("link", { name: /Повседневная/ });
+
+		server.use(http.get("*/api/v1/bank-cards", () => HttpResponse.error()));
+		await view.invalidateQueries();
+
+		expect(
+			await screen.findByRole("alert", {}, { timeout: 5000 }),
+		).toHaveTextContent("Не удалось обновить данные. Показаны последние полученные.");
+		expect(
+			screen.getByRole("link", { name: /Повседневная/ }),
+		).toBeInTheDocument();
+	});
 });

src/pages/cards/ui/CardsPage/CardsPage.view.tsx

@@ -18,6 +18,7 @@ import { Link } from "react-router";
 
 import {
 	BankCardFace,
+	BankFeedback,
 	BankPeriodPicker,
 	BankSummaryView,
 } from "@/entities/bank-card";
@@ -51,15 +52,17 @@ const CardsPageViewCards: FC<CardsPageViewProps> = (props) => {
 			);
 		}
 
-		const text = t(vm.archive ? "bank.emptyHint" : "bank.noActive");
+		if (!vm.cards.error) {
+			const text = t(vm.archive ? "bank.emptyHint" : "bank.noActive");
 
-		return (
+			return (
-			<StateView
+				<StateView
-				action={<Button onClick={vm.onAddCard}>{t("bank.addCard")}</Button>}
+					action={<Button onClick={vm.onAddCard}>{t("bank.addCard")}</Button>}
-				text={text}
+					text={text}
-				title={t("bank.empty")}
+					title={t("bank.empty")}
-			/>
+				/>
-		);
+			);
+		}
 	}
 
 	if (vm.cards.isLoading) {
@@ -103,6 +106,15 @@ const CardsPageView: FC<CardsPageViewProps> = (props) => {
 				onChange={vm.onArchiveChange}
 			/>
 
+			{vm.cards.error && (
+				<BankFeedback
+					cached={Boolean(vm.cards.data)}
+					error={vm.cards.error}
+					loadingError={!vm.cards.data}
+					retry={vm.retryCards}
+				/>
+			)}
+
 			<CardsPageViewCards {...props} />
 
 			<Group align="flex-end" justify="space-between">
@@ -123,9 +135,10 @@ const CardsPageView: FC<CardsPageViewProps> = (props) => {
 			<BankSummaryView
 				all
 				data={vm.summary.data}
-				error={vm.summary.isError}
+				error={vm.summary.error}
 				fetching={vm.summary.isFetching}
 				loading={vm.summary.isLoading}
+				retry={vm.retrySummary}
 			/>
 		</Stack>
 	);

src/pages/cards/ui/CardsPage/CardsPage.vm.ts

@@ -39,6 +39,8 @@ function useCardsPageVm() {
 			setArchive(event.currentTarget.checked),
 		onCategories: () => setManagingCategories(true),
 		period,
+		retryCards: () => cards.refetch(),
+		retrySummary: () => summary.refetch(),
 		setPeriod: (value: [null | string, null | string]) => {
 			if (value[0] && value[1]) setParameters({ from: value[0], to: value[1] });
 		},

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

@@ -337,7 +337,7 @@ describe("stock page", () => {
 				"/stocks/SBERP?period=year&events=trades",
 			),
 		);
-		expect(await screen.findByText("Зачисление дивидендов")).toBeVisible();
+		expect(await screen.findByText("Дивиденд")).toBeVisible();
 	});
 	it("offers search for ambiguous tickers without requesting personal data", async () => {
 		const { requests } = setup({ ambiguousTicker: true, path: "/stocks/SAME" });
@@ -368,18 +368,18 @@ describe("stock page", () => {
 			screen.getByText("К закрытию предыдущего торгового дня, 09.09.2026"),
 		).toBeVisible();
 		expect(await screen.findByText("Зачисление дивидендов")).toBeVisible();
-		expect(screen.getByText("Событие компании")).toBeVisible();
+		expect(screen.getAllByText("на акцию").length).toBeGreaterThan(0);
 		expect(screen.getByText("328,8 ₽")).toBeVisible();
 		expect(screen.getByText("P/E · TTM")).toBeVisible();
 		expect(screen.getByText("Описание компании")).toBeVisible();
 		expect(
 			screen.queryByRole("button", { name: "О компании" }),
 		).not.toBeInTheDocument();
-		expect(screen.getByText("13.10.2026")).toBeVisible();
+		expect(screen.getByText(/13\.10\.2026/)).toBeVisible();
 		fireEvent.click(
 			screen.getByRole("button", { name: "История дивидендов компании" }),
 		);
-		await waitFor(() => expect(screen.getByText("13.10.2025")).toBeVisible());
+		await waitFor(() => expect(screen.getByText(/13\.10\.2025/)).toBeVisible());
 		expect(screen.getByText("Текущая средняя покупка: 200 ₽")).toBeVisible();
 		fireEvent.click(screen.getByRole("button", { name: /Цены в таблице/ }));
 		const rows = within(await screen.findByRole("table")).getAllByRole("row");
@@ -413,7 +413,9 @@ describe("stock page", () => {
 		expect(await screen.findByText("Продажа")).toBeVisible();
 		expect(screen.getByText("2 шт.")).toBeVisible();
 		expect(screen.getByText("Цена: 100 ₽")).toBeVisible();
-		expect(screen.getByText(/02.01.2022, 10:00 UTC/)).toBeVisible();
+		const snapshotTime = new Intl.DateTimeFormat("ru-RU", { dateStyle: "short", timeStyle: "short" });
+		const operationTime = snapshotTime.format(new Date("2022-01-02T10:00:00Z"));
+		expect(screen.getByText(operationTime, { exact: false })).toBeVisible();
 		expect(
 			requests.some(
 				url =>

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

@@ -63,8 +63,10 @@ const StockPageView: FC<StockPageViewProps> = (props) => {
 
 			<StockDividends
 				dividends={vm.dividends}
+				logoName={stock.logoName}
 				pastDividends={vm.pastDividends}
 				state={vm.dividendsState}
+				ticker={stock.ticker}
 				upcoming={vm.upcoming}
 			/>
 

src/pages/stock/ui/StockPage/components/StockDividends.view.tsx

@@ -1,198 +1,96 @@
 import type { FC } from "react";
 
-import {
+import { Accordion, Alert, Stack, Text } from "@mantine/core";
-	Accordion,
-	Alert,
-	Badge,
-	Group,
-	Paper,
-	Stack,
-	Text,
-} from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
 import type { StockDividends as Dividends } from "@/entities/stock";
 
 import { InstrumentSection, type SectionState } from "@/features/instrument-details";
-import { formatDate, formatMoney, formatSnapshotTime } from "@/shared/lib";
+import { formatDate, formatSnapshotTime, instrumentLogoUrl } from "@/shared/lib";
+import { PayoutCard } from "@/shared/ui";
 
-import classes from "../StockPage.module.css";
+type Dividend = Dividends["dividends"][number];
+
+type DividendCardProps = {
+	event: Dividend;
+	logoName?: null | string;
+	ticker?: null | string;
+};
 
 type StockDividendsProps = {
 	dividends?: Dividends;
+	logoName?: null | string;
 	pastDividends: Dividends["dividends"];
 	state: SectionState;
+	ticker?: null | string;
 	upcoming: Dividends["dividends"];
 };
 
+const DividendCard: FC<DividendCardProps> = (props) => {
+	const { event } = props;
+	const { t } = useTranslation();
+	const title = `${t("events.type.dividend")} · ${props.ticker || t("stock.share")}`;
+
+	const metadata = [
+		event.recordDate
+			? `${t("stock.record")}: ${formatDate(event.recordDate)}`
+			: t("stock.dateUnknown"),
+		event.paymentDate ? `${t("stock.payment")}: ${formatDate(event.paymentDate)}` : null,
+	].filter(Boolean).join(" · ");
+
+	const conditions = event.lastBuyDate
+		? <Text c="dimmed" size="xs">{t("stock.lastBuy")}: {formatDate(event.lastBuyDate)}</Text>
+		: undefined;
+
+	return (
+		<PayoutCard
+			conditions={conditions}
+			estimate={event.estimatedAmount}
+			imageSrc={instrumentLogoUrl(props.logoName)}
+			initial={(props.ticker?.trim()[0] ?? "?").toUpperCase()}
+			kind="schedule"
+			metadata={metadata}
+			perSecurity={event.perShare}
+			perSecurityLabel={t("stock.perShare")}
+			title={title}
+		/>
+	);
+};
+
 const StockDividends: FC<StockDividendsProps> = (props) => {
 	const { dividends, pastDividends, state, upcoming } = props;
 	const { t } = useTranslation();
 
-	let upcomingContent;
-
-	if (dividends) {
-		if (upcoming.length > 0) {
-			upcomingContent = (
-				upcoming.map(event => (
-					<div
-						className={classes.dividend}
-						key={JSON.stringify([
-							event.recordDate,
-							event.paymentDate,
-							event.perShare,
-						])}
-					>
-						<Group align="start" justify="space-between">
-							<div>
-								<Badge color="green" variant="light">
-									{t("stock.companyEvent")}
-								</Badge>
-
-								<Text fw={650} mt="xs" size="xl">
-									{formatMoney(event.perShare)}
-									{" "}
-									<Text c="dimmed" component="span" size="sm">
-										{t("stock.perShare")}
-									</Text>
-								</Text>
-							</div>
-
-							{!!event.estimatedAmount && (
-								<div>
-									<Text c="dimmed" size="xs">
-										{t("stock.yourEstimate")}
-									</Text>
-
-									<Text fw={600}>
-										{formatMoney(event.estimatedAmount)}
-									</Text>
-								</div>
-							)}
-						</Group>
-
-						<Group gap="xl" mt="md">
-							{!!event.lastBuyDate && (
-								<div>
-									<Text c="dimmed" size="xs">
-										{t("stock.lastBuy")}
-									</Text>
-
-									<Text>{formatDate(event.lastBuyDate)}</Text>
-								</div>
-							)}
-
-							{!!event.recordDate && (
-								<div>
-									<Text c="dimmed" size="xs">
-										{t("stock.record")}
-									</Text>
-
-									<Text>{formatDate(event.recordDate)}</Text>
-								</div>
-							)}
-
-							{!!event.paymentDate && (
-								<div>
-									<Text c="dimmed" size="xs">
-										{t("stock.payment")}
-									</Text>
-
-									<Text>{formatDate(event.paymentDate)}</Text>
-								</div>
-							)}
-						</Group>
-					</div>
-				))
-			);
-		}
-		else {
-			upcomingContent = (
-				<Text c="dimmed">
-					{t("stock.noUpcoming", { to: formatDate(dividends.to) })}
-				</Text>
-			);
-		}
-	}
-
-	let pastDividendsContent;
-
-	if (pastDividends.length > 0) {
-		pastDividendsContent = (
-			<Stack gap="sm">
-				{pastDividends.map(event => (
-					<Paper
-						key={JSON.stringify([
-							event.recordDate,
-							event.paymentDate,
-							event.perShare,
-						])}
-						p="md"
-						radius="md"
-						withBorder
-					>
-						<Group align="start" justify="space-between">
-							<div>
-								<Text c="dimmed" size="xs">
-									{t("stock.record")}
-								</Text>
-
-								<Text fw={600}>
-									{event.recordDate
-										? formatDate(event.recordDate)
-										: t("stock.dateUnknown")}
-								</Text>
-
-								{!!event.paymentDate && (
-									<Text c="dimmed" mt="xs" size="xs">
-										{t("stock.payment")}:{" "}
-										{formatDate(event.paymentDate)}
-									</Text>
-								)}
-							</div>
-
-							<div>
-								<Text fw={650} size="lg">
-									{formatMoney(event.perShare)}
-								</Text>
-
-								<Text c="dimmed" size="xs">
-									{t("stock.perShare")}
-								</Text>
-							</div>
-						</Group>
-					</Paper>
-				))}
-			</Stack>
-		);
-	}
-	else {
-		pastDividendsContent = <Text c="dimmed">{t("stock.noDividends")}</Text>;
-	}
-
 	return (
 		<InstrumentSection state={state} title={t("stock.upcoming")}>
 			{!!dividends && (
 				<Stack gap="md">
-					{!!(
+					{(dividends.estimateUnavailable || dividends.positionIsStale) && (
-						dividends.estimateUnavailable || dividends.positionIsStale
-					) && (
 						<Alert aria-live="polite" color="orange" role="status">
 							{t("stock.estimateUnavailable")}
 						</Alert>
 					)}
 
-					{upcomingContent}
+					{upcoming.length > 0
+						? upcoming.map(event => (
+								<DividendCard
+									event={event}
+									key={JSON.stringify([
+										event.recordDate,
+										event.paymentDate,
+										event.perShare,
+									])}
+									logoName={props.logoName}
+									ticker={props.ticker}
+								/>
+							))
+						: <Text c="dimmed">{t("stock.noUpcoming", { to: formatDate(dividends.to) })}</Text>}
 
-					<Text c="dimmed" size="xs">
+					<Text c="dimmed" size="xs">{t("stock.dividendNote")}</Text>
-						{t("stock.dividendNote")}
-					</Text>
 
 					{!!dividends.positionAt && (
 						<Text c="dimmed" size="xs">
-							{t("stock.snapshotAt", {
+							{t("stock.snapshotAt", { date: formatSnapshotTime(dividends.positionAt) })}
-								date: formatSnapshotTime(dividends.positionAt),
-							})}
 						</Text>
 					)}
 
@@ -210,7 +108,24 @@ const StockDividends: FC<StockDividendsProps> = (props) => {
 									})}
 								</Text>
 
-								{pastDividendsContent}
+								{pastDividends.length > 0
+									? (
+											<Stack gap="sm">
+												{pastDividends.map(event => (
+													<DividendCard
+														event={event}
+														key={JSON.stringify([
+															event.recordDate,
+															event.paymentDate,
+															event.perShare,
+														])}
+														logoName={props.logoName}
+														ticker={props.ticker}
+													/>
+												))}
+											</Stack>
+										)
+									: <Text c="dimmed">{t("stock.noDividends")}</Text>}
 							</Accordion.Panel>
 						</Accordion.Item>
 					</Accordion>

src/pages/stocks/ui/StocksPage/StocksPage.test.tsx

@@ -1,6 +1,6 @@
 import { MantineProvider } from "@mantine/core";
 import { QueryClientProvider } from "@tanstack/react-query";
-import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
 import { MemoryRouter } from "react-router";
 import { afterEach, describe, expect, it, vi } from "vitest";
@@ -12,19 +12,37 @@ import { server } from "@/test/server";
 import { StocksPage } from "./StocksPage";
 import { useStocksPageVm } from "./StocksPage.vm";
 
+const pageOperations: Promise<void>[] = [];
+
 const StocksPageVmProbe = () => {
 	const vm = useStocksPageVm();
 
 	return (
 		<>
-			<button onClick={vm.onSearch}>search</button>
+			<button
-			<button onClick={() => vm.onPage(2)}>page</button>
+				onClick={() => {
+					pageOperations.push(vm.search());
+				}}
+			>
+				search
+			</button>
+			<button
+				onClick={() => {
+					pageOperations.push(vm.changePage(2));
+				}}
+			>
+				page
+			</button>
 			<output>{vm.items.map(item => item.name).join(", ")}</output>
 		</>
 	);
 };
 
-afterEach(() => vi.useRealTimers());
+afterEach(() => {
+	pageOperations.length = 0;
+
+	return vi.useRealTimers();
+});
 
 describe("stock search", () => {
 	it("waits for a meaningful query and uses the server-verified ticker link", async () => {
@@ -75,7 +93,9 @@ describe("stock search", () => {
 		expect(
 			await screen.findByRole("link", { name: /Сбербанк/ }),
 		).toHaveAttribute("href", "/stocks/e6123145-9665-43e0-8413-cd61b8aa9b13");
-		expect(screen.getByText("Список получен 10.10.2026, 10:00")).toBeVisible();
+		const snapshotTime = new Intl.DateTimeFormat("ru-RU", { dateStyle: "short", timeStyle: "short" });
+		const fetchedAt = snapshotTime.format(new Date("2026-10-10T10:00:00Z"));
+		expect(screen.getByText(`Список получен ${fetchedAt}`)).toBeVisible();
 		expect(screen.getByText("Лот: 10 шт.")).toBeVisible();
 		expect(screen.getByText("ISIN: RU0009029540")).toBeVisible();
 		expect(screen.getAllByText("Мосбиржа")[0]).toBeVisible();
@@ -230,9 +250,12 @@ describe("stock search", () => {
 		fireEvent.click(screen.getByRole("button", { name: "page" }));
 		fireEvent.click(screen.getByRole("button", { name: "search" }));
 		await screen.findByText("Новый");
-		oldPage.resolve();
+		await act(async () => {
+			oldPage.resolve();
+			await pageOperations[0];
+		});
 
-		await waitFor(() => expect(screen.getByText("Новый")).toBeVisible());
+		expect(screen.getByText("Новый")).toBeVisible();
 		expect(screen.queryByText("Старый результат")).not.toBeInTheDocument();
 	});
 

src/pages/stocks/ui/StocksPage/StocksPage.vm.ts

@@ -101,6 +101,7 @@ function useStocksPageVm() {
 	};
 
 	return {
+		changePage,
 		criteria,
 		error,
 		items: page?.items ?? [],
@@ -111,6 +112,8 @@ function useStocksPageVm() {
 		onSearch: () => void search(),
 		page: page?.page,
 		resultTime: page?.asOf,
+		// Test seam: settle the actual operation instead of the handler release.
+		search,
 		searched: page !== null,
 		totalPages: page ? page.page + Number(page.hasNext) : 0,
 	};

src/shared/api/client.test.ts

@@ -67,6 +67,25 @@ describe("apiClient authentication", () => {
 		expect(clear).toHaveBeenCalledOnce();
 	});
 
+	it("keeps the session when refresh failed because the server was unreachable", async () => {
+		const clear = vi.fn();
+		server.use(
+			http.get("*/api/v1/brokerage-accounts", () =>
+				HttpResponse.json({ code: "UNAUTHORIZED" }, { status: 401 }),
+			),
+		);
+		configureAuthClient({
+			accessToken: () => "expired",
+			clear,
+			refresh: () => Promise.resolve(false),
+			unavailable: () => true,
+		});
+
+		await apiClient.GET("/api/v1/brokerage-accounts");
+
+		expect(clear).not.toHaveBeenCalled();
+	});
+
 	it("does not attach Bearer auth to authentication endpoints", async () => {
 		let authorization: null | string
 
@@ -281,6 +300,33 @@ describe("apiClient transient read recovery", () => {
 		},
 	);
 
+	it("does not retry a read refused with INVALID_TBANK_TOKEN", async () => {
+		let requests = 0;
+		server.use(
+			http.get("*/api/v1/brokerage-accounts", () => {
+				requests += 1;
+
+				return HttpResponse.json(
+					{ code: "INVALID_TBANK_TOKEN", status: 400 },
+					{ status: 400 },
+				);
+			}),
+		);
+		configureAuthClient({
+			accessToken: () => "token",
+			clear: vi.fn(),
+			refresh: () => Promise.resolve(false),
+		});
+
+		const { error, response } = await apiClient.GET(
+			"/api/v1/brokerage-accounts",
+		);
+
+		expect(response.status).toBe(400);
+		expect(error).toMatchObject({ code: "INVALID_TBANK_TOKEN" });
+		expect(requests).toBe(1);
+	});
+
 	it("does not retry mutations", async () => {
 		let requests = 0;
 		server.use(

src/shared/api/client.ts

@@ -32,6 +32,10 @@ type AuthHandlers = {
 	clear: () => void;
 	generation?: () => number;
 	refresh: () => Promise<boolean>;
+	/**
+	True after a refresh failed transiently (network/5xx): the session is not proven gone.
+	*/
+	unavailable?: () => boolean;
 };
 
 type ReadAttempt = {
@@ -100,7 +104,8 @@ async function authenticatedFetch(request: Request): Promise<Response> {
 	if (!isCurrent()) throw new DOMException("Session changed", "AbortError");
 
 	if (!(await sessionState.handlers.refresh())) {
-		if (isCurrent()) sessionState.handlers.clear();
+		if (isCurrent() && !sessionState.handlers.unavailable?.())
+			sessionState.handlers.clear();
 
 		return response;
 	}

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

@@ -746,10 +746,13 @@ export interface components {
                 detail: string;
             }[];
         };
-        CredentialsDto: {
+        RegisterDto: {
             /** @example user@example.com */
             email: string;
-            /** @example a secure password */
+            /**
+             * @description Raw password: 8-72 printable ASCII characters (letters, digits, symbols, space). Not trimmed or normalized.
+             * @example a secure password
+             */
             password: string;
         };
         UserDto: {
@@ -760,6 +763,15 @@ export interface components {
             accessToken: string;
             user: components["schemas"]["UserDto"];
         };
+        LoginDto: {
+            /** @example user@example.com */
+            email: string;
+            /**
+             * @description Raw password, at most 72 UTF-8 bytes. Not trimmed or normalized.
+             * @example a secure password
+             */
+            password: string;
+        };
         MoneyDto: {
             currency: string;
             value: string;
@@ -897,12 +909,54 @@ export interface components {
             version: number;
             archived?: boolean;
         };
+        PortfolioStructureCategoryDto: {
+            /** @enum {string} */
+            type: "STOCK" | "BOND" | "OTHER" | "CASH";
+            /** @description Exact known value as a decimal string. */
+            value: string;
+            /** @description Percentage including cash, rounded to six decimal places. Null for incomplete, negative or zero-total compositions. */
+            sharePercent: string | null;
+        };
+        PortfolioStructureCurrencyDto: {
+            currency: string;
+            totalValue: string;
+            /** @description Any negative constituent, even if netted positive. */
+            hasNegativeValues: boolean;
+            categories: components["schemas"]["PortfolioStructureCategoryDto"][];
+        };
+        PortfolioUnvaluedCategoryDto: {
+            /** @enum {string} */
+            type: "STOCK" | "BOND" | "OTHER";
+            count: number;
+        };
+        PortfolioStructureDto: {
+            currencies: components["schemas"]["PortfolioStructureCurrencyDto"][];
+            /** @description Positions without current value and known valuation currency. Shares are unavailable across all currencies when nonempty. */
+            unvaluedCategories: components["schemas"]["PortfolioUnvaluedCategoryDto"][];
+        };
+        UnrealizedReturnDto: {
+            currency: string;
+            /** @example 12.345678901 */
+            absolute: string;
+            /** @example 100.00 */
+            costBasis: string;
+            /** @example 12.34 */
+            percent: string | null;
+            partial: boolean;
+        };
         PortfolioSummaryDto: {
             totalsByCurrency: components["schemas"]["MoneyDto"][];
+            cashBalances: components["schemas"]["MoneyDto"][];
+            structure: components["schemas"]["PortfolioStructureDto"];
+            unrealizedReturnByCurrency: components["schemas"]["UnrealizedReturnDto"][];
             /** @description Number of non-zero stock positions, not the number of units. */
             stockPositionCount: number;
             /** @description Number of non-zero bond positions, not the number of units. */
             bondPositionCount: number;
+            /** @description Number of non-zero fund positions, not the number of units. */
+            fundPositionCount: number;
+            /** @description Number of all non-zero positions, not the number of units. */
+            totalPositionCount: number;
         };
         BrokerageAccountDto: {
             id: string;
@@ -1014,31 +1068,6 @@ export interface components {
             ticker: string | null;
             logoName: string | null;
         };
-        PortfolioStructureCategoryDto: {
-            /** @enum {string} */
-            type: "STOCK" | "BOND" | "OTHER" | "CASH";
-            /** @description Exact known value as a decimal string. */
-            value: string;
-            /** @description Percentage including cash, rounded to six decimal places. Null for incomplete, negative or zero-total compositions. */
-            sharePercent: string | null;
-        };
-        PortfolioStructureCurrencyDto: {
-            currency: string;
-            totalValue: string;
-            /** @description Any negative constituent, even if netted positive. */
-            hasNegativeValues: boolean;
-            categories: components["schemas"]["PortfolioStructureCategoryDto"][];
-        };
-        PortfolioUnvaluedCategoryDto: {
-            /** @enum {string} */
-            type: "STOCK" | "BOND" | "OTHER";
-            count: number;
-        };
-        PortfolioStructureDto: {
-            currencies: components["schemas"]["PortfolioStructureCurrencyDto"][];
-            /** @description Positions without current value and known valuation currency. Shares are unavailable across all currencies when nonempty. */
-            unvaluedCategories: components["schemas"]["PortfolioUnvaluedCategoryDto"][];
-        };
         PortfolioDto: {
             /** Format: date-time */
             lastSuccessfulAt: string;
@@ -1107,16 +1136,6 @@ export interface components {
             data: components["schemas"]["IncomeSummaryDto"] | null;
             meta: components["schemas"]["InvestmentResourceMetaDto"];
         };
-        IncomeComparisonCurrencyDto: {
-            currency: string;
-            selected: components["schemas"]["IncomeCurrencySummaryDto"];
-            compared: components["schemas"]["IncomeCurrencySummaryDto"];
-            difference: components["schemas"]["IncomeCurrencySummaryDto"];
-        };
-        IncomeComparisonDto: {
-            period: components["schemas"]["IncomePeriodDto"];
-            totalsByCurrency: components["schemas"]["IncomeComparisonCurrencyDto"][];
-        };
         IncomeBucketDto: {
             period: components["schemas"]["IncomePeriodDto"];
             totalsByCurrency: components["schemas"]["IncomeCurrencySummaryDto"][];
@@ -1160,8 +1179,6 @@ export interface components {
             totalsByCurrency: components["schemas"]["IncomeCurrencySummaryDto"][];
             /** Format: date-time */
             calculatedAt: string;
-            previous: components["schemas"]["IncomeComparisonDto"] | null;
-            yearComparison: components["schemas"]["IncomeComparisonDto"] | null;
             /** @enum {string} */
             bucketGranularity: "day" | "week" | "month";
             buckets: components["schemas"]["IncomeBucketDto"][];
@@ -1183,7 +1200,7 @@ export interface components {
             lastSuccessfulAt: string | null;
             lastAttempt: components["schemas"]["InvestmentAttemptDto"];
             /** @enum {string} */
-            role: "selected" | "previous" | "year";
+            role: "selected";
         };
         IncomeAnalyticsMetaDto: {
             dataRevision: string;
@@ -1720,7 +1737,7 @@ export interface operations {
         };
         requestBody: {
             content: {
-                "application/json": components["schemas"]["CredentialsDto"];
+                "application/json": components["schemas"]["RegisterDto"];
             };
         };
         responses: {
@@ -1788,7 +1805,7 @@ export interface operations {
         };
         requestBody: {
             content: {
-                "application/json": components["schemas"]["CredentialsDto"];
+                "application/json": components["schemas"]["LoginDto"];
             };
         };
         responses: {

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

@@ -164,10 +164,16 @@ describe("persistent resource query lifecycle", () => {
 		});
 
 		await waitFor(() => expect(isStarted).toBe(true));
-		await act(() => result.current.observe());
+		// Capture the observation promise before releasing the old handler; the
+		// final assertion must follow its settlement, not the handler release.
+		let observation: Promise<unknown> = Promise.resolve();
+		await act(async () => {
+			observation = result.current.observe() ?? Promise.resolve();
+			await observation;
+		});
 		await act(async () => {
 			release();
-			await blocked;
+			await observation;
 		});
 		expect(result.current.data).toEqual(snapshot);
 	});

src/shared/api/spec/openapi.json

@@ -10,7 +10,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CredentialsDto"
+                "$ref": "#/components/schemas/RegisterDto"
               }
             }
           }
@@ -91,7 +91,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/CredentialsDto"
+                "$ref": "#/components/schemas/LoginDto"
               }
             }
           }
@@ -5236,7 +5236,7 @@
           "code"
         ]
       },
-      "CredentialsDto": {
+      "RegisterDto": {
         "type": "object",
         "properties": {
           "email": {
@@ -5245,8 +5245,8 @@
           },
           "password": {
             "type": "string",
-            "minLength": 12,
+            "description": "Raw password: 8-72 printable ASCII characters (letters, digits, symbols, space). Not trimmed or normalized.",
-            "maxLength": 72,
+            "pattern": "^[\\x20-\\x7E]{8,72}$",
             "example": "a secure password"
           }
         },
@@ -5285,6 +5285,24 @@
           "user"
         ]
       },
+      "LoginDto": {
+        "type": "object",
+        "properties": {
+          "email": {
+            "type": "string",
+            "example": "user@example.com"
+          },
+          "password": {
+            "type": "string",
+            "description": "Raw password, at most 72 UTF-8 bytes. Not trimmed or normalized.",
+            "example": "a secure password"
+          }
+        },
+        "required": [
+          "email",
+          "password"
+        ]
+      },
       "MoneyDto": {
         "type": "object",
         "properties": {
@@ -5801,6 +5819,135 @@
           "version"
         ]
       },
+      "PortfolioStructureCategoryDto": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "STOCK",
+              "BOND",
+              "OTHER",
+              "CASH"
+            ]
+          },
+          "value": {
+            "type": "string",
+            "description": "Exact known value as a decimal string."
+          },
+          "sharePercent": {
+            "type": "string",
+            "nullable": true,
+            "description": "Percentage including cash, rounded to six decimal places. Null for incomplete, negative or zero-total compositions."
+          }
+        },
+        "required": [
+          "type",
+          "value",
+          "sharePercent"
+        ]
+      },
+      "PortfolioStructureCurrencyDto": {
+        "type": "object",
+        "properties": {
+          "currency": {
+            "type": "string"
+          },
+          "totalValue": {
+            "type": "string"
+          },
+          "hasNegativeValues": {
+            "type": "boolean",
+            "description": "Any negative constituent, even if netted positive."
+          },
+          "categories": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PortfolioStructureCategoryDto"
+            }
+          }
+        },
+        "required": [
+          "currency",
+          "totalValue",
+          "hasNegativeValues",
+          "categories"
+        ]
+      },
+      "PortfolioUnvaluedCategoryDto": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string",
+            "enum": [
+              "STOCK",
+              "BOND",
+              "OTHER"
+            ]
+          },
+          "count": {
+            "type": "number",
+            "minimum": 1
+          }
+        },
+        "required": [
+          "type",
+          "count"
+        ]
+      },
+      "PortfolioStructureDto": {
+        "type": "object",
+        "properties": {
+          "currencies": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PortfolioStructureCurrencyDto"
+            }
+          },
+          "unvaluedCategories": {
+            "description": "Positions without current value and known valuation currency. Shares are unavailable across all currencies when nonempty.",
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PortfolioUnvaluedCategoryDto"
+            }
+          }
+        },
+        "required": [
+          "currencies",
+          "unvaluedCategories"
+        ]
+      },
+      "UnrealizedReturnDto": {
+        "type": "object",
+        "properties": {
+          "currency": {
+            "type": "string"
+          },
+          "absolute": {
+            "type": "string",
+            "example": "12.345678901"
+          },
+          "costBasis": {
+            "type": "string",
+            "example": "100.00"
+          },
+          "percent": {
+            "type": "string",
+            "nullable": true,
+            "example": "12.34"
+          },
+          "partial": {
+            "type": "boolean"
+          }
+        },
+        "required": [
+          "currency",
+          "absolute",
+          "costBasis",
+          "percent",
+          "partial"
+        ]
+      },
       "PortfolioSummaryDto": {
         "type": "object",
         "properties": {
@@ -5810,6 +5957,21 @@
               "$ref": "#/components/schemas/MoneyDto"
             }
           },
+          "cashBalances": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MoneyDto"
+            }
+          },
+          "structure": {
+            "$ref": "#/components/schemas/PortfolioStructureDto"
+          },
+          "unrealizedReturnByCurrency": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/UnrealizedReturnDto"
+            }
+          },
           "stockPositionCount": {
             "type": "integer",
             "minimum": 0,
@@ -5819,12 +5981,27 @@
             "type": "integer",
             "minimum": 0,
             "description": "Number of non-zero bond positions, not the number of units."
+          },
+          "fundPositionCount": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Number of non-zero fund positions, not the number of units."
+          },
+          "totalPositionCount": {
+            "type": "integer",
+            "minimum": 0,
+            "description": "Number of all non-zero positions, not the number of units."
           }
         },
         "required": [
           "totalsByCurrency",
+          "cashBalances",
+          "structure",
+          "unrealizedReturnByCurrency",
           "stockPositionCount",
-          "bondPositionCount"
+          "bondPositionCount",
+          "fundPositionCount",
+          "totalPositionCount"
         ]
       },
       "BrokerageAccountDto": {
@@ -6296,104 +6473,6 @@
           "logoName"
         ]
       },
-      "PortfolioStructureCategoryDto": {
-        "type": "object",
-        "properties": {
-          "type": {
-            "type": "string",
-            "enum": [
-              "STOCK",
-              "BOND",
-              "OTHER",
-              "CASH"
-            ]
-          },
-          "value": {
-            "type": "string",
-            "description": "Exact known value as a decimal string."
-          },
-          "sharePercent": {
-            "type": "string",
-            "nullable": true,
-            "description": "Percentage including cash, rounded to six decimal places. Null for incomplete, negative or zero-total compositions."
-          }
-        },
-        "required": [
-          "type",
-          "value",
-          "sharePercent"
-        ]
-      },
-      "PortfolioStructureCurrencyDto": {
-        "type": "object",
-        "properties": {
-          "currency": {
-            "type": "string"
-          },
-          "totalValue": {
-            "type": "string"
-          },
-          "hasNegativeValues": {
-            "type": "boolean",
-            "description": "Any negative constituent, even if netted positive."
-          },
-          "categories": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/PortfolioStructureCategoryDto"
-            }
-          }
-        },
-        "required": [
-          "currency",
-          "totalValue",
-          "hasNegativeValues",
-          "categories"
-        ]
-      },
-      "PortfolioUnvaluedCategoryDto": {
-        "type": "object",
-        "properties": {
-          "type": {
-            "type": "string",
-            "enum": [
-              "STOCK",
-              "BOND",
-              "OTHER"
-            ]
-          },
-          "count": {
-            "type": "number",
-            "minimum": 1
-          }
-        },
-        "required": [
-          "type",
-          "count"
-        ]
-      },
-      "PortfolioStructureDto": {
-        "type": "object",
-        "properties": {
-          "currencies": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/PortfolioStructureCurrencyDto"
-            }
-          },
-          "unvaluedCategories": {
-            "description": "Positions without current value and known valuation currency. Shares are unavailable across all currencies when nonempty.",
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/PortfolioUnvaluedCategoryDto"
-            }
-          }
-        },
-        "required": [
-          "currencies",
-          "unvaluedCategories"
-        ]
-      },
       "PortfolioDto": {
         "type": "object",
         "properties": {
@@ -6706,47 +6785,6 @@
           "meta"
         ]
       },
-      "IncomeComparisonCurrencyDto": {
-        "type": "object",
-        "properties": {
-          "currency": {
-            "type": "string"
-          },
-          "selected": {
-            "$ref": "#/components/schemas/IncomeCurrencySummaryDto"
-          },
-          "compared": {
-            "$ref": "#/components/schemas/IncomeCurrencySummaryDto"
-          },
-          "difference": {
-            "$ref": "#/components/schemas/IncomeCurrencySummaryDto"
-          }
-        },
-        "required": [
-          "currency",
-          "selected",
-          "compared",
-          "difference"
-        ]
-      },
-      "IncomeComparisonDto": {
-        "type": "object",
-        "properties": {
-          "period": {
-            "$ref": "#/components/schemas/IncomePeriodDto"
-          },
-          "totalsByCurrency": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/IncomeComparisonCurrencyDto"
-            }
-          }
-        },
-        "required": [
-          "period",
-          "totalsByCurrency"
-        ]
-      },
       "IncomeBucketDto": {
         "type": "object",
         "properties": {
@@ -6948,24 +6986,6 @@
             "type": "string",
             "format": "date-time"
           },
-          "previous": {
-            "nullable": true,
-            "type": "object",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/IncomeComparisonDto"
-              }
-            ]
-          },
-          "yearComparison": {
-            "nullable": true,
-            "type": "object",
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/IncomeComparisonDto"
-              }
-            ]
-          },
           "bucketGranularity": {
             "type": "string",
             "enum": [
@@ -6998,8 +7018,6 @@
           "period",
           "totalsByCurrency",
           "calculatedAt",
-          "previous",
-          "yearComparison",
           "bucketGranularity",
           "buckets",
           "instruments",
@@ -7056,9 +7074,7 @@
           "role": {
             "type": "string",
             "enum": [
-              "selected",
+              "selected"
-              "previous",
-              "year"
             ]
           }
         },
@@ -7523,7 +7539,8 @@
             "type": "integer",
             "minimum": 1
           }
-        }
+        },
+        "additionalProperties": false
       },
       "StockScreenerItemDto": {
         "type": "object",
@@ -7569,7 +7586,8 @@
           },
           "lot": {
             "type": "integer",
-            "nullable": true
+            "nullable": true,
+            "minimum": 1
           }
         },
         "required": [

src/shared/i18n/locales/ru.ts

@@ -5,7 +5,20 @@ const ru = {
 			all: "Все счета",
 			allDescription: "Портфель по всем доступным инвестиционным счетам",
 			bonds: "Облигации",
+			brokerDescription: "По данным брокера",
+			cash: "Деньги на счёте",
+			count_few: "{{count}} счёта",
+			count_many: "{{count}} счетов",
+			count_one: "{{count}} счёт",
+			count_other: "{{count}} счёта",
 			currentValue: "Текущая стоимость",
+			description: {
+				currentValue: "Текущая стоимость: {{value}}. ",
+				return: "Доходность {{currency}}: {{percent}}, {{absolute}}",
+				start: "Счёт {{name}}, {{type}}. ",
+				structure: "Структура {{currency}}: {{value}}",
+				structureCategory: "{{category}} {{value}}",
+			},
 			emptyText:
 				"Откройте инвестиционный счет в T-Bank, чтобы он появился здесь.",
 			emptyTitle: "Нет инвестиционных счетов",
@@ -18,6 +31,11 @@ const ru = {
 			openAll: "Портфель по всем счетам",
 			openedOn: "Открыт {{date}}",
 			openSettings: "Открыть настройки T-Bank",
+			partial: "частично",
+			positions_few: "{{count}} позиции",
+			positions_many: "{{count}} позиций",
+			positions_one: "{{count}} позиция",
+			positions_other: "{{count}} позиции",
 			refreshError:
 				"Не удалось обновить данные. Показаны последние полученные.",
 			refreshing: "Обновляем данные",
@@ -28,8 +46,22 @@ const ru = {
 			retry: "Повторить",
 			scope: "Счёт",
 			stocks: "Акции",
+			structure: {
+				category: "{{category}} {{percent}} %",
+				incomplete: "{{category}}: доля неизвестна",
+				label: "Структура в {{currency}}: {{value}}",
+			},
 			subtitle: "Ваши инвестиции по счетам",
 			summaryEmpty: "Нет текущих сумм",
+			summaryExcluded_few:
+				"Ещё {{count}} счёта не включены: нет актуального портфеля",
+			summaryExcluded_many:
+				"Ещё {{count}} счетов не включены: нет актуального портфеля",
+			summaryExcluded_one:
+				"Ещё {{count}} счёт не включён: нет актуального портфеля",
+			summaryExcluded_other:
+				"Ещё {{count}} счёта не включены: нет актуального портфеля",
+			summaryNoTotals: "Нет данных для сводки",
 			summaryUnavailable: "Сводка временно недоступна",
 			title: "Счета",
 			types: {
@@ -53,10 +85,14 @@ const ru = {
 			passwordConfirmation: "Подтвердите пароль",
 			register: "Регистрация",
 			requestError: "Не удалось выполнить запрос. Попробуйте ещё раз.",
+			retry: "Повторить",
+			unavailableText: "Сервер временно недоступен. Ваш вход сохранён, попробуйте через минуту.",
+			unavailableTitle: "Не удалось подключиться",
 			validation: {
 				invalidEmail: "Некорректный email",
-				invalidPasswordLength: "Пароль должен содержать от 12 до 72 байт",
+				invalidPasswordLength: "Пароль: от 8 до 72 символов, только латинские буквы, цифры, спецсимволы и пробел",
 				passwordsDoNotMatch: "Пароли не совпадают",
+				passwordTooLong: "Пароль не должен превышать 72 байта",
 			},
 		},
 		bank: {
@@ -340,13 +376,8 @@ const ru = {
 		},
 		income: {
 			apply: "Применить",
-			comparisonEmpty: "За эти периоды купоны и дивиденды не найдены.",
-			comparisonFailed:
-				"Не удалось загрузить период сравнения. Повторите обновление.",
-			comparisonPending: "Период сравнения ещё не загружен полностью.",
 			coupon: "Купоны",
 			datePlaceholder: "ДД.ММ.ГГГГ",
-			difference: "Разница",
 			dividend: "Дивиденды",
 			emptyText: "За выбранный период подходящих исполненных выплат нет.",
 			emptyTitle: "Купоны и дивиденды не найдены",
@@ -356,8 +387,6 @@ const ru = {
 			open: "Открыть пассивный доход",
 			payments: "Выплаты",
 			period: "Период",
-			previousPeriod: "Предыдущий период",
-			previousUnavailable: "Сравнение с предыдущим периодом недоступно.",
 			refreshError:
 				"Не удалось обновить пассивный доход. Показан последний загруженный результат.",
 			refreshing: "Обновляем пассивный доход",
@@ -378,8 +407,6 @@ const ru = {
 				period:
 					"Укажите корректный период без будущих дат: начало не позже окончания.",
 			},
-			yearAgo: "Годом ранее",
-			yearUnavailable: "Сравнение с годом ранее недоступно.",
 		},
 		investment: {
 			attempt: {
@@ -425,7 +452,7 @@ const ru = {
 			next: "Далее",
 			noInstrument: "Без инструмента",
 			noMoney: "Без движения денег",
-			occurredAt: "{{date}} UTC",
+			occurredAt: "Исполнено {{date}}",
 			open: "Открыть журнал",
 			operationType: {
 				buy: "Покупка",
@@ -455,10 +482,19 @@ const ru = {
 			accounts: "Счета",
 			bonds: "Облигации",
 			cards: "Карты",
+			primary: "Основная навигация",
 			settings: "Настройки",
 			stocks: "Акции",
 		},
 		notFound: { action: "К счетам", title: "Страница не найдена" },
+		payout: {
+			estimate: "Оценка по позиции",
+			executedAt: "Исполнено {{date}}",
+			forecast: "Прогноз",
+			noAmount: "Сумма неизвестна",
+			noMoney: "Без движения денег",
+			registryDate: "Дата реестра",
+		},
 		portfolio: {
 			accountUnavailableText: "Вернитесь к списку и выберите доступный счет.",
 			accountUnavailableTitle: "Счет недоступен",
@@ -478,13 +514,21 @@ const ru = {
 			},
 			emptyText: "На счете нет позиций и доступных денежных остатков.",
 			emptyTitle: "Портфель пока пуст",
+			more: "Подробнее",
 			otherPositions: "Другие позиции",
+			positionFilter: "Тип позиции",
+			positionKinds: {
+				bonds: "Облигации",
+				other: "Прочее",
+				stocks: "Акции",
+			},
 			positions: "Позиции",
 			quantity: "Количество: {{value}}",
 			refreshError:
 				"Не удалось обновить портфель. Показан последний полученный снимок.",
 			refreshing: "Обновляем портфель",
 			return: "Доход: {{value}}",
+			sections: "Разделы счёта",
 			share: "Доля: {{value}}",
 			staleWarning:
 				"T-Bank временно недоступен. Показан последний успешный снимок.",
@@ -510,7 +554,16 @@ const ru = {
 				unvalued: "Нет оценки",
 				unvaluedCategory: "{{category}}: без оценки — {{count}}",
 			},
+			tabs: {
+				cash: "Деньги",
+				events: "События",
+				income: "Доход",
+				operations: "Операции",
+				positions: "Позиции",
+			},
 			title: "Портфель",
+			unrealizedResult: "Нереализованный результат",
+			unrealizedResultCaption: "по цене, без НКД и купонов",
 			updatedAt: "Данные получены {{date}}",
 		},
 		routeError: {
@@ -629,7 +682,7 @@ const ru = {
 			position: "Моя позиция",
 			previous: "Назад",
 			price: "Цена",
-			priceAt: "Цена на {{date}} UTC",
+			priceAt: "Цена на {{date}}",
 			priceTable: "Цены в таблице",
 			priceTableHint: "Дневные закрытия · записей: {{count}} · сначала новые",
 			priceUnavailable: "Цена недоступна",
@@ -718,7 +771,7 @@ const ru = {
 				SHARE_TYPE_GDR: "Депозитарная расписка",
 				SHARE_TYPE_PREFERRED: "Привилегированная акция",
 			},
-			snapshotAt: "Позиция на {{date}} UTC",
+			snapshotAt: "Позиция на {{date}}",
 			trading: {
 				SECURITY_TRADING_STATUS_BREAK_IN_TRADING: "Перерыв в торгах",
 				SECURITY_TRADING_STATUS_CLOSING_AUCTION: "Аукцион закрытия",