refactor: enforce frontend view model boundaries

src/entities/bank-card/api/banking.test.tsx

@@ -19,8 +19,10 @@ import {
 	useBankSummary,
 } from "./queries";
 
-const card: BankCard = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+const card: BankCard
+	= {
 		archivedAt: null,
 		balance: { currency: "RUB", value: "100" },
 		bankName: null,
@@ -31,8 +33,9 @@ const card: BankCard = (/* eslint-disable unicorn/no-null -- Fixture preserves t
 		openingDate: "2026-09-01",
 		paymentSystem: null,
 		version: 1,
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+
+/* eslint-enable unicorn/no-null */
 const transfer: CreateBankOperation = {
 	amount: { currency: "RUB", value: "90071992547409.93" },
 	cardId: "a",
@@ -55,6 +58,7 @@ function readHandlers(counts: Map<string, number>, categoryName = "Food") {
 		http.get("*/api/v1/bank-cards", ({ request }) => {
 			const key = new URL(request.url).pathname + new URL(request.url).search;
 			counts.set(key, (counts.get(key) ?? 0) + 1);
+
 			return HttpResponse.json([card]);
 		}),
 		http.get("*/api/v1/bank-cards/*", ({ request }) => {
@@ -84,7 +88,10 @@ function readHandlers(counts: Map<string, number>, categoryName = "Food") {
 					page: 1,
 					total: 0,
 				});
-			return url.pathname.includes("/operations/") ? HttpResponse.json({ ...transfer, version: 1 }) : HttpResponse.json({ ...card, id: url.pathname.split("/").at(-1) });
+
+			return url.pathname.includes("/operations/")
+				? HttpResponse.json({ ...transfer, version: 1 })
+				: HttpResponse.json({ ...card, id: url.pathname.split("/").at(-1) });
 		}),
 	];
 }
@@ -94,15 +101,18 @@ function useReadModels() {
 	const a = useBankCard("a");
 	const b = useBankCard("b");
 	const categories = useBankCategories();
+
 	const history = useBankOperations("a", {
 		limit: 20,
 		month: "2026-09",
 		page: 2,
 	});
+
 	const expenses = useBankExpenses("a", { page: 1 });
 	const september = useBankSummary("2026-09");
 	const august = useBankSummary("2026-08", "b");
 	const original = useBankOperation("original");
+
 	return {
 		mutations: useBankMutations(),
 		reads: [
@@ -134,6 +144,7 @@ describe("banking API", () => {
 				expect(url.searchParams.get("month")).toBe("2026-09");
 				if (isFail && page === 2)
 					return HttpResponse.json({ code: "FAILED" }, { status: 500 });
+
 				return HttpResponse.json({
 					hasNext: page === 1,
 					items: [{ ...transfer, id: String(page) }],
@@ -142,10 +153,12 @@ describe("banking API", () => {
 				});
 			}),
 		);
+
 		const { result } = renderHook(
 			() => useBankOperations("a", { limit: "all", month: "2026-09", page: 1 }),
 			{ wrapper: createQueryWrapper().wrapper },
 		);
+
 		await waitFor(() => expect(result.current.isSuccess).toBe(true));
 		expect(pages).toEqual([1, 2]);
 		expect(result.current.data?.items.map(item => item.id)).toEqual([
@@ -153,10 +166,12 @@ describe("banking API", () => {
 			"2",
 		]);
 		isFail = true;
+
 		const { result: failedResult } = renderHook(
 			() => useBankOperations("a", { limit: "all", month: "2026-09", page: 1 }),
 			{ wrapper: createQueryWrapper().wrapper },
 		);
+
 		await waitFor(() => expect(failedResult.current.isError).toBe(true));
 		expect(failedResult.current.data).toBeUndefined();
 	});
@@ -164,15 +179,15 @@ describe("banking API", () => {
 	it("uses session-aware banking endpoints and explicit month/page without T-Bank", async () => {
 		const counts = new Map<string, number>();
 		server.use(...readHandlers(counts));
+
 		const { result } = renderHook(useReadModels, {
 			wrapper: createQueryWrapper().wrapper,
 		});
+
 		await waitFor(() =>
 			expect(result.current.reads.every(read => read.isSuccess)).toBe(true),
 		);
-		expect(counts.keys()).toContain(
-			"/api/v1/bank-cards?includeArchived=true",
-		);
+		expect(counts.keys()).toContain("/api/v1/bank-cards?includeArchived=true");
 		expect(counts.keys()).toContain(
 			"/api/v1/bank-cards/a/operations?limit=20&month=2026-09&page=2",
 		);
@@ -184,10 +199,13 @@ describe("banking API", () => {
 
 	it("replays the exact UUID and large Money string once across shared auth refresh", async () => {
 		let token = "expired";
+
 		const refresh = vi.fn(() => {
 			token = "renewed";
+
 			return Promise.resolve(true);
 		});
+
 		configureAuthClient({ accessToken: () => token, clear: vi.fn(), refresh });
 		const bodies: unknown[] = [];
 		const headers: (null | string)[] = [];
@@ -195,14 +213,17 @@ describe("banking API", () => {
 			http.post("*/api/v1/bank-cards/operations", async ({ request }) => {
 				bodies.push(await request.json());
 				headers.push(request.headers.get("Authorization"));
+
 				return bodies.length === 1
 					? HttpResponse.json({ code: "UNAUTHORIZED" }, { status: 401 })
 					: HttpResponse.json({ ...transfer, version: 1 });
 			}),
 		);
+
 		const { result } = renderHook(useBankMutations, {
 			wrapper: createQueryWrapper().wrapper,
 		});
+
 		await act(() => result.current.createOperation.mutateAsync(transfer));
 		expect(bodies).toEqual([transfer, transfer]);
 		expect(headers).toEqual(["Bearer expired", "Bearer renewed"]);
@@ -214,14 +235,17 @@ describe("banking API", () => {
 		server.use(
 			http.post("*/api/v1/bank-cards/operations", async ({ request }) => {
 				bodies.push(await request.json());
+
 				return bodies.length === 1
 					? HttpResponse.error()
 					: HttpResponse.json({ ...transfer, version: 1 });
 			}),
 		);
+
 		const { result } = renderHook(useBankMutations, {
 			wrapper: createQueryWrapper().wrapper,
 		});
+
 		await act(async () => {
 			await expect(
 				result.current.createOperation.mutateAsync(transfer),
@@ -239,13 +263,16 @@ describe("banking API", () => {
 		server.use(
 			http.post("*/api/v1/bank-cards/operations", async () => {
 				await pending;
+
 				return HttpResponse.json({ code: "INTERNAL_ERROR" }, { status: 500 });
 			}),
 		);
+
 		const { result } = renderHook(
 			() => ({ mutations: useBankMutations(), query: useBankCard("a") }),
 			{ wrapper: createQueryWrapper().wrapper },
 		);
+
 		await waitFor(() => expect(result.current.query.isSuccess).toBe(true));
 		let saving: Promise<unknown>;
 		act(() => {
@@ -310,10 +337,12 @@ describe("banking API", () => {
 				HttpResponse.json({ code }, { status: 409 }),
 			),
 		);
+
 		const { result } = renderHook(
 			() => ({ card: useBankCard("a"), mutations: useBankMutations() }),
 			{ wrapper: createQueryWrapper().wrapper },
 		);
+
 		await waitFor(() => expect(result.current.card.data?.version).toBe(1));
 		await act(async () => {
 			await expect(
@@ -337,6 +366,7 @@ describe("banking API", () => {
 				const body = await request.json();
 				requests.push(body);
 				name = "Groceries";
+
 				return HttpResponse.json({
 					id: "food",
 					isDefault: true,
@@ -348,14 +378,17 @@ describe("banking API", () => {
 				"*/api/v1/bank-cards/operations/original",
 				async ({ request }) => {
 					requests.push(await request.json());
+
 					return HttpResponse.json({ ...transfer, version: 2 });
 				},
 			),
 			http.delete("*/api/v1/bank-cards/operations/original", ({ request }) => {
 				requests.push(new URL(request.url).searchParams.get("version"));
+
 				return new HttpResponse(null, { status: 204 });
 			}),
 		);
+
 		const { result } = renderHook(
 			() => ({
 				categories: useBankCategories(),
@@ -363,6 +396,7 @@ describe("banking API", () => {
 			}),
 			{ wrapper: createQueryWrapper().wrapper },
 		);
+
 		await waitFor(() =>
 			expect(result.current.categories.data?.[0].name).toBe("Food"),
 		);
@@ -406,9 +440,11 @@ describe("banking API", () => {
 			),
 		);
 		const { queryClient, wrapper } = createQueryWrapper();
+
 		const { rerender, result } = renderHook(() => useBankCard("a"), {
 			wrapper,
 		});
+
 		await waitFor(() => expect(result.current.data?.balance.value).toBe("100"));
 		await apiClient.PUT("/api/v1/tbank-connection", {
 			body: { token: "synthetic" },

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

@@ -1,6 +1,11 @@
 import { useMutation, useQueryClient } from "@tanstack/react-query";
 
-import { apiClient, ApiErrorCode, apiErrorCode, isApiErrorCode } from "@/shared/api";
+import {
+	apiClient,
+	ApiErrorCode,
+	apiErrorCode,
+	isApiErrorCode,
+} from "@/shared/api";
 
 import type {
 	CreateBankCard,
@@ -17,21 +22,27 @@ async function mutationData<T>(
 	const { data, error } = await request;
 	// eslint-disable-next-line @typescript-eslint/only-throw-error -- Preserve generated ProblemDetails for apiErrorCode and field-error consumers.
 	if (error) throw error;
+
 	return data;
 }
 
 function useBankMutations() {
 	const queryClient = useQueryClient();
+
 	const invalidate = () =>
 		queryClient.invalidateQueries({
 			predicate: ({ queryKey }) => {
 				const [method, path] = queryKey;
-				return method === "get"
+
+				return (
+					method === "get"
 					&& typeof path === "string"
 					&& (path === "/api/v1/bank-cards"
-						|| path.startsWith("/api/v1/bank-cards/"));
+						|| path.startsWith("/api/v1/bank-cards/"))
+				);
 			},
 		});
+
 	const options = {
 		onError: (error: unknown) => {
 			const errorCode = apiErrorCode(error);
@@ -49,11 +60,13 @@ function useBankMutations() {
 		onSuccess: invalidate,
 		retry: false,
 	} as const;
+
 	const cardCreation = useMutation({
 		...options,
 		mutationFn: (body: CreateBankCard) =>
 			mutationData(apiClient.POST("/api/v1/bank-cards", { body })),
 	});
+
 	const updateCard = useMutation({
 		...options,
 		mutationFn: ({ body, id }: { body: UpdateBankCard; id: string }) =>
@@ -64,11 +77,13 @@ function useBankMutations() {
 				}),
 			),
 	});
+
 	const operationCreation = useMutation({
 		...options,
 		mutationFn: (body: CreateBankOperation) =>
 			mutationData(apiClient.POST("/api/v1/bank-cards/operations", { body })),
 	});
+
 	const updateOperation = useMutation({
 		...options,
 		mutationFn: ({ body, id }: { body: UpdateBankOperation; id: string }) =>
@@ -79,6 +94,7 @@ function useBankMutations() {
 				}),
 			),
 	});
+
 	const operationDeletion = useMutation({
 		...options,
 		mutationFn: ({ id, version }: { id: string; version: number }) =>
@@ -88,11 +104,13 @@ function useBankMutations() {
 				}),
 			),
 	});
+
 	const categoryCreation = useMutation({
 		...options,
 		mutationFn: (body: CreateExpenseCategory) =>
 			mutationData(apiClient.POST("/api/v1/bank-cards/categories", { body })),
 	});
+
 	const updateCategory = useMutation({
 		...options,
 		mutationFn: ({ body, id }: { body: UpdateExpenseCategory; id: string }) =>
@@ -103,6 +121,7 @@ function useBankMutations() {
 				}),
 			),
 	});
+
 	return {
 		createCard: cardCreation,
 		createCategory: categoryCreation,

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

@@ -9,24 +9,34 @@ import { moneyCents } from "../model/form-validation";
 
 type BankCard
 	= paths["/api/v1/bank-cards/{id}"]["get"]["responses"][200]["content"]["application/json"];
+
 type BankOperation
 	= paths["/api/v1/bank-cards/operations/{id}"]["get"]["responses"][200]["content"]["application/json"];
+
 type BankOperations
 	= paths["/api/v1/bank-cards/{id}/operations"]["get"]["responses"][200]["content"]["application/json"];
+
 type BankSummary
 	= paths["/api/v1/bank-cards/summary"]["get"]["responses"][200]["content"]["application/json"];
+
 type CreateBankCard
 	= paths["/api/v1/bank-cards"]["post"]["requestBody"]["content"]["application/json"];
+
 type CreateBankOperation
 	= paths["/api/v1/bank-cards/operations"]["post"]["requestBody"]["content"]["application/json"];
+
 type CreateExpenseCategory
 	= paths["/api/v1/bank-cards/categories"]["post"]["requestBody"]["content"]["application/json"];
+
 type ExpenseCategory
 	= paths["/api/v1/bank-cards/categories"]["get"]["responses"][200]["content"]["application/json"][number];
+
 type UpdateBankCard
 	= paths["/api/v1/bank-cards/{id}"]["patch"]["requestBody"]["content"]["application/json"];
+
 type UpdateBankOperation
 	= paths["/api/v1/bank-cards/operations/{id}"]["patch"]["requestBody"]["content"]["application/json"];
+
 type UpdateExpenseCategory
 	= paths["/api/v1/bank-cards/categories/{id}"]["patch"]["requestBody"]["content"]["application/json"];
 
@@ -41,12 +51,13 @@ function sortBankSummary(data: BankSummary): BankSummary {
 			if (left === null || right === null)
 				throw new Error("Invalid bank summary amount");
 			if (left > right) return -1;
+
 			return left < right ? 1 : 0;
 		}),
 	};
 }
 
-function useBankCard(id: string | undefined) {
+function useBankCard(id?: string) {
 	return useAuthenticatedQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/bank-cards/{id}", {
 			params: { path: { id: id ?? "" } },
@@ -83,7 +94,7 @@ function useBankExpenses(
 	});
 }
 
-function useBankOperation(id: string | undefined) {
+function useBankOperation(id?: string) {
 	return useAuthenticatedQuery({
 		...apiQueryClient.queryOptions(
 			"get",
@@ -105,6 +116,7 @@ function useBankOperations(
 	},
 ) {
 	const isAll = query.limit === "all";
+
 	const parameters = {
 		path: { id: id ?? "" },
 		query: {
@@ -113,11 +125,13 @@ function useBankOperations(
 			page: isAll ? 1 : query.page,
 		},
 	};
+
 	const options = apiQueryClient.queryOptions(
 		"get",
 		"/api/v1/bank-cards/{id}/operations",
 		{ params: parameters },
 	);
+
 	// eslint-disable-next-line @tanstack/query/exhaustive-deps -- Generated options.queryKey already contains params; retain the shared cache identity.
 	return useAuthenticatedQuery({
 		enabled: Boolean(id && (query.month || (query.from && query.to))),
@@ -126,6 +140,7 @@ function useBankOperations(
 			previousQuery,
 		) => {
 			const previous = previousQuery?.queryKey[2]?.params;
+
 			return !isAll
 				&& previousQuery?.queryKey.length === options.queryKey.length
 				&& previous?.path?.id === id
@@ -138,6 +153,7 @@ function useBankOperations(
 		},
 		queryFn: async ({ signal }) => {
 			const items: BankOperation[] = [];
+
 			for (let page = parameters.query.page; ; page++) {
 				const { data, error } = await apiClient.GET(
 					"/api/v1/bank-cards/{id}/operations",
@@ -146,6 +162,7 @@ function useBankOperations(
 						signal,
 					},
 				);
+
 				// eslint-disable-next-line @typescript-eslint/only-throw-error -- Preserve generated ProblemDetails for apiErrorCode and field-error consumers.
 				if (error) throw error;
 				if (!data) throw new Error("Missing bank operations response");
@@ -154,18 +171,22 @@ function useBankOperations(
 				if (!data.hasNext) return { ...data, hasNext: false, items, page: 1 };
 			}
 		},
-		queryKey: isAll ? ([...options.queryKey, "all"] as const) : options.queryKey,
+		queryKey: isAll
+			? ([...options.queryKey, "all"] as const)
+			: options.queryKey,
 	});
 }
 
 function useBankSummary(
-	period: string | { from: string; to: string },
+	period: string
+		| { from: string; to: string },
 	cardId?: string,
 ) {
 	const query
 		= typeof period === "string"
 			? { cardId, month: period }
 			: { ...period, cardId };
+
 	return useAuthenticatedQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/bank-cards/summary", {
 			params: { query },

src/entities/bank-card/api/summary.test.ts

@@ -28,6 +28,7 @@ it("orders displayed expenses descending, preserving cents, ties and source data
 		net: money("0"),
 		refunds: money("0"),
 	};
+
 	expect(sortBankSummary(data).categories.map(row => row.categoryId)).toEqual(
 		["3", "1", "2", "5", "4", "0"],
 	);

src/entities/bank-card/index.ts

@@ -10,21 +10,16 @@ export {
 	useBankOperations,
 	useBankSummary,
 } from "./api/queries";
-export {
-	bankDateInputValue,
-	bankDateSchema,
-	bankMoneyValue,
-	bankToday,
-	moneyCents,
-	positiveMoneySchema,
-} from "./model/form-validation";
+export { bankDateInputValue, bankMoneyValue, bankToday, moneyCents } from "./model/form-validation";
+export { bankDateSchema, positiveMoneySchema } from "./model/form.schema";
+
+export { bankOperationAppearance } from "./model/operation-appearance";
 export { bankOperationKinds } from "./model/operation-kinds";
 export { bankPeriod } from "./model/period";
 export { BankCardFace } from "./ui/BankCardFace/BankCardFace";
 export { BankCardForm } from "./ui/BankCardForm/BankCardForm";
 export { BankFeedback } from "./ui/BankFeedback";
-export { BankOperationIcon } from "./ui/BankOperationIcon/BankOperationIcon";
-export { BankPeriodPicker } from "./ui/BankPeriodPicker";
+export { BankPeriodPicker } from "./ui/BankPeriodPicker/BankPeriodPicker";
 export { BankSummaryView } from "./ui/BankSummary/BankSummary.view";
 export { CategoryManager } from "./ui/CategoryManager/CategoryManager";
 export { useBankFormFocus } from "./ui/useBankFormFocus";

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

@@ -0,0 +1,30 @@
+import { z } from "zod";
+
+import { validationMessage } from "@/shared/i18n";
+
+import type { ExpenseCategory } from "../api/queries";
+const MAX_CATEGORY_NAME_LENGTH = 80;
+
+function categorySchema(categories?: ExpenseCategory[], editingId?: string) {
+	return z.object({
+		name: z
+			.string()
+			.trim()
+			.refine(
+				value => value.length > 0 && value.length <= MAX_CATEGORY_NAME_LENGTH,
+				{ error: validationMessage("bank.validation.category") },
+			)
+			.refine(
+				value =>
+					!categories?.some(
+						c =>
+							c.id !== editingId
+							&& c.name.toLocaleLowerCase("ru-RU")
+							=== value.toLocaleLowerCase("ru-RU"),
+					),
+				{ error: validationMessage("bank.validation.duplicate") },
+			),
+	});
+}
+
+export { categorySchema };

src/entities/bank-card/model/form-validation.test.ts

@@ -1,14 +1,7 @@
 import { afterEach, describe, expect, it, vi } from "vitest";
 
-import {
-	bankCardSchema,
-	bankDateInputValue,
-	bankDateSchema,
-	bankMoneyValue,
-	bankMonth,
-	bankToday,
-	positiveMoneySchema,
-} from "./form-validation";
+import { bankDateInputValue, bankMoneyValue, bankMonth, bankToday } from "./form-validation";
+import { bankCardSchema, bankDateSchema, positiveMoneySchema } from "./form.schema";
 
 afterEach(() => vi.useRealTimers());
 describe("bank form input", () => {
@@ -16,6 +9,7 @@ describe("bank form input", () => {
 		expect(positiveMoneySchema.safeParse("92233720368547758.07").success).toBe(
 			true,
 		);
+
 		for (const invalid of [
 			"92233720368547758.08",
 			"1.001",
@@ -26,7 +20,9 @@ describe("bank form input", () => {
 		]) {
 			expect(positiveMoneySchema.safeParse(invalid).success).toBe(false);
 		}
+
 		expect(bankMoneyValue(" -00010,20 ")).toBe("-10.20");
+
 		const values = {
 			bankName: "",
 			lastFour: "",
@@ -34,6 +30,7 @@ describe("bank form input", () => {
 			openingBalance: "-92233720368547758.08",
 			openingDate: "2026-01-01",
 		};
+
 		expect(bankCardSchema.safeParse(values).success).toBe(true);
 		expect(
 			bankCardSchema.safeParse({
@@ -62,6 +59,7 @@ it("converts local date input without accepting impossible or unfinished dates",
 	expect(
 		bankDateSchema.safeParse(bankDateInputValue("29.02.2024")).success,
 	).toBe(true);
+
 	for (const value of ["31.02.2026", "07.08.", ""]) {
 		expect(bankDateSchema.safeParse(bankDateInputValue(value)).success).toBe(
 			false,

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

@@ -1,28 +1,25 @@
-import { z } from "zod";
-
-import { validationMessage } from "@/shared/i18n";
-
 const DECIMAL_PART_COUNT = 2;
 const CENTS_PRECISION = 2;
-const ISO_DATE_LENGTH = 10;
 
 const ISO_MONTH_LENGTH = 7;
-const MAX_CARD_NAME_LENGTH = 100;
 
 function bankDateInputValue(value: string) {
 	return value.replace(/^(\d{2})\.(\d{2})\.(\d{4})$/, "$3-$2-$1");
 }
+
 function bankMoneyValue(value: string) {
 	return value
 		.trim()
 		.replace(",", ".")
 		.replace(/^(-?)0+(?=\d)/, "$1");
 }
+
 function bankMonth(value: null | string) {
 	return value && value >= "0001-01" && /^\d{4}-(?:0[1-9]|1[0-2])$/.test(value)
 		? value
 		: bankToday().slice(0, ISO_MONTH_LENGTH);
 }
+
 function bankToday() {
 	return new Intl.DateTimeFormat("en-CA", {
 		day: "2-digit",
@@ -31,84 +28,21 @@ function bankToday() {
 		year: "numeric",
 	}).format(new Date());
 }
+
 function moneyCents(value: string): bigint | null {
 	const normalized = value.trim().replace(",", ".");
-	if (!/^-?\d+$|^-?\d+\.\d{1,2}$/.test(normalized)) return /* eslint-disable-line unicorn/no-null -- The money parser’s callers distinguish invalid input with null. */ null;
-	const [whole, fraction = ""] = normalized.replace("-", "").split(".", DECIMAL_PART_COUNT);
+	if (!/^-?\d+$|^-?\d+\.\d{1,2}$/.test(normalized))
+		// eslint-disable-next-line unicorn/no-null -- The money parser’s callers distinguish invalid input with null.
+		return null;
+
+	const [whole, fraction = ""] = normalized
+		.replace("-", "")
+		.split(".", DECIMAL_PART_COUNT);
+
 	return (
 		BigInt(`${whole}${fraction.padEnd(CENTS_PRECISION, "0")}`)
 		* (normalized.startsWith("-") ? -1n : 1n)
 	);
 }
-const MIN_BALANCE_KOPECKS = -9_223_372_036_854_775_808n;
-const MAX_BALANCE_KOPECKS = 9_223_372_036_854_775_807n;
 
-const moneySchema = z.string().refine(
-	(value) => {
-		const cents = moneyCents(value);
-		return (
-			cents !== null
-			&& cents >= MIN_BALANCE_KOPECKS
-			&& cents <= MAX_BALANCE_KOPECKS
-		);
-	},
-	{ error: validationMessage("bank.validation.money") },
-);
-const positiveMoneySchema = moneySchema.refine(
-	(value) => {
-		const cents = moneyCents(value);
-		return cents === null || cents > 0n;
-	},
-	{ error: validationMessage("bank.validation.positive") },
-);
-const bankDateSchema = z
-	.string()
-	.refine(
-		value =>
-			/^\d{4}-\d{2}-\d{2}$/.test(value)
-			&& value >= "0001-01-01"
-			&& !Number.isNaN(Date.parse(`${value}T00:00:00Z`))
-			&& new Date(`${value}T00:00:00Z`).toISOString().slice(0, ISO_DATE_LENGTH) === value
-			&& value <= bankToday(),
-		{ error: validationMessage("bank.validation.date") },
-	);
-const bankCardSchema = z.object({
-	bankName: z
-		.string()
-		.trim()
-		.max(
-			MAX_CARD_NAME_LENGTH,
-			validationMessage("bank.validation.bankName")(undefined),
-		),
-	lastFour: z.string().refine(value => !value || /^\d{4}$/.test(value), {
-		error: validationMessage("bank.validation.lastFour"),
-	}),
-	name: z
-		.string()
-		.trim()
-		.min(1, validationMessage("bank.validation.name")(undefined))
-		.max(
-			MAX_CARD_NAME_LENGTH,
-			validationMessage("bank.validation.name")(undefined),
-		),
-	openingBalance: moneySchema,
-	openingDate: bankDateSchema,
-	paymentSystem: z
-		.enum(["", "mir", "visa", "mastercard"], {
-			error: validationMessage("bank.validation.paymentSystem"),
-		})
-		.optional(),
-});
-type BankCardValues = z.infer<typeof bankCardSchema>;
-
-export {
-	bankCardSchema,
-	type BankCardValues,
-	bankDateInputValue,
-	bankDateSchema,
-	bankMoneyValue,
-	bankMonth,
-	bankToday,
-	moneyCents,
-	positiveMoneySchema,
-};
+export { bankDateInputValue, bankMoneyValue, bankMonth, bankToday, moneyCents };

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

@@ -0,0 +1,81 @@
+import { z } from "zod";
+
+import { validationMessage } from "@/shared/i18n";
+
+import { bankToday, moneyCents } from "./form-validation";
+const ISO_DATE_LENGTH = 10;
+const MAX_CARD_NAME_LENGTH = 100;
+const MIN_BALANCE_KOPECKS = -9_223_372_036_854_775_808n;
+const MAX_BALANCE_KOPECKS = 9_223_372_036_854_775_807n;
+
+const moneySchema = z.string().refine(
+	(value) => {
+		const cents = moneyCents(value);
+
+		return (
+			cents !== null
+			&& cents >= MIN_BALANCE_KOPECKS
+			&& cents <= MAX_BALANCE_KOPECKS
+		);
+	},
+	{ error: validationMessage("bank.validation.money") },
+);
+
+const positiveMoneySchema = moneySchema.refine(
+	(value) => {
+		const cents = moneyCents(value);
+
+		return cents === null || cents > 0n;
+	},
+	{ error: validationMessage("bank.validation.positive") },
+);
+
+const bankDateSchema = z
+	.string()
+	.refine(
+		value =>
+			/^\d{4}-\d{2}-\d{2}$/.test(value)
+			&& value >= "0001-01-01"
+			&& !Number.isNaN(Date.parse(`${value}T00:00:00Z`))
+			&& new Date(`${value}T00:00:00Z`).toISOString().slice(0, ISO_DATE_LENGTH)
+			=== value
+			&& value <= bankToday(),
+		{ error: validationMessage("bank.validation.date") },
+	);
+
+const bankCardSchema = z.object({
+	bankName: z
+		.string()
+		.trim()
+		.max(
+			MAX_CARD_NAME_LENGTH,
+			validationMessage("bank.validation.bankName")(undefined),
+		),
+	lastFour: z.string().refine(value => !value || /^\d{4}$/.test(value), {
+		error: validationMessage("bank.validation.lastFour"),
+	}),
+	name: z
+		.string()
+		.trim()
+		.min(1, validationMessage("bank.validation.name")(undefined))
+		.max(
+			MAX_CARD_NAME_LENGTH,
+			validationMessage("bank.validation.name")(undefined),
+		),
+	openingBalance: moneySchema,
+	openingDate: bankDateSchema,
+	paymentSystem: z
+		.enum(["", "mir", "visa", "mastercard"], {
+			error: validationMessage("bank.validation.paymentSystem"),
+		})
+		.optional(),
+});
+
+type BankCardValues = z.infer<typeof bankCardSchema>;
+
+export {
+	bankCardSchema,
+	type BankCardValues,
+	bankDateSchema,
+	positiveMoneySchema,
+};

src/entities/bank-card/model/operation-appearance.ts

@@ -1,124 +1,132 @@
+import type { OperationIconProps } from "@wealthledger/icons";
+
 import type { BankOperation } from "../api/queries";
 
-type OperationIcon = { animation?: string; color: string; path: string };
+type OperationIcon = {
+	animation?: string;
+	color: string;
+	variant: OperationIconProps["variant"];
+};
 
 const categoryIcons: Record<string, OperationIcon> = {
 	"алкоголь": {
 		animation: "wine",
 		color: "grape",
-		path: "M7 3h10v5a5 5 0 0 1-10 0V3Z M7 7h10v1a5 5 0 0 1-10 0V7Z M12 13v8 M8 21h8",
+		variant: "wine",
 	},
 	"вклады": {
 		animation: "deposit",
 		color: "green",
-		path: "M6 9a6 6 0 1 0 12 0a6 6 0 1 0-12 0 M10.5 12V6h2a1.5 1.5 0 0 1 0 3h-3m0 1.5h3 M4 16c0 4 16 4 16 0 M4 19c0 4 16 4 16 0",
+		variant: "deposit",
 	},
-	"жилье": { color: "orange", path: "M3 11l9-8 9 8 M5 10v11h14V10 M9 21v-8h6v8" },
-	"здоровье": { color: "red", path: "M9 3h6v6h6v6h-6v6H9v-6H3V9h6V3Z" },
+	"жилье": { color: "orange", variant: "home" },
+	"здоровье": { color: "red", variant: "medical" },
 	"инвестиции и накопления": {
 		animation: "growth",
 		color: "green",
-		path: "M3 3v18h18 M6 15l5-5 4 3 6-8 M16 5h5v5",
+		variant: "growth",
 	},
 	"кафе": {
 		animation: "coffee",
 		color: "orange",
-		path: "M4 8h12v7a4 4 0 0 1-4 4H8a4 4 0 0 1-4-4V8Z M16 9h2a3 3 0 0 1 0 6h-2 M8 6c-2-1 2-2 0-4 M12 6c-2-1 2-2 0-4 M3 22h15",
+		variant: "coffee",
 	},
 	"образование": {
 		color: "blue",
-		path: "M2 8l10-5 10 5-10 5L2 8Z M6 10v7c4 3 8 3 12 0v-7 M22 8v9",
+		variant: "education",
 	},
 	"переводы": {
 		animation: "transfer",
 		color: "blue",
-		path: "M3 7h18l-4-4 M21 17H3l4 4",
+		variant: "transfer",
 	},
 	"погашение кредита": {
 		animation: "repayment",
 		color: "orange",
-		path: "M3 5h18v14H3V5Z M3 9h18 M10 18v-7h3a2 2 0 0 1 0 4H9m0 1.5h4",
+		variant: "repayment",
 	},
 	"подписки": {
 		color: "grape",
-		path: "M4 10a8 8 0 0 1 13-6l3 3 M20 3v4h-4 M20 14a8 8 0 0 1-13 6l-3-3 M4 21v-4h4",
+		variant: "subscriptions",
 	},
 	"покупки": {
 		color: "grape",
-		path: "M5 7h14l2 14H3L5 7Z M8 8V6a4 4 0 0 1 8 0v2",
+		variant: "shopping",
 	},
 	"продукты": {
 		animation: "basket",
 		color: "green",
-		path: "M3 9h18l-2 11H5L3 9Z M8 9l4-6 4 6 M9 13v3 M15 13v3 M10 6a2 2 0 1 0 4 0a2 2 0 1 0-4 0",
+		variant: "basket",
 	},
 	"путешествия": {
 		color: "blue",
-		path: "M10 3h4v7l7 5v3l-7-3v5l2 1v1l-4-1-4 1v-1l2-1v-5l-7 3v-3l7-5V3Z",
+		variant: "travel",
 	},
 	"развлечения": {
 		color: "grape",
-		path: "M9 5v14a3 3 0 1 1-3-3h3 M9 5l11-2v14a3 3 0 1 1-3-3h3 M9 9l11-2",
+		variant: "music",
 	},
 	"связь и интернет": {
 		animation: "wifi",
 		color: "blue",
-		path: "M3 7a14 14 0 0 1 18 0 M6 11a9 9 0 0 1 12 0 M9 15a4 4 0 0 1 6 0 M12 19h.01",
+		variant: "wifi",
 	},
 	"снятие наличных": {
 		color: "green",
-		path: "M4 10V3h16v7 M7 7h10v14H7V7Z M7 11h10 M10 16h4",
+		variant: "cashWithdrawal",
 	},
 	"ставки": {
 		color: "grape",
-		path: "M5 3h14a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2Z M7 7h.01 M17 7h.01 M12 12h.01 M7 17h.01 M17 17h.01",
+		variant: "dice",
 	},
 	"страхование": {
 		color: "green",
-		path: "M12 2l8 4v6c0 5-8 10-8 10S4 17 4 12V6l8-4Z M8 12l3 3 5-6",
+		variant: "shield",
 	},
 	"табак": {
 		color: "orange",
-		path: "M3 14h18v5H3v-5Z M16 14v5 M8 10V8c0-2 3-2 3-4V2 M15 10V8c0-2 3-2 3-4",
+		variant: "smoking",
 	},
 	"такси": {
 		color: "yellow",
-		path: "M4 10l2-6h12l2 6 M3 10h18v8H3v-8Z M6 18v3 M18 18v3 M6 14h2 M16 14h2 M10 4V2h4v2",
+		variant: "taxi",
 	},
 	"транспорт": {
 		animation: "car",
 		color: "blue",
-		path: "M4 16H2v-4l3-1 3-4h6l4 4 4 1v4h-2 M8 16h8 M6 11h12m-6-4v4 M4 16a2 2 0 1 0 4 0a2 2 0 1 0-4 0m2-2v4m-2-2h4 M16 16a2 2 0 1 0 4 0a2 2 0 1 0-4 0m2-2v4m-2-2h4",
+		variant: "car",
 	},
 	"хостинг и ии-сервисы": {
 		animation: "server",
 		color: "grape",
-		path: "M3 3h18v7H3V3Z M3 14h18v7H3v-7Z M7 6.5h.01 M7 17.5h.01 M15 6.5h3 M15 17.5h3",
+		variant: "server",
 	},
 	"цифровые покупки": {
 		color: "blue",
-		path: "M3 3h18v13H3V3Z M8 21h8 M12 16v5 M12 6v7 M9 10l3 3 3-3",
+		variant: "download",
 	},
 };
+
 const otherIcon: OperationIcon = {
 	animation: "grid",
 	color: "gray",
-	path: "M4 4h6v6H4V4Z M14 4h6v6h-6V4Z M4 14h6v6H4v-6Z M14 14h6v6h-6v-6Z",
+	variant: "grid",
 };
+
 const operationIcons: Record<
 	Exclude<BankOperation["kind"], "expense">,
 	OperationIcon
 > = {
-	refund: { color: "teal", path: "M8 4L3 9l5 5 M3 9h11a7 7 0 0 1 0 14" },
+	refund: { color: "teal", variant: "refund" },
 	topup: {
 		animation: "topup",
 		color: "green",
-		path: "M20 8V5H5a2 2 0 0 1 0-4h13v4 M3 3v16a2 2 0 0 0 2 2h15V8H5 M16 12v5m-2.5-2.5h5",
+		variant: "topup",
 	},
 	transfer: {
 		animation: "transfer",
 		color: "blue",
-		path: "M3 7h18l-4-4 M21 17H3l4 4",
+		variant: "transfer",
 	},
 };
 
@@ -126,12 +134,18 @@ function bankOperationAppearance(
 	kind: BankOperation["kind"],
 	categoryName?: null | string,
 ) {
-	if (kind !== "expense") return /* eslint-disable-line security/detect-object-injection -- Operation kinds are finite; category names are guarded by Object.hasOwn. */ operationIcons[kind];
+	if (kind !== "expense")
+		// eslint-disable-next-line security/detect-object-injection -- Operation kinds are finite; category names are guarded by Object.hasOwn.
+		return operationIcons[kind];
+
 	const name = categoryName
 		?.trim()
 		.toLocaleLowerCase("ru-RU")
 		.replaceAll("ё", "е");
-	return name && Object.hasOwn(categoryIcons, name) ? /* eslint-disable-line security/detect-object-injection -- Operation kinds are finite; category names are guarded by Object.hasOwn. */ categoryIcons[name] : otherIcon;
+
+	return name && Object.hasOwn(categoryIcons, name)
+		? categoryIcons[name] // eslint-disable-line security/detect-object-injection -- Operation kinds are finite; category names are guarded by Object.hasOwn.
+		: otherIcon;
 }
 
 export { bankOperationAppearance };

src/entities/bank-card/model/period.test.ts

@@ -17,6 +17,7 @@ it.each([
 it("rejects zero year consistently in legacy and explicit periods", () => {
 	vi.useFakeTimers();
 	vi.setSystemTime(new Date("2026-09-27T10:00:00Z"));
+
 	for (const query of ["month=0000-01", "from=0000-01-01&to=0000-01-31"]) {
 		expect(bankPeriod(new URLSearchParams(query))).toEqual({
 			from: "2026-09-01",

src/entities/bank-card/model/period.ts

@@ -1,15 +1,16 @@
-import { z } from "zod";
+import { calendarDate } from "@/shared/lib";
 
 import { bankMonth } from "./form-validation";
 
-const calendarDate = z.iso.date();
 const ISO_DATE_LENGTH = 10;
+
 function bankPeriod(parameters: URLSearchParams) {
 	const month = bankMonth(parameters.get("month"));
 	const monthEnd = new Date(`${month}-01T00:00:00Z`);
 	monthEnd.setUTCMonth(monthEnd.getUTCMonth() + 1, 0);
 	const from = parameters.get("from");
 	const to = parameters.get("to");
+
 	return from
 		&& to
 		&& calendarDate.safeParse(from).success

src/entities/bank-card/ui/BankCardFace/BankCardFace.stories.tsx

@@ -4,53 +4,66 @@ import { SimpleGrid } from "@mantine/core";
 
 import { BankCardFace } from "./BankCardFace";
 
-const meta = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-{
-	args: {
-		card: {
-			archivedAt: null,
-			balance: { currency: "RUB", value: "128450.75" },
-			bankName: "Сбербанк",
-			id: "fictional",
-			lastFour: "4829",
-			name: "Для повседневных покупок",
-			openingBalance: { currency: "RUB", value: "0" },
-			openingDate: "2026-01-01",
-			paymentSystem: "mir",
-			version: 1,
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+const meta
+	= {
+		args: {
+			card: {
+				archivedAt: null,
+				balance: { currency: "RUB", value: "128450.75" },
+				bankName: "Сбербанк",
+				id: "fictional",
+				lastFour: "4829",
+				name: "Для повседневных покупок",
+				openingBalance: { currency: "RUB", value: "0" },
+				openingDate: "2026-01-01",
+				paymentSystem: "mir",
+				version: 1,
+			},
 		},
-	},
-	component: BankCardFace,
-	tags: ["autodocs"],
-	title: "Product/BankCards/CardAppearance",
-}
-/* eslint-enable unicorn/no-null */) satisfies Meta<typeof BankCardFace>;
+		component: BankCardFace,
+		tags: ["autodocs"],
+		title: "Product/BankCards/CardAppearance",
+	} satisfies /* eslint-enable unicorn/no-null */ Meta<typeof BankCardFace>;
+
 export default meta;
+
 type Story = StoryObj<typeof meta>;
+
 export const Banks: Story = {
 	render: arguments_ => (
 		<SimpleGrid cols={{ base: 1, sm: 2 }} maw={920}>
-			{["Сбербанк", "Т-Банк", "Альфа-Банк", "ВТБ", /* eslint-disable-line unicorn/no-null -- Exercise the explicit null returned by the production API/DOM contract. */ null].map(
-				(bankName, index) => (
-					<BankCardFace
-						card={(/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-							{
-								...arguments_.card,
-								bankName,
-								paymentSystem:
-								/* eslint-disable-line security/detect-object-injection -- This is a positional index into the local array, not a user-supplied object key. */ (["mir", "mastercard", "visa", "mir", null] as const)[index]
+			{[
+				"Сбербанк",
+				"Т-Банк",
+				"Альфа-Банк",
+				"ВТБ",
+				// eslint-disable-next-line unicorn/no-null -- Exercise the explicit null returned by the production API/DOM contract.
+				null,
+			].map((bankName, index) => (
+				<BankCardFace
+					/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+					card={
+						{
+							...arguments_.card,
+							bankName,
+							paymentSystem:
+								// eslint-disable-next-line security/detect-object-injection -- This is a positional index into the local array, not a user-supplied object key.
+								(["mir", "mastercard", "visa", "mir", null] as const)[index]
 								?? null,
-							}
-							/* eslint-enable unicorn/no-null */)}
-						key={bankName ?? "unknown"}
-					/>
-				),
-			)}
+						}
+						/* eslint-enable unicorn/no-null */
+					}
+					key={bankName ?? "unknown"}
+				/>
+			))}
 		</SimpleGrid>
 	),
 };
-export const MissingDetails: Story = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+export const MissingDetails: Story
+	= {
 		args: {
 			card: {
 				...meta.args.card,
@@ -59,8 +72,8 @@ export const MissingDetails: Story = (/* eslint-disable unicorn/no-null -- Fixtu
 				paymentSystem: null,
 			},
 		},
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+/* eslint-enable unicorn/no-null */
 export const LongArchived: Story = {
 	args: {
 		card: {

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

@@ -1,5 +1,6 @@
 import type { FC } from "react";
 
+import { ContactlessIcon } from "@wealthledger/icons";
 import { useTranslation } from "react-i18next";
 
 import { formatMoney } from "@/shared/lib";
@@ -9,51 +10,46 @@ import type { BankCard } from "../../api/queries";
 import classes from "./BankCardFace.module.css";
 
 type BankCardFaceProps = { card: BankCard };
+
 const BankCardFace: FC<BankCardFaceProps> = (props) => {
 	const { card } = props;
 	const { t } = useTranslation();
 	const bank = card.bankName?.toLocaleLowerCase("ru") ?? "";
 	const tone = bankTone(bank);
+
 	return (
 		<div className={classes.face} data-tone={tone}>
 			<div className={classes.top}>
 				<span className={classes.bank}>{card.bankName || t("bank.card")}</span>
+
 				{card.archivedAt && (
 					<span className={classes.archive}>{t("bank.archived")}</span>
 				)}
 			</div>
+
 			<div aria-hidden="true" className={classes.hardware}>
 				<span className={classes.chip} />
-				<svg
-					aria-hidden="true"
-					fill="none"
-					height="30"
-					viewBox="0 0 24 30"
-					width="24"
-				>
-					<path
-						d="M7 11a8 8 0 0 1 0 8m5-12a15 15 0 0 1 0 16m5-20a23 23 0 0 1 0 24"
-						stroke="currentColor"
-						strokeLinecap="round"
-						strokeWidth="2"
-					/>
-				</svg>
+
+				<ContactlessIcon height="30" viewBox="0 0 24 30" />
 			</div>
-			<div
-				className={classes.number}
-			>
+
+			<div className={classes.number}>
 				{`•••• •••• •••• ${card.lastFour || "••••"}`}
 			</div>
+
 			<div className={classes.bottom}>
 				<div className={classes.details}>
 					<div className={classes.name}>{card.name}</div>
+
 					<div className={classes.balance}>{formatMoney(card.balance)}</div>
 				</div>
+
 				{card.paymentSystem && (
 					<span className={classes.network} data-network={card.paymentSystem}>
 						{card.paymentSystem === "mastercard" && (
 							<span aria-hidden="true" className={classes.circles} />
 						)}
+
 						{t(`bank.paymentSystems.${card.paymentSystem}`)}
 					</span>
 				)}
@@ -66,6 +62,7 @@ function bankTone(bank: string) {
 	if (/сбер|sber/.test(bank)) return "green";
 	if (/тинькофф|т[ -]?банк|t[ -]?bank|tinkoff/.test(bank)) return "yellow";
 	if (/альфа|alfa/.test(bank)) return "red";
+
 	return /втб|vtb|газпром|gazprom/.test(bank) ? "blue" : "graphite";
 }
 

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

@@ -0,0 +1,76 @@
+import type { ComponentProps } from "react";
+
+import { DateInput } from "@mantine/dates";
+import { useController, useFormContext } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+
+import { bankDateInputValue } from "../../model/form-validation";
+import { type BankCardValues, bankDateSchema } from "../../model/form.schema";
+
+function useBankCardFieldsVm() {
+	const {
+		control,
+		formState: { errors },
+		register,
+	} = useFormContext<BankCardValues>();
+
+	const { t } = useTranslation();
+
+	const { field: paymentSystemField } = useController({
+		control,
+		name: "paymentSystem",
+	});
+
+	const { field: openingDateField } = useController({
+		control,
+		name: "openingDate",
+	});
+
+	const paymentSystems = ["mir", "visa", "mastercard"].map(value => ({
+		label: t(`bank.paymentSystems.${value}`),
+		value,
+	}));
+
+	const onPaymentSystemChange: (value: null | string) => void = value =>
+		paymentSystemField.onChange(value ?? "");
+
+	const dateParser: ComponentProps<typeof DateInput>["dateParser"] = value =>
+		bankDateSchema.safeParse(bankDateInputValue(value)).success
+			? bankDateInputValue(value)
+			: null; // eslint-disable-line unicorn/no-null -- Mantine represents an empty controlled openingDateField as null.
+
+	const onOpeningDateBlur: ComponentProps<typeof DateInput>["onBlur"] = (
+		event,
+	) => {
+		openingDateField.onChange(bankDateInputValue(event.currentTarget.value));
+		openingDateField.onBlur();
+	};
+
+	const onOpeningDateChange: (value: null | string) => void = value =>
+		openingDateField.onChange(value ?? "");
+
+	const onOpeningDateInput: ComponentProps<typeof DateInput>["onInput"] = event =>
+		openingDateField.onChange(bankDateInputValue(event.currentTarget.value));
+
+	const openingDateValue = bankDateSchema.safeParse(openingDateField.value)
+		.success
+		? openingDateField.value
+		: undefined;
+
+	return {
+		dateParser,
+		errors,
+		onOpeningDateBlur,
+		onOpeningDateChange,
+		onOpeningDateInput,
+		onPaymentSystemChange,
+		openingDateField,
+		openingDateValue,
+		paymentSystemField,
+		paymentSystems,
+		register,
+		t,
+	};
+}
+
+export { useBankCardFieldsVm };

src/entities/bank-card/ui/BankCardForm/BankCardForm.stories.tsx

@@ -2,7 +2,7 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 
 import { FormProvider, useForm } from "react-hook-form";
 
-import type { BankCardValues } from "../../model/form-validation";
+import type { BankCardValues } from "../../model/form.schema";
 
 import { BankCardFields } from "./BankCardForm.view";
 
@@ -20,6 +20,7 @@ const meta = {
 					openingDate: "2026-08-01",
 				},
 			});
+
 			return (
 				<FormProvider {...methods}>
 					<Story />
@@ -38,8 +39,11 @@ const meta = {
 	tags: ["autodocs"],
 	title: "Product/BankCards/CardFields",
 } satisfies Meta<typeof BankCardFields>;
+
 export default meta;
+
 type Story = StoryObj<typeof meta>;
+
 export const Active: Story = { name: "Независимая карта в рублях" };
 export const Archived: Story = {
 	args: { archived: true },

src/entities/bank-card/ui/BankCardForm/BankCardForm.test.tsx

@@ -12,8 +12,10 @@ import type { BankCard } from "../../api/queries";
 
 import { BankCardForm } from "./BankCardForm";
 
-const card: BankCard = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+const card: BankCard
+	= {
 		archivedAt: null,
 		balance: { currency: "RUB", value: "50" },
 		bankName: "Банк",
@@ -24,8 +26,9 @@ const card: BankCard = (/* eslint-disable unicorn/no-null -- Fixture preserves t
 		openingDate: "2026-01-01",
 		paymentSystem: null,
 		version: 1,
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+
+/* eslint-enable unicorn/no-null */
 function setup(value: BankCard) {
 	configureAuthClient({
 		accessToken: () => "test",
@@ -41,8 +44,10 @@ function setup(value: BankCard) {
 			</MantineProvider>
 		</QueryClientProvider>,
 	);
+
 	return close;
 }
+
 describe("BankCardForm", () => {
 	it("waits for the exit transition before notifying the parent", async () => {
 		const close = setup(card);
@@ -64,20 +69,23 @@ describe("BankCardForm", () => {
 		server.use(
 			http.patch("*/api/v1/bank-cards/a", async ({ request }) => {
 				body = await request.json();
+
 				return HttpResponse.json(card);
 			}),
 		);
 		fireEvent.click(screen.getByRole("button", { name: "Сохранить" }));
 		await waitFor(() => expect(close).toHaveBeenCalled());
-		expect(body).toEqual((/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+		/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+		expect(body).toEqual(
 			{
 				bankName: null,
 				lastFour: null,
 				name: "Основная",
 				paymentSystem: null,
 				version: 1,
-			}
-			/* eslint-enable unicorn/no-null */));
+			},
+			/* eslint-enable unicorn/no-null */
+		);
 	});
 	it("loads and saves the selected payment system", async () => {
 		const close = setup({ ...card, paymentSystem: "mir" });
@@ -92,6 +100,7 @@ describe("BankCardForm", () => {
 		server.use(
 			http.patch("*/api/v1/bank-cards/a", async ({ request }) => {
 				body = await request.json();
+
 				return HttpResponse.json({ ...card, paymentSystem: "visa" });
 			}),
 		);
@@ -132,6 +141,7 @@ describe("BankCardForm", () => {
 				const body = (await request.json()) as Record<string, unknown>;
 				bodies.push(body);
 				version = 2;
+
 				return body.version === 1
 					? HttpResponse.json(
 							{ code: "BANK_VERSION_CONFLICT" },
@@ -146,9 +156,11 @@ describe("BankCardForm", () => {
 		fireEvent.click(screen.getByRole("button", { name: "Сохранить" }));
 		await screen.findByText(/Запись уже изменена/);
 		fireEvent.click(screen.getByRole("button", { name: "Перечитать запись" }));
+
 		const adopt = await screen.findByRole("button", {
 			name: "Использовать актуальную версию 2",
 		});
+
 		expect(screen.getByLabelText(/Название карты/)).toHaveValue("Мой черновик");
 		fireEvent.click(adopt);
 		fireEvent.click(screen.getByRole("button", { name: "Сохранить" }));

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

@@ -1,121 +1,61 @@
-import { zodResolver } from "@hookform/resolvers/zod";
 import { Button, Group, Modal, Stack, Text } from "@mantine/core";
-import { type FC, useState } from "react";
-import { FormProvider, useForm } from "react-hook-form";
-import { useTranslation } from "react-i18next";
+import { type FC } from "react";
+import { FormProvider } from "react-hook-form";
 
 import { formatDate } from "@/shared/lib";
 
-import { useBankMutations } from "../../api/mutations";
-import { type BankCard, useBankCard } from "../../api/queries";
-import {
-	bankCardSchema,
-	type BankCardValues,
-	bankMoneyValue,
-	bankToday,
-} from "../../model/form-validation";
+import { type BankCard } from "../../api/queries";
 import { BankFeedback } from "../BankFeedback";
 import classes from "../BankForms.module.css";
-import { useBankFormFocus } from "../useBankFormFocus";
 import { BankCardFields } from "./BankCardForm.view";
+import { useBankCardFormVm } from "./BankCardForm.vm";
 
 type BankCardFormProps = { card?: BankCard; onClose: () => void };
+
 const BankCardForm: FC<BankCardFormProps> = (props) => {
-	useBankFormFocus();
-	const [opened, setOpened] = useState(true);
-	const { t } = useTranslation();
-	const [intent] = useState(() => crypto.randomUUID());
-	const [version, setVersion] = useState(props.card?.version ?? 1);
-	const [error, setError] = useState<unknown>();
-	const [latest, setLatest] = useState<BankCard>();
-	const fresh = useBankCard(props.card?.id);
-	const mutation = useBankMutations();
-	const methods = useForm<BankCardValues>({
-		defaultValues: {
-			bankName: props.card?.bankName ?? "",
-			lastFour: props.card?.lastFour ?? "",
-			name: props.card?.name ?? "",
-			openingBalance: props.card?.openingBalance.value ?? "0",
-			openingDate: props.card?.openingDate ?? bankToday(),
-			paymentSystem: props.card?.paymentSystem ?? "",
-		},
-		resolver: zodResolver(bankCardSchema),
-	});
-	const isPending
-		= !opened
-			|| methods.formState.isSubmitting
-			|| (fresh.isFetching && Boolean(error));
+	const {
+		dialogTitle,
+		error,
+		isPending,
+		latest,
+		methods,
+		onAdoptVersion,
+		onCancel,
+		onReloadRecord,
+		onRequestClose,
+		onSubmit,
+		opened,
+		t,
+	} = useBankCardFormVm(props);
+
 	return (
 		<Modal
 			closeButtonProps={{ "aria-label": t("bank.close"), "disabled": isPending }}
 			closeOnClickOutside={!isPending}
 			closeOnEscape={!isPending}
-			onClose={() => !isPending && setOpened(false)}
+			onClose={onRequestClose}
 			onExitTransitionEnd={props.onClose}
 			opened={opened}
-			title={t(props.card ? "bank.editCard" : "bank.addCard")}
+			title={dialogTitle}
 		>
 			<FormProvider {...methods}>
-				<form
-					onSubmit={methods.handleSubmit(async (values) => {
-						setError(undefined);
-						try {
-							const metadata = {
-								bankName: values.bankName || /* eslint-disable-line unicorn/no-null -- PATCH uses null to clear these optional card fields. */ null,
-								lastFour: values.lastFour || /* eslint-disable-line unicorn/no-null -- PATCH uses null to clear these optional card fields. */ null,
-								name: values.name,
-								paymentSystem: values.paymentSystem || /* eslint-disable-line unicorn/no-null -- PATCH uses null to clear these optional card fields. */ null,
-							};
-							const financial = {
-								openingBalance: {
-									currency: "RUB" as const,
-									value: bankMoneyValue(values.openingBalance),
-								},
-								openingDate: values.openingDate,
-							};
-							if (props.card)
-								await mutation.updateCard.mutateAsync({
-									body: {
-										...metadata,
-										...(!props.card.archivedAt && financial),
-										version,
-									},
-									id: props.card.id,
-								});
-							else
-								await mutation.createCard.mutateAsync({
-									id: intent,
-									...metadata,
-									...financial,
-								});
-							setOpened(false);
-						}
-						catch (error_) {
-							setError(error_);
-						}
-					})}
-				>
+				<form onSubmit={onSubmit}>
 					<fieldset className={classes.fieldset} disabled={isPending}>
 						<Stack>
 							<BankCardFields archived={Boolean(props.card?.archivedAt)} />
-							{!!(error) && ((
+
+							{!!error && (
 								<>
 									<BankFeedback error={error} />
+
 									{props.card && (
-										<Button
-											onClick={async () => {
-												const response = await fresh.refetch();
-												if (response.data && !response.error)
-													setLatest(response.data);
-												else setError(response.error);
-											}}
-											variant="default"
-										>
+										<Button onClick={onReloadRecord} variant="default">
 											{t("bank.reloadRecord")}
 										</Button>
 									)}
 								</>
-							))}
+							)}
+
 							{latest && (
 								<>
 									<Text>
@@ -123,23 +63,19 @@ const BankCardForm: FC<BankCardFormProps> = (props) => {
 											details: `${latest.name} · ${latest.openingBalance.value} RUB · ${formatDate(latest.openingDate)}`,
 										})}
 									</Text>
-									<Button
-										onClick={() => {
-											setVersion(latest.version);
-											setLatest(undefined);
-											setError(undefined);
-										}}
-										variant="default"
-									>
+
+									<Button onClick={onAdoptVersion} variant="default">
 										{t("bank.adoptVersion", { version: latest.version })}
 									</Button>
 								</>
 							)}
+
 							<Group>
 								<Button loading={isPending} type="submit">
 									{t("bank.save")}
 								</Button>
-								<Button onClick={() => setOpened(false)} variant="default">
+
+								<Button onClick={onCancel} variant="default">
 									{t("bank.cancel")}
 								</Button>
 							</Group>

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

@@ -2,24 +2,28 @@ import type { FC } from "react";
 
 import { Select, Stack, Text, TextInput } from "@mantine/core";
 import { DateInput } from "@mantine/dates";
-import { Controller, useFormContext } from "react-hook-form";
-import { useTranslation } from "react-i18next";
 
-import {
-	type BankCardValues,
-	bankDateInputValue,
-	bankDateSchema,
-	bankToday,
-} from "../../model/form-validation";
+import { bankToday } from "../../model/form-validation";
+import { useBankCardFieldsVm } from "./BankCardFields.vm";
 
 type BankCardFieldsProps = { archived: boolean };
+
 const BankCardFields: FC<BankCardFieldsProps> = (props) => {
 	const {
-		control,
-		formState: { errors },
+		dateParser,
+		errors,
+		onOpeningDateBlur,
+		onOpeningDateChange,
+		onOpeningDateInput,
+		onPaymentSystemChange,
+		openingDateField,
+		openingDateValue,
+		paymentSystemField,
+		paymentSystems,
 		register,
-	} = useFormContext<BankCardValues>();
-	const { t } = useTranslation();
+		t,
+	} = useBankCardFieldsVm();
+
 	return (
 		<Stack>
 			<TextInput
@@ -28,37 +32,36 @@ const BankCardFields: FC<BankCardFieldsProps> = (props) => {
 				{...register("name")}
 				error={errors.name?.message}
 			/>
+
 			<TextInput
 				label={t("bank.bankName")}
 				{...register("bankName")}
 				error={errors.bankName?.message}
 			/>
+
 			<TextInput
 				inputMode="numeric"
 				label={t("bank.lastFour")}
 				{...register("lastFour")}
 				error={errors.lastFour?.message}
 			/>
-			<Controller
-				control={control}
-				name="paymentSystem"
-				render={({ field }) => (
-					<Select
-						{...field}
-						clearable
-						comboboxProps={{ withinPortal: false }}
-						data={["mir", "visa", "mastercard"].map(value => ({
-							label: t(`bank.paymentSystems.${value}`),
-							value,
-						}))}
-						error={errors.paymentSystem?.message}
-						label={t("bank.paymentSystem")}
-						onChange={value => field.onChange(value ?? "")}
-						placeholder={t("bank.paymentSystemUnknown")}
-						value={field.value || /* eslint-disable-line unicorn/no-null -- Mantine represents an empty controlled field as null. */ null}
-					/>
-				)}
+
+			<Select
+				{...paymentSystemField}
+				clearable
+				comboboxProps={{ withinPortal: false }}
+				data={paymentSystems}
+				error={errors.paymentSystem?.message}
+				label={t("bank.paymentSystem")}
+				onChange={onPaymentSystemChange}
+				placeholder={t("bank.paymentSystemUnknown")}
+				value={
+					paymentSystemField.value
+					// eslint-disable-next-line unicorn/no-null -- Mantine represents an empty controlled paymentSystemField as null.
+					|| null
+				}
 			/>
+
 			<TextInput
 				inputMode="decimal"
 				label={t("bank.openingBalance")}
@@ -67,43 +70,31 @@ const BankCardFields: FC<BankCardFieldsProps> = (props) => {
 				{...register("openingBalance")}
 				error={errors.openingBalance?.message}
 			/>
-			<Controller
-				control={control}
-				name="openingDate"
-				render={({ field }) => (
-					<DateInput
-						{...field}
-						dateParser={value =>
-							bankDateSchema.safeParse(bankDateInputValue(value)).success
-								? bankDateInputValue(value)
-								: /* eslint-disable-line unicorn/no-null -- Mantine represents an empty controlled field as null. */ null}
-						error={errors.openingDate?.message}
-						fixOnBlur={false}
-						label={t("bank.openingDate")}
-						maxDate={bankToday()}
-						onBlur={(event) => {
-							field.onChange(bankDateInputValue(event.currentTarget.value));
-							field.onBlur();
-						}}
-						onChange={value => field.onChange(value ?? "")}
-						onInput={event =>
-							field.onChange(bankDateInputValue(event.currentTarget.value))}
-						popoverProps={{
-							middlewares: { shift: { crossAxis: true } },
-							withinPortal: false,
-						}}
-						readOnly={props.archived}
-						required
-						value={
-							(bankDateSchema.safeParse(field.value).success) ? (field.value) : undefined
-						}
-						valueFormat="DD.MM.YYYY"
-					/>
-				)}
+
+			<DateInput
+				{...openingDateField}
+				dateParser={dateParser}
+				error={errors.openingDate?.message}
+				fixOnBlur={false}
+				label={t("bank.openingDate")}
+				maxDate={bankToday()}
+				onBlur={onOpeningDateBlur}
+				onChange={onOpeningDateChange}
+				onInput={onOpeningDateInput}
+				popoverProps={{
+					middlewares: { shift: { crossAxis: true } },
+					withinPortal: false,
+				}}
+				readOnly={props.archived}
+				required
+				value={openingDateValue}
+				valueFormat="DD.MM.YYYY"
 			/>
+
 			<Text c="dimmed" size="sm">
 				{t("bank.openingHint")}
 			</Text>
+
 			{props.archived && <Text>{t("bank.archiveHint")}</Text>}
 		</Stack>
 	);

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

@@ -0,0 +1,127 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useState } from "react";
+import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+
+import { useBankMutations } from "../../api/mutations";
+import { type BankCard, useBankCard } from "../../api/queries";
+import { bankMoneyValue, bankToday } from "../../model/form-validation";
+import { bankCardSchema, type BankCardValues } from "../../model/form.schema";
+import { useBankFormFocus } from "../useBankFormFocus";
+
+type BankCardFormProps = { card?: BankCard; onClose: () => void };
+
+function useBankCardFormVm(props: BankCardFormProps) {
+	useBankFormFocus();
+	const [opened, setOpened] = useState(true);
+	const { t } = useTranslation();
+	const [intent] = useState(() => crypto.randomUUID());
+	const [version, setVersion] = useState(props.card?.version ?? 1);
+	const [error, setError] = useState<unknown>();
+	const [latest, setLatest] = useState<BankCard>();
+	const fresh = useBankCard(props.card?.id);
+	const mutation = useBankMutations();
+
+	const methods = useForm<BankCardValues>({
+		defaultValues: {
+			bankName: props.card?.bankName ?? "",
+			lastFour: props.card?.lastFour ?? "",
+			name: props.card?.name ?? "",
+			openingBalance: props.card?.openingBalance.value ?? "0",
+			openingDate: props.card?.openingDate ?? bankToday(),
+			paymentSystem: props.card?.paymentSystem ?? "",
+		},
+		resolver: zodResolver(bankCardSchema),
+	});
+
+	const isPending
+		= !opened
+			|| methods.formState.isSubmitting
+			|| (fresh.isFetching && Boolean(error));
+
+	const onRequestClose = () => !isPending && setOpened(false);
+	const dialogTitle = t(props.card ? "bank.editCard" : "bank.addCard");
+
+	const onSubmit = methods.handleSubmit(async (values) => {
+		setError(undefined);
+
+		try {
+			const metadata = {
+				bankName:
+					values.bankName
+					// eslint-disable-next-line unicorn/no-null -- PATCH uses null to clear these optional card fields.
+					|| null,
+				lastFour:
+					values.lastFour
+					// eslint-disable-next-line unicorn/no-null -- PATCH uses null to clear these optional card fields.
+					|| null,
+				name: values.name,
+				paymentSystem:
+					values.paymentSystem
+					// eslint-disable-next-line unicorn/no-null -- PATCH uses null to clear these optional card fields.
+					|| null,
+			};
+
+			const financial = {
+				openingBalance: {
+					currency: "RUB" as const,
+					value: bankMoneyValue(values.openingBalance),
+				},
+				openingDate: values.openingDate,
+			};
+
+			if (props.card)
+				await mutation.updateCard.mutateAsync({
+					body: {
+						...metadata,
+						...(!props.card.archivedAt && financial),
+						version,
+					},
+					id: props.card.id,
+				});
+			else
+				await mutation.createCard.mutateAsync({
+					id: intent,
+					...metadata,
+					...financial,
+				});
+			setOpened(false);
+		}
+		catch (error_) {
+			setError(error_);
+		}
+	});
+
+	const onReloadRecord = async () => {
+		const response = await fresh.refetch();
+		if (response.data && !response.error) setLatest(response.data);
+		else setError(response.error);
+	};
+
+	const onAdoptVersion = () => {
+		if (!latest) return;
+		setVersion(latest.version);
+		setLatest(undefined);
+		setError(undefined);
+	};
+
+	const onCancel = () => setOpened(false);
+
+	return {
+		dialogTitle,
+		error,
+		isPending,
+		latest,
+		methods,
+		onAdoptVersion,
+		onCancel,
+		onReloadRecord,
+		onRequestClose,
+		onSubmit,
+		opened,
+		t,
+		version,
+	};
+}
+
+export { useBankCardFormVm };

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

@@ -11,9 +11,11 @@ type BankFeedbackProps = {
 	loadingError?: boolean;
 	retry?: () => void;
 };
+
 const BankFeedback: FC<BankFeedbackProps> = (props) => {
 	const { t } = useTranslation();
 	const code = apiErrorCode(props.error);
+
 	return (
 		<Alert color="orange" role="alert">
 			<Group>
@@ -26,6 +28,7 @@ const BankFeedback: FC<BankFeedbackProps> = (props) => {
 								),
 							})}
 				</Text>
+
 				{props.retry && (
 					<Button onClick={props.retry} variant="default">
 						{t("bank.retry")}

src/entities/bank-card/ui/BankOperationIcon/BankOperationIcon.module.css

@@ -1,365 +0,0 @@
-.icon {
-	overflow: visible;
-
-	& path {
-		--motion: none;
-		transform-box: fill-box;
-		transform-origin: center;
-	}
-}
-
-.deposit path:nth-child(-n + 2) {
-	transform-box: view-box;
-	transform-origin: 12px 9px;
-	--motion: bank-operation-coin-turn 1000ms ease-in-out both;
-}
-
-.repayment path:last-child {
-	--motion: bank-operation-ruble-in 1000ms ease-out both;
-}
-
-.topup path:last-child {
-	--motion: bank-operation-plus-in 900ms ease-out both;
-}
-
-.transfer path {
-	--shift: 3px;
-	--motion: bank-operation-exchange 700ms ease-in-out both;
-	&:last-child {
-		--shift: -3px;
-	}
-}
-
-.growth {
-	& path:nth-child(2) {
-		stroke-dasharray: 1;
-		--motion: bank-operation-draw 450ms ease-out both;
-	}
-	& path:last-child {
-		--motion: bank-operation-arrow-rise 350ms ease-out 400ms both;
-	}
-}
-
-.server {
-	& path:nth-child(3) {
-		--motion: bank-operation-blink 500ms ease-in-out both;
-	}
-	& path:nth-child(4) {
-		--motion: bank-operation-blink 500ms ease-in-out 220ms both;
-	}
-}
-
-.basket {
-	& path:not(:last-child) {
-		--motion: bank-operation-settle 850ms ease-in-out both;
-	}
-	& path:last-child {
-		opacity: 0;
-		fill: currentColor;
-		--motion: bank-operation-grocery-drop 850ms ease-out both;
-	}
-}
-
-.wine {
-	--motion: bank-operation-cheers 1100ms ease-in-out both;
-	transform-origin: 12px 21px;
-	& path:nth-child(2) {
-		fill: currentColor;
-		fill-opacity: 0.2;
-		transform-origin: bottom;
-		--motion: bank-operation-fill-glass 1100ms ease-out both;
-	}
-}
-
-.coffee {
-	& path:nth-child(3),
-	& path:nth-child(4) {
-		--motion: bank-operation-steam 1000ms ease-out var(--delay, 0ms) both;
-	}
-	& path:nth-child(4) {
-		--delay: 180ms;
-	}
-}
-
-.grid path {
-	--x: -1.5px;
-	--y: -1.5px;
-	--turn: 0deg;
-	--motion: bank-operation-rearrange 850ms ease-in-out both;
-	&:nth-child(2) {
-		--x: 1.5px;
-		--turn: 90deg;
-	}
-	&:nth-child(3) {
-		--y: 1.5px;
-	}
-	&:nth-child(4) {
-		--x: 1.5px;
-		--y: 1.5px;
-	}
-}
-
-.wifi path {
-	--motion: bank-operation-signal 450ms ease-out var(--delay, 0ms) both;
-	&:nth-child(1) {
-		--delay: 360ms;
-	}
-	&:nth-child(2) {
-		--delay: 240ms;
-	}
-	&:nth-child(3) {
-		--delay: 120ms;
-	}
-}
-
-.car {
-	--motion: bank-operation-drive 1100ms ease-in-out both;
-	& path:nth-child(-n + 3) {
-		--motion: bank-operation-suspension 275ms ease-in-out 4 both;
-	}
-	& path:nth-last-child(-n + 2) {
-		--motion: bank-operation-wheel-roll 1100ms ease-in-out both;
-	}
-}
-
-@media (prefers-reduced-motion: no-preference) {
-	.icon[data-icon-animating] {
-		animation: var(--motion, none);
-		& path {
-			animation: var(--motion, none);
-		}
-	}
-}
-
-@keyframes :global(bank-operation-coin-turn) {
-	0%,
-	100% {
-		transform: scaleX(1);
-	}
-	35%,
-	65% {
-		transform: scaleX(0.12);
-	}
-	50% {
-		transform: scaleX(-1);
-	}
-}
-
-@keyframes :global(bank-operation-settle) {
-	0%,
-	30%,
-	100% {
-		transform: translateY(0);
-	}
-	45% {
-		transform: translateY(1.5px);
-	}
-	65% {
-		transform: translateY(-0.5px);
-	}
-}
-
-@keyframes :global(bank-operation-ruble-in) {
-	0% {
-		opacity: 0;
-		transform: translateY(-9px) scale(0.7);
-	}
-	25% {
-		opacity: 1;
-	}
-	65% {
-		transform: translateY(0) scale(1.15);
-	}
-	80% {
-		transform: scale(0.95);
-	}
-	100% {
-		opacity: 1;
-		transform: scale(1);
-	}
-}
-
-@keyframes :global(bank-operation-plus-in) {
-	0% {
-		opacity: 0;
-		transform: translateY(-5px) scale(0.5);
-	}
-	55% {
-		opacity: 1;
-		transform: translateY(0) scale(1.3);
-	}
-	75% {
-		transform: scale(0.9);
-	}
-	100% {
-		opacity: 1;
-		transform: scale(1);
-	}
-}
-
-@keyframes :global(bank-operation-exchange) {
-	0%,
-	100% {
-		transform: translateX(0);
-	}
-	45% {
-		transform: translateX(var(--shift));
-	}
-}
-
-@keyframes :global(bank-operation-draw) {
-	from {
-		stroke-dashoffset: 1;
-	}
-	to {
-		stroke-dashoffset: 0;
-	}
-}
-
-@keyframes :global(bank-operation-arrow-rise) {
-	0%,
-	100% {
-		transform: translateY(0);
-	}
-	45% {
-		transform: translateY(-2px);
-	}
-}
-
-@keyframes :global(bank-operation-blink) {
-	0%,
-	100% {
-		stroke-width: 1.6;
-	}
-	45% {
-		stroke: var(--mantine-color-green-6);
-		stroke-width: 3;
-	}
-}
-
-@keyframes :global(bank-operation-grocery-drop) {
-	0% {
-		opacity: 0;
-		transform: translateY(-5px);
-	}
-	20% {
-		opacity: 1;
-	}
-	55% {
-		opacity: 1;
-		transform: translateY(7px);
-	}
-	80%,
-	100% {
-		opacity: 0;
-		transform: translateY(7px);
-	}
-}
-
-@keyframes :global(bank-operation-fill-glass) {
-	0% {
-		transform: scaleY(0.05);
-	}
-	45%,
-	75% {
-		transform: scaleY(1);
-		fill-opacity: 0.5;
-	}
-	100% {
-		transform: scaleY(1);
-		fill-opacity: 0.2;
-	}
-}
-
-@keyframes :global(bank-operation-cheers) {
-	0%,
-	40%,
-	100% {
-		transform: rotate(0);
-	}
-	65% {
-		transform: rotate(8deg);
-	}
-}
-
-@keyframes :global(bank-operation-steam) {
-	0% {
-		opacity: 0;
-		transform: translateY(2px);
-	}
-	25% {
-		opacity: 1;
-	}
-	70% {
-		opacity: 0;
-		transform: translateY(-3px);
-	}
-	100% {
-		opacity: 1;
-		transform: translateY(0);
-	}
-}
-
-@keyframes :global(bank-operation-rearrange) {
-	0%,
-	100% {
-		transform: translate(0, 0) rotate(0);
-	}
-	50% {
-		transform: translate(var(--x), var(--y)) rotate(var(--turn));
-	}
-}
-
-@keyframes :global(bank-operation-signal) {
-	0% {
-		opacity: 0.1;
-	}
-	100% {
-		opacity: 1;
-	}
-}
-
-@keyframes :global(bank-operation-drive) {
-	0% {
-		opacity: 0;
-		transform: translateX(-4px);
-	}
-	20% {
-		opacity: 1;
-	}
-	80% {
-		opacity: 1;
-		transform: translateX(3px);
-	}
-	90% {
-		opacity: 0;
-		transform: translateX(4px);
-	}
-	91% {
-		opacity: 0;
-		transform: translateX(0);
-	}
-	100% {
-		opacity: 1;
-		transform: translateX(0);
-	}
-}
-
-@keyframes :global(bank-operation-suspension) {
-	0%,
-	100% {
-		transform: translateY(0);
-	}
-	50% {
-		transform: translateY(-0.5px);
-	}
-}
-
-@keyframes :global(bank-operation-wheel-roll) {
-	from {
-		transform: rotate(0);
-	}
-	to {
-		transform: rotate(360deg);
-	}
-}

src/entities/bank-card/ui/BankOperationIcon/BankOperationIcon.stories.tsx

@@ -1,9 +1,17 @@
 import type { Meta, StoryObj } from "@storybook/react-vite";
 
 import { Stack } from "@mantine/core";
+import { OperationIcon } from "@wealthledger/icons";
 import { EntryCard } from "@wealthledger/ui";
 
-import { BankOperationIcon } from "./BankOperationIcon";
+import { bankOperationAppearance } from "../../model/operation-appearance";
+
+const BankOperationIcon = (props: {
+	categoryName?: null | string;
+	kind: "expense" | "refund" | "topup" | "transfer";
+}) => (
+	<OperationIcon {...bankOperationAppearance(props.kind, props.categoryName)} />
+);
 
 const meta = {
 	args: { categoryName: "Продукты", kind: "expense" },
@@ -11,8 +19,11 @@ const meta = {
 	tags: ["autodocs"],
 	title: "Product/BankCards/OperationIcons",
 } satisfies Meta<typeof BankOperationIcon>;
+
 export default meta;
+
 type Story = StoryObj<typeof meta>;
+
 export const Categories: Story = {
 	render: () => (
 		<Stack maw={640}>
@@ -55,6 +66,7 @@ export const Categories: Story = {
 					valueLabel="Расход"
 				/>
 			))}
+
 			<EntryCard
 				color="green"
 				icon={<BankOperationIcon kind="topup" />}

src/entities/bank-card/ui/BankOperationIcon/BankOperationIcon.test.tsx

@@ -1,12 +1,21 @@
 import { render } from "@testing-library/react";
+import { OperationIcon } from "@wealthledger/icons";
 import { expect, it } from "vitest";
 
-import { BankOperationIcon } from "./BankOperationIcon";
+import { bankOperationAppearance } from "../../model/operation-appearance";
+
+const BankOperationIcon = (props: {
+	categoryName?: null | string;
+	kind: "expense" | "refund" | "topup" | "transfer";
+}) => (
+	<OperationIcon {...bankOperationAppearance(props.kind, props.categoryName)} />
+);
 
 it("matches normalized category names, falls back after renaming and distinguishes operation kinds", () => {
 	const { container, rerender } = render(
 		<BankOperationIcon categoryName="Жильё" kind="expense" />,
 	);
+
 	// eslint-disable-next-line testing-library/no-container, testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
 	const path = () => container.querySelector("path")?.getAttribute("d");
 	const housing = path();
@@ -15,16 +24,25 @@ it("matches normalized category names, falls back after renaming and distinguish
 	rerender(<BankOperationIcon categoryName="Другое" kind="expense" />);
 	const fallback = path();
 	expect(fallback).not.toBe(housing);
-	for (const categoryName of ["Моя категория", "constructor", /* eslint-disable-line unicorn/no-null -- Exercise the explicit null returned by the production API/DOM contract. */ null]) {
+
+	for (const categoryName of [
+		"Моя категория",
+		"constructor",
+		// eslint-disable-next-line unicorn/no-null -- Exercise the explicit null returned by the production API/DOM contract.
+		null,
+	]) {
 		rerender(<BankOperationIcon categoryName={categoryName} kind="expense" />);
 		expect(path()).toBe(fallback);
 	}
+
 	const paths = [fallback, housing];
+
 	for (const kind of ["topup", "transfer", "refund"] as const) {
 		rerender(<BankOperationIcon categoryName="Жильё" kind={kind} />);
 		expect(path()).toBeTruthy();
 		paths.push(path());
 	}
+
 	expect(new Set(paths).size).toBe(5);
 	// eslint-disable-next-line testing-library/no-container, testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
 	expect(container.querySelector("svg")).toHaveAttribute("aria-hidden", "true");
@@ -34,8 +52,10 @@ it("provides a distinct icon for every existing named category", () => {
 	const { container, rerender } = render(
 		<BankOperationIcon categoryName="Другое" kind="expense" />,
 	);
+
 	// eslint-disable-next-line testing-library/no-container, testing-library/no-node-access -- This assertion checks DOM structure, decoration or focus behavior that semantic queries cannot establish.
 	const paths = new Set([container.querySelector("path")?.getAttribute("d")]);
+
 	for (const categoryName of [
 		"Алкоголь",
 		"Вклады",

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

@@ -1,39 +0,0 @@
-import type { FC } from "react";
-
-import { bindIconAnimation } from "@/shared/lib";
-
-import type { BankOperation } from "../../api/queries";
-
-import { bankOperationAppearance } from "../../model/operation-appearance";
-import classes from "./BankOperationIcon.module.css";
-
-type BankOperationIconProps = {
-	categoryName?: null | string;
-	kind: BankOperation["kind"];
-};
-const BankOperationIcon: FC<BankOperationIconProps> = (props) => {
-	const icon = bankOperationAppearance(props.kind, props.categoryName);
-	return (
-		<svg
-			aria-hidden="true"
-			className={`${classes.icon} ${icon.animation ? classes[icon.animation] : ""}`}
-			fill="none"
-			focusable="false"
-			height="24"
-			ref={bindIconAnimation}
-			stroke="currentColor"
-			strokeLinecap="round"
-			strokeLinejoin="round"
-			strokeWidth="1.6"
-			style={{ color: `var(--mantine-color-${icon.color}-7)`, flexShrink: 0 }}
-			viewBox="0 0 24 24"
-			width="24"
-		>
-			{icon.path.split(" M").map((part, index) => (
-				<path d={index ? `M${part}` : part} key={part} pathLength={1} />
-			))}
-		</svg>
-	);
-};
-
-export { BankOperationIcon };

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

@@ -1,29 +1,21 @@
 import { DatePickerInput } from "@mantine/dates";
-import { type FC, useState } from "react";
-import { useTranslation } from "react-i18next";
+import { type FC } from "react";
+
+import { useBankPeriodPickerVm } from "./BankPeriodPicker.vm";
 
 type BankPeriodPickerProps = {
 	onChange: (value: [null | string, null | string]) => void;
 	period: { from: string; to: string };
 };
+
 const BankPeriodPicker: FC<BankPeriodPickerProps> = (props) => {
-	const { onChange, period } = props;
-	const { t } = useTranslation();
-	const scope = `${period.from}-${period.to}`;
-	const [draft, setDraft] = useState<{
-		scope: string;
-		value: [null | string, null | string];
-	}>();
-	const value: [null | string, null | string]
-		= draft?.scope === scope ? draft.value : [period.from, period.to];
+	const { onPeriodChange, t, value } = useBankPeriodPickerVm(props);
+
 	return (
 		<DatePickerInput
 			allowSingleDateInRange
 			label={t("bank.period")}
-			onChange={(next) => {
-				setDraft({ scope, value: next });
-				onChange(next);
-			}}
+			onChange={onPeriodChange}
 			popoverProps={{
 				middlewares: { shift: { crossAxis: true } },
 				returnFocus: true,

src/entities/bank-card/ui/BankPeriodPicker/BankPeriodPicker.vm.ts

@@ -0,0 +1,30 @@
+import { useState } from "react";
+import { useTranslation } from "react-i18next";
+
+type BankPeriodPickerProps = {
+	onChange: (value: [null | string, null | string]) => void;
+	period: { from: string; to: string };
+};
+
+function useBankPeriodPickerVm(props: BankPeriodPickerProps) {
+	const { onChange, period } = props;
+	const { t } = useTranslation();
+	const scope = `${period.from}-${period.to}`;
+
+	const [draft, setDraft] = useState<{
+		scope: string;
+		value: [null | string, null | string];
+	}>();
+
+	const value: [null | string, null | string]
+		= draft?.scope === scope ? draft.value : [period.from, period.to];
+
+	const onPeriodChange = (next: [null | string, null | string]) => {
+		setDraft({ scope, value: next });
+		onChange(next);
+	};
+
+	return { onChange, onPeriodChange, t, value };
+}
+
+export { useBankPeriodPickerVm };

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

@@ -3,69 +3,75 @@ import type { Meta, StoryObj } from "@storybook/react-vite";
 import { BankSummaryView } from "./BankSummary.view";
 
 const money = (value: string) => ({ currency: "RUB", value });
-const meta = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-{
-	args: {
-		data: {
-			cardId: null,
-			categories: [
-				{
-					categoryId: "food",
-					categoryName: "Продукты",
-					expenses: money("3500"),
-					net: money("2500"),
-					refunds: money("1000"),
-				},
-				{
-					categoryId: "cafe",
-					categoryName: "Кафе",
-					expenses: money("2200"),
-					net: money("2200"),
-					refunds: money("0"),
-				},
-				{
-					categoryId: "taxi",
-					categoryName: "Такси",
-					expenses: money("1800"),
-					net: money("1800"),
-					refunds: money("0"),
-				},
-				{
-					categoryId: "health",
-					categoryName: "Здоровье",
-					expenses: money("1000"),
-					net: money("1000"),
-					refunds: money("0"),
-				},
-			],
-			expenses: money("8500"),
-			month: "2026-09",
-			net: money("7500"),
-			refunds: money("1000"),
+
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+const meta
+	= {
+		args: {
+			data: {
+				cardId: null,
+				categories: [
+					{
+						categoryId: "food",
+						categoryName: "Продукты",
+						expenses: money("3500"),
+						net: money("2500"),
+						refunds: money("1000"),
+					},
+					{
+						categoryId: "cafe",
+						categoryName: "Кафе",
+						expenses: money("2200"),
+						net: money("2200"),
+						refunds: money("0"),
+					},
+					{
+						categoryId: "taxi",
+						categoryName: "Такси",
+						expenses: money("1800"),
+						net: money("1800"),
+						refunds: money("0"),
+					},
+					{
+						categoryId: "health",
+						categoryName: "Здоровье",
+						expenses: money("1000"),
+						net: money("1000"),
+						refunds: money("0"),
+					},
+				],
+				expenses: money("8500"),
+				month: "2026-09",
+				net: money("7500"),
+				refunds: money("1000"),
+			},
+			error: false,
+			fetching: false,
+			loading: false,
+			retry: () => {},
 		},
-		error: false,
-		fetching: false,
-		loading: false,
-		retry: () => {},
-	},
-	component: BankSummaryView,
-	parameters: {
-		docs: {
-			description: {
-				component:
-					"Месячные расходы ручного учёта. Вымышленные суммы, без API и сохранения. Один итог с учётом возвратов и компактные строки категорий. Отрицательные суммы сохраняют знак.",
+		component: BankSummaryView,
+		parameters: {
+			docs: {
+				description: {
+					component:
+						"Месячные расходы ручного учёта. Вымышленные суммы, без API и сохранения. Один итог с учётом возвратов и компактные строки категорий. Отрицательные суммы сохраняют знак.",
+				},
 			},
 		},
-	},
-	tags: ["autodocs"],
-	title: "Product/BankCards/Summary",
-}
-/* eslint-enable unicorn/no-null */) satisfies Meta<typeof BankSummaryView>;
+		tags: ["autodocs"],
+		title: "Product/BankCards/Summary",
+	} satisfies /* eslint-enable unicorn/no-null */ Meta<typeof BankSummaryView>;
+
 export default meta;
+
 type Story = StoryObj<typeof meta>;
+
 export const Loaded: Story = { name: "Расходы по категориям" };
-export const RefundMonth: Story = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+export const RefundMonth: Story
+	= {
 		args: {
 			data: {
 				cardId: null,
@@ -73,7 +79,7 @@ export const RefundMonth: Story = (/* eslint-disable unicorn/no-null -- Fixture
 					{
 						categoryId: "shopping",
 						categoryName:
-						"Покупки с длинным пользовательским названием категории",
+							"Покупки с длинным пользовательским названием категории",
 						expenses: money("0"),
 						net: money("-600"),
 						refunds: money("600"),
@@ -86,10 +92,11 @@ export const RefundMonth: Story = (/* eslint-disable unicorn/no-null -- Fixture
 			},
 		},
 		name: "Возврат покупки прошлого месяца",
-	}
-/* eslint-enable unicorn/no-null */);
-export const Empty: Story = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+	};
+/* eslint-enable unicorn/no-null */
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+export const Empty: Story
+	= {
 		args: {
 			data: {
 				cardId: null,
@@ -101,8 +108,8 @@ export const Empty: Story = (/* eslint-disable unicorn/no-null -- Fixture preser
 			},
 		},
 		name: "Известные нули",
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+/* eslint-enable unicorn/no-null */
 export const Loading: Story = {
 	args: { data: undefined, loading: true },
 	name: "Начальная загрузка",
@@ -115,8 +122,9 @@ export const CachedError: Story = {
 	args: { error: true },
 	name: "Сохранённые суммы при ошибке обновления",
 };
-export const LongAmounts: Story = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+export const LongAmounts: Story
+	= {
 		args: {
 			data: {
 				cardId: null,
@@ -136,5 +144,5 @@ export const LongAmounts: Story = (/* eslint-disable unicorn/no-null -- Fixture
 			},
 		},
 		name: "Точный итог длиннее предела отдельного ввода",
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+/* eslint-enable unicorn/no-null */

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

@@ -1,6 +1,7 @@
 import type { CSSProperties, FC } from "react";
 
 import { Button, Group, Skeleton, Stack, Text, Title } from "@mantine/core";
+import { OperationIcon } from "@wealthledger/icons";
 import { LoadingSkeleton } from "@wealthledger/ui";
 import { useTranslation } from "react-i18next";
 
@@ -8,7 +9,7 @@ import { formatMoney } from "@/shared/lib";
 
 import type { BankSummary } from "../../api/queries";
 
-import { BankOperationIcon } from "../BankOperationIcon/BankOperationIcon";
+import { bankOperationAppearance } from "../../model/operation-appearance";
 import classes from "./BankSummary.module.css";
 
 const CATEGORY_COLUMNS = 2;
@@ -21,77 +22,93 @@ type BankSummaryViewProps = {
 	loading: boolean;
 	retry: () => void;
 };
+
+const BankSummaryViewCategories: FC<BankSummaryViewProps> = (props) => {
+	const { t } = useTranslation();
+
+	if (props.data) {
+		if (props.data.categories.length > 0) {
+			return (
+				<dl
+					className={classes.categories}
+					style={
+						{
+							"--category-rows": Math.ceil(
+								props.data.categories.length / CATEGORY_COLUMNS,
+							),
+						} as CSSProperties
+					}
+				>
+					{props.data.categories.map(category => (
+						<div className={classes.category} key={category.categoryId}>
+							<dt className={classes.label}>
+								<OperationIcon
+									{...bankOperationAppearance("expense", category.categoryName)}
+								/>
+
+								<span>{category.categoryName}</span>
+							</dt>
+
+							<dd className={classes.amount}>
+								{formatMoney(category.net, { withZeroCents: true })}
+							</dd>
+						</div>
+					))}
+				</dl>
+			);
+		}
+
+		return (
+			<Text c="dimmed" size="sm">
+				{t("bank.noExpenses")}
+			</Text>
+		);
+	}
+
+	if (props.loading) {
+		return (
+			<LoadingSkeleton label={t("bank.loading")}>
+				<Stack gap="sm">
+					<Skeleton h={32} w="35%" />
+
+					<Skeleton h={40} />
+
+					<Skeleton h={40} />
+				</Stack>
+			</LoadingSkeleton>
+		);
+	}
+};
+
 const BankSummaryView: FC<BankSummaryViewProps> = (props) => {
 	const { t } = useTranslation();
 
-	function renderCategories() {
-		if (props.data) {
-			if (props.data.categories.length > 0) {
-				return (
-					<dl
-						className={classes.categories}
-						style={
-							{
-								"--category-rows": Math.ceil(props.data.categories.length / CATEGORY_COLUMNS),
-							} as CSSProperties
-						}
-					>
-						{props.data.categories.map(category => (
-							<div className={classes.category} key={category.categoryId}>
-								<dt className={classes.label}>
-									<BankOperationIcon
-										categoryName={category.categoryName}
-										kind="expense"
-									/>
-									<span>{category.categoryName}</span>
-								</dt>
-								<dd className={classes.amount}>
-									{formatMoney(category.net, { withZeroCents: true })}
-								</dd>
-							</div>
-						))}
-					</dl>
-				);
-			}
-			return (
-				<Text c="dimmed" size="sm">
-					{t("bank.noExpenses")}
-				</Text>
-			);
-		}
-		if (props.loading) {
-			return (
-				<LoadingSkeleton label={t("bank.loading")}>
-					<Stack gap="sm">
-						<Skeleton h={32} w="35%" />
-						<Skeleton h={40} />
-						<Skeleton h={40} />
-					</Stack>
-				</LoadingSkeleton>
-			);
-		}
-	}
 	return (
 		<Stack aria-busy={props.loading || props.fetching} gap="md">
 			<div className={classes.header}>
 				<Title order={2}>
 					{t(props.all ? "bank.allSummary" : "bank.summary")}
 				</Title>
+
 				{props.data && (
 					<Text className={classes.total}>
 						{formatMoney(props.data.net, { withZeroCents: true })}
 					</Text>
 				)}
 			</div>
-			{renderCategories()}
+
+			<BankSummaryViewCategories {...props} />
+
 			{props.error && (
 				<Group role="alert">
 					<Text>{t(props.data ? "bank.refreshError" : "bank.error")}</Text>
+
 					<Button onClick={props.retry} variant="default">
 						{t("bank.retry")}
 					</Button>
 				</Group>
 			)}
+
 			{props.data && props.fetching && (
 				<Text role="status">{t("bank.refreshing")}</Text>
 			)}

src/entities/bank-card/ui/CategoryManager/CategoryManager.test.tsx

@@ -23,18 +23,23 @@ describe("CategoryManager", () => {
 			clear: () => {},
 			refresh: () => Promise.resolve(false),
 		});
+
 		const categories = [
 			{ id: "a", isDefault: false, name: "Первая", version: 1 },
 			{ id: "b", isDefault: false, name: "Вторая", version: 4 },
 		];
+
 		let reads = 0;
 
-		const { promise: reloaded, resolve: release } = Promise.withResolvers<void>();
+		const { promise: reloaded, resolve: release }
+			= Promise.withResolvers<void>();
+
 		const patches: { body: unknown; id: unknown }[] = [];
 		server.use(
 			http.get("*/api/v1/bank-cards/categories", async () => {
 				reads++;
 				if (reads === 3) await reloaded;
+
 				return HttpResponse.json(
 					categories.map(category =>
 						category.id === "a" && reads > 1
@@ -51,6 +56,7 @@ describe("CategoryManager", () => {
 				"*/api/v1/bank-cards/categories/:id",
 				async ({ params, request }) => {
 					patches.push({ body: await request.json(), id: params.id });
+
 					return patches.length === 1
 						? HttpResponse.json(
 								{ code: "BANK_VERSION_CONFLICT" },
@@ -67,7 +73,11 @@ describe("CategoryManager", () => {
 				</MantineProvider>
 			</QueryClientProvider>,
 		);
-		const renameButtons = await screen.findAllByRole("button", { name: "Переименовать" });
+
+		const renameButtons = await screen.findAllByRole("button", {
+			name: "Переименовать",
+		});
+
 		fireEvent.click(renameButtons[0]);
 		fireEvent.click(screen.getByRole("button", { name: "Сохранить" }));
 		fireEvent.click(
@@ -122,6 +132,7 @@ describe("CategoryManager", () => {
 				),
 				http.patch("*/api/v1/bank-cards/categories/a", () => {
 					version = 2;
+
 					return ++writes === 1
 						? HttpResponse.json(
 								{ code: "BANK_VERSION_CONFLICT" },
@@ -163,12 +174,14 @@ describe("CategoryManager", () => {
 			clear: () => {},
 			refresh: () => Promise.resolve(false),
 		});
+
 		let category = {
 			id: "default",
 			isDefault: true,
 			name: "Другое",
 			version: 1,
 		};
+
 		let creates = 0;
 		let body: unknown;
 		server.use(
@@ -177,6 +190,7 @@ describe("CategoryManager", () => {
 			),
 			http.post("*/api/v1/bank-cards/categories", () => {
 				creates++;
+
 				return HttpResponse.json({});
 			}),
 			http.patch(
@@ -184,6 +198,7 @@ describe("CategoryManager", () => {
 				async ({ request }) => {
 					body = await request.json();
 					category = { ...category, name: "Остальное", version: 2 };
+
 					return HttpResponse.json(category);
 				},
 			),

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

@@ -1,4 +1,3 @@
-import { zodResolver } from "@hookform/resolvers/zod";
 import {
 	Badge,
 	Button,
@@ -8,218 +7,148 @@ import {
 	Text,
 	TextInput,
 } from "@mantine/core";
-import { type FC, useRef, useState } from "react";
-import {
-	Controller,
-	FormProvider,
-	useForm,
-	useFormContext,
-} from "react-hook-form";
+import { OperationIcon } from "@wealthledger/icons";
+import { type FC } from "react";
+import { FormProvider, useController, useFormContext } from "react-hook-form";
 import { useTranslation } from "react-i18next";
-import { z } from "zod";
 
-import { validationMessage } from "@/shared/i18n";
-
-import { useBankMutations } from "../../api/mutations";
-import { type ExpenseCategory, useBankCategories } from "../../api/queries";
+import { bankOperationAppearance } from "../../model/operation-appearance";
 import { BankFeedback } from "../BankFeedback";
 import classes from "../BankForms.module.css";
-import { BankOperationIcon } from "../BankOperationIcon/BankOperationIcon";
-import { useBankFormFocus } from "../useBankFormFocus";
-
-const MAX_CATEGORY_NAME_LENGTH = 80;
+import { useCategoryManagerVm } from "./CategoryManager.vm";
 
 type CategoryManagerProps = {
 	onClose: () => void;
 	onCreated?: (id: string) => void;
 };
+
 type CategoryValues = { name: string };
+
 const CategoryFields: FC = () => {
 	const { t } = useTranslation();
+
 	const {
 		control,
 		formState: { errors },
 	} = useFormContext<CategoryValues>();
+
+	const { field: nameField } = useController({ control, name: "name" });
+
 	return (
-		<Controller
-			control={control}
-			name="name"
-			render={({ field }) => (
-				<TextInput
-					label={t("bank.categoryName")}
-					required
-					{...field}
-					error={errors.name?.message}
-				/>
-			)}
+		<TextInput
+			label={t("bank.categoryName")}
+			required
+			{...nameField}
+			error={errors.name?.message}
 		/>
 	);
 };
+
 const CategoryManager: FC<CategoryManagerProps> = (props) => {
-	useBankFormFocus();
-	const [opened, setOpened] = useState(true);
-	const { t } = useTranslation();
-	const categories = useBankCategories();
-	const mutation = useBankMutations();
-	const [editing, setEditing] = useState<ExpenseCategory>();
-	const editSessionRef = useRef(0);
-	const [error, setError] = useState<unknown>();
-	const [latest, setLatest] = useState<ExpenseCategory>();
-	const schema = z.object({
-		name: z
-			.string()
-			.trim()
-			.refine(
-				value =>
-					value.length > 0 && value.length <= MAX_CATEGORY_NAME_LENGTH,
-				{ error: validationMessage("bank.validation.category") },
-			)
-			.refine(
-				value =>
-					!categories.data?.some(
-						c =>
-							c.id !== editing?.id
-							&& c.name.toLocaleLowerCase("ru-RU")
-							=== value.toLocaleLowerCase("ru-RU"),
-					),
-				{ error: validationMessage("bank.validation.duplicate") },
-			),
-	});
-	const methods = useForm<CategoryValues>({ defaultValues: { name: "" }, resolver: zodResolver(schema) });
-	const isPending = !opened || methods.formState.isSubmitting;
+	const {
+		categories,
+		categoryRows,
+		editing,
+		error,
+		isPending,
+		latest,
+		methods,
+		onAdoptVersion,
+		onCancel,
+		onDismiss,
+		onReloadRecord,
+		onRequestClose,
+		onSubmit,
+		opened,
+		retryCategories,
+		t,
+	} = useCategoryManagerVm(props);
+
 	return (
 		<Modal
 			closeButtonProps={{ "aria-label": t("bank.close"), "disabled": isPending }}
 			closeOnClickOutside={!isPending}
 			closeOnEscape={!isPending}
-			onClose={() => !isPending && setOpened(false)}
+			onClose={onRequestClose}
 			onExitTransitionEnd={props.onClose}
 			opened={opened}
 			title={t("bank.categories")}
 		>
 			<FormProvider {...methods}>
-				<form
-					onSubmit={(event) => {
-						void methods.handleSubmit(async (values) => {
-							setError(undefined);
-							try {
-								if (editing)
-									await mutation.updateCategory.mutateAsync({
-										body: { name: values.name, version: editing.version },
-										id: editing.id,
-									});
-								else {
-									const result = await mutation.createCategory.mutateAsync({
-										name: values.name,
-									});
-									if (result) props.onCreated?.(result.id);
-								}
-								editSessionRef.current++;
-								setEditing(undefined);
-								setLatest(undefined);
-								methods.reset({ name: "" });
-							}
-							catch (error_) {
-								setError(error_);
-							}
-						})(event);
-					}}
-				>
+				<form onSubmit={onSubmit}>
 					<fieldset className={classes.fieldset} disabled={isPending}>
 						<Stack>
-							{categories.data?.map(category => (
-								<Group justify="space-between" key={category.id}>
-									<Group gap="xs">
-										<BankOperationIcon
-											categoryName={category.name}
-											kind="expense"
-										/>
-										<Text>{category.name}</Text>
-										{category.isDefault && (
-											<Badge>{t("bank.defaultCategory")}</Badge>
-										)}
+							{categoryRows?.map((category) => {
+								return (
+									<Group justify="space-between" key={category.id}>
+										<Group gap="xs">
+											<OperationIcon
+												{...bankOperationAppearance("expense", category.name)}
+											/>
+
+											<Text>{category.name}</Text>
+
+											{category.isDefault && (
+												<Badge>{t("bank.defaultCategory")}</Badge>
+											)}
+										</Group>
+
+										<Button onClick={category.onRename} variant="subtle">
+											{t("bank.rename")}
+										</Button>
 									</Group>
-									<Button
-										onClick={() => {
-											editSessionRef.current++;
-											setEditing(category);
-											methods.reset({ name: category.name });
-											setError(undefined);
-											setLatest(undefined);
-										}}
-										variant="subtle"
-									>
-										{t("bank.rename")}
-									</Button>
-								</Group>
-							))}
+								);
+							})}
+
 							{categories.isLoading && (
 								<Text role="status">{t("bank.loading")}</Text>
 							)}
+
 							{categories.isError && (
 								<BankFeedback
 									cached={Boolean(categories.data)}
 									error={categories.error}
 									loadingError
-									retry={() => void categories.refetch()}
+									retry={retryCategories}
 								/>
 							)}
+
 							<CategoryFields />
-							{!!(error) && ((
+
+							{!!error && (
 								<>
 									<BankFeedback error={error} />
+
 									{editing && (
-										<Button
-											onClick={async () => {
-												const session = editSessionRef.current;
-												const response = await categories.refetch();
-												if (session !== editSessionRef.current) return;
-												if (response.error) setError(response.error);
-												else
-													setLatest(
-														response.data?.find(c => c.id === editing.id),
-													);
-											}}
-											variant="default"
-										>
+										<Button onClick={onReloadRecord} variant="default">
 											{t("bank.reloadRecord")}
 										</Button>
 									)}
 								</>
-							))}
+							)}
+
 							{latest && latest.id === editing?.id && (
 								<>
 									<Text>{t("bank.versionHint", { details: latest.name })}</Text>
-									<Button
-										onClick={() => {
-											setEditing(latest);
-											setLatest(undefined);
-											setError(undefined);
-										}}
-									>
+
+									<Button onClick={onAdoptVersion}>
 										{t("bank.adoptVersion", { version: latest.version })}
 									</Button>
 								</>
 							)}
+
 							<Group>
 								<Button loading={isPending} type="submit">
 									{t(editing ? "bank.save" : "bank.addCategory")}
 								</Button>
+
 								{editing && (
-									<Button
-										onClick={() => {
-											editSessionRef.current++;
-											setEditing(undefined);
-											setLatest(undefined);
-											methods.reset({ name: "" });
-											setError(undefined);
-										}}
-										variant="default"
-									>
+									<Button onClick={onCancel} variant="default">
 										{t("bank.cancel")}
 									</Button>
 								)}
-								<Button onClick={() => setOpened(false)} variant="default">
+
+								<Button onClick={onDismiss} variant="default">
 									{t("bank.close")}
 								</Button>
 							</Group>

src/entities/bank-card/ui/CategoryManager/CategoryManager.vm.ts

@@ -0,0 +1,128 @@
+import type { ComponentProps } from "react";
+
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useRef, useState } from "react";
+import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
+
+import { useBankMutations } from "../../api/mutations";
+import { type ExpenseCategory, useBankCategories } from "../../api/queries";
+import { categorySchema } from "../../model/category.schema";
+import { useBankFormFocus } from "../useBankFormFocus";
+
+type CategoryManagerProps = {
+	onClose: () => void;
+	onCreated?: (id: string) => void;
+};
+
+type CategoryValues = { name: string };
+
+function useCategoryManagerVm(props: CategoryManagerProps) {
+	useBankFormFocus();
+	const [opened, setOpened] = useState(true);
+	const { t } = useTranslation();
+	const categories = useBankCategories();
+	const mutation = useBankMutations();
+	const [editing, setEditing] = useState<ExpenseCategory>();
+	const editSessionRef = useRef(0);
+	const [error, setError] = useState<unknown>();
+	const [latest, setLatest] = useState<ExpenseCategory>();
+	const schema = categorySchema(categories.data, editing?.id);
+
+	const methods = useForm<CategoryValues>({
+		defaultValues: { name: "" },
+		resolver: zodResolver(schema),
+	});
+
+	const isPending = !opened || methods.formState.isSubmitting;
+	const onRequestClose = () => !isPending && setOpened(false);
+
+	const onSubmit: ComponentProps<"form">["onSubmit"] = (event) => {
+		void methods.handleSubmit(async (values) => {
+			setError(undefined);
+
+			try {
+				if (editing)
+					await mutation.updateCategory.mutateAsync({
+						body: { name: values.name, version: editing.version },
+						id: editing.id,
+					});
+				else {
+					const result = await mutation.createCategory.mutateAsync({
+						name: values.name,
+					});
+
+					if (result) props.onCreated?.(result.id);
+				}
+
+				editSessionRef.current++;
+				setEditing(undefined);
+				setLatest(undefined);
+				methods.reset({ name: "" });
+			}
+			catch (error_) {
+				setError(error_);
+			}
+		})(event);
+	};
+
+	const retryCategories = () => void categories.refetch();
+
+	const onReloadRecord = async () => {
+		if (!editing) return;
+		const session = editSessionRef.current;
+		const response = await categories.refetch();
+		if (session !== editSessionRef.current) return;
+		if (response.error) setError(response.error);
+		else setLatest(response.data?.find(c => c.id === editing.id));
+	};
+
+	const onAdoptVersion = () => {
+		setEditing(latest);
+		setLatest(undefined);
+		setError(undefined);
+	};
+
+	const onCancel = () => {
+		editSessionRef.current++;
+		setEditing(undefined);
+		setLatest(undefined);
+		methods.reset({ name: "" });
+		setError(undefined);
+	};
+
+	const onDismiss = () => setOpened(false);
+
+	const categoryRows = categories.data?.map((category) => {
+		const onRename = () => {
+			editSessionRef.current++;
+			setEditing(category);
+			methods.reset({ name: category.name });
+			setError(undefined);
+			setLatest(undefined);
+		};
+
+		return { ...category, onRename };
+	});
+
+	return {
+		categories,
+		categoryRows,
+		editing,
+		error,
+		isPending,
+		latest,
+		methods,
+		onAdoptVersion,
+		onCancel,
+		onDismiss,
+		onReloadRecord,
+		onRequestClose,
+		onSubmit,
+		opened,
+		retryCategories,
+		t,
+	};
+}
+
+export { useCategoryManagerVm };

src/entities/bond/api/queries.ts

@@ -18,6 +18,7 @@ function bondQueryOptions(uid: string) {
 		staleTime: BOND_STALE_TIME_MS,
 	};
 }
+
 function useBond(identifier: string) {
 	const isUid
 		= /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(
@@ -28,6 +29,7 @@ function useBond(identifier: string) {
 		...bondQueryOptions(identifier),
 		enabled: Boolean(identifier) && isUid,
 	});
+
 	const byTicker = useResourceQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/bonds/by-ticker/{ticker}", {
 			params: { path: { ticker: identifier } },
@@ -35,6 +37,7 @@ function useBond(identifier: string) {
 		enabled: Boolean(identifier) && !isUid,
 		staleTime: BOND_STALE_TIME_MS,
 	});
+
 	return isUid ? byUid : byTicker;
 }
 
@@ -47,6 +50,7 @@ function useBondCandles(uid: string, period: BondPeriod) {
 		staleTime: BOND_STALE_TIME_MS,
 	});
 }
+
 function useBondCoupons(uid: string) {
 	return useResourceQuery({
 		meta: { accessGroup: "brokerage" },
@@ -57,6 +61,7 @@ function useBondCoupons(uid: string) {
 		staleTime: BOND_STALE_TIME_MS,
 	});
 }
+
 function useBondMetrics(uid: string) {
 	return useResourceQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/bonds/{uid}/metrics", {
@@ -66,6 +71,7 @@ function useBondMetrics(uid: string) {
 		staleTime: BOND_STALE_TIME_MS,
 	});
 }
+
 function useBondPosition(uid: string) {
 	return useResourceQuery({
 		meta: { accessGroup: "brokerage" },
@@ -76,6 +82,7 @@ function useBondPosition(uid: string) {
 		staleTime: BOND_STALE_TIME_MS,
 	});
 }
+
 function useBondQuote(uid: string) {
 	return useResourceQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/bonds/{uid}/quote", {
@@ -85,6 +92,7 @@ function useBondQuote(uid: string) {
 		staleTime: BOND_STALE_TIME_MS,
 	});
 }
+
 function useBondSearch(query: string) {
 	return useResourceQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/bonds", {
@@ -95,7 +103,8 @@ function useBondSearch(query: string) {
 	});
 }
 
-export { type BondPeriod,
+export {
+	type BondPeriod,
 	MIN_BOND_SEARCH_LENGTH,
 	useBond,
 	useBondCandles,

src/entities/bond/index.ts

@@ -1,4 +1,5 @@
-export { type BondPeriod,
+export {
+	type BondPeriod,
 	MIN_BOND_SEARCH_LENGTH,
 	useBond,
 	useBondCandles,

src/entities/broker-operation/api/useBrokerageOperations.test.tsx

@@ -22,6 +22,7 @@ describe("useBrokerageOperations", () => {
 				cursor: "next",
 			}),
 		).toEqual({ categories: ["income", "tax"], cursor: "next" });
+
 		const { result } = renderHook(
 			() => useBrokerageOperations("account-1", { limit: 5 }),
 			{ wrapper: createQueryWrapper().wrapper },

src/entities/broker-operation/api/useBrokerageOperations.ts

@@ -8,7 +8,9 @@ type BrokerageOperationsQuery = Omit<
 	NonNullable<OperationsEndpoint["parameters"]["query"]>,
 	"sync"
 >;
+
 type OperationCategory = BrokerageOperation["category"];
+
 type OperationsEndpoint
 	= paths["/api/v1/brokerage-accounts/{accountId}/operations"]["get"];
 
@@ -42,7 +44,11 @@ function brokerageOperationsQueryParameters(query: BrokerageOperationsQuery) {
 		...(query.instrumentUid && { instrumentUid: query.instrumentUid }),
 		...(query.from && { from: query.from }),
 		...(query.to && { to: query.to }),
-		...(query.categories?.length && { categories: query.categories.toSorted((left, right) => left.localeCompare(right)) }),
+		...(query.categories?.length && {
+			categories: query.categories.toSorted((left, right) =>
+				left.localeCompare(right),
+			),
+		}),
 		...(query.cursor && { cursor: query.cursor }),
 		...(query.limit && { limit: query.limit }),
 	};

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

@@ -22,7 +22,9 @@ const operationTransferPrefix = "OPERATION_TYPE_TRANS_";
 type PaymentPresentation = {
 	amount: string;
 	label: string;
-	tone: "negative" | "neutral" | "positive";
+	tone: "negative"
+		| "neutral"
+		| "positive";
 };
 
 function entryLabelKey(operation: BrokerageOperation): string {
@@ -30,6 +32,7 @@ function entryLabelKey(operation: BrokerageOperation): string {
 		return isOperationType(operation.type, OperationType.Coupon)
 			? "ledger.entryLabel.income.coupon"
 			: "ledger.entryLabel.income.dividend";
+
 	return `ledger.category.${operation.category}`;
 }
 
@@ -43,19 +46,15 @@ function isZeroDecimal(value: string): boolean {
 
 function operationLabelKey(type: string): string {
 	if (
-		[
-			OperationType.Buy,
-			OperationType.BuyCard,
-			OperationType.BuyMargin,
-		].some(candidate => isOperationType(type, candidate))
+		[OperationType.Buy, OperationType.BuyCard, OperationType.BuyMargin].some(
+			candidate => isOperationType(type, candidate),
+		)
 	)
 		return "ledger.operationType.buy";
 	if (
-		[
-			OperationType.Sell,
-			OperationType.SellCard,
-			OperationType.SellMargin,
-		].some(candidate => isOperationType(type, candidate))
+		[OperationType.Sell, OperationType.SellCard, OperationType.SellMargin].some(
+			candidate => isOperationType(type, candidate),
+		)
 	)
 		return "ledger.operationType.sell";
 	if (
@@ -72,7 +71,10 @@ function operationLabelKey(type: string): string {
 		return "ledger.operationType.input";
 	if (isOperationType(type, OperationType.OutputSecurities))
 		return "ledger.operationType.output";
-	return type.startsWith(operationTransferPrefix) ? "ledger.operationType.transfer" : "ledger.operationType.other";
+
+	return type.startsWith(operationTransferPrefix)
+		? "ledger.operationType.transfer"
+		: "ledger.operationType.other";
 }
 
 function paymentPresentation(
@@ -99,6 +101,7 @@ function paymentPresentation(
 			label: entryLabelKey(operation),
 			tone: "negative",
 		};
+
 	return {
 		amount: `+${formatMoney(operation.payment)}`,
 		label: entryLabelKey(operation),

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

@@ -24,50 +24,59 @@ type LedgerEntryRowProps = {
 const LedgerEntryRow: FC<LedgerEntryRowProps> = (props) => {
 	const { operation } = props;
 	const { t } = useTranslation();
+
 	const instrument
 		= operation.ticker ?? operation.instrumentType ?? t("ledger.noInstrument");
+
 	const payment = paymentPresentation(operation);
+
 	const metadata = [
 		t("ledger.occurredAt", { date: formatSnapshotTime(operation.occurredAt) }),
 		instrument,
-		props.withDetails ? /* eslint-disable-line unicorn/no-null -- Preserve the nullable domain value consumed by this view model. */ null : operation.account?.name,
+		props.withDetails
+			? null // eslint-disable-line unicorn/no-null -- Preserve the nullable domain value consumed by this view model.
+			: operation.account?.name,
 	]
 		.filter(Boolean)
 		.join(" · ");
 
+	let details;
+	if (props.withDetails) {
+		details = (
+			<>
+				<Group gap="sm">
+					{operation.quantity != undefined && (
+						<Text c="dimmed" size="xs">
+							{t("ledger.quantity", {
+								value: formatDecimal(operation.quantity),
+							})}
+						</Text>
+					)}
+
+					{!!operation.price && (
+						<Text c="dimmed" size="xs">
+							{t("ledger.price", { value: formatMoney(operation.price) })}
+						</Text>
+					)}
+				</Group>
+
+				{!!operation.account && (
+					<Anchor
+						component={Link}
+						size="sm"
+						to={`/accounts/${encodeURIComponent(operation.account.id)}`}
+					>
+						{operation.account.name}
+					</Anchor>
+				)}
+			</>
+		);
+	}
+	else details = undefined;
+
 	return (
 		<EntryCard
-			details={
-				(props.withDetails)
-					? ((
-							<>
-								<Group gap="sm">
-									{operation.quantity != undefined && ((
-										<Text c="dimmed" size="xs">
-											{t("ledger.quantity", {
-												value: formatDecimal(operation.quantity),
-											})}
-										</Text>
-									))}
-									{!!(operation.price) && ((
-										<Text c="dimmed" size="xs">
-											{t("ledger.price", { value: formatMoney(operation.price) })}
-										</Text>
-									))}
-								</Group>
-								{!!(operation.account) && ((
-									<Anchor
-										component={Link}
-										size="sm"
-										to={`/accounts/${encodeURIComponent(operation.account.id)}`}
-									>
-										{operation.account.name}
-									</Anchor>
-								))}
-							</>
-						))
-					: undefined
-			}
+			details={details}
 			imageSrc={instrumentLogoUrl(operation.logoName)}
 			initial={(instrument.trim()[0] ?? "?").toUpperCase()}
 			metadata={metadata}

src/entities/brokerage-account/api/useBrokerageAccounts.test.tsx

@@ -56,6 +56,7 @@ describe("useBrokerageAccounts", () => {
 		server.use(
 			http.get("*/api/v1/brokerage-accounts", () => {
 				calls += 1;
+
 				return calls === 1
 					? HttpResponse.json(
 							resource([
@@ -70,6 +71,7 @@ describe("useBrokerageAccounts", () => {
 					: HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 });
 			}),
 		);
+
 		const { result } = renderHook(() => useBrokerageAccounts(), {
 			wrapper: createQueryWrapper().wrapper,
 		});

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

@@ -7,7 +7,8 @@ const VISIBLE_CURRENCY_LIMIT = 2;
 
 type BrokerageAccountCard = {
 	account: BrokerageAccount;
-	positionCounts: null | { bonds: number; stocks: number };
+	positionCounts: null
+		| { bonds: number; stocks: number };
 	source?: NonNullable<
 		ReturnType<typeof useBrokerageAccounts>["meta"]
 	>["dependencies"] extends (infer T)[] | undefined
@@ -38,20 +39,26 @@ function brokerageAccountCards(
 			item =>
 				item.resourceKey === `portfolio/${encodeURIComponent(account.id)}`,
 		);
+
 		const summary = account.portfolioSummary;
 		if (!summary)
 			return {
 				account,
-				positionCounts: /* eslint-disable-line unicorn/no-null -- The existing formatter contract uses null for unavailable data. */ null,
+				positionCounts:
+					// eslint-disable-next-line unicorn/no-null -- The existing formatter contract uses null for unavailable data.
+					null,
 				source,
 				summary: { state: "unavailable" },
 			};
+
 		const positionCounts = {
 			bonds: summary.bondPositionCount,
 			stocks: summary.stockPositionCount,
 		};
+
 		if (summary.totalsByCurrency.length === 0)
 			return { account, positionCounts, source, summary: { state: "empty" } };
+
 		return {
 			account,
 			positionCounts,

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

@@ -64,8 +64,10 @@ export const Available: Story = {
 	},
 };
 
-export const Unavailable: Story = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+export const Unavailable: Story
+	= {
 		args: {
 			accounts: brokerageAccountCards([
 				{ ...syntheticAccount, openedOn: null, portfolioSummary: null },
@@ -76,12 +78,12 @@ export const Unavailable: Story = (/* eslint-disable unicorn/no-null -- Fixture
 			docs: {
 				description: {
 					story:
-					"Счёт остаётся доступен для открытия, даже если сводка временно недоступна. Неизвестные суммы не заменяются нулём; отсутствующая дата открытия не отображается.",
+						"Счёт остаётся доступен для открытия, даже если сводка временно недоступна. Неизвестные суммы не заменяются нулём; отсутствующая дата открытия не отображается.",
 				},
 			},
 		},
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+/* eslint-enable unicorn/no-null */
 
 export const Empty: Story = {
 	args: {
@@ -191,8 +193,10 @@ export const LargeValues: Story = {
 	name: "Длинные суммы",
 };
 
-export const IndependentFreshness: Story = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+export const IndependentFreshness: Story
+	= {
 		args: {
 			accounts: brokerageAccountCards(
 				[
@@ -231,5 +235,5 @@ export const IndependentFreshness: Story = (/* eslint-disable unicorn/no-null --
 			),
 		},
 		name: "Независимая свежесть и ошибка сводок",
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+/* eslint-enable unicorn/no-null */

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

@@ -29,29 +29,26 @@ describe("BrokerageAccountList", () => {
 									],
 								},
 								type: "BROKERAGE",
+							/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+							},
+							{
+								id: "account-2",
+								name: "Недоступный",
+								openedOn: null,
+								portfolioSummary: null,
+								type: "BROKERAGE",
+							},
+							/* eslint-enable unicorn/no-null */ {
+								id: "account-3",
+								name: "Пустой",
+								openedOn: null, // eslint-disable-line unicorn/no-null -- Preserve explicit null in the API fixture.
+								portfolioSummary: {
+									bondPositionCount: 0,
+									stockPositionCount: 2,
+									totalsByCurrency: [],
+								},
+								type: "BROKERAGE",
 							},
-							(/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-								{
-									id: "account-2",
-									name: "Недоступный",
-									openedOn: null,
-									portfolioSummary: null,
-									type: "BROKERAGE",
-								}
-							/* eslint-enable unicorn/no-null */),
-							(/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-								{
-									id: "account-3",
-									name: "Пустой",
-									openedOn: null,
-									portfolioSummary: {
-										bondPositionCount: 0,
-										stockPositionCount: 2,
-										totalsByCurrency: [],
-									},
-									type: "BROKERAGE",
-								}
-							/* eslint-enable unicorn/no-null */),
 						])}
 					/>
 				</MemoryRouter>
@@ -71,19 +68,11 @@ describe("BrokerageAccountList", () => {
 		expect(screen.getByText("Нет текущих сумм")).toBeInTheDocument();
 		expect(screen.getAllByText("Открыть счет")).toHaveLength(3);
 		const available = within(screen.getByRole("link", { name: /Основной/ }));
-		expect(available.getAllByRole("definition")[0]).toHaveTextContent(
-			"5",
-		);
-		expect(
-			available.getAllByRole("definition")[1],
-		).toHaveTextContent("12");
+		expect(available.getAllByRole("definition")[0]).toHaveTextContent("5");
+		expect(available.getAllByRole("definition")[1]).toHaveTextContent("12");
 		const unvalued = within(screen.getByRole("link", { name: /Пустой/ }));
-		expect(unvalued.getAllByRole("definition")[0]).toHaveTextContent(
-			"2",
-		);
-		expect(
-			unvalued.getAllByRole("definition")[1],
-		).toHaveTextContent("0");
+		expect(unvalued.getAllByRole("definition")[0]).toHaveTextContent("2");
+		expect(unvalued.getAllByRole("definition")[1]).toHaveTextContent("0");
 		expect(
 			within(screen.getByRole("link", { name: /Недоступный/ })).queryByText(
 				"Акции",
@@ -94,19 +83,22 @@ describe("BrokerageAccountList", () => {
 
 it("shows portfolio summary freshness independently for each account", () => {
 	const accounts = brokerageAccountCards(
-		["fresh", "stale"].map(id => ((/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-			{
-				id,
-				name: id,
-				openedOn: null,
-				portfolioSummary: {
-					bondPositionCount: 0,
-					stockPositionCount: 1,
-					totalsByCurrency: [{ currency: "RUB", value: "10" }],
-				},
-				type: "BROKERAGE" as const,
-			}
-			/* eslint-enable unicorn/no-null */))),
+		["fresh", "stale"].map(
+			/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+			id =>
+				({
+					id,
+					name: id,
+					openedOn: null,
+					portfolioSummary: {
+						bondPositionCount: 0,
+						stockPositionCount: 1,
+						totalsByCurrency: [{ currency: "RUB", value: "10" }],
+					},
+					type: "BROKERAGE" as const,
+				}),
+			/* eslint-enable unicorn/no-null */
+		),
 		[
 			resource(null, { freshness: "fresh", resourceKey: "portfolio/fresh" })
 				.meta,
@@ -114,6 +106,7 @@ it("shows portfolio summary freshness independently for each account", () => {
 				.meta,
 		],
 	);
+
 	render(
 		<MantineProvider>
 			<MemoryRouter>

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

@@ -1,6 +1,7 @@
 import type { FC } from "react";
 
 import { Card, Group, SimpleGrid, Stack, Text } from "@mantine/core";
+import { WalletIcon } from "@wealthledger/icons";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 
@@ -40,13 +41,14 @@ const BrokerageAccountSummary: FC<BrokerageAccountSummaryProps> = (props) => {
 					{formatMoney(total)}
 				</Text>
 			))}
-			{!!(summary.remainingCurrencyCount) && ((
+
+			{!!summary.remainingCurrencyCount && (
 				<Text c="dimmed" size="sm">
 					{t("accounts.remainingCurrencies", {
 						count: summary.remainingCurrencyCount,
 					})}
 				</Text>
-			))}
+			)}
 		</Stack>
 	);
 };
@@ -72,76 +74,78 @@ const BrokerageAccountList: FC<BrokerageAccountListProps> = (props) => {
 							<Text className={classes.kicker} fw={700} size="xs">
 								{t(accountTypeKey(account.type))}
 							</Text>
-							<svg
-								aria-hidden="true"
-								className={classes.accountIcon}
-								fill="none"
-								focusable="false"
-								stroke="currentColor"
-								strokeLinecap="round"
-								strokeLinejoin="round"
-								strokeWidth="1.5"
-								viewBox="0 0 24 24"
-							>
-								<rect height="15" rx="3" width="18" x="3" y="5" />
-								<path d="M3 9h18M7 15h3M14 5V3H7a4 4 0 0 0-4 4" />
-							</svg>
+
+							<WalletIcon className={classes.accountIcon} />
 						</Group>
+
 						<Text className={classes.name} component="h2" fw={700}>
 							{account.name}
 						</Text>
 					</Stack>
+
 					<Stack className={classes.balance} gap="xs">
 						<Text c="dimmed" size="sm">
 							{t("accounts.currentValue")}
 						</Text>
+
 						<BrokerageAccountSummary summary={summary} />
-						{!!(source?.lastSuccessfulAt) && ((
+
+						{!!source?.lastSuccessfulAt && (
 							<Text c="dimmed" size="xs">
 								{t("investment.sourceTime", {
 									date: formatSnapshotTime(source.lastSuccessfulAt),
 								})}
 							</Text>
-						))}
+						)}
+
 						{(source?.sync.state === "running"
-							|| source?.sync.state === "queued") && ((
+							|| source?.sync.state === "queued") && (
 							<Text role="status" size="xs">
 								{t("accounts.refreshing")}
 							</Text>
-						))}
-						{(source?.sync.state === "failed") && ((
+						)}
+
+						{source?.sync.state === "failed" && (
 							<Text size="xs">{t("accounts.refreshError")}</Text>
-						))}
-						{(source?.freshness === "stale") && ((
+						)}
+
+						{source?.freshness === "stale" && (
 							<Text size="xs">{t("investment.stale")}</Text>
-						))}
+						)}
 					</Stack>
-					{!!(positionCounts) && ((
+
+					{!!positionCounts && (
 						<dl className={classes.positions}>
 							<div className={classes.stocks}>
 								<dt>{t("accounts.stocks")}</dt>
+
 								<dd>
 									{new Intl.NumberFormat("ru-RU").format(positionCounts.stocks)}
 								</dd>
 							</div>
+
 							<div className={classes.bonds}>
 								<dt>{t("accounts.bonds")}</dt>
+
 								<dd>
 									{new Intl.NumberFormat("ru-RU").format(positionCounts.bonds)}
 								</dd>
 							</div>
 						</dl>
-					))}
+					)}
+
 					<Group className={classes.footer} gap="sm" justify="space-between">
-						{!!(account.openedOn) && ((
+						{!!account.openedOn && (
 							<Text c="dimmed" size="xs">
 								{t("accounts.openedOn", {
 									date: formatDate(account.openedOn),
 								})}
 							</Text>
-						))}
+						)}
+
 						<Text className={classes.open} component="span" fw={600} size="sm">
 							{t("accounts.openAccount")}
+
 							<span aria-hidden="true" className={classes.arrow}>
 								→
 							</span>

src/entities/brokerage-event/api/useBrokerageEvents.test.tsx

@@ -20,9 +20,11 @@ describe("useBrokerageEvents", () => {
 		server.use(
 			http.get("*/api/v1/brokerage-accounts/:accountId/events", requested),
 		);
+
 		const { result } = renderHook(() => useBrokerageEvents(undefined), {
 			wrapper: createQueryWrapper().wrapper,
 		});
+
 		await waitFor(() => expect(result.current.fetchStatus).toBe("idle"));
 		expect(requested).not.toHaveBeenCalled();
 	});
@@ -35,7 +37,8 @@ describe("useBrokerageEvents", () => {
 		server.use(
 			http.get("*/api/v1/brokerage-accounts/account-1/events", () =>
 				HttpResponse.json(
-					resource((/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+					/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+					resource(
 						{
 							accountId: "account-1",
 							calculatedAt: "2026-08-14T00:00:00Z",
@@ -52,8 +55,9 @@ describe("useBrokerageEvents", () => {
 									type: "dividend",
 								},
 							],
-						}
-						/* eslint-enable unicorn/no-null */)),
+						},
+						/* eslint-enable unicorn/no-null */
+					),
 				),
 			),
 		);
@@ -63,20 +67,20 @@ describe("useBrokerageEvents", () => {
 		});
 
 		await waitFor(() => expect(result.current.isSuccess).toBe(true));
+		/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
 		expect(result.current.data?.events).toEqual([
-			(/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-				{
-					date: "2026-09-01",
-					dateKind: "registry",
-					displayName: "Сбер",
-					figi: "figi-1",
-					instrumentUid: null,
-					logoName: "sber3.png",
-					projectedAmount: { currency: "RUB", value: "12.34" },
-					ticker: "SBER",
-					type: "dividend",
-				}
-			/* eslint-enable unicorn/no-null */),
+			{
+				date: "2026-09-01",
+				dateKind: "registry",
+				displayName: "Сбер",
+				figi: "figi-1",
+				instrumentUid: null,
+				logoName: "sber3.png",
+				projectedAmount: { currency: "RUB", value: "12.34" },
+				ticker: "SBER",
+				type: "dividend",
+			},
+			/* eslint-enable unicorn/no-null */
 		]);
 	});
 });

src/entities/brokerage-event/api/useBrokerageEvents.ts

@@ -3,6 +3,7 @@ import { apiQueryClient, type paths, useResourceQuery } from "@/shared/api";
 type BrokerageEvent = NonNullable<
 	EventsEndpoint["responses"][200]["content"]["application/json"]["data"]
 >["events"][number];
+
 type EventsEndpoint
 	= paths["/api/v1/brokerage-accounts/{accountId}/events"]["get"];
 

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

@@ -17,13 +17,19 @@ const BrokerageEventCard: FC<BrokerageEventCardProps> = (props) => {
 
 	const metadata = [
 		date,
-		event.dateKind === "registry" ? t("events.dateKind.registry") : /* eslint-disable-line unicorn/no-null -- Preserve the nullable domain value consumed by this view model. */ null,
+		event.dateKind === "registry"
+			? t("events.dateKind.registry")
+			: null, // eslint-disable-line unicorn/no-null -- Preserve the nullable domain value consumed by this view model.
 		event.isin,
 		event.account?.name,
 	]
 		.filter(Boolean)
 		.join(" · ");
 
+	const projectedAmount = event.projectedAmount
+		? formatMoney(event.projectedAmount)
+		: t("events.noAmount");
+
 	return (
 		<EntryCard
 			imageSrc={instrumentLogoUrl(event.logoName)}
@@ -33,11 +39,7 @@ const BrokerageEventCard: FC<BrokerageEventCardProps> = (props) => {
 			metadata={metadata}
 			title={[t(`events.type.${event.type}`), event.displayName].join(" · ")}
 			tone="neutral"
-			value={
-				event.projectedAmount
-					? formatMoney(event.projectedAmount)
-					: t("events.noAmount")
-			}
+			value={projectedAmount}
 			valueLabel={t("events.projectedAmount")}
 		/>
 	);

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

@@ -6,20 +6,21 @@ import type { BrokerageEvent } from "../../api/useBrokerageEvents";
 
 import { BrokerageEventsPreview } from "./BrokerageEventsPreview";
 
-const syntheticEvent = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-{
-	date: "2026-10-15",
-	dateKind: "event",
-	displayName: "Учебные облигации",
-	figi: null,
-	instrumentUid: null,
-	isin: "RU000A0JX0J2",
-	logoName: null,
-	projectedAmount: { currency: "RUB", value: "850.50" },
-	ticker: "DEMO",
-	type: "coupon",
-}
-/* eslint-enable unicorn/no-null */) satisfies BrokerageEvent;
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+const syntheticEvent
+	= {
+		date: "2026-10-15",
+		dateKind: "event",
+		displayName: "Учебные облигации",
+		figi: null,
+		instrumentUid: null,
+		isin: "RU000A0JX0J2",
+		logoName: null,
+		projectedAmount: { currency: "RUB", value: "850.50" },
+		ticker: "DEMO",
+		type: "coupon",
+	} satisfies /* eslint-enable unicorn/no-null */ BrokerageEvent;
 
 const eventsPath = "/accounts/storybook-account/events";
 
@@ -120,8 +121,10 @@ export const Empty: Story = {
 	},
 };
 
-export const MissingAmount: Story = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+export const MissingAmount: Story
+	= {
 		args: {
 			events: {
 				items: [{ ...syntheticEvent, projectedAmount: null }],
@@ -134,22 +137,24 @@ export const MissingAmount: Story = (/* eslint-disable unicorn/no-null -- Fixtur
 			docs: {
 				description: {
 					story:
-					"Событие остаётся видимым при неизвестной ожидаемой сумме. Отсутствие оценки не подменяется нулевой выплатой.",
+						"Событие остаётся видимым при неизвестной ожидаемой сумме. Отсутствие оценки не подменяется нулевой выплатой.",
 				},
 			},
 		},
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+/* eslint-enable unicorn/no-null */
 
-export const LongEvent: Story = (/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
-	{
+/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+
+export const LongEvent: Story
+	= {
 		args: {
 			events: {
 				items: [
 					{
 						...syntheticEvent,
 						displayName:
-						"Учебные облигации компании с очень длинным названием инструмента",
+							"Учебные облигации компании с очень длинным названием инструмента",
 						projectedAmount: null,
 						type: "offer",
 					},
@@ -159,5 +164,5 @@ export const LongEvent: Story = (/* eslint-disable unicorn/no-null -- Fixture pr
 			},
 		},
 		name: "Длинное название на узком экране",
-	}
-/* eslint-enable unicorn/no-null */);
+	};
+/* eslint-enable unicorn/no-null */

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

@@ -24,7 +24,9 @@ type BrokerageEventsPreviewState
 		state: "loaded" | "partial";
 		to: string;
 	}
-	| { state: "empty" | "error" | "loading"; to: string };
+	| { state: "empty"
+		| "error"
+		| "loading"; to: string; };
 
 const BrokerageEventsPreview: FC<BrokerageEventsPreviewProps> = (props) => {
 	const { events } = props;
@@ -32,51 +34,60 @@ const BrokerageEventsPreview: FC<BrokerageEventsPreviewProps> = (props) => {
 
 	return (
 		<Stack gap="sm">
-			{(events.state === "loaded") && ((
+			{events.state === "loaded" && (
 				<>
-					{!!(events.lastSuccessfulAt) && ((
+					{!!events.lastSuccessfulAt && (
 						<Text c="dimmed" size="xs">
 							{t("investment.sourceTime", {
 								date: formatSnapshotTime(events.lastSuccessfulAt),
 							})}
 						</Text>
-					))}
-					{!!(events.stale) && (<Text size="xs">{t("investment.stale")}</Text>)}
-					{!!(events.refreshError) && ((
+					)}
+
+					{!!events.stale && <Text size="xs">{t("investment.stale")}</Text>}
+
+					{!!events.refreshError && (
 						<Text role="status">{t("accounts.refreshError")}</Text>
-					))}
+					)}
 				</>
-			))}
-			{(events.state === "loading") && ((
+			)}
+
+			{events.state === "loading" && (
 				<LoadingSkeleton label={t("events.recentLoading")}>
 					{["first", "second", "third"].map(placeholder => (
 						<Skeleton height={48} key={placeholder} radius="sm" />
 					))}
 				</LoadingSkeleton>
-			))}
-			{(events.state === "error") && ((
+			)}
+
+			{events.state === "error" && (
 				<Alert color="red">{t("events.recentError")}</Alert>
-			))}
-			{(events.state === "empty") && ((
+			)}
+
+			{events.state === "empty" && (
 				<Text c="dimmed">{t("events.recentEmpty")}</Text>
-			))}
-			{(events.state === "partial") && ((
+			)}
+
+			{events.state === "partial" && (
 				<Text role="status">{t("investment.partial")}</Text>
-			))}
-			{(events.state === "loaded" || events.state === "partial") && (events.items.map(event => (
-				<BrokerageEventCard
-					event={event}
-					key={JSON.stringify([
-						event.account?.id,
-						event.type,
-						event.date,
-						event.instrumentUid,
-						event.figi,
-						event.ticker,
-						event.logoName,
-					])}
-				/>
-			)))}
+			)}
+
+			{(events.state === "loaded" || events.state === "partial")
+				&& events.items.map(event => (
+					<BrokerageEventCard
+						event={event}
+						key={JSON.stringify([
+							event.account?.id,
+							event.type,
+							event.date,
+							event.instrumentUid,
+							event.figi,
+							event.ticker,
+							event.logoName,
+						])}
+					/>
+				))}
+
 			<Button component={Link} to={events.to} variant="subtle">
 				{t("events.open")}
 			</Button>

src/entities/income/api/useIncome.ts

@@ -3,6 +3,7 @@ import { apiQueryClient, type paths, useResourceQuery } from "@/shared/api";
 type IncomeAnalytics = NonNullable<
 	paths["/api/v1/brokerage-accounts/{accountId}/income-analytics"]["get"]["responses"][200]["content"]["application/json"]["data"]
 >;
+
 type IncomeSummary = NonNullable<
 	paths["/api/v1/brokerage-accounts/{accountId}/income-summary"]["get"]["responses"][200]["content"]["application/json"]["data"]
 >;
@@ -28,7 +29,7 @@ function useIncomeAnalytics(
 	});
 }
 
-function useIncomeSummary(accountId: string | undefined) {
+function useIncomeSummary(accountId?: string) {
 	return useResourceQuery({
 		meta: { accessGroup: "brokerage" },
 		...apiQueryClient.queryOptions(

src/entities/portfolio/api/resource-lifecycle.test.tsx

@@ -21,6 +21,7 @@ const snapshot: Portfolio = {
 	structure: { currencies: [], unvaluedCategories: [] },
 	totalsByCurrency: [{ currency: "RUB", value: "123.000000001" }],
 };
+
 function auth() {
 	configureAuthClient({
 		accessToken: () => "synthetic",
@@ -41,6 +42,7 @@ describe("persistent resource query lifecycle", () => {
 					const mode = new URL(request.url).searchParams.get("sync");
 					modes.push(mode);
 					if (mode) observations += 1;
+
 					return HttpResponse.json(
 						resource(snapshot, {
 							stateVersion: observations > 1 ? "new" : "old",
@@ -76,22 +78,26 @@ describe("persistent resource query lifecycle", () => {
 				),
 			),
 		);
+
 		const { result } = renderHook(() => usePortfolio("a"), {
 			wrapper: createQueryWrapper().wrapper,
 		});
+
 		await waitFor(() => expect(result.current.meta?.sync.state).toBe("failed"));
 		expect(result.current.data).toBeUndefined();
 		expect(result.current.isSuccess).toBe(false);
 		expect(result.current.status).toBe("pending");
 		expect(result.current.isPending).toBe(true);
 		expect(result.current.isLoading).toBe(false);
-		expect(result.current.transport).toEqual((/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+		/* eslint-disable unicorn/no-null -- Fixture preserves the production contract’s explicit null values. */
+		expect(result.current.transport).toEqual(
 			{
 				error: null,
 				fetchStatus: "idle",
 				status: "success",
-			}
-			/* eslint-enable unicorn/no-null */));
+			},
+			/* eslint-enable unicorn/no-null */
+		);
 		expect(result.current.meta?.availability).toBe("missing");
 	});
 	it("keeps the refetch envelope while exposing the refreshed resource payload", async () => {
@@ -103,9 +109,11 @@ describe("persistent resource query lifecycle", () => {
 				HttpResponse.json(isReady ? refreshed : resource(null)),
 			),
 		);
+
 		const { result } = renderHook(() => usePortfolio("a"), {
 			wrapper: createQueryWrapper().wrapper,
 		});
+
 		await waitFor(() =>
 			expect(result.current.transport.status).toBe("success"),
 		);
@@ -130,20 +138,25 @@ describe("persistent resource query lifecycle", () => {
 	it("rejects a late ordinary response when an observe response for that resource arrived first", async () => {
 		auth();
 
-		const { promise: blocked, resolve: release } = Promise.withResolvers<void>();
+		const { promise: blocked, resolve: release }
+			= Promise.withResolvers<void>();
+
 		server.use(
 			http.get(
 				"*/api/v1/brokerage-accounts/:accountId/portfolio",
 				async ({ request }) => {
 					if (!new URL(request.url).searchParams.has("sync")) await blocked;
+
 					return HttpResponse.json(resource(snapshot));
 				},
 			),
 		);
+
 		const old = apiClient.GET(
 			"/api/v1/brokerage-accounts/{accountId}/portfolio",
 			{ params: { path: { accountId: "a" } } },
 		);
+
 		// eslint-disable-next-line vitest/valid-expect -- Attach rejection handling before releasing the request; the assertion is awaited below.
 		const rejected = expect(old).rejects.toMatchObject({ name: "AbortError" });
 		await apiClient.GET("/api/v1/brokerage-accounts/{accountId}/portfolio", {
@@ -156,21 +169,28 @@ describe("persistent resource query lifecycle", () => {
 		auth();
 		let isDenied = false;
 
-		const { promise: blocked, resolve: release } = Promise.withResolvers<void>();
+		const { promise: blocked, resolve: release }
+			= Promise.withResolvers<void>();
+
 		server.use(
 			http.get(
 				"*/api/v1/brokerage-accounts/:accountId/portfolio",
 				async ({ params }) => {
 					if (params.accountId === "b") await blocked;
-					return isDenied && params.accountId === "a" ? HttpResponse.json({ code: "NOT_FOUND" }, { status: 404 }) : HttpResponse.json(resource(snapshot));
+
+					return isDenied && params.accountId === "a"
+						? HttpResponse.json({ code: "NOT_FOUND" }, { status: 404 })
+						: HttpResponse.json(resource(snapshot));
 				},
 			),
 		);
 		const { wrapper } = createQueryWrapper();
+
 		const { result } = renderHook(
 			() => ({ a: usePortfolio("a"), b: usePortfolio("b") }),
 			{ wrapper },
 		);
+
 		await waitFor(() => expect(result.current.a.data).toEqual(snapshot));
 		isDenied = true;
 		await act(() => result.current.a.refetch());

src/entities/portfolio/api/usePortfolio.test.tsx

@@ -16,6 +16,7 @@ describe("usePortfolio", () => {
 			clear: vi.fn(),
 			refresh: () => Promise.resolve(true),
 		});
+
 		const { result } = renderHook(() => usePortfolio("account-1"), {
 			wrapper: createQueryWrapper().wrapper,
 		});
@@ -34,6 +35,7 @@ describe("usePortfolio", () => {
 		server.use(
 			http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () => {
 				calls += 1;
+
 				return calls === 1
 					? HttpResponse.json(
 							resource({
@@ -48,6 +50,7 @@ describe("usePortfolio", () => {
 					: HttpResponse.json({ code: "TBANK_UNAVAILABLE" }, { status: 503 });
 			}),
 		);
+
 		const { result } = renderHook(() => usePortfolio("account-1"), {
 			wrapper: createQueryWrapper().wrapper,
 		});

src/entities/portfolio/api/usePortfolio.ts

@@ -8,7 +8,7 @@ type Portfolio = NonNullable<
 	paths["/api/v1/brokerage-accounts/{accountId}/portfolio"]["get"]["responses"][200]["content"]["application/json"]["data"]
 >;
 
-function portfolioQueryOptions(accountId: string | undefined) {
+function portfolioQueryOptions(accountId?: string) {
 	return apiQueryClient.queryOptions(
 		"get",
 		"/api/v1/brokerage-accounts/{accountId}/portfolio",
@@ -16,7 +16,7 @@ function portfolioQueryOptions(accountId: string | undefined) {
 	);
 }
 
-function usePortfolio(accountId: string | undefined) {
+function usePortfolio(accountId?: string) {
 	return useResourceQuery({
 		meta: { accessGroup: "brokerage" },
 		...portfolioQueryOptions(accountId),

src/entities/portfolio/model/display.ts

@@ -8,14 +8,22 @@ function formatShare(
 	numerator: Money | null,
 	denominator: Money | null,
 ): null | string {
-	if (!numerator || !denominator) return /* eslint-disable-line unicorn/no-null -- The existing formatter contract uses null for unavailable data. */ null;
+	if (!numerator || !denominator)
+		// eslint-disable-next-line unicorn/no-null -- The existing formatter contract uses null for unavailable data.
+		return null;
 	const total = Number(denominator.value);
-	if (!Number.isFinite(total) || total <= 0) return /* eslint-disable-line unicorn/no-null -- The existing formatter contract uses null for unavailable data. */ null;
+	if (!Number.isFinite(total) || total <= 0)
+		// eslint-disable-next-line unicorn/no-null -- The existing formatter contract uses null for unavailable data.
+		return null;
 	const percent = (Number(numerator.value) / total) * PERCENT_SCALE;
-	if (!Number.isFinite(percent)) return /* eslint-disable-line unicorn/no-null -- The existing formatter contract uses null for unavailable data. */ null;
+	if (!Number.isFinite(percent))
+		// eslint-disable-next-line unicorn/no-null -- The existing formatter contract uses null for unavailable data.
+		return null;
+
 	const rounded = new Intl.NumberFormat("ru-RU", {
 		maximumFractionDigits: 1,
 	}).format(percent);
+
 	return `${rounded} %`;
 }
 

src/entities/stock/api/queries.ts

@@ -24,6 +24,7 @@ function stockQueryOptions(uid: string) {
 		staleTime: STOCK_STALE_TIME_MS,
 	};
 }
+
 function useStock(identifier: string) {
 	const isUid
 		= /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(
@@ -34,6 +35,7 @@ function useStock(identifier: string) {
 		...stockQueryOptions(identifier),
 		enabled: Boolean(identifier) && isUid,
 	});
+
 	const byTicker = useResourceQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/stocks/by-ticker/{ticker}", {
 			params: { path: { ticker: identifier } },
@@ -41,6 +43,7 @@ function useStock(identifier: string) {
 		enabled: Boolean(identifier) && !isUid,
 		staleTime: STOCK_STALE_TIME_MS,
 	});
+
 	return isUid ? byUid : byTicker;
 }
 
@@ -63,6 +66,7 @@ function useStockCompany(uid: string) {
 		staleTime: STOCK_STALE_TIME_MS,
 	});
 }
+
 function useStockDividends(uid: string) {
 	return useResourceQuery({
 		meta: { accessGroup: "brokerage" },
@@ -73,6 +77,7 @@ function useStockDividends(uid: string) {
 		staleTime: STOCK_STALE_TIME_MS,
 	});
 }
+
 function useStockPosition(uid: string) {
 	return useResourceQuery({
 		meta: { accessGroup: "brokerage" },
@@ -83,6 +88,7 @@ function useStockPosition(uid: string) {
 		staleTime: STOCK_STALE_TIME_MS,
 	});
 }
+
 function useStockQuote(uid: string) {
 	return useResourceQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/stocks/{uid}/quote", {
@@ -92,16 +98,23 @@ function useStockQuote(uid: string) {
 		staleTime: STOCK_STALE_TIME_MS,
 	});
 }
+
 function useStocks(uids: string[]) {
 	const uniqueUids = [...new Set(uids)];
-	const queries = useAuthenticatedQueries(uniqueUids.map(uniqueUid => stockQueryOptions(uniqueUid)));
+
+	const queries = useAuthenticatedQueries(
+		uniqueUids.map(uniqueUid => stockQueryOptions(uniqueUid)),
+	);
+
 	return new Map(
 		queries.map((query, index) => [
-			/* eslint-disable-line security/detect-object-injection -- This is a positional index into the local array, not a user-supplied object key. */ uniqueUids[index],
+			// eslint-disable-next-line security/detect-object-injection -- This is a positional index into the local array, not a user-supplied object key.
+			uniqueUids[index],
 			unwrapResourceResult(query).data,
 		]),
 	);
 }
+
 function useStockSearch(query: string) {
 	return useResourceQuery({
 		...apiQueryClient.queryOptions("get", "/api/v1/stocks", {
@@ -112,7 +125,8 @@ function useStockSearch(query: string) {
 	});
 }
 
-export { MIN_STOCK_SEARCH_LENGTH,
+export {
+	MIN_STOCK_SEARCH_LENGTH,
 	type StockPeriod,
 	useStock,
 	useStockCandles,

src/entities/stock/index.ts

@@ -1,4 +1,5 @@
-export { MIN_STOCK_SEARCH_LENGTH,
+export {
+	MIN_STOCK_SEARCH_LENGTH,
 	type StockPeriod,
 	useStock,
 	useStockCandles,