diff --git a/src/entities/brokerage-event/api/useBrokerageEvents.test.tsx b/src/entities/brokerage-event/api/useBrokerageEvents.test.tsx index edc1a46..6ba2bd3 100644 --- a/src/entities/brokerage-event/api/useBrokerageEvents.test.tsx +++ b/src/entities/brokerage-event/api/useBrokerageEvents.test.tsx @@ -41,12 +41,12 @@ describe("useBrokerageEvents", () => { { type: "dividend", date: "2026-09-01", - dateKind: "declared", - instrumentId: "figi-1", + dateKind: "registry", + figi: "figi-1", + instrumentUid: null, ticker: "SBER", displayName: "Сбер", - amount: "12.34", - currency: "RUB", + projectedAmount: { currency: "RUB", value: "12.34" }, }, ], }), @@ -62,12 +62,12 @@ describe("useBrokerageEvents", () => { { type: "dividend", date: "2026-09-01", - dateKind: "declared", - instrumentId: "figi-1", + dateKind: "registry", + figi: "figi-1", + instrumentUid: null, ticker: "SBER", displayName: "Сбер", - amount: "12.34", - currency: "RUB", + projectedAmount: { currency: "RUB", value: "12.34" }, }, ]); }); diff --git a/src/pages/account-events/ui/AccountEventsPage.test.tsx b/src/pages/account-events/ui/AccountEventsPage.test.tsx index 5147f28..49e78c6 100644 --- a/src/pages/account-events/ui/AccountEventsPage.test.tsx +++ b/src/pages/account-events/ui/AccountEventsPage.test.tsx @@ -42,24 +42,22 @@ describe("AccountEventsPage", () => { calculatedAt: "2026-08-14T00:00:00Z", events: [ { - amount: "1250", - currency: "RUB", date: "2026-08-20", dateKind: "event", displayName: "ОФЗ 26238", figi: "FIGI", instrumentUid: "UID", + projectedAmount: { currency: "RUB", value: "1250" }, ticker: "OFZ", type: "coupon", }, { - amount: null, - currency: null, date: "2026-08-25", dateKind: "event", displayName: "ОФЗ 26238", figi: "FIGI", instrumentUid: "UID", + projectedAmount: null, ticker: "OFZ", type: "offer", }, diff --git a/src/pages/account-events/ui/AccountEventsPage.tsx b/src/pages/account-events/ui/AccountEventsPage.tsx index c706703..85d597f 100644 --- a/src/pages/account-events/ui/AccountEventsPage.tsx +++ b/src/pages/account-events/ui/AccountEventsPage.tsx @@ -104,8 +104,8 @@ const AccountEventRow: FC = (props) => { - {event.amount && event.currency - ? formatMoney({ currency: event.currency, value: event.amount }) + {event.projectedAmount + ? formatMoney(event.projectedAmount) : t("events.noAmount")} diff --git a/src/pages/account/ui/AccountPage.vm.test.tsx b/src/pages/account/ui/AccountPage.vm.test.tsx index ae451c1..dba445e 100644 --- a/src/pages/account/ui/AccountPage.vm.test.tsx +++ b/src/pages/account/ui/AccountPage.vm.test.tsx @@ -119,8 +119,7 @@ function mockLoadedAccountPage() { instrumentUid: null, ticker: `BND${index}`, displayName: `Купон ${index}`, - currency: "RUB", - amount: String(index + 1), + projectedAmount: { currency: "RUB", value: String(index + 1) }, })), }), ), diff --git a/src/pages/account/ui/components/RecentEvents.view.tsx b/src/pages/account/ui/components/RecentEvents.view.tsx index 8e1cc76..f72df75 100644 --- a/src/pages/account/ui/components/RecentEvents.view.tsx +++ b/src/pages/account/ui/components/RecentEvents.view.tsx @@ -54,8 +54,8 @@ const RecentEvent: FC = (props) => { {`${t(`events.type.${event.type}`)} · ${event.displayName}`} - {event.amount && event.currency - ? formatMoney({ currency: event.currency, value: event.amount }) + {event.projectedAmount + ? formatMoney(event.projectedAmount) : t("events.noAmount")} diff --git a/src/shared/api/generated/schema.d.ts b/src/shared/api/generated/schema.d.ts index 0d01bf8..f151df3 100644 --- a/src/shared/api/generated/schema.d.ts +++ b/src/shared/api/generated/schema.d.ts @@ -274,8 +274,7 @@ export interface components { instrumentUid: string | null; ticker: string; displayName: string; - currency: string | null; - amount: string | null; + projectedAmount: components["schemas"]["MoneyDto"] | null; }; UpcomingEventsDto: { accountId: string; diff --git a/src/shared/api/spec/openapi.json b/src/shared/api/spec/openapi.json index d8e3e6d..5313661 100644 --- a/src/shared/api/spec/openapi.json +++ b/src/shared/api/spec/openapi.json @@ -1437,13 +1437,14 @@ "displayName": { "type": "string" }, - "currency": { - "type": "string", - "nullable": true - }, - "amount": { - "type": "string", - "nullable": true + "projectedAmount": { + "nullable": true, + "type": "object", + "allOf": [ + { + "$ref": "#/components/schemas/MoneyDto" + } + ] } }, "required": [ @@ -1454,8 +1455,7 @@ "instrumentUid", "ticker", "displayName", - "currency", - "amount" + "projectedAmount" ] }, "UpcomingEventsDto": {