feat: replace account page accordion with tabs and show open position result (#112) #113
@@ -303,14 +303,16 @@ describe("All accounts routes", () => {
|
|||||||
"href",
|
"href",
|
||||||
`/accounts/${account.id}`,
|
`/accounts/${account.id}`,
|
||||||
);
|
);
|
||||||
for (const suffix of ["operations", "income", "events"])
|
|
||||||
expect(
|
for (const [suffix, tab] of [
|
||||||
screen
|
["operations", "Операции"],
|
||||||
.getAllByRole("link")
|
["income", "Доход"],
|
||||||
.find(
|
["events", "События"],
|
||||||
link => link.getAttribute("href") === `/accounts/all/${suffix}`,
|
]) {
|
||||||
),
|
fireEvent.click(screen.getByRole("tab", { name: tab }));
|
||||||
).toBeInTheDocument();
|
expect(screen.getByRole("link", { name: "Подробнее" }))
|
||||||
|
.toHaveAttribute("href", `/accounts/all/${suffix}`);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
it("switches accounts within operations with applied filters and a fresh cursor", async () => {
|
it("switches accounts within operations with applied filters and a fresh cursor", async () => {
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { BrokerageEventCard } from "../BrokerageEventCard";
|
|||||||
|
|
||||||
type BrokerageEventsPreviewProps = {
|
type BrokerageEventsPreviewProps = {
|
||||||
events: BrokerageEventsPreviewState;
|
events: BrokerageEventsPreviewState;
|
||||||
|
moreLabel?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type BrokerageEventsPreviewState
|
type BrokerageEventsPreviewState
|
||||||
@@ -51,7 +52,7 @@ const BrokerageEventsPreview: FC<BrokerageEventsPreviewProps> = (props) => {
|
|||||||
))}
|
))}
|
||||||
|
|
||||||
<Button component={Link} to={events.to} variant="subtle">
|
<Button component={Link} to={events.to} variant="subtle">
|
||||||
{t("events.open")}
|
{props.moreLabel ?? t("events.open")}
|
||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -2,9 +2,19 @@ import { describe, expect, it } from "vitest";
|
|||||||
|
|
||||||
import type { Portfolio } from "@/entities/portfolio";
|
import type { Portfolio } from "@/entities/portfolio";
|
||||||
|
|
||||||
import { toAccountPagePositionSections } from "./positions";
|
import {
|
||||||
|
formatPositionReturnPercent,
|
||||||
|
toAccountPagePositionSections,
|
||||||
|
toUnrealizedReturns,
|
||||||
|
} from "./positions";
|
||||||
import { portfolio, position, second } from "./positions.fixtures";
|
import { portfolio, position, second } from "./positions.fixtures";
|
||||||
|
|
||||||
|
function makePosition(
|
||||||
|
overrides: Partial<Portfolio["positions"][number]>,
|
||||||
|
): Portfolio["positions"][number] {
|
||||||
|
return { ...position, ...overrides };
|
||||||
|
}
|
||||||
|
|
||||||
function sections(positions: Portfolio["positions"]) {
|
function sections(positions: Portfolio["positions"]) {
|
||||||
return toAccountPagePositionSections({
|
return toAccountPagePositionSections({
|
||||||
...portfolio,
|
...portfolio,
|
||||||
@@ -82,6 +92,8 @@ describe("account position sections", () => {
|
|||||||
{
|
{
|
||||||
displayName: "Акция",
|
displayName: "Акция",
|
||||||
logoSrc: "https://invest-brands.cdn-tinkoff.ru/akciyax160.png",
|
logoSrc: "https://invest-brands.cdn-tinkoff.ru/akciyax160.png",
|
||||||
|
returnPercent: null,
|
||||||
|
returnPercentText: null,
|
||||||
returnText: "+10 ₽",
|
returnText: "+10 ₽",
|
||||||
returnTone: "positive",
|
returnTone: "positive",
|
||||||
shareText: "66,7 %",
|
shareText: "66,7 %",
|
||||||
@@ -95,6 +107,8 @@ describe("account position sections", () => {
|
|||||||
{
|
{
|
||||||
displayName: "Облигация",
|
displayName: "Облигация",
|
||||||
logoSrc: null,
|
logoSrc: null,
|
||||||
|
returnPercent: "-11.111111",
|
||||||
|
returnPercentText: "-11,11 %",
|
||||||
returnText: "-5 ₽",
|
returnText: "-5 ₽",
|
||||||
returnTone: "negative",
|
returnTone: "negative",
|
||||||
shareText: "33,3 %",
|
shareText: "33,3 %",
|
||||||
@@ -107,6 +121,8 @@ describe("account position sections", () => {
|
|||||||
{
|
{
|
||||||
displayName: "Фонд",
|
displayName: "Фонд",
|
||||||
logoSrc: null,
|
logoSrc: null,
|
||||||
|
returnPercent: null,
|
||||||
|
returnPercentText: null,
|
||||||
returnText: null,
|
returnText: null,
|
||||||
returnTone: undefined,
|
returnTone: undefined,
|
||||||
shareText: null,
|
shareText: null,
|
||||||
@@ -187,3 +203,109 @@ describe("account position sections", () => {
|
|||||||
expect(source).toEqual(before);
|
expect(source).toEqual(before);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("account position returns", () => {
|
||||||
|
it.each([
|
||||||
|
{
|
||||||
|
absoluteReturn: { currency: "RUB", value: "25" },
|
||||||
|
averagePurchasePrice: { currency: "RUB", value: "280" },
|
||||||
|
expected: "7.142857",
|
||||||
|
name: "gain",
|
||||||
|
quantity: "1.25",
|
||||||
|
type: "STOCK",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
absoluteReturn: { currency: "RUB", value: "-25" },
|
||||||
|
averagePurchasePrice: { currency: "RUB", value: "280" },
|
||||||
|
expected: "-7.142857",
|
||||||
|
name: "loss",
|
||||||
|
quantity: "1.25",
|
||||||
|
type: "STOCK",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
absoluteReturn: { currency: "RUB", value: "-5" },
|
||||||
|
averagePurchasePrice: { currency: "RUB", value: "45" },
|
||||||
|
expected: "-11.111111",
|
||||||
|
name: "bond without accrued interest",
|
||||||
|
quantity: "1",
|
||||||
|
type: "BOND",
|
||||||
|
},
|
||||||
|
] as const)("calculates $name from the clean purchase cost", (testCase) => {
|
||||||
|
const result = sections([makePosition({
|
||||||
|
absoluteReturn: testCase.absoluteReturn,
|
||||||
|
averagePurchasePrice: testCase.averagePurchasePrice,
|
||||||
|
quantity: testCase.quantity,
|
||||||
|
type: testCase.type,
|
||||||
|
})]);
|
||||||
|
|
||||||
|
expect(result[0]?.groups[0]?.positions[0].returnPercent)
|
||||||
|
.toBe(testCase.expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
{ name: "zero quantity", overrides: { quantity: "0" } },
|
||||||
|
{ name: "negative quantity", overrides: { quantity: "-1" } },
|
||||||
|
{ name: "missing average price", overrides: { averagePurchasePrice: null } },
|
||||||
|
{
|
||||||
|
name: "currency mismatch",
|
||||||
|
overrides: { averagePurchasePrice: { currency: "USD", value: "280" } },
|
||||||
|
},
|
||||||
|
{ name: "zero cost", overrides: { averagePurchasePrice: { currency: "RUB", value: "0" } } },
|
||||||
|
])("returns null for $name", ({ overrides }) => {
|
||||||
|
const result = sections([makePosition({
|
||||||
|
absoluteReturn: { currency: "RUB", value: "25" },
|
||||||
|
averagePurchasePrice: { currency: "RUB", value: "280" },
|
||||||
|
quantity: "1.25",
|
||||||
|
...overrides,
|
||||||
|
})]);
|
||||||
|
|
||||||
|
expect(result[0]?.groups[0]?.positions[0].returnPercent).toBeNull();
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
{ absoluteReturn: "1", expected: "0.000001" },
|
||||||
|
{ absoluteReturn: "-1", expected: "-0.000001" },
|
||||||
|
])("rounds an exact half away from zero for $absoluteReturn", (testCase) => {
|
||||||
|
const result = sections([makePosition({
|
||||||
|
absoluteReturn: { currency: "RUB", value: testCase.absoluteReturn },
|
||||||
|
averagePurchasePrice: { currency: "RUB", value: "200000000" },
|
||||||
|
quantity: "1",
|
||||||
|
})]);
|
||||||
|
|
||||||
|
expect(result[0]?.groups[0]?.positions[0].returnPercent)
|
||||||
|
.toBe(testCase.expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
{ expected: "+1.01", value: "1.005" },
|
||||||
|
{ expected: "-1.01", value: "-1.005" },
|
||||||
|
])("formats $value for display with a sign and two decimals", (testCase) => {
|
||||||
|
expect(formatPositionReturnPercent(testCase.value)).toBe(testCase.expected);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("sums complete unrealized returns by currency", () => {
|
||||||
|
const result = toUnrealizedReturns([
|
||||||
|
makePosition({ absoluteReturn: { currency: "RUB", value: "0.1" } }),
|
||||||
|
makePosition({ absoluteReturn: { currency: "RUB", value: "0.2" } }),
|
||||||
|
makePosition({ absoluteReturn: { currency: "USD", value: "-2.5" } }),
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(result).toEqual([
|
||||||
|
{ currency: "RUB", value: "0.3" },
|
||||||
|
{ currency: "USD", value: "-2.5" },
|
||||||
|
]);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("omits only currencies with incomplete returns", () => {
|
||||||
|
const result = toUnrealizedReturns([
|
||||||
|
makePosition({ absoluteReturn: { currency: "RUB", value: "10" } }),
|
||||||
|
makePosition({
|
||||||
|
absoluteReturn: null,
|
||||||
|
currentValue: { currency: "RUB", value: "100" },
|
||||||
|
}),
|
||||||
|
makePosition({ absoluteReturn: { currency: "USD", value: "2" } }),
|
||||||
|
]);
|
||||||
|
|
||||||
|
expect(result).toEqual([{ currency: "USD", value: "2" }]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -1,9 +1,11 @@
|
|||||||
import { formatShare, type Portfolio } from "@/entities/portfolio";
|
import { formatShare, type Portfolio } from "@/entities/portfolio";
|
||||||
import { formatMoney, instrumentLogoUrl } from "@/shared/lib";
|
import { formatDecimal, formatMoney, instrumentLogoUrl } from "@/shared/lib";
|
||||||
|
|
||||||
type AccountPagePosition = Portfolio["positions"][number] & {
|
type AccountPagePosition = Portfolio["positions"][number] & {
|
||||||
instrumentTo?: string;
|
instrumentTo?: string;
|
||||||
logoSrc: null | string;
|
logoSrc: null | string;
|
||||||
|
returnPercent: null | string;
|
||||||
|
returnPercentText: null | string;
|
||||||
returnText: null | string;
|
returnText: null | string;
|
||||||
returnTone?: AccountPageReturnTone;
|
returnTone?: AccountPageReturnTone;
|
||||||
shareText: null | string;
|
shareText: null | string;
|
||||||
@@ -21,10 +23,73 @@ type AccountPagePositionSection = {
|
|||||||
|
|
||||||
type AccountPageReturnTone = "negative" | "positive";
|
type AccountPageReturnTone = "negative" | "positive";
|
||||||
|
|
||||||
|
type Decimal = { scale: number; value: bigint };
|
||||||
|
|
||||||
|
type Money = NonNullable<Portfolio["positions"][number]["absoluteReturn"]>;
|
||||||
|
|
||||||
type PositionSectionKind = "bonds"
|
type PositionSectionKind = "bonds"
|
||||||
| "other"
|
| "other"
|
||||||
| "stocks";
|
| "stocks";
|
||||||
|
|
||||||
|
const RADIX = 10n;
|
||||||
|
const DECIMAL_PARTS = 2;
|
||||||
|
const PERCENT_SCALE = 6;
|
||||||
|
const DISPLAY_PERCENT_SCALE = 2;
|
||||||
|
const PERCENT_FACTOR = 100n;
|
||||||
|
const ROUNDING_FACTOR = 2n;
|
||||||
|
|
||||||
|
function decimalFromString(value: string): Decimal {
|
||||||
|
const [whole = "0", fraction = ""] = value.split(".", DECIMAL_PARTS);
|
||||||
|
|
||||||
|
return { scale: fraction.length, value: BigInt(`${whole}${fraction}`) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function decimalToString(decimal: Decimal): string {
|
||||||
|
const sign = decimal.value < 0n ? "-" : "";
|
||||||
|
|
||||||
|
const digits = (decimal.value < 0n ? -decimal.value : decimal.value)
|
||||||
|
.toString()
|
||||||
|
.padStart(decimal.scale + 1, "0");
|
||||||
|
|
||||||
|
const whole = decimal.scale
|
||||||
|
? digits.slice(0, -decimal.scale)
|
||||||
|
: digits;
|
||||||
|
|
||||||
|
let fraction = decimal.scale ? digits.slice(-decimal.scale) : "";
|
||||||
|
|
||||||
|
while (fraction.endsWith("0")) fraction = fraction.slice(0, -1);
|
||||||
|
|
||||||
|
const suffix = fraction ? `.${fraction}` : "";
|
||||||
|
|
||||||
|
return `${sign}${whole}${suffix}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatPositionReturnPercent(value: string): string {
|
||||||
|
const decimal = decimalFromString(value);
|
||||||
|
let rounded = decimal.value;
|
||||||
|
|
||||||
|
if (decimal.scale > DISPLAY_PERCENT_SCALE) {
|
||||||
|
const divisor = RADIX ** BigInt(decimal.scale - DISPLAY_PERCENT_SCALE);
|
||||||
|
const remainder = rounded % divisor;
|
||||||
|
const absoluteRemainder = remainder < 0n ? -remainder : remainder;
|
||||||
|
rounded /= divisor;
|
||||||
|
|
||||||
|
if (absoluteRemainder * ROUNDING_FACTOR >= divisor) {
|
||||||
|
rounded += decimal.value < 0n ? -1n : 1n;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
rounded *= RADIX ** BigInt(DISPLAY_PERCENT_SCALE - decimal.scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
const sign = rounded > 0n ? "+" : "";
|
||||||
|
|
||||||
|
return `${sign}${decimalToString({
|
||||||
|
scale: DISPLAY_PERCENT_SCALE,
|
||||||
|
value: rounded,
|
||||||
|
})}`;
|
||||||
|
}
|
||||||
|
|
||||||
function groupPositions(
|
function groupPositions(
|
||||||
positions: AccountPagePosition[],
|
positions: AccountPagePosition[],
|
||||||
): AccountPagePositionGroup[] {
|
): AccountPagePositionGroup[] {
|
||||||
@@ -67,6 +132,53 @@ function positionIdentity(position: AccountPagePosition) {
|
|||||||
return position.isin?.trim() ? ["isin", position.isin.trim()] : undefined;
|
return position.isin?.trim() ? ["isin", position.isin.trim()] : undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function returnPercent(
|
||||||
|
position: Portfolio["positions"][number],
|
||||||
|
): null | string {
|
||||||
|
const result = position.absoluteReturn;
|
||||||
|
const price = position.averagePurchasePrice;
|
||||||
|
if (!result || !price || result.currency !== price.currency) return null;
|
||||||
|
|
||||||
|
const quantity = decimalFromString(position.quantity);
|
||||||
|
const purchasePrice = decimalFromString(price.value);
|
||||||
|
|
||||||
|
const cost = {
|
||||||
|
scale: quantity.scale + purchasePrice.scale,
|
||||||
|
value: quantity.value * purchasePrice.value,
|
||||||
|
};
|
||||||
|
|
||||||
|
if (quantity.value <= 0n || cost.value <= 0n) return null;
|
||||||
|
|
||||||
|
const absoluteReturn = decimalFromString(result.value);
|
||||||
|
|
||||||
|
const numerator = absoluteReturn.value * PERCENT_FACTOR
|
||||||
|
* RADIX ** BigInt(cost.scale + PERCENT_SCALE);
|
||||||
|
|
||||||
|
const denominator = cost.value * RADIX ** BigInt(absoluteReturn.scale);
|
||||||
|
const remainder = numerator % denominator;
|
||||||
|
|
||||||
|
const isRoundsUp = (remainder < 0n ? -remainder : remainder) * ROUNDING_FACTOR
|
||||||
|
>= denominator;
|
||||||
|
|
||||||
|
const rounding = isRoundsUp ? 1n : 0n;
|
||||||
|
const signedRounding = numerator < 0n ? -rounding : rounding;
|
||||||
|
const rounded = numerator / denominator + signedRounding;
|
||||||
|
|
||||||
|
return decimalToString({ scale: PERCENT_SCALE, value: rounded });
|
||||||
|
}
|
||||||
|
|
||||||
|
function sumDecimals(values: Decimal[]): Decimal {
|
||||||
|
const scale = Math.max(...values.map(value => value.scale));
|
||||||
|
|
||||||
|
const sum = values.reduce(
|
||||||
|
(total, value) => total
|
||||||
|
+ value.value * RADIX ** BigInt(scale - value.scale),
|
||||||
|
0n,
|
||||||
|
);
|
||||||
|
|
||||||
|
return { scale, value: sum };
|
||||||
|
}
|
||||||
|
|
||||||
function toAccountPagePositionSections(
|
function toAccountPagePositionSections(
|
||||||
portfolio: Portfolio,
|
portfolio: Portfolio,
|
||||||
): AccountPagePositionSection[] {
|
): AccountPagePositionSection[] {
|
||||||
@@ -111,6 +223,8 @@ function toPosition(
|
|||||||
const returnPrefix
|
const returnPrefix
|
||||||
= isExpanded && returnValue !== null && returnValue > 0 ? "+" : "";
|
= isExpanded && returnValue !== null && returnValue > 0 ? "+" : "";
|
||||||
|
|
||||||
|
const percent = returnPercent(position);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
...position,
|
...position,
|
||||||
instrumentTo:
|
instrumentTo:
|
||||||
@@ -120,6 +234,10 @@ function toPosition(
|
|||||||
logoSrc: isExpanded
|
logoSrc: isExpanded
|
||||||
? instrumentLogoUrl(position.logoName)
|
? instrumentLogoUrl(position.logoName)
|
||||||
: null,
|
: null,
|
||||||
|
returnPercent: percent,
|
||||||
|
returnPercentText: percent
|
||||||
|
? `${formatDecimal(formatPositionReturnPercent(percent))} %`
|
||||||
|
: null,
|
||||||
returnText: position.absoluteReturn
|
returnText: position.absoluteReturn
|
||||||
? `${returnPrefix}${formatMoney(position.absoluteReturn)}`
|
? `${returnPrefix}${formatMoney(position.absoluteReturn)}`
|
||||||
: null,
|
: null,
|
||||||
@@ -162,9 +280,46 @@ function toSection(
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function toUnrealizedReturns(
|
||||||
|
positions: Portfolio["positions"],
|
||||||
|
): Money[] {
|
||||||
|
const totals = new Map<string, {
|
||||||
|
complete: boolean;
|
||||||
|
values: Decimal[];
|
||||||
|
}>();
|
||||||
|
|
||||||
|
for (const position of positions) {
|
||||||
|
const currencies = position.absoluteReturn
|
||||||
|
? [position.absoluteReturn.currency]
|
||||||
|
: [...new Set([
|
||||||
|
position.averagePurchasePrice?.currency,
|
||||||
|
position.currentValue?.currency,
|
||||||
|
].filter((currency): currency is string => !!currency))];
|
||||||
|
|
||||||
|
for (const currency of currencies) {
|
||||||
|
const total = totals.get(currency) ?? { complete: true, values: [] };
|
||||||
|
|
||||||
|
if (position.absoluteReturn) {
|
||||||
|
total.values.push(decimalFromString(position.absoluteReturn.value));
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
total.complete = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
totals.set(currency, total);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [...totals].flatMap(([currency, total]) => total.complete
|
||||||
|
? [{ currency, value: decimalToString(sumDecimals(total.values)) }]
|
||||||
|
: []);
|
||||||
|
}
|
||||||
|
|
||||||
export {
|
export {
|
||||||
type AccountPagePosition,
|
type AccountPagePosition,
|
||||||
type AccountPagePositionGroup,
|
type AccountPagePositionGroup,
|
||||||
type AccountPagePositionSection,
|
type AccountPagePositionSection,
|
||||||
|
formatPositionReturnPercent,
|
||||||
toAccountPagePositionSections,
|
toAccountPagePositionSections,
|
||||||
|
toUnrealizedReturns,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -98,21 +98,13 @@
|
|||||||
font-family: var(--mantine-font-family-monospace);
|
font-family: var(--mantine-font-family-monospace);
|
||||||
}
|
}
|
||||||
|
|
||||||
.accordionControl {
|
.tabsList {
|
||||||
transition:
|
flex-wrap: nowrap;
|
||||||
background-color 150ms ease,
|
overflow-x: auto;
|
||||||
color 150ms ease;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.accordionLabel {
|
.positionFilter {
|
||||||
font-size: var(--mantine-h2-font-size);
|
overflow-x: auto;
|
||||||
font-weight: var(--mantine-h2-font-weight);
|
|
||||||
line-height: var(--mantine-h2-line-height);
|
|
||||||
}
|
|
||||||
|
|
||||||
.accordionPanel {
|
|
||||||
padding-left: 0;
|
|
||||||
padding-right: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.accountPositions {
|
.accountPositions {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { MantineProvider } from "@mantine/core";
|
import { MantineProvider } from "@mantine/core";
|
||||||
import { type QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
import { type QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
||||||
import {
|
import {
|
||||||
|
fireEvent,
|
||||||
render,
|
render,
|
||||||
screen,
|
screen,
|
||||||
waitFor,
|
waitFor,
|
||||||
@@ -23,7 +24,10 @@ import type {
|
|||||||
AccountPageRecentOperations,
|
AccountPageRecentOperations,
|
||||||
} from "../../model/previews";
|
} from "../../model/previews";
|
||||||
|
|
||||||
import { toAccountPagePositionSections } from "../../model/positions";
|
import {
|
||||||
|
toAccountPagePositionSections,
|
||||||
|
toUnrealizedReturns,
|
||||||
|
} from "../../model/positions";
|
||||||
import { AccountPage } from "./AccountPage";
|
import { AccountPage } from "./AccountPage";
|
||||||
import { AccountPageEmpty } from "./components/AccountPageEmpty.view";
|
import { AccountPageEmpty } from "./components/AccountPageEmpty.view";
|
||||||
import { AccountPageError } from "./components/AccountPageError.view";
|
import { AccountPageError } from "./components/AccountPageError.view";
|
||||||
@@ -142,6 +146,7 @@ function loadedProps(nextPortfolio: Portfolio = portfolio) {
|
|||||||
positionSections: toAccountPagePositionSections(nextPortfolio),
|
positionSections: toAccountPagePositionSections(nextPortfolio),
|
||||||
recentEvents: emptyRecentEvents,
|
recentEvents: emptyRecentEvents,
|
||||||
recentOperations: emptyRecentOperations,
|
recentOperations: emptyRecentOperations,
|
||||||
|
unrealizedReturns: toUnrealizedReturns(nextPortfolio.positions),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -246,7 +251,7 @@ describe("AccountPage states", () => {
|
|||||||
).toHaveTextContent("Данные о структуре портфеля пока недоступны.");
|
).toHaveTextContent("Данные о структуре портфеля пока недоступны.");
|
||||||
expect(
|
expect(
|
||||||
screen.getAllByRole("definition").map(node => node.textContent),
|
screen.getAllByRole("definition").map(node => node.textContent),
|
||||||
).toEqual(["1 234,5 ₽", "0,5 $"]);
|
).toEqual(["1 234,5 ₽"]);
|
||||||
});
|
});
|
||||||
it("keeps initial placeholders decorative without amounts or focus targets", () => {
|
it("keeps initial placeholders decorative without amounts or focus targets", () => {
|
||||||
const { container } = renderPage(<AccountPageLoading />);
|
const { container } = renderPage(<AccountPageLoading />);
|
||||||
@@ -309,8 +314,10 @@ describe("AccountPage states", () => {
|
|||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
|
||||||
|
|
||||||
const balances = within(
|
const balances = within(
|
||||||
screen.getByRole("region", { name: "Денежные остатки" }),
|
screen.getByRole("tabpanel", { name: "Деньги" }),
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
@@ -318,7 +325,12 @@ describe("AccountPage states", () => {
|
|||||||
).toEqual(["234,500000000000000001 ₽", "-0,5 $", "3,00 XYZ"]);
|
).toEqual(["234,500000000000000001 ₽", "-0,5 $", "3,00 XYZ"]);
|
||||||
expect(
|
expect(
|
||||||
screen.getAllByRole("definition").map(node => node.textContent),
|
screen.getAllByRole("definition").map(node => node.textContent),
|
||||||
).toEqual(["1 234,5 ₽", "234,500000000000000001 ₽", "-0,5 $", "3,00 XYZ"]);
|
).toEqual([
|
||||||
|
"1 234,5 ₽",
|
||||||
|
"234,500000000000000001 ₽",
|
||||||
|
"-0,5 $",
|
||||||
|
"3,00 XYZ",
|
||||||
|
]);
|
||||||
expect(screen.queryByText("Торгуемая валюта")).not.toBeInTheDocument();
|
expect(screen.queryByText("Торгуемая валюта")).not.toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
screen.queryByText(/полная оценка|общая стоимость/i),
|
screen.queryByText(/полная оценка|общая стоимость/i),
|
||||||
@@ -341,6 +353,7 @@ describe("AccountPage states", () => {
|
|||||||
);
|
);
|
||||||
renderAccountRoute(createTestQueryClient());
|
renderAccountRoute(createTestQueryClient());
|
||||||
await screen.findByRole("heading", { level: 1, name: "Портфель" });
|
await screen.findByRole("heading", { level: 1, name: "Портфель" });
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
|
||||||
expect(screen.getByRole("definition")).toHaveTextContent("0,5 $");
|
expect(screen.getByRole("definition")).toHaveTextContent("0,5 $");
|
||||||
expect(screen.queryByText("Портфель пока пуст")).not.toBeInTheDocument();
|
expect(screen.queryByText("Портфель пока пуст")).not.toBeInTheDocument();
|
||||||
},
|
},
|
||||||
@@ -381,9 +394,10 @@ describe("AccountPage states", () => {
|
|||||||
).not.toBeInTheDocument();
|
).not.toBeInTheDocument();
|
||||||
expect(screen.queryByText("Торгуемая валюта")).not.toBeInTheDocument();
|
expect(screen.queryByText("Торгуемая валюта")).not.toBeInTheDocument();
|
||||||
expect(screen.queryByText("Портфель пока пуст")).not.toBeInTheDocument();
|
expect(screen.queryByText("Портфель пока пуст")).not.toBeInTheDocument();
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
|
||||||
expect(
|
expect(
|
||||||
within(
|
within(
|
||||||
screen.getByRole("region", { name: "Денежные остатки" }),
|
screen.getByRole("tabpanel", { name: "Деньги" }),
|
||||||
).queryByRole("definition"),
|
).queryByRole("definition"),
|
||||||
).not.toBeInTheDocument();
|
).not.toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
@@ -395,11 +409,25 @@ describe("AccountPage states", () => {
|
|||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
it("renders the empty state", () => {
|
it("renders the empty state with self-descriptive preview links", () => {
|
||||||
renderPage(<AccountPageEmpty {...emptyProps()} />);
|
renderPage(
|
||||||
|
<AccountPageEmpty
|
||||||
|
{...emptyProps()}
|
||||||
|
incomeSummary={{
|
||||||
|
state: "empty",
|
||||||
|
to: "/accounts/account-1/income",
|
||||||
|
}}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
expect(
|
expect(
|
||||||
screen.getByRole("heading", { name: "Портфель пока пуст" }),
|
screen.getByRole("heading", { name: "Портфель пока пуст" }),
|
||||||
).toBeInTheDocument();
|
).toBeInTheDocument();
|
||||||
|
expect(screen.getByRole("link", { name: "Открыть журнал" }))
|
||||||
|
.toBeInTheDocument();
|
||||||
|
expect(screen.getByRole("link", { name: "Открыть будущие события" }))
|
||||||
|
.toBeInTheDocument();
|
||||||
|
expect(screen.getByRole("link", { name: "Открыть пассивный доход" }))
|
||||||
|
.toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
it("keeps a null portfolio envelope loading instead of an empty portfolio", async () => {
|
it("keeps a null portfolio envelope loading instead of an empty portfolio", async () => {
|
||||||
@@ -455,18 +483,22 @@ describe("AccountPage states", () => {
|
|||||||
expect(screen.queryByText(/T-Bank временно недоступен/))
|
expect(screen.queryByText(/T-Bank временно недоступен/))
|
||||||
.not.toBeInTheDocument();
|
.not.toBeInTheDocument();
|
||||||
expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
|
expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
|
||||||
expect(screen.getByRole("button", { name: "Акции" })).toBeInTheDocument();
|
expect(screen.getByRole("radio", { name: "Акции" })).toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
screen.getByRole("button", { name: "Облигации" }),
|
screen.getByRole("radio", { name: "Облигации" }),
|
||||||
).toBeInTheDocument();
|
).toBeInTheDocument();
|
||||||
|
|
||||||
const positions = screen
|
expect(
|
||||||
.getAllByText(/Вторая|Первая/)
|
screen.getAllByRole<HTMLInputElement>("radio").map(radio => radio.value),
|
||||||
.map(element => element.textContent);
|
).toEqual(["stocks", "bonds"]);
|
||||||
|
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||||
expect(positions).toEqual(["Вторая", "Первая"]);
|
|
||||||
expect(screen.getByText("10 ₽")).toBeInTheDocument();
|
|
||||||
expect(screen.getByText("-1 ₽")).toBeInTheDocument();
|
expect(screen.getByText("-1 ₽")).toBeInTheDocument();
|
||||||
|
expect(screen.getByRole("img", { name: "Вторая" })).toHaveAttribute(
|
||||||
|
"src",
|
||||||
|
"https://invest-brands.cdn-tinkoff.ru/vtorayax160.png",
|
||||||
|
);
|
||||||
|
fireEvent.click(screen.getByRole("radio", { name: "Облигации" }));
|
||||||
|
expect(screen.getByText("10 ₽")).toBeInTheDocument();
|
||||||
expect(screen.queryByText(/Доход:/)).not.toBeInTheDocument();
|
expect(screen.queryByText(/Доход:/)).not.toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
screen.getByText("Средняя цена: 11 ₽ · Доля: 100 %"),
|
screen.getByText("Средняя цена: 11 ₽ · Доля: 100 %"),
|
||||||
@@ -475,10 +507,6 @@ describe("AccountPage states", () => {
|
|||||||
screen.getByText("Количество: 1 · RU000A0JX0J2"),
|
screen.getByText("Количество: 1 · RU000A0JX0J2"),
|
||||||
).toBeInTheDocument();
|
).toBeInTheDocument();
|
||||||
expect(screen.queryByText("—")).not.toBeInTheDocument();
|
expect(screen.queryByText("—")).not.toBeInTheDocument();
|
||||||
expect(screen.getByRole("img", { name: "Вторая" })).toHaveAttribute(
|
|
||||||
"src",
|
|
||||||
"https://invest-brands.cdn-tinkoff.ru/vtorayax160.png",
|
|
||||||
);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
it.each(["STOCK", "BOND"] as const)(
|
it.each(["STOCK", "BOND"] as const)(
|
||||||
@@ -515,8 +543,11 @@ describe("AccountPage states", () => {
|
|||||||
expect(screen.getByText("Б")).toBeInTheDocument();
|
expect(screen.getByText("Б")).toBeInTheDocument();
|
||||||
expect(screen.getByText("Н")).toBeInTheDocument();
|
expect(screen.getByText("Н")).toBeInTheDocument();
|
||||||
expect(screen.getAllByRole("img")).toHaveLength(1);
|
expect(screen.getAllByRole("img")).toHaveLength(1);
|
||||||
for (const value of ["+3 ₽", "+2 ₽", "0 ₽"])
|
|
||||||
|
for (const value of ["+3 ₽", "+2 ₽", "0 ₽"]) {
|
||||||
expect(screen.getByText(value)).toBeInTheDocument();
|
expect(screen.getByText(value)).toBeInTheDocument();
|
||||||
|
}
|
||||||
|
|
||||||
expect(screen.queryByText(/Доход:/)).not.toBeInTheDocument();
|
expect(screen.queryByText(/Доход:/)).not.toBeInTheDocument();
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@@ -564,6 +595,7 @@ describe("AccountPage states", () => {
|
|||||||
expect(screen.queryByText("STOCK-ISIN")).not.toBeInTheDocument();
|
expect(screen.queryByText("STOCK-ISIN")).not.toBeInTheDocument();
|
||||||
expect(screen.getByText("Количество: 2 · FALLBACK-ISIN"))
|
expect(screen.getByText("Количество: 2 · FALLBACK-ISIN"))
|
||||||
.toBeInTheDocument();
|
.toBeInTheDocument();
|
||||||
|
fireEvent.click(screen.getByRole("radio", { name: "Облигации" }));
|
||||||
expect(screen.getByText("Количество: 3 · BOND-ISIN"))
|
expect(screen.getByText("Количество: 3 · BOND-ISIN"))
|
||||||
.toBeInTheDocument();
|
.toBeInTheDocument();
|
||||||
expect(screen.queryByText("OFZ")).not.toBeInTheDocument();
|
expect(screen.queryByText("OFZ")).not.toBeInTheDocument();
|
||||||
@@ -617,9 +649,11 @@ describe("AccountPage states", () => {
|
|||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
|
||||||
expect(
|
expect(
|
||||||
screen.getByText("Пока недоступно"),
|
screen.getByText("Пока недоступно"),
|
||||||
).toBeInTheDocument();
|
).toBeInTheDocument();
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Позиции" }));
|
||||||
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -654,6 +688,7 @@ describe("AccountPage states", () => {
|
|||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
|
||||||
expect(screen.getByText("Сделка")).toBeInTheDocument();
|
expect(screen.getByText("Сделка")).toBeInTheDocument();
|
||||||
expect(screen.getByText("−12 ₽")).toBeInTheDocument();
|
expect(screen.getByText("−12 ₽")).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
@@ -707,7 +742,8 @@ describe("AccountPage states", () => {
|
|||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
|
||||||
const section = screen.getByRole("region", { name: "Будущие события" });
|
fireEvent.click(screen.getByRole("tab", { name: "События" }));
|
||||||
|
const section = screen.getByRole("tabpanel", { name: "События" });
|
||||||
const content = within(section);
|
const content = within(section);
|
||||||
const text = section.textContent ?? "";
|
const text = section.textContent ?? "";
|
||||||
|
|
||||||
@@ -734,7 +770,7 @@ describe("AccountPage states", () => {
|
|||||||
expect(content.queryByText("Без движения денег")).not.toBeInTheDocument();
|
expect(content.queryByText("Без движения денег")).not.toBeInTheDocument();
|
||||||
expect(content.queryByText(/^\+/)).not.toBeInTheDocument();
|
expect(content.queryByText(/^\+/)).not.toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
content.getByRole("link", { name: "Открыть будущие события" }),
|
content.getByRole("link", { name: "Подробнее" }),
|
||||||
).toHaveAttribute("href", "/accounts/account-1/events");
|
).toHaveAttribute("href", "/accounts/account-1/events");
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -748,8 +784,10 @@ describe("AccountPage states", () => {
|
|||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "События" }));
|
||||||
|
|
||||||
const content = within(
|
const content = within(
|
||||||
screen.getByRole("region", { name: "Будущие события" }),
|
screen.getByRole("tabpanel", { name: "События" }),
|
||||||
);
|
);
|
||||||
|
|
||||||
if (state === "loading") {
|
if (state === "loading") {
|
||||||
@@ -770,7 +808,7 @@ describe("AccountPage states", () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
expect(
|
expect(
|
||||||
content.getByRole("link", { name: "Открыть будущие события" }),
|
content.getByRole("link", { name: "Подробнее" }),
|
||||||
).toHaveAttribute("href", "/accounts/account-1/events");
|
).toHaveAttribute("href", "/accounts/account-1/events");
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
@@ -786,9 +824,11 @@ describe("AccountPage states", () => {
|
|||||||
/>,
|
/>,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "События" }));
|
||||||
expect(
|
expect(
|
||||||
screen.getByText("Данные появятся здесь, когда чтение восстановится."),
|
screen.getByText("Данные появятся здесь, когда чтение восстановится."),
|
||||||
).toBeInTheDocument();
|
).toBeInTheDocument();
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Позиции" }));
|
||||||
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -857,7 +897,7 @@ describe("AccountPage states", () => {
|
|||||||
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
screen.getAllByRole("definition").map(node => node.textContent),
|
screen.getAllByRole("definition").map(node => node.textContent),
|
||||||
).toEqual(["1 234,5 ₽", "0,5 $"]);
|
).toEqual(["1 234,5 ₽"]);
|
||||||
expect(screen.queryByRole("button", { name: "Повторить" }))
|
expect(screen.queryByRole("button", { name: "Повторить" }))
|
||||||
.not.toBeInTheDocument();
|
.not.toBeInTheDocument();
|
||||||
void queryClient.invalidateQueries({
|
void queryClient.invalidateQueries({
|
||||||
@@ -867,7 +907,7 @@ describe("AccountPage states", () => {
|
|||||||
expect(structure).toHaveTextContent("10 ₽");
|
expect(structure).toHaveTextContent("10 ₽");
|
||||||
expect(
|
expect(
|
||||||
screen.getAllByRole("definition").map(node => node.textContent),
|
screen.getAllByRole("definition").map(node => node.textContent),
|
||||||
).toEqual(["1 234,5 ₽", "0,5 $"]);
|
).toEqual(["1 234,5 ₽"]);
|
||||||
resolveRetry?.(
|
resolveRetry?.(
|
||||||
HttpResponse.json(
|
HttpResponse.json(
|
||||||
resource(
|
resource(
|
||||||
@@ -886,7 +926,7 @@ describe("AccountPage states", () => {
|
|||||||
await waitFor(() =>
|
await waitFor(() =>
|
||||||
expect(
|
expect(
|
||||||
screen.getAllByRole("definition").map(node => node.textContent),
|
screen.getAllByRole("definition").map(node => node.textContent),
|
||||||
).toEqual(["-0,5 $", "2,50 €"]),
|
).toEqual(["-0,5 $"]),
|
||||||
);
|
);
|
||||||
expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
|
expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
|
||||||
expect(structure).not.toHaveTextContent("10 ₽");
|
expect(structure).not.toHaveTextContent("10 ₽");
|
||||||
@@ -928,7 +968,7 @@ describe("AccountPage states", () => {
|
|||||||
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
expect(screen.getByText("Вторая")).toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
screen.getAllByRole("definition").map(node => node.textContent),
|
screen.getAllByRole("definition").map(node => node.textContent),
|
||||||
).toEqual(["1 234,5 ₽", "0,5 $"]);
|
).toEqual(["1 234,5 ₽"]);
|
||||||
expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
|
expect(screen.queryByText(/Данные получены/)).not.toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
screen.queryByRole("status", { name: "Загрузка" }),
|
screen.queryByRole("status", { name: "Загрузка" }),
|
||||||
@@ -938,4 +978,96 @@ describe("AccountPage states", () => {
|
|||||||
|
|
||||||
resolveRefresh?.(HttpResponse.json(resource(portfolio)));
|
resolveRefresh?.(HttpResponse.json(resource(portfolio)));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("opens positions by default and switches between local tabs", () => {
|
||||||
|
renderPage(<AccountPageLoaded {...loadedProps()} />);
|
||||||
|
|
||||||
|
expect(screen.getByRole("tab", { name: "Позиции" }))
|
||||||
|
.toHaveAttribute("aria-selected", "true");
|
||||||
|
expect(screen.getByText("Вторая")).toBeVisible();
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Деньги" }));
|
||||||
|
expect(screen.getByRole("tabpanel", { name: "Деньги" }))
|
||||||
|
.toBeVisible();
|
||||||
|
expect(screen.queryByText("Вторая")).not.toBeInTheDocument();
|
||||||
|
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: "Операции" }));
|
||||||
|
expect(screen.getByText("Последних событий пока нет.")).toBeVisible();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("links operation, event and income previews to their detail pages", () => {
|
||||||
|
renderPage(
|
||||||
|
<AccountPageLoaded
|
||||||
|
{...loadedProps()}
|
||||||
|
incomeSummary={{
|
||||||
|
state: "empty",
|
||||||
|
to: "/accounts/account-1/income",
|
||||||
|
}}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
|
||||||
|
for (const [tab, href] of [
|
||||||
|
["Операции", "/accounts/account-1/operations"],
|
||||||
|
["События", "/accounts/account-1/events"],
|
||||||
|
["Доход", "/accounts/account-1/income"],
|
||||||
|
]) {
|
||||||
|
fireEvent.click(screen.getByRole("tab", { name: tab }));
|
||||||
|
expect(screen.getByRole("link", { name: "Подробнее" }))
|
||||||
|
.toHaveAttribute("href", href);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it("filters positions by the kinds present in the portfolio", () => {
|
||||||
|
renderPage(<AccountPageLoaded {...loadedProps()} />);
|
||||||
|
|
||||||
|
expect(
|
||||||
|
screen.getAllByRole<HTMLInputElement>("radio").map(radio => radio.value),
|
||||||
|
).toEqual(["stocks", "bonds"]);
|
||||||
|
expect(screen.getByText("Вторая")).toBeVisible();
|
||||||
|
expect(screen.queryByText("Первая")).not.toBeInTheDocument();
|
||||||
|
fireEvent.click(screen.getByRole("radio", { name: "Облигации" }));
|
||||||
|
expect(screen.getByText("Первая")).toBeVisible();
|
||||||
|
expect(screen.queryByText("Вторая")).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("hides the position filter when only one kind exists", () => {
|
||||||
|
renderPage(
|
||||||
|
<AccountPageLoaded
|
||||||
|
{...loadedProps({
|
||||||
|
...portfolio,
|
||||||
|
positions: [portfolio.positions[0]],
|
||||||
|
})}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.queryByRole("radiogroup", { name: "Тип позиции" }))
|
||||||
|
.not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("hides unrealized returns for a partial portfolio", () => {
|
||||||
|
renderPage(<AccountPageLoaded {...loadedProps()} partial />);
|
||||||
|
|
||||||
|
expect(screen.queryByRole("region", { name: "Нереализованный результат" }))
|
||||||
|
.not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
it("omits an unrealized currency total when any return is incomplete", () => {
|
||||||
|
renderPage(
|
||||||
|
<AccountPageLoaded
|
||||||
|
{...loadedProps({
|
||||||
|
...portfolio,
|
||||||
|
positions: [
|
||||||
|
position({ absoluteReturn: { currency: "RUB", value: "10" } }),
|
||||||
|
position({
|
||||||
|
absoluteReturn: null,
|
||||||
|
currentValue: { currency: "RUB", value: "100" },
|
||||||
|
}),
|
||||||
|
],
|
||||||
|
})}
|
||||||
|
/>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.queryByRole("region", { name: "Нереализованный результат" }))
|
||||||
|
.not.toBeInTheDocument();
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -31,6 +31,7 @@ const AccountPage: FC = () => {
|
|||||||
positionSections={viewModel.positionSections}
|
positionSections={viewModel.positionSections}
|
||||||
recentEvents={viewModel.recentEvents}
|
recentEvents={viewModel.recentEvents}
|
||||||
recentOperations={viewModel.recentOperations}
|
recentOperations={viewModel.recentOperations}
|
||||||
|
unrealizedReturns={viewModel.unrealizedReturns}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import { useInitialAvailability } from "@/shared/lib";
|
|||||||
import {
|
import {
|
||||||
type AccountPagePositionSection,
|
type AccountPagePositionSection,
|
||||||
toAccountPagePositionSections,
|
toAccountPagePositionSections,
|
||||||
|
toUnrealizedReturns,
|
||||||
} from "../../model/positions";
|
} from "../../model/positions";
|
||||||
import {
|
import {
|
||||||
type AccountPageIncomeSummary,
|
type AccountPageIncomeSummary,
|
||||||
@@ -48,6 +49,7 @@ type AccountPageLoadedViewModel = AccountPageContent & {
|
|||||||
positionSections: AccountPagePositionSection[];
|
positionSections: AccountPagePositionSection[];
|
||||||
source?: InvestmentResourceMeta;
|
source?: InvestmentResourceMeta;
|
||||||
state: "loaded";
|
state: "loaded";
|
||||||
|
unrealizedReturns: Portfolio["totalsByCurrency"];
|
||||||
};
|
};
|
||||||
|
|
||||||
type AccountPageViewModel
|
type AccountPageViewModel
|
||||||
@@ -133,6 +135,7 @@ function useAccountPageViewModel(): AccountPageViewModel {
|
|||||||
recentOperations,
|
recentOperations,
|
||||||
source: portfolio.meta,
|
source: portfolio.meta,
|
||||||
state: "loaded" as const,
|
state: "loaded" as const,
|
||||||
|
unrealizedReturns: toUnrealizedReturns(portfolio.data.positions),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,12 @@
|
|||||||
import type { FC } from "react";
|
import {
|
||||||
|
Alert,
|
||||||
import { Accordion, Alert, Stack } from "@mantine/core";
|
Group,
|
||||||
|
SegmentedControl,
|
||||||
|
Stack,
|
||||||
|
Tabs,
|
||||||
|
Text,
|
||||||
|
} from "@mantine/core";
|
||||||
|
import { type FC, useState } from "react";
|
||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
import type { BrokerageAccount } from "@/entities/brokerage-account";
|
import type { BrokerageAccount } from "@/entities/brokerage-account";
|
||||||
@@ -8,6 +14,7 @@ import type { Portfolio } from "@/entities/portfolio";
|
|||||||
import type { InvestmentResourceMeta } from "@/shared/api";
|
import type { InvestmentResourceMeta } from "@/shared/api";
|
||||||
|
|
||||||
import { BrokerageEventsPreview } from "@/entities/brokerage-event";
|
import { BrokerageEventsPreview } from "@/entities/brokerage-event";
|
||||||
|
import { formatMoney } from "@/shared/lib";
|
||||||
import { SourceSyncStatus } from "@/shared/ui";
|
import { SourceSyncStatus } from "@/shared/ui";
|
||||||
import { PortfolioStructure } from "@/widgets/portfolio-structure";
|
import { PortfolioStructure } from "@/widgets/portfolio-structure";
|
||||||
|
|
||||||
@@ -35,18 +42,27 @@ type AccountPageLoadedProps = {
|
|||||||
recentEvents: AccountPageRecentEvents;
|
recentEvents: AccountPageRecentEvents;
|
||||||
recentOperations: AccountPageRecentOperations;
|
recentOperations: AccountPageRecentOperations;
|
||||||
source?: InvestmentResourceMeta;
|
source?: InvestmentResourceMeta;
|
||||||
|
unrealizedReturns: Portfolio["totalsByCurrency"];
|
||||||
};
|
};
|
||||||
|
|
||||||
const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const [filter, setFilter] = useState<string>();
|
||||||
|
|
||||||
const defaultValue = [
|
const activeSection = props.positionSections.find(
|
||||||
...props.positionSections.map(section => section.kind),
|
section => section.kind === filter,
|
||||||
"cash",
|
) ?? props.positionSections[0];
|
||||||
"recentOperations",
|
|
||||||
"recentEvents",
|
const positionKindLabels: Record<AccountPagePositionSection["kind"], string> = {
|
||||||
"incomeSummary",
|
bonds: t("portfolio.positionKinds.bonds"),
|
||||||
];
|
other: t("portfolio.positionKinds.other"),
|
||||||
|
stocks: t("portfolio.positionKinds.stocks"),
|
||||||
|
};
|
||||||
|
|
||||||
|
const filterOptions = props.positionSections.map(section => ({
|
||||||
|
label: positionKindLabels[section.kind],
|
||||||
|
value: section.kind,
|
||||||
|
}));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack gap="lg">
|
<Stack gap="lg">
|
||||||
@@ -62,6 +78,26 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
|||||||
? <Alert role="status">{t("investment.partial")}</Alert>
|
? <Alert role="status">{t("investment.partial")}</Alert>
|
||||||
: <CurrencyCards amounts={props.portfolio.totalsByCurrency} />}
|
: <CurrencyCards amounts={props.portfolio.totalsByCurrency} />}
|
||||||
|
|
||||||
|
{!props.partial && props.unrealizedReturns.length > 0 && (
|
||||||
|
<Stack
|
||||||
|
aria-label={t("portfolio.unrealizedResult")}
|
||||||
|
component="section"
|
||||||
|
gap={4}
|
||||||
|
>
|
||||||
|
<Text fw={600}>{t("portfolio.unrealizedResult")}</Text>
|
||||||
|
|
||||||
|
<Group gap="md">
|
||||||
|
{props.unrealizedReturns.map(total => (
|
||||||
|
<Text key={total.currency}>{formatMoney(total)}</Text>
|
||||||
|
))}
|
||||||
|
</Group>
|
||||||
|
|
||||||
|
<Text c="dimmed" size="xs">
|
||||||
|
{t("portfolio.unrealizedResultCaption")}
|
||||||
|
</Text>
|
||||||
|
</Stack>
|
||||||
|
)}
|
||||||
|
|
||||||
{!props.partial && (
|
{!props.partial && (
|
||||||
<PortfolioStructure
|
<PortfolioStructure
|
||||||
key={props.accountId}
|
key={props.accountId}
|
||||||
@@ -69,70 +105,73 @@ const AccountPageLoaded: FC<AccountPageLoadedProps> = (props) => {
|
|||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
<Accordion
|
<Tabs
|
||||||
classNames={{
|
classNames={{ list: classes.tabsList }}
|
||||||
chevron: classes.accordionChevron,
|
defaultValue="positions"
|
||||||
control: classes.accordionControl,
|
keepMounted={false}
|
||||||
label: classes.accordionLabel,
|
|
||||||
panel: classes.accordionPanel,
|
|
||||||
}}
|
|
||||||
defaultValue={defaultValue}
|
|
||||||
multiple
|
|
||||||
>
|
>
|
||||||
{props.positionSections.map(section => (
|
<Tabs.List aria-label={t("portfolio.sections")} mb="md">
|
||||||
<Accordion.Item key={section.kind} value={section.kind}>
|
<Tabs.Tab value="positions">
|
||||||
<Accordion.Control>
|
{t("portfolio.tabs.positions")}
|
||||||
{t(positionSectionTitleKey(section.kind))}
|
</Tabs.Tab>
|
||||||
</Accordion.Control>
|
|
||||||
|
|
||||||
<Accordion.Panel>
|
<Tabs.Tab value="cash">{t("portfolio.tabs.cash")}</Tabs.Tab>
|
||||||
<PositionSection section={section} />
|
|
||||||
</Accordion.Panel>
|
|
||||||
</Accordion.Item>
|
|
||||||
))}
|
|
||||||
|
|
||||||
<Accordion.Item value="cash">
|
<Tabs.Tab value="operations">
|
||||||
<Accordion.Control>{t("portfolio.cashBalances")}</Accordion.Control>
|
{t("portfolio.tabs.operations")}
|
||||||
|
</Tabs.Tab>
|
||||||
|
|
||||||
<Accordion.Panel>
|
<Tabs.Tab value="events">{t("portfolio.tabs.events")}</Tabs.Tab>
|
||||||
<CurrencyCards amounts={props.portfolio.cashBalances} />
|
|
||||||
</Accordion.Panel>
|
|
||||||
</Accordion.Item>
|
|
||||||
|
|
||||||
<Accordion.Item value="recentOperations">
|
<Tabs.Tab value="income">{t("portfolio.tabs.income")}</Tabs.Tab>
|
||||||
<Accordion.Control>{t("ledger.recentTitle")}</Accordion.Control>
|
</Tabs.List>
|
||||||
|
|
||||||
<Accordion.Panel>
|
<Tabs.Panel value="positions">
|
||||||
<RecentOperations operations={props.recentOperations} />
|
<Stack gap="md">
|
||||||
</Accordion.Panel>
|
{props.positionSections.length > 1 && (
|
||||||
</Accordion.Item>
|
<div className={classes.positionFilter}>
|
||||||
|
<SegmentedControl
|
||||||
<Accordion.Item value="recentEvents">
|
aria-label={t("portfolio.positionFilter")}
|
||||||
<Accordion.Control>{t("events.recentTitle")}</Accordion.Control>
|
data={filterOptions}
|
||||||
|
onChange={setFilter}
|
||||||
<Accordion.Panel>
|
value={activeSection?.kind}
|
||||||
<BrokerageEventsPreview events={props.recentEvents} />
|
/>
|
||||||
</Accordion.Panel>
|
</div>
|
||||||
</Accordion.Item>
|
|
||||||
|
|
||||||
<Accordion.Item value="incomeSummary">
|
|
||||||
<Accordion.Control>{t("income.summaryTitle")}</Accordion.Control>
|
|
||||||
|
|
||||||
<Accordion.Panel>
|
|
||||||
{!!props.incomeSummary && (
|
|
||||||
<IncomeSummary {...props.incomeSummary} />
|
|
||||||
)}
|
)}
|
||||||
</Accordion.Panel>
|
|
||||||
</Accordion.Item>
|
{activeSection && <PositionSection section={activeSection} />}
|
||||||
</Accordion>
|
</Stack>
|
||||||
|
</Tabs.Panel>
|
||||||
|
|
||||||
|
<Tabs.Panel value="cash">
|
||||||
|
<CurrencyCards amounts={props.portfolio.cashBalances} />
|
||||||
|
</Tabs.Panel>
|
||||||
|
|
||||||
|
<Tabs.Panel value="operations">
|
||||||
|
<RecentOperations
|
||||||
|
moreLabel={t("portfolio.more")}
|
||||||
|
operations={props.recentOperations}
|
||||||
|
/>
|
||||||
|
</Tabs.Panel>
|
||||||
|
|
||||||
|
<Tabs.Panel value="events">
|
||||||
|
<BrokerageEventsPreview
|
||||||
|
events={props.recentEvents}
|
||||||
|
moreLabel={t("portfolio.more")}
|
||||||
|
/>
|
||||||
|
</Tabs.Panel>
|
||||||
|
|
||||||
|
<Tabs.Panel value="income">
|
||||||
|
{!!props.incomeSummary && (
|
||||||
|
<IncomeSummary
|
||||||
|
{...props.incomeSummary}
|
||||||
|
moreLabel={t("portfolio.more")}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</Tabs.Panel>
|
||||||
|
</Tabs>
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
function positionSectionTitleKey(kind: AccountPagePositionSection["kind"]) {
|
|
||||||
if (kind === "stocks") return "portfolio.stocks";
|
|
||||||
|
|
||||||
return kind === "bonds" ? "portfolio.bonds" : "portfolio.otherPositions";
|
|
||||||
}
|
|
||||||
|
|
||||||
export { AccountPageLoaded };
|
export { AccountPageLoaded };
|
||||||
|
|||||||
+3
-1
@@ -34,7 +34,9 @@ const AccountPageLoading: FC = () => {
|
|||||||
|
|
||||||
<Skeleton height={260} radius="sm" />
|
<Skeleton height={260} radius="sm" />
|
||||||
|
|
||||||
{["first", "second", "third"].map(placeholder => <Skeleton height={52} key={placeholder} radius="sm" />)}
|
<Skeleton height={40} radius="sm" />
|
||||||
|
|
||||||
|
<Skeleton height={220} radius="sm" />
|
||||||
</LoadingSkeleton>
|
</LoadingSkeleton>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ import type { IncomeSummary as IncomeSummaryData } from "@/entities/income";
|
|||||||
|
|
||||||
import { formatMoney } from "@/shared/lib";
|
import { formatMoney } from "@/shared/lib";
|
||||||
|
|
||||||
type IncomeSummaryProps
|
type IncomeSummaryProps = { moreLabel?: string } & (
|
||||||
= | {
|
| {
|
||||||
state: "empty";
|
state: "empty";
|
||||||
to: string;
|
to: string;
|
||||||
}
|
}
|
||||||
@@ -27,7 +27,8 @@ type IncomeSummaryProps
|
|||||||
| {
|
| {
|
||||||
state: "partial";
|
state: "partial";
|
||||||
to: string;
|
to: string;
|
||||||
};
|
}
|
||||||
|
);
|
||||||
|
|
||||||
const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
|
const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
@@ -56,7 +57,7 @@ const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
|
|||||||
<Text c="dimmed">{t("income.summaryEmpty")}</Text>
|
<Text c="dimmed">{t("income.summaryEmpty")}</Text>
|
||||||
|
|
||||||
<Button component={Link} to={props.to} variant="subtle">
|
<Button component={Link} to={props.to} variant="subtle">
|
||||||
{t("income.open")}
|
{props.moreLabel ?? t("income.open")}
|
||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
@@ -75,7 +76,7 @@ const IncomeSummary: FC<IncomeSummaryProps> = (props) => {
|
|||||||
))}
|
))}
|
||||||
|
|
||||||
<Button component={Link} to={props.to} variant="subtle">
|
<Button component={Link} to={props.to} variant="subtle">
|
||||||
{t("income.open")}
|
{props.moreLabel ?? t("income.open")}
|
||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ const syntheticPosition
|
|||||||
logoName: null,
|
logoName: null,
|
||||||
logoSrc: null,
|
logoSrc: null,
|
||||||
quantity: "100",
|
quantity: "100",
|
||||||
|
returnPercent: "25",
|
||||||
|
returnPercentText: "+25,00 %",
|
||||||
returnText: "+5 000 ₽",
|
returnText: "+5 000 ₽",
|
||||||
returnTone: "positive",
|
returnTone: "positive",
|
||||||
shareText: "20%",
|
shareText: "20%",
|
||||||
@@ -73,6 +75,8 @@ export const BondLoss: Story
|
|||||||
"Учебные облигации для долгосрочных накоплений, выпуск 2030",
|
"Учебные облигации для долгосрочных накоплений, выпуск 2030",
|
||||||
isin: "DEMO-BOND-2030",
|
isin: "DEMO-BOND-2030",
|
||||||
quantity: "10",
|
quantity: "10",
|
||||||
|
returnPercent: "-5",
|
||||||
|
returnPercentText: "-5,00 %",
|
||||||
returnText: "−500 ₽",
|
returnText: "−500 ₽",
|
||||||
returnTone: "negative",
|
returnTone: "negative",
|
||||||
shareText: "7,6%",
|
shareText: "7,6%",
|
||||||
@@ -123,6 +127,8 @@ export const MissingValuation: Story
|
|||||||
averagePurchasePrice: null,
|
averagePurchasePrice: null,
|
||||||
currentValue: null,
|
currentValue: null,
|
||||||
displayName: "Учебная позиция без текущей оценки",
|
displayName: "Учебная позиция без текущей оценки",
|
||||||
|
returnPercent: null,
|
||||||
|
returnPercentText: null,
|
||||||
returnText: null,
|
returnText: null,
|
||||||
returnTone: undefined,
|
returnTone: undefined,
|
||||||
shareText: null,
|
shareText: null,
|
||||||
|
|||||||
@@ -6,7 +6,10 @@ import { Link } from "react-router";
|
|||||||
|
|
||||||
import { formatMoney } from "@/shared/lib";
|
import { formatMoney } from "@/shared/lib";
|
||||||
|
|
||||||
import type { AccountPagePosition, AccountPagePositionSection } from "../../../../model/positions";
|
import type {
|
||||||
|
AccountPagePosition,
|
||||||
|
AccountPagePositionSection,
|
||||||
|
} from "../../../../model/positions";
|
||||||
|
|
||||||
import classes from "../../AccountPage.module.css";
|
import classes from "../../AccountPage.module.css";
|
||||||
import { PositionLogo } from "../PositionLogo.view";
|
import { PositionLogo } from "../PositionLogo.view";
|
||||||
@@ -26,8 +29,15 @@ const PositionCard: FC<PositionCardProps> = (props) => {
|
|||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
let returnText = position.returnText;
|
let returnText = position.returnText;
|
||||||
if (returnText && !isExpanded)
|
|
||||||
|
if (returnText && position.returnPercentText) {
|
||||||
|
returnText += ` · ${position.returnPercentText}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (returnText && !isExpanded) {
|
||||||
returnText = t("portfolio.return", { value: returnText });
|
returnText = t("portfolio.return", { value: returnText });
|
||||||
|
}
|
||||||
|
|
||||||
const instrumentTo = position.instrumentTo;
|
const instrumentTo = position.instrumentTo;
|
||||||
|
|
||||||
const identifier
|
const identifier
|
||||||
|
|||||||
@@ -6,7 +6,10 @@ import { Link } from "react-router";
|
|||||||
|
|
||||||
import { formatMoney } from "@/shared/lib";
|
import { formatMoney } from "@/shared/lib";
|
||||||
|
|
||||||
import type { AccountPagePositionGroup, AccountPagePositionSection } from "../../../model/positions";
|
import type {
|
||||||
|
AccountPagePositionGroup,
|
||||||
|
AccountPagePositionSection,
|
||||||
|
} from "../../../model/positions";
|
||||||
|
|
||||||
import classes from "../AccountPage.module.css";
|
import classes from "../AccountPage.module.css";
|
||||||
import { PositionLogo } from "./PositionLogo.view";
|
import { PositionLogo } from "./PositionLogo.view";
|
||||||
@@ -60,6 +63,16 @@ const PositionGroupCard: FC<PositionGroupCardProps> = (props) => {
|
|||||||
? classes[position.returnTone]
|
? classes[position.returnTone]
|
||||||
: undefined;
|
: undefined;
|
||||||
|
|
||||||
|
const returnPercent = position.returnPercentText
|
||||||
|
? ` · ${position.returnPercentText}`
|
||||||
|
: "";
|
||||||
|
|
||||||
|
const returnValue = `${position.returnText ?? ""}${returnPercent}`;
|
||||||
|
|
||||||
|
const returnText = kind === "other"
|
||||||
|
? t("portfolio.return", { value: returnValue })
|
||||||
|
: returnValue;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Stack
|
<Stack
|
||||||
className={classes.accountPosition}
|
className={classes.accountPosition}
|
||||||
@@ -89,9 +102,7 @@ const PositionGroupCard: FC<PositionGroupCardProps> = (props) => {
|
|||||||
|
|
||||||
{!!position.returnText && (
|
{!!position.returnText && (
|
||||||
<Text className={appearanceClass} size="sm">
|
<Text className={appearanceClass} size="sm">
|
||||||
{kind === "other"
|
{returnText}
|
||||||
? t("portfolio.return", { value: position.returnText })
|
|
||||||
: position.returnText}
|
|
||||||
</Text>
|
</Text>
|
||||||
)}
|
)}
|
||||||
</Group>
|
</Group>
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import { LedgerEntryRow } from "@/entities/broker-operation";
|
|||||||
import type { AccountPageRecentOperations } from "../../../model/previews";
|
import type { AccountPageRecentOperations } from "../../../model/previews";
|
||||||
|
|
||||||
type RecentOperationsProps = {
|
type RecentOperationsProps = {
|
||||||
|
moreLabel?: string;
|
||||||
operations: AccountPageRecentOperations;
|
operations: AccountPageRecentOperations;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -44,7 +45,7 @@ const RecentOperations: FC<RecentOperationsProps> = (props) => {
|
|||||||
))}
|
))}
|
||||||
|
|
||||||
<Button component={Link} to={operations.to} variant="subtle">
|
<Button component={Link} to={operations.to} variant="subtle">
|
||||||
{t("ledger.open")}
|
{props.moreLabel ?? t("ledger.open")}
|
||||||
</Button>
|
</Button>
|
||||||
</Stack>
|
</Stack>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ describe("Positions grouped by security", () => {
|
|||||||
).toHaveAttribute("href", "/accounts/a");
|
).toHaveAttribute("href", "/accounts/a");
|
||||||
expect(within(rows[0]).getByText("Количество: 1.25")).toBeInTheDocument();
|
expect(within(rows[0]).getByText("Количество: 1.25")).toBeInTheDocument();
|
||||||
expect(within(rows[0]).getByText("375 ₽")).toBeInTheDocument();
|
expect(within(rows[0]).getByText("375 ₽")).toBeInTheDocument();
|
||||||
|
expect(within(rows[0]).getByText("+25 ₽ · +7,14 %"))
|
||||||
|
.toBeInTheDocument();
|
||||||
expect(
|
expect(
|
||||||
within(rows[0]).getByText("Средняя цена: 280 ₽"),
|
within(rows[0]).getByText("Средняя цена: 280 ₽"),
|
||||||
).toBeInTheDocument();
|
).toBeInTheDocument();
|
||||||
|
|||||||
@@ -40,6 +40,8 @@ it("keeps expanded positions vertical while other positions adapt to the viewpor
|
|||||||
logoName: null,
|
logoName: null,
|
||||||
logoSrc: null,
|
logoSrc: null,
|
||||||
quantity: "10",
|
quantity: "10",
|
||||||
|
returnPercent: null,
|
||||||
|
returnPercentText: null,
|
||||||
returnText: null,
|
returnText: null,
|
||||||
shareText: null,
|
shareText: null,
|
||||||
ticker: null,
|
ticker: null,
|
||||||
|
|||||||
@@ -420,7 +420,7 @@ const ru = {
|
|||||||
next: "Далее",
|
next: "Далее",
|
||||||
noInstrument: "Без инструмента",
|
noInstrument: "Без инструмента",
|
||||||
noMoney: "Без движения денег",
|
noMoney: "Без движения денег",
|
||||||
occurredAt: "{{date}}",
|
occurredAt: "Исполнено {{date}}",
|
||||||
open: "Открыть журнал",
|
open: "Открыть журнал",
|
||||||
operationType: {
|
operationType: {
|
||||||
buy: "Покупка",
|
buy: "Покупка",
|
||||||
@@ -482,13 +482,21 @@ const ru = {
|
|||||||
},
|
},
|
||||||
emptyText: "На счете нет позиций и доступных денежных остатков.",
|
emptyText: "На счете нет позиций и доступных денежных остатков.",
|
||||||
emptyTitle: "Портфель пока пуст",
|
emptyTitle: "Портфель пока пуст",
|
||||||
|
more: "Подробнее",
|
||||||
otherPositions: "Другие позиции",
|
otherPositions: "Другие позиции",
|
||||||
|
positionFilter: "Тип позиции",
|
||||||
|
positionKinds: {
|
||||||
|
bonds: "Облигации",
|
||||||
|
other: "Прочее",
|
||||||
|
stocks: "Акции",
|
||||||
|
},
|
||||||
positions: "Позиции",
|
positions: "Позиции",
|
||||||
quantity: "Количество: {{value}}",
|
quantity: "Количество: {{value}}",
|
||||||
refreshError:
|
refreshError:
|
||||||
"Не удалось обновить портфель. Показан последний полученный снимок.",
|
"Не удалось обновить портфель. Показан последний полученный снимок.",
|
||||||
refreshing: "Обновляем портфель",
|
refreshing: "Обновляем портфель",
|
||||||
return: "Доход: {{value}}",
|
return: "Доход: {{value}}",
|
||||||
|
sections: "Разделы счёта",
|
||||||
share: "Доля: {{value}}",
|
share: "Доля: {{value}}",
|
||||||
staleWarning:
|
staleWarning:
|
||||||
"T-Bank временно недоступен. Показан последний успешный снимок.",
|
"T-Bank временно недоступен. Показан последний успешный снимок.",
|
||||||
@@ -514,7 +522,16 @@ const ru = {
|
|||||||
unvalued: "Нет оценки",
|
unvalued: "Нет оценки",
|
||||||
unvaluedCategory: "{{category}}: без оценки — {{count}}",
|
unvaluedCategory: "{{category}}: без оценки — {{count}}",
|
||||||
},
|
},
|
||||||
|
tabs: {
|
||||||
|
cash: "Деньги",
|
||||||
|
events: "События",
|
||||||
|
income: "Доход",
|
||||||
|
operations: "Операции",
|
||||||
|
positions: "Позиции",
|
||||||
|
},
|
||||||
title: "Портфель",
|
title: "Портфель",
|
||||||
|
unrealizedResult: "Нереализованный результат",
|
||||||
|
unrealizedResultCaption: "по цене, без НКД и купонов",
|
||||||
updatedAt: "Данные получены {{date}}",
|
updatedAt: "Данные получены {{date}}",
|
||||||
},
|
},
|
||||||
routeError: {
|
routeError: {
|
||||||
|
|||||||
Reference in New Issue
Block a user