diff --git a/apps/frontend/src/widgets/broker-dashboard/lib/dashboardVisual.ts b/apps/frontend/src/widgets/broker-dashboard/lib/dashboardVisual.ts
index 325cce5..04e31db 100644
--- a/apps/frontend/src/widgets/broker-dashboard/lib/dashboardVisual.ts
+++ b/apps/frontend/src/widgets/broker-dashboard/lib/dashboardVisual.ts
@@ -73,6 +73,10 @@ export function incomeTypeTone(label: DashboardIncomeTypeLabel): TypeTone {
}
}
+export function eventStatusTone(source: BrokerEventItem['source']): TypeTone {
+ return source === 'actual' ? 'success' : 'neutral'
+}
+
function nonEmpty(value: string | null | undefined): string | null {
return typeof value === 'string' && value.trim().length > 0 ? value.trim() : null
}
diff --git a/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardEventsCard.tsx b/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardEventsCard.tsx
index d859667..beb46c6 100644
--- a/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardEventsCard.tsx
+++ b/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardEventsCard.tsx
@@ -6,6 +6,7 @@ import { formatBrokerDate } from '@/shared/lib/formatters'
import type { DashboardDatePreset, DashboardEventType } from '../lib/dashboardFilters'
import { eventStatusLabel, eventTypeLabel } from '../lib/dashboardFormatters'
import {
+ eventStatusTone,
eventTypeTone,
formatDashboardCurrency,
instrumentDisplay,
@@ -39,7 +40,6 @@ const TH_SX = {
color: 'text.secondary',
fontWeight: 600,
fontSize: 12,
- letterSpacing: 0.2,
textTransform: 'uppercase' as const,
whiteSpace: 'nowrap' as const,
}
@@ -86,10 +86,6 @@ type BrokerDashboardEventsCardProps = {
canGoForward: boolean
}
-function eventStatusTone(event: BrokerEventItem): TypeTone {
- return event.source === 'actual' ? 'success' : 'neutral'
-}
-
function eventAmountValue(event: BrokerEventItem): number | null {
return event.source === 'actual' ? event.actualAmount : event.estimatedAmount
}
@@ -254,7 +250,7 @@ export function BrokerDashboardEventsCard({
diff --git a/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardIncomeCard.tsx b/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardIncomeCard.tsx
index 2859589..b91902d 100644
--- a/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardIncomeCard.tsx
+++ b/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardIncomeCard.tsx
@@ -34,7 +34,6 @@ const TH_SX = {
color: 'text.secondary',
fontWeight: 600,
fontSize: 12,
- letterSpacing: 0.2,
textTransform: 'uppercase' as const,
whiteSpace: 'nowrap' as const,
}
diff --git a/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardTableSkeleton.tsx b/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardTableSkeleton.tsx
index ea7d13d..42c0bd7 100644
--- a/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardTableSkeleton.tsx
+++ b/apps/frontend/src/widgets/broker-dashboard/ui/BrokerDashboardTableSkeleton.tsx
@@ -1,12 +1,11 @@
import { Skeleton } from '@moex-vibe/design-system'
import { Box } from '@mui/material'
-type ColumnWidth = number | string
+type ColumnWidth = string
type BrokerDashboardTableSkeletonProps = {
rows?: number
columns?: number
- columnWidths?: ColumnWidth[]
}
const DEFAULT_EVENT_WIDTHS: ColumnWidth[] = ['14%', '32%', '18%', '18%', '18%']
@@ -21,8 +20,7 @@ const EVENT_ROW_VARIANTS: Array<'short' | 'long' | 'full'> = [
]
const INCOME_ROW_VARIANTS: Array<'short' | 'long' | 'full'> = ['short', 'long', 'medium', 'short']
-function widthsFor(columns: number, override?: ColumnWidth[]): ColumnWidth[] {
- if (override && override.length === columns) return override
+function widthsFor(columns: number): ColumnWidth[] {
if (columns === 4) return DEFAULT_INCOME_WIDTHS
if (columns === 5) return DEFAULT_EVENT_WIDTHS
return Array.from({ length: columns }, () => '100%')
@@ -36,16 +34,15 @@ function rowVariantsFor(columns: number): Array<'short' | 'long' | 'full' | 'med
export function BrokerDashboardTableSkeleton({
rows = 5,
columns = 5,
- columnWidths,
}: BrokerDashboardTableSkeletonProps) {
- const widths = widthsFor(columns, columnWidths)
+ const widths = widthsFor(columns)
const variants = rowVariantsFor(columns)
return (
{Array.from({ length: rows }, (_, i) => (
{widths.map((width, j) => (