fix: preserve latest stock screener result

.ai/conventions/data.md

@@ -30,8 +30,7 @@ backend checkout и не проверяют backend runtime OpenAPI; измен
 shape/status/route сохраняет
 публичный контракт предоставленного snapshot.
 Одна UI-модель не требует менять API. `openapi:generate` работает offline от snapshot;
-`openapi:check` запускает native `--check` того же CLI и падает при устаревших
+`openapi:check` генерирует во временный каталог и сравнивает, не меняя tracked files.
-generated types, не меняя tracked files.
 
 ## Auth и invalidation
 
@@ -40,11 +39,6 @@ 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

@@ -7,19 +7,11 @@
 checkout. Внешний API задаётся предоставленным публичным контрактом;
 исходники или инструкции его реализации не являются зависимостью разработки.
 При нехватке требования сообщи, какое решение не определено, до его реализации.
-При конфликте с общим шаблоном следуй местным правилам и явному запросу
-пользователя. Выбирай реализацию самостоятельно, но изменение финансовой
-логики, публичного контракта или утверждённой семантики возвращай владельцу
-на согласование до зависимой работы.
 
 Начни с результата и affected areas. До edits проследи flow/invariants, найди
 owner и 1–3 примера. Код показывает механизм; случайный аналог не меняет контракт.
