fix: preserve cached data during refresh failures

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

@@ -2,17 +2,22 @@ import { MantineProvider } from "@mantine/core";
 import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { cleanup, render, screen, waitFor } from "@testing-library/react";
 import { HttpResponse, http } from "msw";
-import { MemoryRouter } from "react-router";
+import { MemoryRouter, Route, Routes } from "react-router";
 import { afterEach, describe, expect, it, vi } from "vitest";
 import type { Portfolio } from "@/entities/portfolio";
 import { server } from "@/test/server";
 import {
+	AccountPage,
 	AccountPageEmpty,
 	AccountPageError,
 	AccountPageLoaded,
 	AccountPageLoading,
 } from "./AccountPage";
 
+vi.mock("@/features/auth", () => ({
+	useAuth: () => ({ accessToken: "test-token" }),
+}));
+
 function renderPage(ui: React.ReactNode) {
 	return render(
 		<QueryClientProvider client={new QueryClient()}>
@@ -23,6 +28,20 @@ function renderPage(ui: React.ReactNode) {
 	);
 }
 
+function renderAccountRoute(queryClient: QueryClient) {
+	return render(
+		<QueryClientProvider client={queryClient}>
+			<MantineProvider>
+				<MemoryRouter initialEntries={["/accounts/account-1"]}>
+					<Routes>
+						<Route path="/accounts/:accountId" element={<AccountPage />} />
+					</Routes>
+				</MemoryRouter>
+			</MantineProvider>
+		</QueryClientProvider>,
+	);
+}
+
 const portfolio: Portfolio = {
 	lastSuccessfulAt: "2026-08-13T10:00:00Z",
 	isStale: true,
@@ -169,4 +188,68 @@ describe("AccountPage states", () => {
 		);
 		expect(screen.getByText("Вторая")).toBeInTheDocument();
 	});
+
+	it("keeps the cached portfolio visible with distinct server and refresh warnings", async () => {
+		let requestCount = 0;
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () => {
+				requestCount += 1;
+				if (requestCount === 1) return HttpResponse.json(portfolio);
+				return HttpResponse.json(
+					{ code: "TBANK_UNAVAILABLE" },
+					{ status: 503 },
+				);
+			}),
+		);
+		const queryClient = new QueryClient();
+		renderAccountRoute(queryClient);
+
+		await screen.findByText("Вторая");
+		void queryClient.invalidateQueries({
+			queryKey: ["get", "/api/v1/brokerage-accounts/{accountId}/portfolio"],
+		});
+
+		expect(
+			await screen.findByText(
+				"Не удалось обновить портфель. Показан последний полученный снимок.",
+			),
+		).toBeInTheDocument();
+		expect(
+			screen.getByText(
+				"T-Bank временно недоступен. Показан последний успешный снимок.",
+			),
+		).toBeInTheDocument();
+		expect(screen.getByText("Вторая")).toBeInTheDocument();
+		screen.getByRole("button", { name: "Повторить" }).click();
+		await waitFor(() => expect(requestCount).toBe(3));
+	});
+
+	it("keeps the cached portfolio visible during a background refresh", async () => {
+		let requestCount = 0;
+		let resolveRefresh: ((response: Response) => void) | undefined;
+		server.use(
+			http.get("*/api/v1/brokerage-accounts/:accountId/portfolio", () => {
+				requestCount += 1;
+				if (requestCount === 1) return HttpResponse.json(portfolio);
+				return new Promise<Response>((resolve) => {
+					resolveRefresh = resolve;
+				});
+			}),
+		);
+		const queryClient = new QueryClient();
+		renderAccountRoute(queryClient);
+
+		await screen.findByText("Вторая");
+		void queryClient.invalidateQueries({
+			queryKey: ["get", "/api/v1/brokerage-accounts/{accountId}/portfolio"],
+		});
+
+		await waitFor(() => expect(requestCount).toBe(2));
+		expect(screen.getByText("Вторая")).toBeInTheDocument();
+		expect(
+			screen.getByRole("status", { name: "Обновляем портфель" }),
+		).toBeInTheDocument();
+
+		resolveRefresh?.(HttpResponse.json(portfolio));
+	});
 });

src/pages/account/ui/AccountPage.tsx

@@ -16,6 +16,9 @@ export function AccountPage() {
 				account={viewModel.account}
 				accountId={viewModel.accountId}
 				accessToken={viewModel.accessToken}
+				refreshing={viewModel.refreshing}
+				refreshError={viewModel.refreshError}
+				retry={viewModel.retry}
 			/>
 		);
 	return (
@@ -24,6 +27,9 @@ export function AccountPage() {
 			accountId={viewModel.accountId}
 			accessToken={viewModel.accessToken}
 			portfolio={viewModel.portfolio}
+			refreshing={viewModel.refreshing}
+			refreshError={viewModel.refreshError}
+			retry={viewModel.retry}
 		/>
 	);
 }

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

