feat(cards): refine controls and modal transitions

src/app/routes/AppRoutes.test.tsx

@@ -126,7 +126,9 @@ describe("AppRoutes", () => {
 		});
 		fireEvent.click(screen.getByRole("button", { name: "Вход" }));
 		await screen.findByRole("heading", { name: "Добавьте первую карту" });
-		expect(screen.getByLabelText("Месяц")).toHaveTextContent("August 2026");
+		expect(screen.getByLabelText("Период")).toHaveTextContent(
+			"01.08.2026 – 31.08.2026",
+		);
 		expect(document.title).toBe("Карты — WealthLedger");
 	});
 

src/entities/bank-card/index.ts

@@ -14,15 +14,16 @@ export {
 	bankDateInputValue,
 	bankDateSchema,
 	bankMoneyValue,
-	bankMonth,
 	bankToday,
 	moneyCents,
 	positiveMoneySchema,
 } from "./model/form-validation";
+export { bankPeriod } from "./model/period";
 export { BankCardFace } from "./ui/BankCardFace";
 export { BankCardForm } from "./ui/BankCardForm";
 export { BankFeedback } from "./ui/BankFeedback";
 export { BankOperationIcon } from "./ui/BankOperationIcon";
+export { BankPeriodPicker } from "./ui/BankPeriodPicker";
 export { BankSummaryView } from "./ui/BankSummary.view";
 export { CategoryManager } from "./ui/CategoryManager";
 export { useBankFormFocus } from "./ui/useBankFormFocus";

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

@@ -0,0 +1,23 @@
+import dayjs from "dayjs";
+import { z } from "zod";
+import { bankMonth } from "./form-validation";
+
+const calendarDate = z.string().date();
+function bankPeriod(params: URLSearchParams) {
+	const month = bankMonth(params.get("month"));
+	const from = params.get("from");
+	const to = params.get("to");
+	return from &&
+		to &&
+		calendarDate.safeParse(from).success &&
+		calendarDate.safeParse(to).success &&
+		from >= "0001-01-01" &&
+		from <= to
+		? { from, to }
+		: {
+				from: `${month}-01`,
+				to: dayjs(`${month}-01`).endOf("month").format("YYYY-MM-DD"),
+			};
+}
+
+export { bankPeriod };

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