-Выбери lightweight или SDD по [Engineering Workflow](https://git.personal.ksv741.ru/WealthLedger/main/src/commit/03b3b59e6ff2ba391f9dfc42a039a96d0d84c1c9/.ai/conventions/engineering-workflow.md);
+Работай напрямую; OpenSpec/SDD lifecycle — только по явному запросу.
-OpenSpec lifecycle начинай после явного решения Change Owner.
+Перед Node-командами активируй местную `.nvmrc`: `nvm use --silent`.
-Перед Node-командами активируй местную `.nvmrc`: если `nvm` не загружен в
-non-interactive shell, загрузи установленный `$HOME/.nvm/nvm.sh`; затем
-выполни `nvm use --silent` из frontend. Если `nvm.sh` недоступен, остановись,
-не используй системный Node.
 Сохраняй чужие staged/unstaged/untracked изменения и read-only архивы.
 
 ## Change scope
@@ -65,33 +57,21 @@ Peer-конфликт решай совместимыми версиями бе
 
 ## Проверки и завершение
 
-| Когда | Что проверить |
+Code/dependency change: `npm ci`, полный `npm run verify` и дополнительные
-| --- | --- |
+risk checks из местной testing convention. Targeted tests ускоряют итерацию,
-| Окружение новое, изменились manifest/lockfile или Node, установка сомнительна | `npm ci` до Node-проверок; одна правка кода переустановки не требует. |
+но не заменяют финальный gate. `lint:fix`/format — edits, не proof.
-| Итерация | Адресные тесты, typecheck и lint по затронутому поведению и риску. При изменении поведения добавь/обнови содержательную регрессию, если существующая проверка не ловит её; для косметики не создавай искусственный тест. |
+Markdown-only: проверь новые/изменённые тексты, локальные ссылки/якоря, маршруты
-| Итоговый code/dependency diff | Перед объявлением готовности и передачей к интеграции выполни один полный `npm run verify` на итоговых входах. Дополнительные risk checks из testing convention и явно утверждённые task checks обязательны; CI проверяет независимо. |
+чтения и `git diff --check`; application build ради текста не нужен.
-| Только Markdown | Проверь тексты, ссылки/якоря, маршруты чтения и `git diff --check`; application build не нужен. При изменении verification-контура проверь его работу. |
+Повтори routing по staged/unstaged/new files. Запиши краткие команды, результаты
-| Pre-commit | Hook не скачивает tools: вызывай установленные бинарники из `node_modules/.bin` (не `npx`). Full graph не входит в hook; он выполняется в `npm run verify` и CI. |
+и ограничения. Зелёный lint не заменяет semantic/security review.
-
-Повтори routing по staged/unstaged/new files. В отчёте по задаче/PR запиши
-проверенные входы, команду, exit code, результат и ограничения. Повторяй
-проверку при изменении значимых входов (включая config, dependencies и
-generated artifacts), сомнении в evidence или явном запросе пользователя.
-`lint:fix`/format — edits, не proof; lint не заменяет semantic/security review.
 
 ## Git и релизы
 
-Работа — в ветке `<type>/<issue-number>-<slug>` от актуального `develop`,
+Работа — в `codex/<task>` от актуального `develop`, затем PR в `develop`.
-затем PR в `develop`; для cross-repo ссылки укажи owner/repo#number.
 Сохраняй чужие изменения; перед commit просмотри staged paths и diff.
-Commits и PR titles — Conventional Commits с parser-recognized Issue reference (`fix: … (#12)`
+Commits и PR titles — Conventional Commits; допустим `spec:`. Каждый commit
-или `chore: … (WealthLedger/main#27)`); допустим `spec:`. Каждый commit
+содержит одну связанную задачу. При связанной issue добавь её номер в конец
-содержит одну связанную задачу. Исключения release и правила ссылки — в
+заголовка (`fix: … #12`); без issue номер не нужен. Root другого checkout
-Engineering Workflow из AGENTS. Root другого checkout не управляет этим repo.
+не управляет этим repo.
 Прямой push в `main`, force-push и перенос опубликованных тегов не входят в
-обычную работу. PR сливается squash или rebase-merge; merge-коммит не
+обычную работу. Перед release/hotfix прочитай местный README, раздел «Релизы».
-используется. `main` обновляется только fast-forward из `develop`, поэтому
-`origin/main` всегда предок `origin/develop`:
-`git merge-base --is-ancestor origin/main origin/develop`. Срочный fix —
-обычная ветка `fix/*` от `develop`; пути hotfix от `main` нет.
-Перед релизом прочитай местный README, раздел «Релизы».

.gitea/ISSUE_TEMPLATE/bug.md

@@ -1,12 +0,0 @@
----
-name: Bug Report
-about: Неверное поведение
----
-## Проблема и шаги воспроизведения
-
-## Факт / ожидание
-
-## Acceptance Criteria
-- [ ]
-
-## Окружение / ссылки (если применимо)

.gitea/ISSUE_TEMPLATE/engineering.md

@@ -1,10 +0,0 @@
----
-name: Engineering Task
-about: CI, тесты, документация, процесс и прочее
----
-## Контекст и результат
-
-## Scope / связанные Issues (если есть)
-
-## Acceptance Criteria
-- [ ]

.gitea/ISSUE_TEMPLATE/feature.md

@@ -1,12 +0,0 @@
----
-name: Feature Request
-about: Новое наблюдаемое поведение
----
-## Зачем и какой результат
-
-## Ожидаемое поведение
-
-## Acceptance Criteria
-- [ ]
-
-## Зависимости / связанные Issues (если есть)

.gitea/ISSUE_TEMPLATE/refactor.md

@@ -1,12 +0,0 @@
----
-name: Refactoring / Technical Debt
-about: Улучшение без нового поведения
----
-## Проблема и результат
-
-## Сохраняемые инварианты / границы
-
-## Acceptance Criteria
-- [ ]
-
-## Зависимости / ссылки (если есть)

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +0,0 @@
-## Summary
-
-## Linked Issue
-Refs
-
-## Changes
-
-## Verification
-- Команда / результат / ограничения:
-
-## Breaking Changes (если есть)

.gitea/workflows/pr-title.yml

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

@@ -4,7 +4,7 @@ on:
   push:
     branches: [develop, main]
   pull_request:
-    types: [opened, synchronize, reopened]
+    types: [opened, synchronize, reopened, edited]
   schedule:
     - cron: '17 5 * * *'
 
@@ -34,11 +34,7 @@ jobs:
           HEAD_SHA: ${{ github.event.pull_request.head.sha }}
         run: |
           printf '%s\n' "$PR_TITLE" | npm run commitlint -- --strict
-          if [[ "$PR_TITLE" =~ ^chore\(release\):\ [0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+          npm run commitlint -- --strict --from "$BASE_SHA" --to "$HEAD_SHA"
-            npm run commitlint -- --strict --from "$HEAD_SHA^" --to "$HEAD_SHA"
-          else
-            npm run commitlint -- --strict --from "$BASE_SHA" --to "$HEAD_SHA"
-          fi
 
   security:
     needs: commits

.husky/pre-commit

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

.nvmrc

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

AGENTS.md

@@ -4,9 +4,6 @@
 только его файлы и предоставленные публичные контракты. Перед работой прочитай
 [порядок работы](.ai/conventions/engineering.md#граница-и-порядок-работы), затем
 объединяй triggers задачи и путей; читай активированные темы до решения.
-До edits найди/создай подходящую Gitea Issue, проверь AC и ветку; чтение
-допускается без Issue. Общий маршрут — [Engineering Workflow](https://git.personal.ksv741.ru/WealthLedger/main/src/commit/03b3b59e6ff2ba391f9dfc42a039a96d0d84c1c9/.ai/conventions/engineering-workflow.md)
-(main#28; после merge — актуальная версия `develop`).
 
 | Решение / сигнал | Читать |
 | --- | --- |

CHANGELOG.md

@@ -1,85 +1,5 @@
 # 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
-
-* add stock screener ([a84411d](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/a84411df39dc131290e9f5b5d9313fed17cc629a))
-* align investment client with hourly sync ([432cca2](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/432cca299f3a9a9e45b2697527369ee95f2d0adc))
-* render hourly investment states ([3c226f8](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/3c226f8c29efceccb75af0d6424639a757534f39))
-
-### Bug Fixes
-
-* align frontend workflow rules (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/27)) ([c315f80](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/c315f80b1b07ae0888366512ec157b8e29c81d62))
-* preserve latest stock screener result ([cec9c63](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/cec9c6348a389f16f272dac5533aebc9d12ceae8))
-* show bank summary totals ([20b2cdf](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/20b2cdfd432f8b01e447f68657cf5c685a297f1e))
-
-### Documentation
-
-* clarify frontend verification policy ([cac4351](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/cac4351bc4abf2cec7c5b6611a74d87bf4ec2f70))
-* pin frontend workflow reference (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/27)) ([0d747cc](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/0d747cc93ee08c337cf300c0367612708f45dfb9))
-
-### CI
-
-* skip checks on PR metadata edits ([c882120](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/c8821200ce699dab1ce65360d1968d5877a2e78b))
-
-### Maintenance
-
-* align frontend engineering workflow (WealthLedger/main[#27](https://git.personal.ksv741.ru/WealthLedger/frontend/issues/27)) ([617edfd](https://git.personal.ksv741.ru/WealthLedger/frontend/commit/617edfd489a6a84bb33b57386eca4eb54661f4f0))
-
 ## [1.0.0](https://git.personal.ksv741.ru/WealthLedger/frontend/compare/v0.4.0...v1.0.0) (2026-10-07)
 
 ### ⚠ BREAKING CHANGES

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24.22.1-bookworm-slim AS dependencies
+FROM node:24.21.0-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.31.8-alpine AS production
+FROM nginx:1.28.0-alpine AS production
 ARG VERSION
 ARG REVISION
 LABEL org.opencontainers.image.version=$VERSION \

README.md

@@ -19,10 +19,8 @@ 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 с полной редакцией секретов, затем запускает установленный
+staged diff с полной редакцией секретов, затем запускает formatting и FSD checks.
-`node_modules/.bin/lint-staged` только для staged JS/TS. Hook не скачивает tools и
+Находка или отсутствие Gitleaks блокирует commit.
-не запускает full graph: полный `npm run verify` выполняется в CI и перед передачей.
-Находка или отсутствие Gitleaks либо lint-staged блокирует commit.
 Проверка этого поведения: `node --test scripts/test-pre-commit.mjs`.
 
 ## Контейнерный image
@@ -118,8 +116,7 @@ Chromium при ширинах 375 и 1280 px. Browser project не исполь
 Единый `.gitea/workflows/verify.yml` запускает `commits → security → verify`
 последовательно на PR; на push в `develop`/`main` — `security → verify`.
 Рабочие ветки проверяются после открытия PR, без дублирующего push-запуска.
-Изменение заголовка PR запускает `.gitea/workflows/pr-title.yml` (то же имя workflow,
+Изменение заголовка PR тоже повторяет проверки Conventional Commits.
-только job `commits`): статусы `security` и `verify` на HEAD не перезаписываются.
 Новый запуск отменяет устаревший для того же PR/ветки и типа события
 (требуется Gitea 1.26+). Ежедневно в 05:17 UTC выполняется только `security`.
 Job `security` проверяет полную доступную историю Gitleaks 8.30.1 и выполняет
@@ -206,8 +203,7 @@ Checkout frontend содержит все входы сборки и прове
 локальную копию и не обращаются к исходникам или CI сервера. Доставка новой
 схемы — явное обновление snapshot с review и `npm run openapi:generate`.
 Runtime URL API задаётся окружением, а не расположением другого репозитория.
-Разработка начинается с Issue; lightweight или SDD выбирается по критериям
+Разработка идёт напрямую по задаче пользователя; OpenSpec/SDD — по явному запросу.
-Engineering Workflow из AGENTS. OpenSpec — после явного решения Change Owner.
 
 Knip исключает `conventional-changelog-conventionalcommits`: release-it загружает
 preset по имени из `.release-it.json`. Версия preset закреплена напрямую.
@@ -215,61 +211,36 @@ preset по имени из `.release-it.json`. Версия preset закреп
 ## Релизы
 
 Репозиторий выпускается независимо. `develop` — интеграция, `main` — принятые
-релизы. Обычная работа: issue-linked ветка от актуального `develop`, PR в `develop`;
+релизы. Работа: `codex/<task>` от актуального `develop`, PR в `develop`.
-общие правила — в Engineering Workflow по ссылке из AGENTS.
+Обычные PR допускают squash; release и обратная синхронизация сохраняют историю.
-PR сливается squash или rebase-merge; merge-коммит не используется. `main`
+Commits и PR titles — Conventional Commits, включая `spec:`. Версии вручную не повышай.
-обновляется только fast-forward из `develop`, поэтому история линейна:
 
-```text
+1. Получи `main`, `develop` и теги: `git fetch origin --tags`. Убедись, что
-<type>/<issue>-<slug> --squash--> develop --ff-only--> main --> tag vX.Y.Z
+   `develop` содержит последний релиз. Создай `release/<name>` от проверенного
-```
+   `develop`; `nvm use --silent`, `npm ci`. Hotfix начинается от `main` в
-
+   `release/hotfix-<name>` и проходит тот же процесс.
-Инвариант: `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`. Проверь
-   инвариант. Создай `release/X.Y.Z` от проверенного `develop`;
-   `nvm use --silent`, `npm ci`.
 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 в **`develop`** с заголовком `chore(release): X.Y.Z`. После зелёных
+   открой PR в `main` с заголовком `chore(release): X.Y.Z`. После зелёных
-   `verify`, `security`, `commits` выполни fast-forward-only merge. Если
+   `verify`, `security`, `commits` выполни fast-forward-only merge. Если `main`
-   `develop` изменился, обнови release-ветку и повтори проверки кандидата.
+   изменился, согласуй историю и повтори проверки кандидата.
-4. Открой PR `develop → main` с тем же заголовком и слей fast-forward-only.
+4. Получи удалённый `main`, сравни его HEAD с проверенным release SHA и версией
-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; проверь,
-Обратная синхронизация не нужна: release-коммит попал в `develop` на шаге 3.
+   что `develop` содержит тег. Опубликованные теги не перемещай. При сбое после
-Опубликованные теги не перемещай. При сбое после merge создай отсутствующий тег
+   merge создай отсутствующий тег без нового bump; до 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`,
+администратором, обязательны `verify`, `security`, `commits`; теги `v*` защищены.
-`security`, `commits`; теги `v*` защищены. Линейность обеспечивают merge styles
-репозитория: merge-коммиты и rebase `--no-ff` выключены, доступны squash,
-rebase-merge и fast-forward-only; стиль по умолчанию — squash.
 Workflow сам не включает эти настройки. Отдельное review approval для одного
 владельца не требуется. Npm publishing, deploy и Gitea Releases не включены.
 

commitlint.config.cjs

@@ -1,12 +1,6 @@
 module.exports = {
-	defaultIgnores: false,
 	extends: ["@commitlint/config-conventional"],
-	ignores: [
-		message => /^chore\(release\): \d+\.\d+\.\d+$/.test(message.trim()),
-		message => /^Merge pull request ['"].+['"] \(#\d+\) from .+ into .+$/.test(message.trim()),
-	],
 	rules: {
-		"references-empty": [2, "never"],
 		"type-enum": [
 			2,
 			"always",

package.json

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

packages/ui/package.json

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

scripts/check-openapi.mjs

@@ -0,0 +1,45 @@
+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/test-pre-commit.mjs",
+			"scripts/check-openapi.mjs",
 			"import { exec } from \"node:child_process\"; exec(process.argv[2]);",
 			"security/detect-child-process",
 		],

scripts/test-pre-commit.mjs

@@ -47,12 +47,6 @@ 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");
@@ -83,37 +77,3 @@ 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

@@ -18,21 +18,12 @@ 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: "ИИС" },
@@ -104,6 +95,10 @@ 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" },
@@ -112,6 +107,7 @@ const analytics: IncomeAnalytics
 				total: { currency: "RUB", value: "2" },
 			},
 		],
+		yearComparison: null,
 	};
 
 const CurrentLocation: FC = () => {
@@ -242,7 +238,7 @@ describe("All accounts routes", () => {
 		);
 	});
 
-	it.each(["operations", "income"])(
+	it.each(["operations", "events", "income"])(
 		"restores applied dates when switching accounts in %s",
 		async (section) => {
 			const search = "?from=2026-08-01&to=2026-08-31";
@@ -270,31 +266,6 @@ describe("All accounts routes", () => {
 		},
 	);
 
-	it("restores applied dates when switching accounts in events", async () => {
-		// 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);

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

@@ -190,30 +190,6 @@ 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", () =>

src/app/routes/RouteErrorBoundary/RouteErrorBoundary.tsx

@@ -10,6 +10,7 @@ import { useAuth } from "@/features/auth";
 
 type BoundaryProps = PropsWithChildren<{
 	authenticated: boolean;
+	routeKey: string;
 }>;
 
 type RouteErrorFallbackProps = {
@@ -25,6 +26,12 @@ class Boundary extends Component<BoundaryProps, State> {
 
 	override state: State = { hasError: false };
 
+	override componentDidUpdate(previousProps: BoundaryProps) {
+		if (previousProps.routeKey !== this.props.routeKey && this.state.hasError) {
+			this.setState({ hasError: false });
+		}
+	}
+
 	override render() {
 		return this.state.hasError
 			? <RouteErrorFallback authenticated={this.props.authenticated} />
@@ -63,7 +70,10 @@ const RouteErrorBoundary: FC<PropsWithChildren> = (props) => {
 	const { user } = useAuth();
 
 	return (
-		<Boundary authenticated={Boolean(user)} key={`${pathname}${search}:${key}`}>
+		<Boundary
+			authenticated={Boolean(user)}
+			routeKey={`${pathname}${search}:${key}`}
+		>
 			{children}
 		</Boundary>
 	);

src/app/routes/RouteGuards.tsx

@@ -1,7 +1,4 @@
-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";
@@ -10,26 +7,12 @@ import { RouteSkeleton } from "./RouteFallback";
 
 const Protected: FC<PropsWithChildren> = (props) => {
 	const { children } = props;
-	const { ready, retry, signedOut, unavailable, user } = useAuth();
+	const { ready, signedOut, 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/entities/bank-card/model/error-code.ts

@@ -1,7 +0,0 @@
-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,7 +6,6 @@ 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;
 
@@ -64,7 +63,7 @@ const bankCardSchema = z.object({
 	openingBalance: moneySchema,
 	openingDate: bankDateSchema,
 	paymentSystem: z
-		.enum(["", ...paymentSystemValues], {
+		.enum(["", "mir", "visa", "mastercard"], {
 			error: validationMessage("bank.validation.paymentSystem"),
 		})
 		.optional(),
@@ -76,6 +75,5 @@ export {
 	bankCardSchema,
 	type BankCardValues,
 	bankDateSchema,
-	paymentSystemValues,
 	positiveMoneySchema,
 };

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

@@ -1,7 +1,8 @@
 import { useController, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
 
-import { type BankCardValues, paymentSystemValues } from "../../model/form.schema";
+import type { BankCardValues } from "../../model/form.schema";
+
 import { bankDateField } from "../bankDateField";
 
 function useBankCardFieldsVm() {
@@ -15,7 +16,7 @@ function useBankCardFieldsVm() {
 	const { field: openingDateField } = useController({ control, name: "openingDate" });
 	const { field: paymentSystemField } = useController({ control, name: "paymentSystem" });
 
-	const paymentSystems = paymentSystemValues.map(value => ({
+	const paymentSystems = ["mir", "visa", "mastercard"].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 { errorCode } from "../model/error-code";
+import { apiErrorCode } from "@/shared/api";
 
 type BankFeedbackProps = {
 	cached?: boolean;
@@ -14,7 +14,7 @@ type BankFeedbackProps = {
 
 const BankFeedback: FC<BankFeedbackProps> = (props) => {
 	const { t } = useTranslation();
-	const code = errorCode(props.error);
+	const code = apiErrorCode(props.error);
 
 	return (
 		<Alert color="orange" role="alert">

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

@@ -10,7 +10,6 @@ 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;
@@ -18,10 +17,9 @@ const CATEGORY_COLUMNS = 2;
 type BankSummaryViewProps = {
 	all?: boolean;
 	data?: BankSummary;
-	error: unknown;
+	error: boolean;
 	fetching: boolean;
 	loading: boolean;
-	retry?: () => void;
 };
 
 const BankSummaryViewCategories: FC<BankSummaryViewProps> = (props) => {
@@ -124,14 +122,7 @@ const BankSummaryView: FC<BankSummaryViewProps> = (props) => {
 
 			<BankSummaryViewCategories {...props} />
 
-			{Boolean(props.error) && (
+			{props.error && !props.data && <Text role="alert">{t("bank.error")}</Text>}
-				<BankFeedback
-					cached={Boolean(props.data)}
-					error={props.error}
-					loadingError={!props.data}
-					retry={props.retry}
-				/>
-			)}
 		</Stack>
 	);
 };

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

@@ -36,12 +36,6 @@ 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;
 }
@@ -115,4 +109,4 @@ function paymentPresentation(
 	};
 }
 
-export { isIncomePayment, operationLabelKey, paymentPresentation };
+export { operationLabelKey, paymentPresentation };

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

@@ -11,11 +11,10 @@ import {
 	formatSnapshotTime,
 	instrumentLogoUrl,
 } from "@/shared/lib";
-import { PayoutCard } from "@/shared/ui";
 
 import type { BrokerageOperation } from "../api/useBrokerageOperations";
 
-import { isIncomePayment, operationLabelKey, paymentPresentation } from "../model/display";
+import { operationLabelKey, paymentPresentation } from "../model/display";
 
 type LedgerEntryRowProps = {
 	operation: BrokerageOperation;
@@ -76,28 +75,6 @@ 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-event/ui/BrokerageEventCard.tsx

@@ -4,7 +4,6 @@ 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";
 
@@ -16,27 +15,6 @@ 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"
@@ -62,7 +40,7 @@ const BrokerageEventCard: FC<BrokerageEventCardProps> = (props) => {
 			title={[t(`events.type.${event.type}`), event.displayName].join(" · ")}
 			tone="neutral"
 			value={projectedAmount}
-			valueLabel={t("payout.forecast")}
+			valueLabel={t("events.projectedAmount")}
 		/>
 	);
 };

src/entities/income/api/useIncome.ts

@@ -4,6 +4,9 @@ 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"]
 >;
@@ -44,6 +47,7 @@ function useIncomeSummary(accountId?: string) {
 
 export {
 	type IncomeAnalytics,
+	type IncomeAnalyticsMeta,
 	type IncomeSummary,
 	useIncomeAnalytics,
 	useIncomeSummary,

src/entities/income/index.ts

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

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

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

@@ -1,55 +0,0 @@
-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,10 +7,8 @@ const EMAIL_PART_COUNT = 2;
 const ASCII_SPACE = 32;
 const ASCII_DELETE = 127;
 const MAX_EMAIL_LENGTH = 254;
-const MIN_PASSWORD_LENGTH = 8;
+const MIN_PASSWORD_BYTES = 12;
 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);
@@ -22,14 +20,6 @@ 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()
@@ -43,42 +33,28 @@ const email = z
 		{ error: validationMessage("auth.validation.invalidEmail") },
 	);
 
-// Login stays lenient: accounts created under an older policy must still sign in.
+const password = z
-const loginPassword = z
 	.string()
-	.min(1)
 	.refine(
-		value => new TextEncoder().encode(value).length <= MAX_PASSWORD_BYTES,
+		value =>
-		{ error: validationMessage("auth.validation.passwordTooLong") },
+			new TextEncoder().encode(value).length >= MIN_PASSWORD_BYTES
+				&& 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: loginPassword,
+	password,
 	passwordConfirmation: z.string().optional(),
 });
 
-const registerSchema = loginSchema
+const registerSchema = loginSchema.refine(
-	.extend({ password: registerPassword })
+	value => value.password === value.passwordConfirmation,
-	.refine(
+	{
-		value => value.password === value.passwordConfirmation,
+		error: validationMessage("auth.validation.passwordsDoNotMatch"),
-		{
+		path: ["passwordConfirmation"],
-			error: validationMessage("auth.validation.passwordsDoNotMatch"),
+	},
-			path: ["passwordConfirmation"],
+);
-		},
-	);
 
 type AuthFormValues = z.input<typeof loginSchema>;
 

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

@@ -92,10 +92,8 @@ describe("AuthProvider", () => {
 		);
 	});
 
-	it("settles unauthenticated and clears cached data when cold-start refresh is rejected with 401", async () => {
+	it("settles unauthenticated and clears cached data when cold-start refresh has a transport error", async () => {
-		server.use(http.post("*/api/v1/auth/refresh", () =>
+		server.use(http.post("*/api/v1/auth/refresh", () => HttpResponse.error()));
-			HttpResponse.json({ code: "UNAUTHORIZED" }, { status: 401 }),
-		));
 		const queryClient = createTestQueryClient();
 		queryClient.setQueryData(["cached-query"], { value: "stale" });
 		queryClient.setQueryData(bankCardsKey, [{ id: "bank-card-1" }]);
@@ -105,54 +103,12 @@ 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.each([
+	it("keeps the original protected 401 when serialized refresh has a transport error", async () => {
-		["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", () => {
@@ -181,11 +137,10 @@ describe("AuthProvider", () => {
 		const response = await apiClient.GET("/api/v1/brokerage-accounts");
 
 		expect(response.response.status).toBe(401);
-		// An unreachable server does not prove the session ended; the next 401 refreshes again.
+		await waitFor(() => expect(result.current.user).toBeUndefined());
-		await waitFor(() => expect(result.current.unavailable).toBe(true));
+		expect(await requestAuthorization()).toBeNull();
-		expect(result.current.user?.id).toBe("user-1");
+		expect(queryClient.getQueryData(["cached-query"])).toBeUndefined();
-		expect(queryClient.getQueryData(["cached-query"])).toEqual({ value: "stale" });
+		expect(queryClient.getQueryData(bankCardsKey)).toBeUndefined();
-		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,9 +5,6 @@ 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"];
 
@@ -35,8 +32,6 @@ 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);
@@ -54,18 +49,12 @@ 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) {
@@ -78,17 +67,16 @@ function useAuthProviderVm() {
 			userRef.current = authentication.user;
 			setUser(authentication.user);
 		},
-		[markUnavailable, queryClient],
+		[queryClient],
 	);
 
 	const clearSession = useCallback(() => {
-		markUnavailable(false);
 		generationRef.current += 1;
 		userRef.current = undefined;
 		setUser(undefined);
 		accessTokenRef.current = undefined;
 		queryClient.clear();
-	}, [markUnavailable, queryClient]);
+	}, [queryClient]);
 
 	const refresh = useCallback((): Promise<boolean> => {
 		if (refreshPromiseRef.current) return refreshPromiseRef.current;
@@ -98,12 +86,11 @@ function useAuthProviderVm() {
 			if (started !== generationRef.current) return false;
 
 			try {
-				const { data, response } = await apiClient.POST("/api/v1/auth/refresh");
+				const { data } = await apiClient.POST("/api/v1/auth/refresh");
 				if (started !== generationRef.current) return false;
 
 				if (!data) {
-					if (response.status >= HTTP_SERVER_ERROR) markUnavailable(true);
+					clearSession();
-					else clearSession();
 
 					return false;
 				}
@@ -113,7 +100,7 @@ function useAuthProviderVm() {
 				return true;
 			}
 			catch {
-				if (started === generationRef.current) markUnavailable(true);
+				if (started === generationRef.current) clearSession();
 
 				return false;
 			}
@@ -125,7 +112,7 @@ function useAuthProviderVm() {
 		refreshPromiseRef.current = pending;
 
 		return pending;
-	}, [applyAuthentication, clearSession, markUnavailable, serialize]);
+	}, [applyAuthentication, clearSession, serialize]);
 
 	useEffect(() => {
 		void refresh().finally(() => setReady(true));
@@ -159,7 +146,6 @@ function useAuthProviderVm() {
 			clear: clearSession,
 			generation: () => generationRef.current,
 			refresh,
-			unavailable: () => unavailableRef.current,
 		});
 	});
 	useEffect(() => () => configureAuthClient(), []);
@@ -171,9 +157,7 @@ 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,79 +30,4 @@ 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, ReactNode } from "react";
+import type { FC } 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?: boolean;
+	register?: true;
 };
 
 const AuthForm: FC<AuthFormProps> = (props) => {
@@ -45,24 +45,6 @@ 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}>
@@ -95,7 +77,9 @@ const AuthForm: FC<AuthFormProps> = (props) => {
 							{t(register ? "auth.register" : "auth.login")}
 						</Button>
 
-						{switchLink}
+						<Button component={Link} to={to} variant="subtle">
+							{t(register ? "auth.haveAccount" : "auth.noAccount")}
+						</Button>
 					</Stack>
 				</Fieldset>
 			</form>

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

@@ -78,35 +78,4 @@ 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,7 +5,6 @@ import { useEffect, useRef } from "react";
 import type { InvestmentResourceMeta } from "@/shared/api";
 
 type ScreenResource = {
-	isEnabled: boolean;
 	isError: boolean;
 	isFetching: boolean;
 	meta?: InvestmentResourceMeta;
@@ -28,31 +27,23 @@ 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(
+	const isRefreshing = resources.some(resource => resource.isFetching);
-		resource => resource.isEnabled && resource.isFetching,
-	);
-
-	const eligible = resources.filter(
-		resource => resource.isEnabled && !resource.isFetching,
-	);
 
 	const refresh = async () => {
 		if (isRefreshing) return;
-		await Promise.allSettled(eligible.map(resource => resource.refetch()));
+		await Promise.allSettled(resources.map(resource => resource.refetch()));
 	};
 
 	// Retry only the HTTP read; source attempts are reported in resource metadata.
 	const retry = async () => {
-		const failed = eligible.filter(resource => resource.isError);
+		const failed = resources.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 { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { beforeEach, describe, expect, it, vi } from "vitest";
 
 import { configureAuthClient } from "@/shared/api";
-import { defaultPeriod, formatDate, moscowDate } from "@/shared/lib";
+import { defaultPeriod, formatDate } from "@/shared/lib";
 import { createTestQueryClient } from "@/test/query";
 import { resource } from "@/test/resource";
 import { server } from "@/test/server";
@@ -72,14 +72,7 @@ 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(),
@@ -87,8 +80,6 @@ describe("Upcoming event date filters", () => {
 		});
 	});
 
-	afterEach(() => vi.useRealTimers());
-
 	it("keeps reads and sync disabled without an account scope", async () => {
 		const requests: string[] = [];
 		server.use(
@@ -238,10 +229,6 @@ 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(
@@ -266,58 +253,37 @@ 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: calendarLabel(today) }),
+				await screen.findByRole("button", { name: /10 February 2026/i }),
 			);
 			fireEvent.click(
-				await screen.findByRole("button", { name: calendarLabel(future) }),
+				await screen.findByRole("button", { name: /28 February 2026/i }),
 			);
-			// The reset itself fetched the default range; picking dates applies only on submit.
+			expect(searches).toHaveLength(1);
-			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=${today}&to=${future}`),
+				expect(searches.at(-1)).toBe("?from=2026-02-10&to=2026-02-28"),
 			);
 			expect(await screen.findByLabelText("Период")).toHaveTextContent(
-				`${formatDate(today)} – ${formatDate(future)}`,
+				"10.02.2026 – 28.02.2026",
 			);
 			fireEvent.click(screen.getByRole("button", { name: "History back" }));
 			await waitFor(() =>
 				expect(screen.getByLabelText("Период")).toHaveTextContent(
-					`${formatDate(defaultFrom)} – ${formatDate(defaultTo)}`,
+					"01.02.2026 – 28.02.2026",
 				),
 			);
-			expect(screen.getByLabelText("URL")).toBeEmptyDOMElement();
+			expect(screen.getByLabelText("URL")).toHaveTextContent(
+				"?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,30 +211,4 @@ 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[];
-		minDate: string;
+		maxDate: string;
 		onApply: () => void;
 		onPeriodChange: (value: [null | string, null | string]) => void;
 		onPeriodPopoverOpen: () => void;
@@ -49,7 +49,7 @@ function useAccountEventsPageViewModel(): AccountEventsPageViewModel {
 
 	const [draftFrom, draftTo] = draftPeriod;
 
-	const [minDate, setMinDate] = useState(() => moscowDate(new Date()));
+	const [maxDate, setMaxDate] = 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,
-		minDate,
+		maxDate,
 		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: () => setMinDate(moscowDate(new Date())),
+		onPeriodPopoverOpen: () => setMaxDate(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")}
-					minDate={props.minDate}
+					maxDate={props.maxDate}
 					onChange={props.onPeriodChange}
 					popoverProps={{
 						middlewares: { shift: { crossAxis: true } },

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

@@ -2,25 +2,168 @@ import { describe, expect, it } from "vitest";
 
 import type { IncomeAnalytics } from "@/entities/income";
 
+import { resource } from "@/test/resource";
+
 import { toIncomeDisplayModel } from "./display";
 
-describe("income payments display", () => {
+const analytics: IncomeAnalytics = {
-	it("keeps repeated IDs, order and logo revisions without reconstructing financial data", () => {
+	accountId: "account-1",
-		const payment = {
+	bucketGranularity: "day",
-			id: "same",
+	buckets: [],
-			instrumentKey: "bond:RUB",
+	calculatedAt: "2026-08-27T00:00:00Z",
-			logoName: null,
+	entries: [],
-		} as IncomeAnalytics["entries"][number];
+	instruments: [],
+	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,
+};
 
-		const analytics = {
+function comparison(currency: string) {
-			entries: [payment, payment, { ...payment, logoName: "bond.png" }],
+	return {
-		} as IncomeAnalytics;
+		compared: summary(currency, "1", "0"),
+		currency,
+		difference: summary(currency, "9", "2"),
+		selected: summary(currency, "10", "2"),
+	};
+}
 
-		const display = toIncomeDisplayModel(analytics);
+function money(currency: string, value: string) {
+	return { currency, value };
+}
 
-		expect(display.entries.map(({ operation }) => operation)).toEqual(
+function summary(currency: string, coupon: string, dividend: string) {
-			analytics.entries,
+	return {
+		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(new Set(display.entries.map(({ key }) => key)).size).toBe(3);
+		expect(display?.comparison?.comparedPeriod.replaceAll(/\s/g, " ")).toBe(
+			"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,11 +1,102 @@
-import type { IncomeAnalytics } from "@/entities/income";
+import type { IncomeAnalytics, IncomeAnalyticsMeta } 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>();
@@ -25,7 +116,17 @@ function toIncomeDisplayModel(
 		});
 	}
 
-	return { entries };
+	const dependencies = meta?.dependencies ?? [];
+	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,6 +22,123 @@
 	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,9 +72,23 @@ 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,
@@ -314,24 +328,6 @@ 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
 			= {
@@ -376,11 +372,19 @@ describe("AccountIncomePage", () => {
 		expect(within(panel).getByText("−2 ₽")).toBeInTheDocument();
 	});
 
-	it("renders realized income without comparison blocks or event requests", async () => {
+	it("renders realized text and comparisons without subscribing to events", async () => {
 		const eventsRequest = vi.fn(() => new HttpResponse(null, { status: 503 }));
 		server.use(
 			http.get("*/api/v1/brokerage-accounts/account-1/income-analytics", () =>
-				HttpResponse.json(resource(analytics)),
+				HttpResponse.json(
+					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),
 		);
@@ -395,9 +399,72 @@ describe("AccountIncomePage", () => {
 		expect(screen.queryByText("Динамика")).not.toBeInTheDocument();
 		expect(eventsRequest).not.toHaveBeenCalled();
 		expect(screen.getByRole("region", { name: "Выплаты" })).toBeInTheDocument();
-		expect(screen.queryByText("Предыдущий период")).not.toBeInTheDocument();
+		const year = screen.getByRole("region", { name: "Годом ранее" });
-		expect(screen.queryByText("Годом ранее")).not.toBeInTheDocument();
+
-		expect(screen.queryByText(/Сравнение с/)).not.toBeInTheDocument();
+		const selected = within(year).getByRole("region", {
+			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 () => {
@@ -681,3 +748,120 @@ 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);
+	const display = toIncomeDisplayModel(analytics.data, analytics.meta);
 
 	const onSubmit = (values: IncomeForm) => {
 		const from = parseDraftDate(values.from);

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

@@ -12,6 +12,7 @@ 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";
@@ -53,6 +54,18 @@ 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

@@ -0,0 +1,167 @@
+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, Stack } from "@mantine/core";
+import { Button, Paper, Stack, Text } from "@mantine/core";
 import { DatePickerInput } from "@mantine/dates";
 
 import classes from "../../AccountIncomePage.module.css";
@@ -27,8 +27,15 @@ const IncomePeriodForm: FC<IncomePeriodFormProps> = (props) => {
 	} = useIncomePeriodFormVm();
 
 	return (
-		<form onSubmit={props.onSubmit}>
+		<Paper
+			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
@@ -64,7 +71,7 @@ const IncomePeriodForm: FC<IncomePeriodFormProps> = (props) => {
 					</Button>
 				</div>
 			</Stack>
-		</form>
+		</Paper>
 	);
 };
 

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

@@ -492,20 +492,6 @@ 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/ui/AccountPage/AccountPage.test.tsx

@@ -402,50 +402,6 @@ describe("AccountPage states", () => {
 		).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", () => {
 		renderPage(<AccountPageLoaded {...loadedProps()} />);
 
@@ -730,7 +686,7 @@ 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(

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

@@ -88,6 +88,7 @@ const quote
 function setup(
 	options: {
 		ambiguousTicker?: boolean;
+		failBond?: boolean;
 		failCoupons?: boolean;
 		noPosition?: boolean;
 		path?: string;
@@ -99,7 +100,11 @@ function setup(
 	const resolved = { ...bond, slug: options.slug ?? uid };
 	let isFailQuote = false;
 	server.use(
-		http.get("*/api/v1/bonds/:uid", () => HttpResponse.json(resource(resolved))),
+		http.get("*/api/v1/bonds/:uid", () =>
+			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,10 +191,8 @@ 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,20 +1,17 @@
 import type { FC } from "react";
 
-import { Accordion, Alert, Badge, Group, Stack, Text } from "@mantine/core";
+import { Accordion, Alert, Badge, Group, Paper, Stack, Text } from "@mantine/core";
 import { useTranslation } from "react-i18next";
 
 import type { BondCoupons as Coupons } from "@/entities/bond";
 
-import { InstrumentSection, type SectionState } from "@/features/instrument-details";
+import { InstrumentMetric, InstrumentSection, type SectionState } from "@/features/instrument-details";
-import { formatDate, formatSnapshotTime, instrumentLogoUrl } from "@/shared/lib";
+import { formatDate, formatMoney, formatSnapshotTime } 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"];
 };
 
@@ -42,8 +39,6 @@ const BondCoupons: FC<BondCouponsProps> = (props) => {
 									<Coupon
 										coupon={coupon}
 										key={`${coupon.number}:${coupon.paymentDate}`}
-										logoName={props.logoName}
-										ticker={props.ticker}
 									/>
 								))
 							)
@@ -80,8 +75,6 @@ const BondCoupons: FC<BondCouponsProps> = (props) => {
 													<Coupon
 														coupon={coupon}
 														key={`${coupon.number}:${coupon.paymentDate}`}
-														logoName={props.logoName}
-														ticker={props.ticker}
 													/>
 												))
 											)
@@ -98,48 +91,59 @@ 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 (
-		<PayoutCard
+		<Paper p="md" radius="md" withBorder>
-			conditions={conditions}
+			<Group align="start" justify="space-between">
-			estimate={coupon.estimatedAmount}
+				<div>
-			imageSrc={instrumentLogoUrl(props.logoName)}
+					<Text fw={600}>
-			initial={(props.ticker?.trim()[0] ?? "?").toUpperCase()}
+						{coupon.paymentDate
-			kind="schedule"
+							? formatDate(coupon.paymentDate)
-			metadata={metadata}
+							: t("stock.dateUnknown")}
-			perSecurity={coupon.perBond}
+					</Text>
-			perSecurityLabel={t("bond.perBond")}
+
-			title={title}
+					<Text c="dimmed" size="xs">
-		/>
+						{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,7 +17,6 @@ import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
 import {
-	BankFeedback,
 	bankOperationAppearance,
 } from "@/entities/bank-card";
 
@@ -109,17 +108,6 @@ 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,47 +316,12 @@ describe("CardPage", () => {
 		setup({ summaryError: true });
 		await screen.findByRole("heading", { name: "Повседневная" });
 		expect(
-			await screen.findByText("Перевод на «Запасная»"),
+			screen.queryByRole("alert"),
-		).toBeInTheDocument();
+		).not.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();
@@ -366,8 +331,9 @@ describe("CardPage", () => {
 			http.get("*/api/v1/bank-cards/a/operations", () => HttpResponse.error()),
 		);
 		await client.invalidateQueries();
-		const alerts = await screen.findAllByRole("alert", {}, { timeout: 5000 });
+		await waitFor(() => {
-		expect(alerts.length).toBeGreaterThanOrEqual(1);
+			expect(screen.queryByRole("alert")).not.toBeInTheDocument();
+		});
 		expect(
 			screen.getByRole("heading", { name: "Повседневная" }),
 		).toBeInTheDocument();
@@ -435,11 +401,11 @@ describe("CardPage", () => {
 		]);
 	});
 	it("recovers the prerequisite card list while preserving the visible balance and journal", async () => {
-		const { client } = setup({ cardsError: true });
+		setup({ cardsError: true });
 		await screen.findByText("Перевод на «Запасная»");
 		expect(
-			await screen.findByRole("alert", {}, { timeout: 5000 }),
+			screen.queryByRole("alert"),
-		).toHaveTextContent("Не удалось загрузить данные карт.");
+		).not.toBeInTheDocument();
 		expect(
 			screen.getByRole("button", { name: "Добавить операцию" }),
 		).toBeDisabled();
@@ -448,7 +414,6 @@ 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,11 +75,6 @@ const CardPageView: FC<CardPageViewProps> = (props) => {
 							{t("bank.back")}
 						</Button>
 
-						{!vm.notFound && (
-							<Button onClick={vm.cardRetry} variant="default">
-								{t("bank.retry")}
-							</Button>
-						)}
 					</Group>
 				)}
 				error
@@ -133,27 +128,18 @@ 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} retry={vm.summary.refetch} />
+			<BankSummaryView {...vm.summary} />
 
 			<Group align="end" justify="space-between">
 				<Group gap="xs">
@@ -197,6 +183,8 @@ 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,16 +97,13 @@ 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),
@@ -115,10 +112,9 @@ function useCardPageVm() {
 		editingCard,
 		history: {
 			changingPage: history.isPlaceholderData,
-			error: history.error,
+			error: history.isError,
 			loading: history.isLoading,
 			page: history.data?.page,
-			refetch: () => history.refetch(),
 		},
 		notFound: isApiErrorCode(
 			apiErrorCode(card.error),
@@ -143,10 +139,9 @@ function useCardPageVm() {
 		},
 		summary: {
 			data: summary.data,
-			error: summary.error,
+			error: summary.isError,
 			fetching: summary.isFetching,
 			loading: summary.isLoading,
-			refetch: () => summary.refetch(),
 		},
 		toggleArchive: () => {
 			if (!card.data) return;

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

@@ -47,9 +47,8 @@ function renderCards(isFail = false, hasCategoryFailure = false) {
 		),
 	);
 
-	const client = createTestQueryClient();
+	return render(
-	render(
+		<QueryClientProvider client={createTestQueryClient()}>
-		<QueryClientProvider client={client}>
 			<MantineProvider env="test">
 				<MemoryRouter initialEntries={["/cards?month=2026-09"]}>
 					<CardsPage />
@@ -57,8 +56,6 @@ function renderCards(isFail = false, hasCategoryFailure = false) {
 			</MantineProvider>
 		</QueryClientProvider>,
 	);
-
-	return client;
 }
 
 describe("CardsPage", () => {
@@ -235,76 +232,4 @@ 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,7 +18,6 @@ import { Link } from "react-router";
 
 import {
 	BankCardFace,
-	BankFeedback,
 	BankPeriodPicker,
 	BankSummaryView,
 } from "@/entities/bank-card";
@@ -52,17 +51,15 @@ const CardsPageViewCards: FC<CardsPageViewProps> = (props) => {
 			);
 		}
 
-		if (!vm.cards.error) {
+		const text = t(vm.archive ? "bank.emptyHint" : "bank.noActive");
-			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) {
@@ -106,15 +103,6 @@ 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">
@@ -135,10 +123,9 @@ const CardsPageView: FC<CardsPageViewProps> = (props) => {
 			<BankSummaryView
 				all
 				data={vm.summary.data}
-				error={vm.summary.error}
+				error={vm.summary.isError}
 				fetching={vm.summary.isFetching}
 				loading={vm.summary.isLoading}
-				retry={vm.retrySummary}
 			/>
 		</Stack>
 	);

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

@@ -39,8 +39,6 @@ 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.getAllByText("на акцию").length).toBeGreaterThan(0);
+		expect(screen.getByText("Событие компании")).toBeVisible();
 		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,9 +413,7 @@ describe("stock page", () => {
 		expect(await screen.findByText("Продажа")).toBeVisible();
 		expect(screen.getByText("2 шт.")).toBeVisible();
 		expect(screen.getByText("Цена: 100 ₽")).toBeVisible();
-		const snapshotTime = new Intl.DateTimeFormat("ru-RU", { dateStyle: "short", timeStyle: "short" });
+		expect(screen.getByText(/02.01.2022, 10:00 UTC/)).toBeVisible();
-		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,10 +63,8 @@ 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,96 +1,198 @@
 import type { FC } from "react";
 
-import { Accordion, Alert, Stack, Text } from "@mantine/core";
+import {
+	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, formatSnapshotTime, instrumentLogoUrl } from "@/shared/lib";
+import { formatDate, formatMoney, formatSnapshotTime } from "@/shared/lib";
-import { PayoutCard } from "@/shared/ui";
 
-type Dividend = Dividends["dividends"][number];
+import classes from "../StockPage.module.css";
-
-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>
 					)}
 
-					{upcoming.length > 0
+					{upcomingContent}
-						? 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">{t("stock.dividendNote")}</Text>
+					<Text c="dimmed" size="xs">
+						{t("stock.dividendNote")}
+					</Text>
 
 					{!!dividends.positionAt && (
 						<Text c="dimmed" size="xs">
-							{t("stock.snapshotAt", { date: formatSnapshotTime(dividends.positionAt) })}
+							{t("stock.snapshotAt", {
+								date: formatSnapshotTime(dividends.positionAt),
+							})}
 						</Text>
 					)}
 
@@ -108,24 +210,7 @@ const StockDividends: FC<StockDividendsProps> = (props) => {
 									})}
 								</Text>
 
-								{pastDividends.length > 0
+								{pastDividendsContent}
-									? (
-											<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 { act, fireEvent, render, screen, waitFor } from "@testing-library/react";
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
 import { http, HttpResponse } from "msw";
 import { MemoryRouter } from "react-router";
 import { afterEach, describe, expect, it, vi } from "vitest";
@@ -12,37 +12,19 @@ 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
+			<button onClick={vm.onSearch}>search</button>
-				onClick={() => {
+			<button onClick={() => vm.onPage(2)}>page</button>
-					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(() => {
+afterEach(() => vi.useRealTimers());
-	pageOperations.length = 0;
-
-	return vi.useRealTimers();
-});
 
 describe("stock search", () => {
 	it("waits for a meaningful query and uses the server-verified ticker link", async () => {
@@ -93,9 +75,7 @@ describe("stock search", () => {
 		expect(
 			await screen.findByRole("link", { name: /Сбербанк/ }),
 		).toHaveAttribute("href", "/stocks/e6123145-9665-43e0-8413-cd61b8aa9b13");
-		const snapshotTime = new Intl.DateTimeFormat("ru-RU", { dateStyle: "short", timeStyle: "short" });
+		expect(screen.getByText("Список получен 10.10.2026, 10:00")).toBeVisible();
-		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();
@@ -250,12 +230,9 @@ describe("stock search", () => {
 		fireEvent.click(screen.getByRole("button", { name: "page" }));
 		fireEvent.click(screen.getByRole("button", { name: "search" }));
 		await screen.findByText("Новый");
-		await act(async () => {
+		oldPage.resolve();
-			oldPage.resolve();
-			await pageOperations[0];
-		});
 
-		expect(screen.getByText("Новый")).toBeVisible();
+		await waitFor(() => expect(screen.getByText("Новый")).toBeVisible());
 		expect(screen.queryByText("Старый результат")).not.toBeInTheDocument();
 	});
 

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

@@ -101,7 +101,6 @@ function useStocksPageVm() {
 	};
 
 	return {
-		changePage,
 		criteria,
 		error,
 		items: page?.items ?? [],
@@ -112,8 +111,6 @@ 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,25 +67,6 @@ 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
 
@@ -300,33 +281,6 @@ 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,10 +32,6 @@ 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 = {
@@ -104,8 +100,7 @@ async function authenticatedFetch(request: Request): Promise<Response> {
 	if (!isCurrent()) throw new DOMException("Session changed", "AbortError");
 
 	if (!(await sessionState.handlers.refresh())) {
-		if (isCurrent() && !sessionState.handlers.unavailable?.())
+		if (isCurrent()) sessionState.handlers.clear();
-			sessionState.handlers.clear();
 
 		return response;
 	}

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

@@ -746,13 +746,10 @@ export interface components {
                 detail: string;
             }[];
         };
-        RegisterDto: {
+        CredentialsDto: {
             /** @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: {
@@ -763,15 +760,6 @@ 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;
@@ -1119,6 +1107,16 @@ 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"][];
@@ -1162,6 +1160,8 @@ 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 +1183,7 @@ export interface components {
             lastSuccessfulAt: string | null;
             lastAttempt: components["schemas"]["InvestmentAttemptDto"];
             /** @enum {string} */
-            role: "selected";
+            role: "selected" | "previous" | "year";
         };
         IncomeAnalyticsMetaDto: {
             dataRevision: string;
@@ -1720,7 +1720,7 @@ export interface operations {
         };
         requestBody: {
             content: {
-                "application/json": components["schemas"]["RegisterDto"];
+                "application/json": components["schemas"]["CredentialsDto"];
             };
         };
         responses: {
@@ -1788,7 +1788,7 @@ export interface operations {
         };
         requestBody: {
             content: {
-                "application/json": components["schemas"]["LoginDto"];
+                "application/json": components["schemas"]["CredentialsDto"];
             };
         };
         responses: {

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

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

src/shared/api/spec/openapi.json

@@ -10,7 +10,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/RegisterDto"
+                "$ref": "#/components/schemas/CredentialsDto"
               }
             }
           }
@@ -91,7 +91,7 @@
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/LoginDto"
+                "$ref": "#/components/schemas/CredentialsDto"
               }
             }
           }
@@ -5236,7 +5236,7 @@
           "code"
         ]
       },
-      "RegisterDto": {
+      "CredentialsDto": {
         "type": "object",
         "properties": {
           "email": {
@@ -5245,8 +5245,8 @@
           },
           "password": {
             "type": "string",
-            "description": "Raw password: 8-72 printable ASCII characters (letters, digits, symbols, space). Not trimmed or normalized.",
+            "minLength": 12,
-            "pattern": "^[\\x20-\\x7E]{8,72}$",
+            "maxLength": 72,
             "example": "a secure password"
           }
         },
@@ -5285,24 +5285,6 @@
           "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": {
@@ -6724,6 +6706,47 @@
           "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": {
@@ -6925,6 +6948,24 @@
             "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": [
@@ -6957,6 +6998,8 @@
           "period",
           "totalsByCurrency",
           "calculatedAt",
+          "previous",
+          "yearComparison",
           "bucketGranularity",
           "buckets",
           "instruments",
@@ -7013,7 +7056,9 @@
           "role": {
             "type": "string",
             "enum": [
-              "selected"
+              "selected",
+              "previous",
+              "year"
             ]
           }
         },
@@ -7478,8 +7523,7 @@
             "type": "integer",
             "minimum": 1
           }
-        },
+        }
-        "additionalProperties": false
       },
       "StockScreenerItemDto": {
         "type": "object",
@@ -7525,8 +7569,7 @@
           },
           "lot": {
             "type": "integer",
-            "nullable": true,
+            "nullable": true
-            "minimum": 1
           }
         },
         "required": [

src/shared/i18n/locales/ru.ts

@@ -53,14 +53,10 @@ const ru = {
 			passwordConfirmation: "Подтвердите пароль",
 			register: "Регистрация",
 			requestError: "Не удалось выполнить запрос. Попробуйте ещё раз.",
-			retry: "Повторить",
-			unavailableText: "Сервер временно недоступен. Ваш вход сохранён, попробуйте через минуту.",
-			unavailableTitle: "Не удалось подключиться",
 			validation: {
 				invalidEmail: "Некорректный email",
-				invalidPasswordLength: "Пароль: от 8 до 72 символов, только латинские буквы, цифры, спецсимволы и пробел",
+				invalidPasswordLength: "Пароль должен содержать от 12 до 72 байт",
 				passwordsDoNotMatch: "Пароли не совпадают",
-				passwordTooLong: "Пароль не должен превышать 72 байта",
 			},
 		},
 		bank: {
@@ -344,8 +340,13 @@ const ru = {
 		},
 		income: {
 			apply: "Применить",
+			comparisonEmpty: "За эти периоды купоны и дивиденды не найдены.",
+			comparisonFailed:
+				"Не удалось загрузить период сравнения. Повторите обновление.",
+			comparisonPending: "Период сравнения ещё не загружен полностью.",
 			coupon: "Купоны",
 			datePlaceholder: "ДД.ММ.ГГГГ",
+			difference: "Разница",
 			dividend: "Дивиденды",
 			emptyText: "За выбранный период подходящих исполненных выплат нет.",
 			emptyTitle: "Купоны и дивиденды не найдены",
@@ -355,6 +356,8 @@ const ru = {
 			open: "Открыть пассивный доход",
 			payments: "Выплаты",
 			period: "Период",
+			previousPeriod: "Предыдущий период",
+			previousUnavailable: "Сравнение с предыдущим периодом недоступно.",
 			refreshError:
 				"Не удалось обновить пассивный доход. Показан последний загруженный результат.",
 			refreshing: "Обновляем пассивный доход",
@@ -375,6 +378,8 @@ const ru = {
 				period:
 					"Укажите корректный период без будущих дат: начало не позже окончания.",
 			},
+			yearAgo: "Годом ранее",
+			yearUnavailable: "Сравнение с годом ранее недоступно.",
 		},
 		investment: {
 			attempt: {
@@ -420,7 +425,7 @@ const ru = {
 			next: "Далее",
 			noInstrument: "Без инструмента",
 			noMoney: "Без движения денег",
-			occurredAt: "{{date}}",
+			occurredAt: "{{date}} UTC",
 			open: "Открыть журнал",
 			operationType: {
 				buy: "Покупка",
@@ -454,14 +459,6 @@ const ru = {
 			stocks: "Акции",
 		},
 		notFound: { action: "К счетам", title: "Страница не найдена" },
-		payout: {
-			estimate: "Оценка по позиции",
-			executedAt: "Исполнено {{date}}",
-			forecast: "Прогноз",
-			noAmount: "Сумма неизвестна",
-			noMoney: "Без движения денег",
-			registryDate: "Дата реестра",
-		},
 		portfolio: {
 			accountUnavailableText: "Вернитесь к списку и выберите доступный счет.",
 			accountUnavailableTitle: "Счет недоступен",
@@ -632,7 +629,7 @@ const ru = {
 			position: "Моя позиция",
 			previous: "Назад",
 			price: "Цена",
-			priceAt: "Цена на {{date}}",
+			priceAt: "Цена на {{date}} UTC",
 			priceTable: "Цены в таблице",
 			priceTableHint: "Дневные закрытия · записей: {{count}} · сначала новые",
 			priceUnavailable: "Цена недоступна",
@@ -721,7 +718,7 @@ const ru = {
 				SHARE_TYPE_GDR: "Депозитарная расписка",
 				SHARE_TYPE_PREFERRED: "Привилегированная акция",
 			},
-			snapshotAt: "Позиция на {{date}}",
+			snapshotAt: "Позиция на {{date}} UTC",
 			trading: {
 				SECURITY_TRADING_STATUS_BREAK_IN_TRADING: "Перерыв в торгах",
 				SECURITY_TRADING_STATUS_CLOSING_AUCTION: "Аукцион закрытия",

src/shared/lib/calendar.test.ts

@@ -38,11 +38,11 @@ describe("calendar dates", () => {
 		expect(moscowDate(new Date("2026-12-31T21:00:00Z"))).toBe("2027-01-01");
 	});
 
-	it("defaults to 7 calendar dates starting with today", () => {
+	it("defaults to the last 7 days including today", () => {
 		const [from, to] = defaultPeriod();
 
 		expect(calendarDate.safeParse(from).success).toBe(true);
-		expect(from).toBe(moscowDate(new Date()));
+		expect(to).toBe(moscowDate(new Date()));
 		expect((Date.parse(to) - Date.parse(from)) / 86_400_000).toBe(6);
 		expect(from <= to).toBe(true);
 	});

src/shared/lib/calendar.ts

@@ -9,7 +9,8 @@ function isValidPeriod(from: null | string, to: null | string) {
 	);
 }
 
-const DEFAULT_PERIOD_LAST_INDEX = 6;
+const DAY_MS = 86_400_000;
+const DEFAULT_PERIOD_DAYS = 6;
 
 const moscowFormatter = new Intl.DateTimeFormat("en-CA", {
 	day: "2-digit",
@@ -24,17 +25,12 @@ function compareDateDesc(a: null | string, b: null | string) {
 	return (b ?? "").localeCompare(a ?? "");
 }
 
-// 7 calendar dates starting with today (Moscow calendar arithmetic).
+// Last 7 days including today. An empty period always means this range.
 function defaultPeriod(): [string, string] {
-	const from = moscowDate(new Date());
+	const to = new Date();
+	const from = new Date(to.getTime() - DEFAULT_PERIOD_DAYS * DAY_MS);
 
-	const [year = 1970, month = 0, day = 1] = from.split("-").map(Number);
+	return [moscowDate(from), moscowDate(to)];
-	const noon = 12;
-	const lastDay = day + DEFAULT_PERIOD_LAST_INDEX;
-	const end = new Date(Date.UTC(year, month - 1, lastDay, noon));
-	const to = moscowDate(end);
-
-	return [from, to];
 }
 
 function moscowDate(value: Date): string {

src/shared/lib/display.test.ts

@@ -12,16 +12,9 @@ describe("shared display helpers", () => {
 		expect(formatDate("2027-09-10")).toBe("10.09.2027");
 		expect(formatDate("2024-02-29")).toBe("29.02.2024");
 		expect(formatDate("2027-09-10T00:30:00+03:00")).toBe("09.09.2027");
-	});
+		expect(formatSnapshotTime("2027-09-10T00:30:00+03:00")).toBe(
-	it("formats snapshot time in the browser time zone", () => {
+			"09.09.2027, 21:30",
-		const instant = "2027-09-10T00:30:00+03:00";
+		);
-
-		const expected = new Intl.DateTimeFormat("ru-RU", {
-			dateStyle: "short",
-			timeStyle: "short",
-		}).format(new Date(instant));
-
-		expect(formatSnapshotTime(instant)).toBe(expected);
 	});
 	it("formats decimal strings without financial arithmetic", () => {
 		expect(formatMoney({ currency: "RUB", value: "-1234567.89" })).toBe(

src/shared/lib/display.ts

@@ -61,10 +61,10 @@ function formatMoney(
 	return `${formatDecimal(decimal)} ${currency}`;
 }
 
-// Без timeZone Intl берёт часовой пояс браузера пользователя.
 const snapshotFormatter = new Intl.DateTimeFormat("ru-RU", {
 	dateStyle: "short",
 	timeStyle: "short",
+	timeZone: "UTC",
 });
 
 function formatSnapshotTime(value: string): string {

src/shared/ui/PayoutCard/PayoutCard.test.tsx

@@ -1,85 +0,0 @@
-import type { FC } from "react";
-
-import { MantineProvider } from "@mantine/core";
-import { render, screen } from "@testing-library/react";
-import { describe, expect, it } from "vitest";
-
-import { PayoutCard } from "./PayoutCard";
-
-const Wrapper: FC<{ children: React.ReactNode }> = props => (
-	<MantineProvider env="test">{props.children}</MantineProvider>
-);
-
-describe("PayoutCard", () => {
-	it("renders an executed payout with signed source money", () => {
-		render(
-			<Wrapper>
-				<PayoutCard
-					initial="К"
-					kind="executed"
-					occurredAt="01.08.2026 12:00"
-					payment={{ currency: "RUB", value: "-10.25" }}
-					title="Купон"
-					typeLabel="Купон"
-				/>
-			</Wrapper>,
-		);
-		expect(screen.getByText("−10,25 ₽")).toBeInTheDocument();
-		expect(screen.getByText(/Исполнено 01.08.2026 12:00/)).toBeInTheDocument();
-	});
-
-	it("keeps zero distinct from an unknown executed amount", () => {
-		render(
-			<Wrapper>
-				<PayoutCard
-					initial="Д"
-					kind="executed"
-					occurredAt="01.08.2026"
-					payment={{ currency: "RUB", value: "0.000" }}
-					title="Дивиденд"
-					typeLabel="Дивиденд"
-				/>
-			</Wrapper>,
-		);
-		expect(screen.getByText("0,000 ₽")).toBeInTheDocument();
-		expect(screen.getByText("Без движения денег")).toBeInTheDocument();
-	});
-
-	it("marks a forecast payout and a dividend registry date without inventing an amount", () => {
-		render(
-			<Wrapper>
-				<PayoutCard
-					date="15.08.2026"
-					dateKind="registry"
-					initial="S"
-					kind="forecast"
-					projectedAmount={null}
-					title="Дивиденд · SBER"
-				/>
-			</Wrapper>,
-		);
-		expect(screen.getByText("Прогноз")).toBeInTheDocument();
-		expect(screen.getByText(/15.08.2026 · Дата реестра/)).toBeInTheDocument();
-		expect(screen.getByText("Сумма неизвестна")).toBeInTheDocument();
-	});
-
-	it("shows a schedule payout with per-security label and separate estimate", () => {
-		render(
-			<Wrapper>
-				<PayoutCard
-					estimate={{ currency: "RUB", value: "125" }}
-					initial="S"
-					kind="schedule"
-					metadata="Дата выплаты 04.10.2026"
-					perSecurity={{ currency: "RUB", value: "12.5" }}
-					perSecurityLabel="На облигацию"
-					title="Купон · SU26238RMFS4"
-				/>
-			</Wrapper>,
-		);
-		expect(screen.getByText("12,5 ₽")).toBeInTheDocument();
-		expect(screen.getByText("На облигацию")).toBeInTheDocument();
-		expect(screen.getByText("Оценка по позиции")).toBeInTheDocument();
-		expect(screen.getByText("125 ₽")).toBeInTheDocument();
-	});
-});

src/shared/ui/PayoutCard/PayoutCard.tsx

@@ -1,166 +0,0 @@
-import type { FC, ReactNode } from "react";
-
-import { Group, Text } from "@mantine/core";
-import { EntryCard } from "@wealthledger/ui";
-import { useTranslation } from "react-i18next";
-
-import { formatMoney } from "@/shared/lib";
-
-type ExecutedPayout = {
-	details?: ReactNode;
-	extraMetadata?: string;
-	imageSrc?: null | string;
-	initial: string;
-	kind: "executed";
-	occurredAt: string;
-	payment: null | PayoutMoney;
-	title: string;
-	typeLabel: string;
-	wrap?: boolean;
-};
-
-type ForecastPayout = {
-	date: string;
-	dateKind?: "event" | "registry";
-	extraMetadata?: string;
-	imageSrc?: null | string;
-	initial: string;
-	kind: "forecast";
-	projectedAmount: null | PayoutMoney;
-	title: string;
-};
-
-type PayoutCardProps
-	= | ExecutedPayout
-		| ForecastPayout
-		| SchedulePayout;
-
-type PayoutMoney = { currency: string; value: string };
-
-type PayoutTone
-	= | "negative"
-		| "neutral"
-		| "positive";
-
-type SchedulePayout = {
-	conditions?: ReactNode;
-	estimate: null | PayoutMoney;
-	imageSrc?: null | string;
-	initial: string;
-	kind: "schedule";
-	metadata: string;
-	perSecurity: null | PayoutMoney;
-	perSecurityLabel: string;
-	title: string;
-};
-
-const PayoutCard: FC<PayoutCardProps> = (props) => {
-	const { t } = useTranslation();
-
-	const common = {
-		imageSrc: props.imageSrc,
-		initial: props.initial,
-		title: props.title,
-		wrap: true,
-	};
-
-	if (props.kind === "executed") {
-		const payment = props.payment;
-		const presentation = executedPresentation(payment);
-		const isKnown = payment !== null && !isZeroDecimal(payment.value);
-
-		const metadata = [
-			t("payout.executedAt", { date: props.occurredAt }),
-			props.extraMetadata,
-		].filter(Boolean).join(" · ");
-
-		const valueLabel = isKnown ? props.typeLabel : t("payout.noMoney");
-
-		return (
-			<EntryCard
-				{...common}
-				details={props.details}
-				metadata={metadata}
-				tone={presentation.tone}
-				value={presentation.amount}
-				valueLabel={valueLabel}
-				wrap={props.wrap}
-			/>
-		);
-	}
-
-	if (props.kind === "forecast") {
-		const metadata = [
-			props.date,
-			props.dateKind === "registry" ? t("payout.registryDate") : null,
-			props.extraMetadata,
-		].filter(Boolean).join(" · ");
-
-		const value = props.projectedAmount
-			? formatMoney(props.projectedAmount)
-			: t("payout.noAmount");
-
-		return (
-			<EntryCard
-				{...common}
-				metadata={metadata}
-				tone="neutral"
-				value={value}
-				valueLabel={t("payout.forecast")}
-			/>
-		);
-	}
-
-	const details = (
-		<>
-			{props.estimate
-				? (
-						<Group gap="sm">
-							<Text c="dimmed" size="xs">{t("payout.estimate")}</Text>
-
-							<Text fw={600} size="xs">{formatMoney(props.estimate)}</Text>
-						</Group>
-					)
-				: null}
-			{props.conditions}
-		</>
-	);
-
-	const value = props.perSecurity
-		? formatMoney(props.perSecurity)
-		: t("payout.noAmount");
-
-	return (
-		<EntryCard
-			{...common}
-			details={details}
-			metadata={props.metadata}
-			tone="neutral"
-			value={value}
-			valueLabel={props.perSecurityLabel}
-		/>
-	);
-};
-
-function executedPresentation(payment: null | PayoutMoney): {
-	amount: string;
-	tone: PayoutTone;
-} {
-	if (!payment) return { amount: "—", tone: "neutral" };
-	if (isZeroDecimal(payment.value))
-		return { amount: formatMoney(payment), tone: "neutral" };
-	if (payment.value.startsWith("-"))
-		return {
-			amount: `−${formatMoney({ ...payment, value: payment.value.slice(1) })}`,
-			tone: "negative",
-		};
-
-	return { amount: `+${formatMoney(payment)}`, tone: "positive" };
-}
-
-function isZeroDecimal(value: string): boolean {
-	// eslint-disable-next-line security/detect-unsafe-regex -- Anchored decimal check over a bounded Money string, with no nested repetition.
-	return /^-?0(?:\.0+)?$/.test(value);
-}
-
-export { PayoutCard };

src/shared/ui/index.ts

@@ -1,2 +1 @@
-export { PayoutCard } from "./PayoutCard/PayoutCard";
 export { SourceSyncStatus } from "./SourceSyncStatus/SourceSyncStatus";