@@ -3,6 +3,7 @@ import {
 	Button,
 	Card,
 	Group,
+	Loader,
 	Paper,
 	SimpleGrid,
 	Stack,
@@ -93,15 +94,26 @@ export function AccountPageEmpty({
 	account,
 	accountId,
 	accessToken = null,
+	refreshing = false,
+	refreshError = false,
+	retry,
 }: {
 	account?: BrokerageAccount;
 	accountId?: string;
 	accessToken?: string | null;
+	refreshing?: boolean;
+	refreshError?: boolean;
+	retry?: () => void;
 }) {
 	const { t } = useTranslation();
 	return (
 		<Stack>
 			<AccountHeading account={account} />
+			<PortfolioRefreshState
+				refreshing={refreshing}
+				refreshError={refreshError}
+				retry={retry}
+			/>
 			<StateView
 				title={t("portfolio.emptyTitle")}
 				text={t("portfolio.emptyText")}
@@ -116,11 +128,17 @@ export function AccountPageLoaded({
 	accountId,
 	accessToken,
 	portfolio,
+	refreshing = false,
+	refreshError = false,
+	retry,
 }: {
 	account?: BrokerageAccount;
 	accountId?: string;
 	accessToken?: string | null;
 	portfolio: Portfolio;
+	refreshing?: boolean;
+	refreshError?: boolean;
+	retry?: () => void;
 }) {
 	const { t } = useTranslation();
 	const stocks = portfolio.positions.filter((p) => p.type === "STOCK");
@@ -140,6 +158,11 @@ export function AccountPageLoaded({
 	return (
 		<Stack className={classes.page} gap="lg">
 			<AccountHeading account={account} />
+			<PortfolioRefreshState
+				refreshing={refreshing}
+				refreshError={refreshError}
+				retry={retry}
+			/>
 			{portfolio.isStale ? (
 				<Alert color="blue">{t("portfolio.staleWarning")}</Alert>
 			) : null}
@@ -197,6 +220,40 @@ export function AccountPageLoaded({
 		</Stack>
 	);
 }
+function PortfolioRefreshState({
+	refreshing,
+	refreshError,
+	retry,
+}: {
+	refreshing: boolean;
+	refreshError: boolean;
+	retry?: () => void;
+}) {
+	const { t } = useTranslation();
+	if (!refreshing && !refreshError) return null;
+	return (
+		<>
+			{refreshing ? (
+				<Group gap="xs" role="status" aria-label={t("portfolio.refreshing")}>
+					<Loader size="sm" />
+					<Text c="dimmed" size="sm">
+						{t("portfolio.refreshing")}
+					</Text>
+				</Group>
+			) : null}
+			{refreshError ? (
+				<Alert color="orange">
+					<Stack gap="sm">
+						<Text>{t("portfolio.refreshError")}</Text>
+						<Button onClick={retry} variant="light">
+							{t("accounts.retry")}
+						</Button>
+					</Stack>
+				</Alert>
+			) : null}
+		</>
+	);
+}
 function RecentOperations({
 	accountId,
 	accessToken,

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

@@ -14,21 +14,34 @@ export function useAccountPageViewModel() {
 	const account = useQueryClient()
 		.getQueryData<BrokerageAccount[]>(brokerageAccountsQueryKey)
 		?.find((item) => item.id === accountId);
-	if (portfolio.isError)
-		return {
-			state: "error" as const,
-			code: portfolioErrorCode(portfolio.error),
-			retry: () => portfolio.refetch(),
-		};
-	if (portfolio.isFetching || !portfolio.data)
+	if (!portfolio.data) {
+		if (portfolio.isError)
+			return {
+				state: "error" as const,
+				code: portfolioErrorCode(portfolio.error),
+				retry: () => portfolio.refetch(),
+			};
 		return { state: "loading" as const };
+	}
+	const refresh = {
+		refreshing: portfolio.isFetching,
+		refreshError: portfolio.isError,
+		retry: () => portfolio.refetch(),
+	};
 	if (!portfolio.data.positions.length && !portfolio.data.cashBalances.length)
-		return { state: "empty" as const, account, accountId, accessToken };
+		return {
+			state: "empty" as const,
+			account,
+			accountId,
+			accessToken,
+			...refresh,
+		};
 	return {
 		state: "loaded" as const,
 		account,
 		accountId,
 		accessToken,
 		portfolio: portfolio.data,
+		...refresh,
 	};
 }

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

@@ -0,0 +1,125 @@
+import { MantineProvider } from "@mantine/core";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
+import { cleanup, render, screen, waitFor } from "@testing-library/react";
+import { HttpResponse, http } from "msw";
+import { MemoryRouter } from "react-router";
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { brokerageAccountsQueryKey } from "@/entities/brokerage-account";
+import { server } from "@/test/server";
+import { AccountsPage } from "./AccountsPage";
+
+vi.mock("@/features/auth", () => ({
+	useAuth: () => ({ accessToken: "test-token" }),
+}));
+
+const account = {
+	id: "account-1",
+	name: "Основной",
+	type: "BROKERAGE",
+	openedOn: "2026-01-01",
+} as const;
+
+function renderPage(queryClient: QueryClient) {
+	return render(
+		<QueryClientProvider client={queryClient}>
+			<MantineProvider>
+				<MemoryRouter>
+					<AccountsPage />
+				</MemoryRouter>
+			</MantineProvider>
+		</QueryClientProvider>,
+	);
+}
+
+describe("AccountsPage", () => {
+	afterEach(cleanup);
+
+	it("keeps the cached account list visible during a background refresh", async () => {
+		let requestCount = 0;
+		let resolveRefresh: ((response: Response) => void) | undefined;
+		server.use(
+			http.get("*/api/v1/brokerage-accounts", () => {
+				requestCount += 1;
+				if (requestCount === 1) return HttpResponse.json([account]);
+				return new Promise<Response>((resolve) => {
+					resolveRefresh = resolve;
+				});
+			}),
+		);
+		const queryClient = new QueryClient();
+		renderPage(queryClient);
+
+		await screen.findByText(account.name);
+		void queryClient.invalidateQueries({
+			queryKey: brokerageAccountsQueryKey,
+		});
+
+		await waitFor(() => expect(requestCount).toBe(2));
+		expect(screen.getByText(account.name)).toBeInTheDocument();
+		expect(
+			screen.getByRole("status", { name: "Обновляем данные" }),
+		).toBeInTheDocument();
+
+		resolveRefresh?.(HttpResponse.json([account]));
+	});
+
+	it("keeps the cached account list and offers retry after a refresh error", async () => {
+		let requestCount = 0;
+		server.use(
+			http.get("*/api/v1/brokerage-accounts", () => {
+				requestCount += 1;
+				if (requestCount === 1) return HttpResponse.json([account]);
+				if (requestCount === 2)
+					return HttpResponse.json(
+						{ code: "TBANK_UNAVAILABLE" },
+						{ status: 503 },
+					);
+				return HttpResponse.json([account]);
+			}),
+		);
+		const queryClient = new QueryClient();
+		renderPage(queryClient);
+
+		await screen.findByText(account.name);
+		void queryClient.invalidateQueries({
+			queryKey: brokerageAccountsQueryKey,
+		});
+
+		const warning = await screen.findByText(
+			"Не удалось обновить данные. Показаны последние полученные.",
+		);
+		expect(warning).toBeInTheDocument();
+		expect(screen.getByText(account.name)).toBeInTheDocument();
+
+		screen.getByRole("button", { name: "Повторить" }).click();
+		await waitFor(() => expect(requestCount).toBe(3));
+	});
+
+	it("keeps a cached empty account list visible after a refresh error", async () => {
+		let requestCount = 0;
+		server.use(
+			http.get("*/api/v1/brokerage-accounts", () => {
+				requestCount += 1;
+				if (requestCount === 1) return HttpResponse.json([]);
+				return HttpResponse.json(
+					{ code: "TBANK_UNAVAILABLE" },
+					{ status: 503 },
+				);
+			}),
+		);
+		const queryClient = new QueryClient();
+		renderPage(queryClient);
+
+		await screen.findByText("Нет инвестиционных счетов");
+		void queryClient.invalidateQueries({
+			queryKey: brokerageAccountsQueryKey,
+		});
+
+		expect(
+			await screen.findByText(
+				"Не удалось обновить данные. Показаны последние полученные.",
+			),
+		).toBeInTheDocument();
+		expect(screen.getByText("Нет инвестиционных счетов")).toBeInTheDocument();
+	});
+});

src/pages/accounts/ui/AccountsPage.tsx

@@ -10,8 +10,22 @@ export function AccountsPage() {
 	const viewModel = useAccountsPageViewModel();
 	if (viewModel.state === "loading") return <AccountsPageLoading />;
 	if (viewModel.state === "error") return <AccountsPageError {...viewModel} />;
-	if (viewModel.state === "empty") return <AccountsPageEmpty />;
-	return <AccountsPageLoaded accounts={viewModel.accounts} />;
+	if (viewModel.state === "empty")
+		return (
+			<AccountsPageEmpty
+				refreshing={viewModel.refreshing}
+				refreshError={viewModel.refreshError}
+				retry={viewModel.retry}
+			/>
+		);
+	return (
+		<AccountsPageLoaded
+			accounts={viewModel.accounts}
+			refreshing={viewModel.refreshing}
+			refreshError={viewModel.refreshError}
+			retry={viewModel.retry}
+		/>
+	);
 }
 
 export {

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

@@ -1,4 +1,12 @@
-import { Button, Stack, Title } from "@mantine/core";
+import {
+	Alert,
+	Button,
+	Group,
+	Loader,
+	Stack,
+	Text,
+	Title,
+} from "@mantine/core";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
 import type { BrokerageAccount } from "@/entities/brokerage-account";
@@ -71,26 +79,87 @@ export function AccountsPageError({
 	);
 }
 
-export function AccountsPageEmpty() {
+export function AccountsPageEmpty({
+	refreshing = false,
+	refreshError = false,
+	retry,
+}: {
+	refreshing?: boolean;
+	refreshError?: boolean;
+	retry?: () => void;
+}) {
 	const { t } = useTranslation();
 	return (
-		<StateView
-			title={t("accounts.emptyTitle")}
-			text={t("accounts.emptyText")}
-		/>
+		<Stack>
+			<AccountsRefreshState
+				refreshing={refreshing}
+				refreshError={refreshError}
+				retry={retry}
+			/>
+			<StateView
+				title={t("accounts.emptyTitle")}
+				text={t("accounts.emptyText")}
+			/>
+		</Stack>
 	);
 }
 
 export function AccountsPageLoaded({
 	accounts,
+	refreshing = false,
+	refreshError = false,
+	retry,
 }: {
 	accounts: BrokerageAccount[];
+	refreshing?: boolean;
+	refreshError?: boolean;
+	retry?: () => void;
 }) {
 	const { t } = useTranslation();
 	return (
 		<Stack>
 			<Title order={1}>{t("accounts.title")}</Title>
+			<AccountsRefreshState
+				refreshing={refreshing}
+				refreshError={refreshError}
+				retry={retry}
+			/>
 			<BrokerageAccountList accounts={accounts} />
 		</Stack>
 	);
 }
+
+function AccountsRefreshState({
+	refreshing,
+	refreshError,
+	retry,
+}: {
+	refreshing: boolean;
+	refreshError: boolean;
+	retry?: () => void;
+}) {
+	const { t } = useTranslation();
+	if (!refreshing && !refreshError) return null;
+	return (
+		<>
+			{refreshing ? (
+				<Group gap="xs" role="status" aria-label={t("accounts.refreshing")}>
+					<Loader size="sm" />
+					<Text c="dimmed" size="sm">
+						{t("accounts.refreshing")}
+					</Text>
+				</Group>
+			) : null}
+			{refreshError ? (
+				<Alert color="orange">
+					<Stack gap="sm">
+						<Text>{t("accounts.refreshError")}</Text>
+						<Button onClick={retry} variant="light">
+							{t("accounts.retry")}
+						</Button>
+					</Stack>
+				</Alert>
+			) : null}
+		</>
+	);
+}

src/pages/accounts/ui/AccountsPage.vm.ts

@@ -4,13 +4,27 @@ import { useAuth } from "@/features/auth";
 export function useAccountsPageViewModel() {
 	const { accessToken } = useAuth();
 	const accounts = useBrokerageAccounts(accessToken);
-	if (accounts.isFetching) return { state: "loading" as const };
-	if (accounts.isError)
+	if (!accounts.data) {
+		if (accounts.isFetching) return { state: "loading" as const };
+		if (accounts.isError)
+			return {
+				state: "error" as const,
+				code: errorCode(accounts.error),
+				retry: () => accounts.refetch(),
+			};
+	}
+	if (!accounts.data?.length)
 		return {
-			state: "error" as const,
-			code: errorCode(accounts.error),
+			state: "empty" as const,
+			refreshing: accounts.isFetching,
+			refreshError: accounts.isError,
 			retry: () => accounts.refetch(),
 		};
-	if (!accounts.data?.length) return { state: "empty" as const };
-	return { state: "loaded" as const, accounts: accounts.data };
+	return {
+		state: "loaded" as const,
+		accounts: accounts.data,
+		refreshing: accounts.isFetching,
+		refreshError: accounts.isError,
+		retry: () => accounts.refetch(),
+	};
 }