@@ -39,6 +39,12 @@ function setup(value: BankCard) {
 	return close;
 }
 describe("BankCardForm", () => {
+	it("waits for the exit transition before notifying the parent", async () => {
+		const close = setup(card);
+		fireEvent.click(screen.getByRole("button", { name: "Отмена" }));
+		expect(close).not.toHaveBeenCalled();
+		await waitFor(() => expect(close).toHaveBeenCalledTimes(1));
+	});
 	it("clears optional metadata on archive while omitting protected financial fields", async () => {
 		const close = setup({ ...card, archivedAt: "2026-09-01" });
 		expect(screen.getByLabelText(/Начальный остаток/)).toHaveAttribute(

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

@@ -20,6 +20,7 @@ import { useBankFormFocus } from "./useBankFormFocus";
 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);
@@ -39,11 +40,14 @@ const BankCardForm: FC<BankCardFormProps> = (props) => {
 		},
 	});
 	const pending =
-		methods.formState.isSubmitting || (fresh.isFetching && Boolean(error));
+		!opened ||
+		methods.formState.isSubmitting ||
+		(fresh.isFetching && Boolean(error));
 	return (
 		<Modal
-			opened
+			opened={opened}
-			onClose={() => !pending && props.onClose()}
+			onExitTransitionEnd={props.onClose}
+			onClose={() => !pending && setOpened(false)}
 			title={t(props.card ? "bank.editCard" : "bank.addCard")}
 			closeButtonProps={{ "aria-label": t("bank.close"), disabled: pending }}
 			closeOnClickOutside={!pending}
@@ -82,7 +86,7 @@ const BankCardForm: FC<BankCardFormProps> = (props) => {
 									...metadata,
 									...financial,
 								});
-							props.onClose();
+							setOpened(false);
 						} catch (failure) {
 							setError(failure);
 						}
@@ -132,7 +136,7 @@ const BankCardForm: FC<BankCardFormProps> = (props) => {
 								<Button type="submit" loading={pending}>
 									{t("bank.save")}
 								</Button>
-								<Button variant="default" onClick={props.onClose}>
+								<Button variant="default" onClick={() => setOpened(false)}>
 									{t("bank.cancel")}
 								</Button>
 							</Group>

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

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

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

@@ -53,6 +53,7 @@ const CategoryFields: FC = () => {
 };
 const CategoryManager: FC<CategoryManagerProps> = (props) => {
 	useBankFormFocus();
+	const [opened, setOpened] = useState(true);
 	const { t } = useTranslation();
 	const categories = useBankCategories();
 	const mutation = useBankMutations();
@@ -83,11 +84,12 @@ const CategoryManager: FC<CategoryManagerProps> = (props) => {
 		),
 		defaultValues: { name: "" },
 	});
-	const pending = methods.formState.isSubmitting;
+	const pending = !opened || methods.formState.isSubmitting;
 	return (
 		<Modal
-			opened
+			opened={opened}
-			onClose={() => !pending && props.onClose()}
+			onExitTransitionEnd={props.onClose}
+			onClose={() => !pending && setOpened(false)}
 			title={t("bank.categories")}
 			closeOnClickOutside={!pending}
 			closeOnEscape={!pending}
@@ -205,7 +207,7 @@ const CategoryManager: FC<CategoryManagerProps> = (props) => {
 										{t("bank.cancel")}
 									</Button>
 								)}
-								<Button variant="default" onClick={props.onClose}>
+								<Button variant="default" onClick={() => setOpened(false)}>
 									{t("bank.close")}
 								</Button>
 							</Group>

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

@@ -10,53 +10,20 @@ import {
 	Text,
 	Title,
 } from "@mantine/core";
-import { DatePickerInput } from "@mantine/dates";
+import { type FC, useLayoutEffect, useRef } from "react";
-import { type FC, useLayoutEffect, useRef, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 import {
 	BankCardFace,
 	BankFeedback,
 	BankOperationIcon,
+	BankPeriodPicker,
 	BankSummaryView,
 } from "@/entities/bank-card";
 import { EntryCard, LoadingSkeleton, StateView } from "@/shared/ui";
 import classes from "./CardPage.module.css";
 import type { CardPageVm } from "./CardPage.vm";
 
-type PeriodPickerProps = {
-	period: CardPageVm["period"];
-	onChange: CardPageVm["setPeriod"];
-};
-const PeriodPicker: FC<PeriodPickerProps> = (props) => {
-	const { period, onChange } = props;
-	const { t } = useTranslation();
-	const scope = `${period.from}-${period.to}`;
-	const [draft, setDraft] = useState<{
-		scope: string;
-		value: [string | null, string | null];
-	}>();
-	const value: [string | null, string | null] =
-		draft?.scope === scope ? draft.value : [period.from, period.to];
-	return (
-		<DatePickerInput
-			type="range"
-			allowSingleDateInRange
-			label={t("bank.period")}
-			valueFormat="DD.MM.YYYY"
-			value={value}
-			onChange={(next) => {
-				setDraft({ scope, value: next });
-				onChange(next);
-			}}
-			popoverProps={{
-				returnFocus: true,
-				middlewares: { shift: { crossAxis: true } },
-			}}
-		/>
-	);
-};
-
 type CardPageViewProps = { vm: CardPageVm };
 const CardPageView: FC<CardPageViewProps> = (props) => {
 	const { vm } = props;
@@ -210,7 +177,7 @@ const CardPageView: FC<CardPageViewProps> = (props) => {
 					retry={() => void vm.cards.refetch()}
 				/>
 			)}
-			<PeriodPicker period={vm.period} onChange={vm.setPeriod} />
+			<BankPeriodPicker period={vm.period} onChange={vm.setPeriod} />
 			<BankSummaryView
 				data={vm.summary.data}
 				loading={vm.summary.isLoading}

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

@@ -1,11 +1,9 @@
-import dayjs from "dayjs";
 import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { useParams, useSearchParams } from "react-router";
-import { z } from "zod";
 import {
 	type BankOperation,
-	bankMonth,
+	bankPeriod,
 	useBankCard,
 	useBankCards,
 	useBankMutations,
@@ -15,29 +13,13 @@ import {
 import { apiErrorCode } from "@/shared/api";
 import { formatDate, formatMoney } from "@/shared/lib";
 
-const calendarDate = z.string().date();
-
 const PAGE_SIZES = ["5", "10", "20", "50", "100", "all"];
 
 function useCardPageVm() {
 	const { cardId } = useParams();
 	const [params, setParams] = useSearchParams();
 	const { t } = useTranslation();
-	const month = bankMonth(params.get("month"));
+	const period = bankPeriod(params);
-	const from = params.get("from");
-	const to = params.get("to");
-	const period =
-		from &&
-		to &&
-		calendarDate.safeParse(from).success &&
-		calendarDate.safeParse(to).success &&
-		from >= "0001-01-01" &&
-		from <= to
-			? { from, to }
-			: {
-					from: `${month}-01`,
-					to: dayjs(`${month}-01`).endOf("month").format("YYYY-MM-DD"),
-				};
 	const requestedSize = params.get("limit") ?? "10";
 	const pageSize = PAGE_SIZES.includes(requestedSize) ? requestedSize : "10";
 	const rawPage = Number(params.get("page") ?? 1);

src/pages/card/ui/DeleteOperation.tsx

@@ -13,6 +13,7 @@ import { formatDate, formatMoney } from "@/shared/lib";
 type DeleteOperationProps = { operation: BankOperation; onClose: () => void };
 const DeleteOperation: FC<DeleteOperationProps> = (props) => {
 	useBankFormFocus();
+	const [opened, setOpened] = useState(true);
 	const { t } = useTranslation();
 	const [record, setRecord] = useState(props.operation);
 	const [latest, setLatest] = useState<BankOperation>();
@@ -20,11 +21,14 @@ const DeleteOperation: FC<DeleteOperationProps> = (props) => {
 	const query = useBankOperation(record.id);
 	const { deleteOperation } = useBankMutations();
 	const pending =
-		deleteOperation.isPending || (query.isFetching && Boolean(error));
+		!opened ||
+		deleteOperation.isPending ||
+		(query.isFetching && Boolean(error));
 	return (
 		<Modal
-			opened
+			opened={opened}
-			onClose={() => !pending && props.onClose()}
+			onExitTransitionEnd={props.onClose}
+			onClose={() => !pending && setOpened(false)}
 			title={t("bank.deleteTitle")}
 			closeOnEscape={!pending}
 			closeOnClickOutside={!pending}
@@ -91,7 +95,7 @@ const DeleteOperation: FC<DeleteOperationProps> = (props) => {
 									id: record.id,
 									version: record.version,
 								});
-								props.onClose();
+								setOpened(false);
 							} catch (failure) {
 								setError(failure);
 							}
@@ -99,7 +103,11 @@ const DeleteOperation: FC<DeleteOperationProps> = (props) => {
 					>
 						{t("bank.delete")}
 					</Button>
-					<Button variant="default" disabled={pending} onClick={props.onClose}>
+					<Button
+						variant="default"
+						disabled={pending}
+						onClick={() => setOpened(false)}
+					>
 						{t("bank.cancel")}
 					</Button>
 				</Group>

src/pages/card/ui/OperationForm.tsx

@@ -47,6 +47,7 @@ type OperationFormProps = {
 };
 const OperationForm: FC<OperationFormProps> = (props) => {
 	useBankFormFocus();
+	const [opened, setOpened] = useState(true);
 	const { t } = useTranslation();
 	const [categoriesOpen, setCategoriesOpen] = useState(false);
 	const [version, setVersion] = useState(props.operation?.version ?? 1);
@@ -164,15 +165,16 @@ const OperationForm: FC<OperationFormProps> = (props) => {
 		{ page: sourcePage },
 	);
 	const source = methods.watch("cardId");
-	const pending = methods.formState.isSubmitting;
+	const pending = !opened || methods.formState.isSubmitting;
 	const options = props.cards
 		.filter((c) => !c.archivedAt)
 		.map((c) => ({ value: c.id, label: c.name }));
 	return (
 		<>
 			<Modal
-				opened
+				opened={opened}
-				onClose={() => !pending && !categoriesOpen && props.onClose()}
+				onExitTransitionEnd={props.onClose}
+				onClose={() => !pending && !categoriesOpen && setOpened(false)}
 				title={t(props.operation ? "bank.editOperation" : "bank.addOperation")}
 				closeOnEscape={!pending && !categoriesOpen}
 				closeOnClickOutside={!pending && !categoriesOpen}
@@ -217,7 +219,7 @@ const OperationForm: FC<OperationFormProps> = (props) => {
 										id: intent,
 										...body,
 									});
-								props.onClose();
+								setOpened(false);
 							} catch (failure) {
 								setError(failure);
 							}
@@ -392,7 +394,7 @@ const OperationForm: FC<OperationFormProps> = (props) => {
 									>
 										{t("bank.save")}
 									</Button>
-									<Button variant="default" onClick={props.onClose}>
+									<Button variant="default" onClick={() => setOpened(false)}>
 										{t("bank.cancel")}
 									</Button>
 								</Group>

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

@@ -42,7 +42,7 @@ function renderCards(fail = false, categoryFail = false) {
 	);
 	return render(
 		<QueryClientProvider client={createTestQueryClient()}>
-			<MantineProvider>
+			<MantineProvider env="test">
 				<MemoryRouter initialEntries={["/cards?month=2026-09"]}>
 					<CardsPage />
 				</MemoryRouter>
@@ -138,10 +138,42 @@ describe("CardsPage", () => {
 		fireEvent.click(screen.getByLabelText("Показать архив"));
 		await screen.findByText("Запасная");
 		expect(requests).toContain("?includeArchived=true");
-		expect(screen.getByLabelText("Месяц")).toHaveTextContent("September 2026");
+		expect(screen.getByLabelText("Период")).toHaveTextContent(
+			"01.09.2026 – 30.09.2026",
+		);
 		expect(screen.getByRole("link", { name: /Запасная/ })).toHaveAttribute(
 			"href",
-			"/cards/demo?month=2026-09",
+			"/cards/demo?from=2026-09-01&to=2026-09-30",
+		);
+	});
+	it("applies a completed custom period to the summary", async () => {
+		renderCards();
+		await screen.findByText("За этот период операций по расходам нет.");
+		await screen.findByRole("heading", { name: "Добавьте первую карту" });
+		const requests: string[] = [];
+		server.use(
+			http.get("*/api/v1/bank-cards/summary", ({ request }) => {
+				requests.push(new URL(request.url).search);
+				return HttpResponse.json({
+					cardId: null,
+					expenses: money("0"),
+					refunds: money("0"),
+					net: money("0"),
+					categories: [],
+				});
+			}),
+		);
+		fireEvent.click(screen.getByLabelText("Период"));
+		fireEvent.click(
+			await screen.findByRole("button", { name: "10 September 2026" }),
+		);
+		expect(requests).toHaveLength(0);
+
+		fireEvent.click(
+			await screen.findByRole("button", { name: "20 September 2026" }),
+		);
+		await waitFor(() =>
+			expect(requests.at(-1)).toBe("?from=2026-09-10&to=2026-09-20"),
 		);
 	});
 	it("shows retry after failure instead of presenting an empty list", async () => {

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

@@ -1,4 +1,5 @@
 import {
+	ActionIcon,
 	Button,
 	Group,
 	Paper,
@@ -9,13 +10,13 @@ import {
 	Text,
 	Title,
 } from "@mantine/core";
-import { MonthPickerInput } from "@mantine/dates";
 import type { FC } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 import {
 	BankCardFace,
 	BankFeedback,
+	BankPeriodPicker,
 	BankSummaryView,
 } from "@/entities/bank-card";
 import { LoadingSkeleton, StateView } from "@/shared/ui";
@@ -28,11 +29,29 @@ const CardsPageView: FC<CardsPageViewProps> = (props) => {
 	const { t } = useTranslation();
 	return (
 		<Stack gap="lg">
-			<Group justify="space-between">
+			<Group gap="sm">
 				<Title order={1}>{t("bank.title")}</Title>
-				<Button onClick={() => vm.setAdding(true)}>{t("bank.addCard")}</Button>
+				<ActionIcon
+					size="lg"
+					variant="light"
+					aria-label={t("bank.addCard")}
+					title={t("bank.addCard")}
+					onClick={() => vm.setAdding(true)}
+				>
+					<svg
+						width="20"
+						height="20"
+						viewBox="0 0 24 24"
+						fill="none"
+						stroke="currentColor"
+						strokeWidth="2"
+						strokeLinecap="round"
+						aria-hidden="true"
+					>
+						<path d="M12 5v14M5 12h14" />
+					</svg>
+				</ActionIcon>
 			</Group>
-			<Text c="dimmed">{t("bank.manualBalance")}</Text>
 			<Switch
 				label={t("bank.showArchive")}
 				checked={vm.archive}
@@ -83,14 +102,32 @@ const CardsPageView: FC<CardsPageViewProps> = (props) => {
 			{vm.cards.data && vm.cards.isFetching && (
 				<Text role="status">{t("bank.refreshing")}</Text>
 			)}
-			<MonthPickerInput
+			<Group align="flex-end" justify="space-between">
-				label={t("bank.month")}
+				<BankPeriodPicker period={vm.period} onChange={vm.setPeriod} />
-				value={`${vm.month}-01`}
+				{Boolean(vm.categories.data?.length || vm.cards.data?.length) && (
-				onChange={(value) => {
+					<Button
-					if (value) vm.setMonth(value.slice(0, 7));
+						variant="subtle"
-				}}
+						color="gray"
-				popoverProps={{ middlewares: { shift: { crossAxis: true } } }}
+						onClick={() => vm.setManagingCategories(true)}
-			/>
+						leftSection={
+							<svg
+								width="18"
+								height="18"
+								viewBox="0 0 24 24"
+								fill="none"
+								stroke="currentColor"
+								strokeWidth="1.7"
+								strokeLinejoin="round"
+								aria-hidden="true"
+							>
+								<path d="M3 3h7v7H3zM14 3h7v7h-7zM3 14h7v7H3zM14 14h7v7h-7z" />
+							</svg>
+						}
+					>
+						{t("bank.categories")}
+					</Button>
+				)}
+			</Group>
 			<BankSummaryView
 				all
 				data={vm.summary.data}
@@ -107,14 +144,6 @@ const CardsPageView: FC<CardsPageViewProps> = (props) => {
 					retry={() => void vm.categories.refetch()}
 				/>
 			)}
-			{Boolean(vm.categories.data?.length || vm.cards.data?.length) && (
-				<Button
-					variant="default"
-					onClick={() => vm.setManagingCategories(true)}
-				>
-					{t("bank.categories")}
-				</Button>
-			)}
 		</Stack>
 	);
 };

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

@@ -1,7 +1,7 @@
 import { useState } from "react";
 import { useSearchParams } from "react-router";
 import {
-	bankMonth,
+	bankPeriod,
 	useBankCards,
 	useBankCategories,
 	useBankSummary,
@@ -9,30 +9,30 @@ import {
 
 function useCardsPageVm() {
 	const [params, setParams] = useSearchParams();
-	const month = bankMonth(params.get("month"));
+	const period = bankPeriod(params);
 	const [archive, setArchive] = useState(false);
 	const categories = useBankCategories();
 	const [managingCategories, setManagingCategories] = useState(false);
 	const [adding, setAdding] = useState(false);
 	const cards = useBankCards(archive);
-	const summary = useBankSummary(month);
+	const summary = useBankSummary(period);
 	return {
 		categories,
 		managingCategories,
 		setManagingCategories,
-		month,
+		period,
 		archive,
 		setArchive,
 		adding,
 		setAdding,
 		cards,
 		summary,
-		setMonth: (value: string) => {
+		setPeriod: (value: [string | null, string | null]) => {
-			if (value) setParams({ month: bankMonth(value) });
+			if (value[0] && value[1]) setParams({ from: value[0], to: value[1] });
 		},
 		items: cards.data?.map((card) => ({
 			...card,
-			to: `/cards/${card.id}?month=${month}`,
+			to: `/cards/${card.id}?${new URLSearchParams(period)}`,
 		})),
 	};
 }

src/shared/theme/styles.css

@@ -10,3 +10,30 @@ a {
 	color: inherit;
 	text-decoration: none;
 }
+
+@media (prefers-reduced-motion: no-preference) {
+	.mantine-Modal-content {
+		animation: modal-appear 220ms ease-out;
+	}
+
+	.mantine-Modal-overlay {
+		animation: modal-backdrop-appear 220ms ease-out;
+	}
+}
+
+@keyframes modal-appear {
+	from {
+		opacity: 0;
+		transform: translateY(8px) scale(0.98);
+	}
+	to {
+		opacity: 1;
+		transform: translateY(0) scale(1);
+	}
+}
+
+@keyframes modal-backdrop-appear {
+	from {
+		opacity: 0;
+	}
+}

src/shared/theme/theme.ts

@@ -4,6 +4,7 @@ import {
 	createTheme,
 	getThemeColor,
 	type MantinePrimaryShade,
+	Modal,
 	rem,
 	rgba,
 } from "@mantine/core";
@@ -21,6 +22,20 @@ const colorRoles = mapValues(color.roles, (role) =>
 );
 
 const theme = createTheme({
+	respectReducedMotion: true,
+	components: {
+		Modal: Modal.extend({
+			defaultProps: {
+				overlayProps: { blur: 3 },
+				transitionProps: {
+					transition: "fade-down",
+					duration: 220,
+					exitDuration: 180,
+					timingFunction: "ease-out",
+				},
+			},
+		}),
+	},
 	primaryColor: color.roles.primary.color,
 	primaryShade: color.primaryShade as MantinePrimaryShade,
 	defaultRadius: radius.default,