gloomberb 0.15.7 → 0.15.8

package/src/components/chart/composite/time-axis.ts

@@ -2,6 +2,7 @@ import type { CompositeViewportRange } from "./interactions";
 import { projectCompositeTimestamp } from "./time-scale";
 import type { CompositeChartScene } from "./types";
 import { clamp } from "../../../utils/math";
+import { timeZoneLabel, zonedWallClockMs, zonedWallClockToUtcMs } from "../../../utils/zoned-date-time";
 
 const MONTHS = [
   "Jan",
@@ -63,6 +64,43 @@ export interface CompositeTimeAxisLayout {
   ticks: CompositeTimeAxisTick[];
 }
 
+/**
+ * The clock the axis reads: wall-clock readings are timestamps whose UTC
+ * fields show the local date and time, so calendar steps and labels work the
+ * same in any zone.
+ */
+interface AxisClock {
+  wall(timestamp: number): number;
+  instant(wall: number): number;
+  label: string;
+}
+
+const UTC_CLOCK: AxisClock = { wall: (timestamp) => timestamp, instant: (wall) => wall, label: "UTC" };
+const axisClocks = new Map<string, AxisClock>();
+
+function axisClock(timeZone: string | undefined): AxisClock {
+  if (!timeZone || timeZone === "UTC") return UTC_CLOCK;
+  let clock = axisClocks.get(timeZone);
+  if (!clock) {
+    try {
+      zonedWallClockMs(0, timeZone);
+    } catch {
+      return UTC_CLOCK;
+    }
+    clock = {
+      wall: (timestamp) => zonedWallClockMs(timestamp, timeZone),
+      instant: (wall) => {
+        const date = new Date(wall);
+        return zonedWallClockToUtcMs(timeZone, date.getUTCFullYear(), date.getUTCMonth() + 1, date.getUTCDate(),
+          date.getUTCHours(), date.getUTCMinutes(), date.getUTCSeconds(), date.getUTCMilliseconds());
+      },
+      label: timeZoneLabel(timeZone),
+    };
+    axisClocks.set(timeZone, clock);
+  }
+  return clock;
+}
+
 const TIME_AXIS_INTERVALS: readonly CompositeTimeAxisInterval[] = [
   { unit: "millisecond", step: 1, approximateMs: 1 },
   { unit: "millisecond", step: 5, approximateMs: 5 },
@@ -104,9 +142,9 @@ function validTimestamp(value: number): boolean {
   return Number.isFinite(value);
 }
 
-function axisLabelWidth(interval: CompositeTimeAxisInterval, startTime: number, endTime: number): number {
-  const start = new Date(startTime);
-  const end = new Date(endTime);
+function axisLabelWidth(interval: CompositeTimeAxisInterval, startTime: number, endTime: number, clock: AxisClock): number {
+  const start = new Date(clock.wall(startTime));
+  const end = new Date(clock.wall(endTime));
   const spansDays = start.getUTCFullYear() !== end.getUTCFullYear()
     || start.getUTCMonth() !== end.getUTCMonth()
     || start.getUTCDate() !== end.getUTCDate();
@@ -134,10 +172,11 @@ function resolveTimeAxisInterval(
   startTime: number,
   endTime: number,
   width: number,
+  clock: AxisClock,
 ): CompositeTimeAxisInterval {
   const span = Math.max(endTime - startTime, 1);
   for (const interval of TIME_AXIS_INTERVALS) {
-    const labelWidth = axisLabelWidth(interval, startTime, endTime);
+    const labelWidth = axisLabelWidth(interval, startTime, endTime, clock);
     const maximumLabels = Math.max(2, Math.floor(width / (labelWidth + 2)));
     const estimatedLabels = Math.floor(span / interval.approximateMs) + 1;
     if (estimatedLabels <= maximumLabels) return interval;
@@ -185,10 +224,28 @@ function nextYearBoundary(startTime: number, step: number): number {
   return boundary;
 }
 
+/** Calendar steps between two instants, taken on the axis clock. */
 function calendarBoundaries(
   startTime: number,
   endTime: number,
   interval: CompositeTimeAxisInterval,
+  clock: AxisClock,
+): number[] {
+  const instants: number[] = [];
+  for (const wall of wallBoundaries(clock.wall(startTime), clock.wall(endTime), interval)) {
+    const instant = clock.instant(wall);
+    // A wall time skipped or repeated by a clock change lands on a neighbour.
+    if (instant > startTime && instant < endTime && instant > (instants.at(-1) ?? Number.NEGATIVE_INFINITY)) {
+      instants.push(instant);
+    }
+  }
+  return instants;
+}
+
+function wallBoundaries(
+  startTime: number,
+  endTime: number,
+  interval: CompositeTimeAxisInterval,
 ): number[] {
   let boundary: number;
   let advance: (timestamp: number) => number;
@@ -252,9 +309,11 @@ function calendarBoundaries(
 }
 
 function intervalBucketKey(
-  timestamp: number,
+  instant: number,
   interval: CompositeTimeAxisInterval,
+  clock: AxisClock,
 ): number {
+  const timestamp = clock.wall(instant);
   switch (interval.unit) {
     case "millisecond":
       return Math.floor(timestamp / interval.step);
@@ -305,7 +364,7 @@ function normalizeMarketSamples(scene: CompositeChartScene): CompositeTimeAxisSa
   ));
 }
 
-function sameUtcDay(left: number, right: number): boolean {
+function sameWallDay(left: number, right: number): boolean {
   const leftDate = new Date(left);
   const rightDate = new Date(right);
   return leftDate.getUTCFullYear() === rightDate.getUTCFullYear()
@@ -313,7 +372,7 @@ function sameUtcDay(left: number, right: number): boolean {
     && leftDate.getUTCDate() === rightDate.getUTCDate();
 }
 
-function sameUtcMonth(left: number, right: number): boolean {
+function sameWallMonth(left: number, right: number): boolean {
   const leftDate = new Date(left);
   const rightDate = new Date(right);
   return leftDate.getUTCFullYear() === rightDate.getUTCFullYear()
@@ -338,12 +397,15 @@ function calendarLabel(timestamp: number, includeYear: boolean): string {
 }
 
 function formatBoundaryLabel(
-  timestamp: number,
-  counterpart: number,
+  instant: number,
+  counterpartInstant: number,
   interval: CompositeTimeAxisInterval,
+  axis: AxisClock,
   includeTimeZone = true,
   includeBoundaryYear = true,
 ): string {
+  const timestamp = axis.wall(instant);
+  const counterpart = axis.wall(counterpartInstant);
   const date = new Date(timestamp);
   switch (interval.unit) {
     case "millisecond":
@@ -351,8 +413,8 @@ function formatBoundaryLabel(
     case "minute":
     case "hour": {
       const clock = clockLabel(timestamp, interval.unit);
-      const suffix = includeTimeZone ? " UTC" : "";
-      if (sameUtcDay(timestamp, counterpart)) return `${clock}${suffix}`;
+      const suffix = includeTimeZone ? ` ${axis.label}` : "";
+      if (sameWallDay(timestamp, counterpart)) return `${clock}${suffix}`;
       const includeYear = includeBoundaryYear
         && date.getUTCFullYear() !== new Date(counterpart).getUTCFullYear();
       return `${calendarLabel(timestamp, includeYear)} ${clock}${suffix}`;
@@ -368,10 +430,13 @@ function formatBoundaryLabel(
 }
 
 function formatInteriorLabel(
-  timestamp: number,
-  previousTimestamp: number,
+  instant: number,
+  previousInstant: number,
   interval: CompositeTimeAxisInterval,
+  axis: AxisClock,
 ): string {
+  const timestamp = axis.wall(instant);
+  const previousTimestamp = axis.wall(previousInstant);
   const date = new Date(timestamp);
   const previous = new Date(previousTimestamp);
   switch (interval.unit) {
@@ -380,7 +445,7 @@ function formatInteriorLabel(
     case "minute":
     case "hour": {
       const clock = clockLabel(timestamp, interval.unit);
-      if (sameUtcDay(timestamp, previousTimestamp)) return clock;
+      if (sameWallDay(timestamp, previousTimestamp)) return clock;
       return `${calendarLabel(
         timestamp,
         date.getUTCFullYear() !== previous.getUTCFullYear(),
@@ -388,7 +453,7 @@ function formatInteriorLabel(
     }
     case "day":
     case "week":
-      if (sameUtcMonth(timestamp, previousTimestamp)) return `${date.getUTCDate()}`;
+      if (sameWallMonth(timestamp, previousTimestamp)) return `${date.getUTCDate()}`;
       return calendarLabel(
         timestamp,
         date.getUTCFullYear() !== previous.getUTCFullYear(),
@@ -433,10 +498,13 @@ function layoutTimeAxis({
   width,
   samples,
   timeRatio,
+  timeZone,
 }: {
   startTime: number;
   endTime: number;
   width: number;
+  /** IANA zone the labels read in; UTC when absent. */
+  timeZone?: string;
   samples?: readonly CompositeTimeAxisSample[];
   /**
    * Where a timestamp lands across the plot. Defaults to the viewport filling
@@ -451,7 +519,8 @@ function layoutTimeAxis({
     return { text: axis.join(""), ticks: [] };
   }
 
-  const interval = resolveTimeAxisInterval(startTime, endTime, axisWidth);
+  const clock = axisClock(timeZone);
+  const interval = resolveTimeAxisInterval(startTime, endTime, axisWidth, clock);
   const span = Math.max(endTime - startTime, 1);
   const ratioAt = (timestamp: number) => {
     const projected = timeRatio?.(timestamp);
@@ -469,14 +538,14 @@ function layoutTimeAxis({
     ratio: 0,
     boundary: true,
   }];
-  const firstBucket = intervalBucketKey(firstTimestamp, interval);
+  const firstBucket = intervalBucketKey(firstTimestamp, interval, clock);
 
-  for (const boundary of calendarBoundaries(startTime, endTime, interval)) {
+  for (const boundary of calendarBoundaries(startTime, endTime, interval, clock)) {
     if (marketSamples) {
       const sample = marketSamples[lowerBoundSample(marketSamples, boundary)];
       if (
         sample
-        && intervalBucketKey(sample.timestamp, interval) !== firstBucket
+        && intervalBucketKey(sample.timestamp, interval, clock) !== firstBucket
         && sample.timestamp < lastTimestamp
         && sample.ratio < 1
       ) {
@@ -484,7 +553,7 @@ function layoutTimeAxis({
       }
       continue;
     }
-    const bucket = intervalBucketKey(boundary, interval);
+    const bucket = intervalBucketKey(boundary, interval, clock);
     if (bucket === firstBucket) continue;
     addCandidate(candidates, {
       timestamp: boundary,
@@ -501,7 +570,7 @@ function layoutTimeAxis({
   candidates.sort((left, right) => left.ratio - right.ratio || left.timestamp - right.timestamp);
 
   if (candidates.length === 1 || firstTimestamp === lastTimestamp) {
-    const label = formatBoundaryLabel(firstTimestamp, lastTimestamp, interval);
+    const label = formatBoundaryLabel(firstTimestamp, lastTimestamp, interval, clock);
     const visibleLabel = label.slice(0, axisWidth);
     const start = Math.max(Math.floor((axisWidth - visibleLabel.length) / 2), 0);
     writeLabel(axis, start, visibleLabel);
@@ -517,22 +586,22 @@ function layoutTimeAxis({
     };
   }
 
-  let startLabel = formatBoundaryLabel(firstTimestamp, lastTimestamp, interval);
-  let endLabel = formatBoundaryLabel(lastTimestamp, firstTimestamp, interval);
+  let startLabel = formatBoundaryLabel(firstTimestamp, lastTimestamp, interval, clock);
+  let endLabel = formatBoundaryLabel(lastTimestamp, firstTimestamp, interval, clock);
   if (startLabel.length + endLabel.length + 1 > axisWidth) {
-    startLabel = formatBoundaryLabel(firstTimestamp, lastTimestamp, interval, false);
-    endLabel = formatBoundaryLabel(lastTimestamp, firstTimestamp, interval, false);
+    startLabel = formatBoundaryLabel(firstTimestamp, lastTimestamp, interval, clock, false);
+    endLabel = formatBoundaryLabel(lastTimestamp, firstTimestamp, interval, clock, false);
   }
   if (startLabel.length + endLabel.length + 1 > axisWidth) {
     // A standalone same-year chart still needs its year. Shorten the right
     // endpoint first instead of dropping that context from both boundaries.
-    if (new Date(firstTimestamp).getUTCFullYear() === new Date(lastTimestamp).getUTCFullYear()) {
-      endLabel = formatBoundaryLabel(lastTimestamp, firstTimestamp, interval, false, false);
+    if (new Date(clock.wall(firstTimestamp)).getUTCFullYear() === new Date(clock.wall(lastTimestamp)).getUTCFullYear()) {
+      endLabel = formatBoundaryLabel(lastTimestamp, firstTimestamp, interval, clock, false, false);
     }
   }
   if (startLabel.length + endLabel.length + 1 > axisWidth) {
-    startLabel = formatBoundaryLabel(firstTimestamp, lastTimestamp, interval, false, false);
-    endLabel = formatBoundaryLabel(lastTimestamp, firstTimestamp, interval, false, false);
+    startLabel = formatBoundaryLabel(firstTimestamp, lastTimestamp, interval, clock, false, false);
+    endLabel = formatBoundaryLabel(lastTimestamp, firstTimestamp, interval, clock, false, false);
   }
   if (startLabel.length + endLabel.length + 1 > axisWidth) {
     const visibleLabel = startLabel.slice(0, axisWidth);
@@ -573,7 +642,7 @@ function layoutTimeAxis({
   let previousTimestamp = firstTimestamp;
   let previousEnd = startLabel.length - 1;
   for (const candidate of candidates.filter((entry) => !entry.boundary)) {
-    const label = formatInteriorLabel(candidate.timestamp, previousTimestamp, interval);
+    const label = formatInteriorLabel(candidate.timestamp, previousTimestamp, interval, clock);
     // A year boundary inside the final year would repeat the right endpoint's year.
     if (label === endLabel) continue;
     const center = candidate.ratio * Math.max(axisWidth - 1, 0);
@@ -620,6 +689,7 @@ export function buildCompositeTimeAxisLayout(
       ? normalizeMarketSamples(scene)
       : undefined,
     timeRatio: (timestamp) => projectCompositeTimestamp(scene.timeScale, timestamp)?.ratio ?? Number.NaN,
+    timeZone: scene.timeZone,
   });
 }
 

package/src/components/chart/composite/tools.ts

@@ -387,7 +387,7 @@ export function summarizeZoomSelection(
 
 /** The same preview for two times, in either order. */
 export function summarizeZoomRange(
-  scene: Pick<CompositeChartScene, "startTime" | "endTime">,
+  scene: Pick<CompositeChartScene, "startTime" | "endTime" | "timeZone">,
   first: number,
   second: number,
 ): string | null {
@@ -398,6 +398,7 @@ export function summarizeZoomRange(
     new Date(timestamp),
     scene.startTime,
     scene.endTime,
+    scene.timeZone,
   );
   return `${label(start)} → ${label(end)} · ${formatMeasureSpan(end - start)}`;
 }

package/src/components/chart/composite/types.ts

@@ -132,6 +132,8 @@ export interface CompositePanelScene {
   volumeProfile?: CompositeVolumeProfile;
   /** Plot spans (x ratios) of intraday bars outside the regular session, shared by every panel. */
   extendedHours?: readonly CompositeExtendedHoursSpan[];
+  /** The previous session's close on a one-day chart, drawn as a dotted reference line. */
+  priorClose?: { axis: CompositeAxisSide; value: number; yRatio: number };
 }
 
 export interface CompositeCursorValue {
@@ -156,6 +158,8 @@ export interface CompositeChartScene {
   cursorDate: Date | null;
   cursorXRatio: number | null;
   cursorValues: CompositeCursorValue[];
+  /** IANA zone the time axis and cursor read in: the venue's for intraday market bars, else UTC. */
+  timeZone?: string;
 }
 
 export interface BuildCompositeChartSceneOptions {

package/src/components/command-bar/workflow/collection-actions.ts

@@ -18,6 +18,7 @@ import {
   adoptFirstPositionCurrency,
   createManualPortfolio as createManualPortfolioConfig,
   deleteManualPortfolio,
+  deleteWatchlist as deleteWatchlistConfig,
   hasOpenPortfolioPositions,
   isManualPortfolio,
   resolveManualPositionCurrency,
@@ -174,15 +175,16 @@ export function createCommandBarCollectionWorkflowActions(options: {
 
     async deleteWatchlist(watchlistId) {
       const currentState = getState();
-      const watchlist = currentState.config.watchlists.find((entry) => entry.id === watchlistId);
-      if (!watchlist) {
-        throw new Error("Watchlist not found.");
+      const { config: nextConfig, watchlist, tickers } = deleteWatchlistConfig(
+        currentState.config,
+        currentState.tickers.values(),
+        watchlistId,
+      );
+      for (const ticker of tickers) {
+        await tickerRepository.saveTicker(ticker);
+        dispatch({ type: "UPDATE_TICKER", ticker });
       }
 
-      const nextConfig = {
-        ...currentState.config,
-        watchlists: currentState.config.watchlists.filter((entry) => entry.id !== watchlistId),
-      };
       dispatch({ type: "SET_CONFIG", config: nextConfig });
       if (activeCollectionId === watchlistId) {
         const fallback = nextConfig.portfolios[0]?.id || nextConfig.watchlists[0]?.id || "";

package/src/components/layout/shell/index.tsx

@@ -430,6 +430,31 @@ export function Shell({
 
   const dockLeafLayouts = useMemo(() => getDockLeafLayouts(activeLayout, bounds, dockGeometryOptions), [activeLayout, bounds, dockGeometryOptions]);
   const dockDividerLayouts = useMemo(() => getDockDividerLayouts(activeLayout, bounds, dockGeometryOptions), [activeLayout, bounds, dockGeometryOptions]);
+  // What is on screen. In fullscreen that is one pane filling the content
+  // area, while the layout above still holds the tiled and floating rects it
+  // returns to. Everything drawn, hit tested or cut out over the panes (the
+  // focus border, the pointer, kitty image occluders) reads these, or it lands
+  // on cells the fullscreen pane now owns.
+  const fullscreenRect = useMemo(() => ({ x: 0, y: 0, width, height: contentHeight }), [contentHeight, width]);
+  const screenDockLeafLayouts = useMemo(() => (
+    transientFocusActive
+      ? dockLeafLayouts.filter((leaf) => leaf.instanceId === transientFocusPaneId).map((leaf) => ({ ...leaf, rect: fullscreenRect }))
+      : dockLeafLayouts
+  ), [dockLeafLayouts, fullscreenRect, transientFocusActive, transientFocusPaneId]);
+  const screenFloatingPanes = useMemo(() => (
+    transientFocusActive
+      ? visibleFloatingPanes.filter(({ pane }) => pane.instance.instanceId === transientFocusPaneId).map((entry) => ({ ...entry, rect: fullscreenRect }))
+      : visibleFloatingPanes
+  ), [fullscreenRect, transientFocusActive, transientFocusPaneId, visibleFloatingPanes]);
+  const screenDockedPanes = useMemo(() => (
+    transientFocusActive
+      ? dockedPanes.filter((pane) => pane.instance.instanceId === transientFocusPaneId)
+      : dockedPanes
+  ), [dockedPanes, transientFocusActive, transientFocusPaneId]);
+  const screenDividerLayouts = useMemo(
+    () => (transientFocusActive ? [] : dockDividerLayouts),
+    [dockDividerLayouts, transientFocusActive],
+  );
   const snapGuides = useMemo(() => makeSnapGuides(width, contentHeight), [contentHeight, width]);
   const externalDockPreview = useMemo(
     () => resolveExternalDockPreview(desktopDockPreview, bounds),
@@ -448,13 +473,13 @@ export function Shell({
     contentHeight,
     dialogOpen,
     dividerPreview,
-    dockDividerLayouts,
-    dockedPanes,
+    dockDividerLayouts: screenDividerLayouts,
+    dockedPanes: screenDockedPanes,
     dragFloatingRect,
     effectiveDockPreview,
     menuState,
     nativeWindowModePanelRect,
-    visibleFloatingPanes,
+    visibleFloatingPanes: screenFloatingPanes,
     width,
     windowModeDockMovePreview,
   });
@@ -528,14 +553,12 @@ export function Shell({
   const openPaneMenuRef = useRef<((paneId: string, rect: LayoutBounds, event?: undefined, options?: { keyboard?: boolean }) => void) | null>(null);
   const openFocusedPaneMenu = useCallback(() => {
     if (!focusedPaneId || windowMode) return false;
-    const rect = transientFocusActive && transientFocusPaneId === focusedPaneId
-      ? { x: 0, y: 0, width, height: contentHeight }
-      : dockLeafLayouts.find((leaf) => leaf.instanceId === focusedPaneId)?.rect
-        ?? visibleFloatingPanes.find(({ pane }) => pane.instance.instanceId === focusedPaneId)?.rect;
+    const rect = screenDockLeafLayouts.find((leaf) => leaf.instanceId === focusedPaneId)?.rect
+      ?? screenFloatingPanes.find(({ pane }) => pane.instance.instanceId === focusedPaneId)?.rect;
     if (!rect || !openPaneMenuRef.current) return false;
     openPaneMenuRef.current(focusedPaneId, rect, undefined, { keyboard: true });
     return true;
-  }, [contentHeight, dockLeafLayouts, focusedPaneId, transientFocusActive, transientFocusPaneId, visibleFloatingPanes, width, windowMode]);
+  }, [focusedPaneId, screenDockLeafLayouts, screenFloatingPanes, windowMode]);
 
   useShellPaneManagementShortcuts({
     cancelActiveDrag,
@@ -706,21 +729,6 @@ export function Shell({
     if (menuState && !paneMap.has(menuState.paneId)) closePaneMenu();
   }, [closePaneMenu, menuState, paneMap]);
 
-  // In fullscreen the pointer only ever meets the one pane on screen: hit
-  // testing the tiled rects behind it would focus a pane nobody can see.
-  const fullscreenRect = useMemo(() => ({ x: 0, y: 0, width, height: contentHeight }), [contentHeight, width]);
-  const pointerDockLeafLayouts = useMemo(() => (
-    transientFocusActive
-      ? dockLeafLayouts.filter((leaf) => leaf.instanceId === transientFocusPaneId).map((leaf) => ({ ...leaf, rect: fullscreenRect }))
-      : dockLeafLayouts
-  ), [dockLeafLayouts, fullscreenRect, transientFocusActive, transientFocusPaneId]);
-  const pointerFloatingPanes = useMemo(() => (
-    transientFocusActive
-      ? visibleFloatingPanes.filter(({ pane }) => pane.instance.instanceId === transientFocusPaneId).map((entry) => ({ ...entry, rect: fullscreenRect }))
-      : visibleFloatingPanes
-  ), [fullscreenRect, transientFocusActive, transientFocusPaneId, visibleFloatingPanes]);
-  const pointerDividerLayouts = transientFocusActive ? [] : dockDividerLayouts;
-
   const {
     handleFloatingCloseMouseDown,
     handleMouse,
@@ -738,8 +746,10 @@ export function Shell({
     closePaneMenu,
     contentHeight,
     dockGeometryOptions,
-    dockDividerLayouts: pointerDividerLayouts,
-    dockLeafLayouts: pointerDockLeafLayouts,
+    // In fullscreen the pointer only ever meets the one pane on screen: hit
+    // testing the tiled rects behind it would focus a pane nobody can see.
+    dockDividerLayouts: screenDividerLayouts,
+    dockLeafLayouts: screenDockLeafLayouts,
     dragRuntime,
     focusPane,
     focusedPaneId,
@@ -756,7 +766,7 @@ export function Shell({
     snapGuides,
     transientFocusActive,
     updateWindowModePreviewLayout,
-    visibleFloatingPanes: pointerFloatingPanes,
+    visibleFloatingPanes: screenFloatingPanes,
     visibleLayout,
     width,
     windowMode,
@@ -851,7 +861,7 @@ export function Shell({
         bounds={bounds}
         contentHeight={contentHeight}
         dockGeometryOptions={dockGeometryOptions}
-        dockLeafLayouts={dockLeafLayouts}
+        dockLeafLayouts={screenDockLeafLayouts}
         dragFloatingRect={dragFloatingRect}
         focusedPaneId={focusedPaneId}
         getPaneTitle={getPaneTitle}
@@ -860,7 +870,7 @@ export function Shell({
         nativeWindowModePanelRect={nativeWindowModePanelRect}
         overlayOpen={overlayOpen}
         paneMap={paneMap}
-        visibleFloatingPanes={visibleFloatingPanes}
+        visibleFloatingPanes={screenFloatingPanes}
         width={width}
         windowMode={windowMode}
         windowModeDockMovePreview={windowModeDockMovePreview}

package/src/components/onboarding/portfolio-step/positions-panel.tsx

@@ -24,14 +24,20 @@ const FIELD_LABELS: Record<PositionFieldId, string> = {
   ticker: "Ticker",
   shares: "Shares",
   avgCost: "Avg cost",
+  currency: "Currency",
 };
 
-const FIELD_PLACEHOLDERS: Record<PositionFieldId, string> = {
+const FIELD_PLACEHOLDERS: Record<Exclude<PositionFieldId, "currency">, string> = {
   ticker: "e.g. AAPL",
   shares: "optional",
   avgCost: "current price",
 };
 
+/** A blank Currency shows the code it will save, as the AP form does. */
+function fieldPlaceholder(field: PositionFieldId, state: OnboardingPositionsState): string {
+  return field === "currency" ? state.blankCurrency : t(FIELD_PLACEHOLDERS[field]);
+}
+
 /** Company name and last price for the symbol being typed, or why it will not resolve. */
 function PreviewLine({ preview, error }: Pick<OnboardingPositionsState, "preview" | "error">) {
   const colors = useThemeColors();
@@ -163,7 +169,7 @@ function DesktopPositionsPanel({
     label: t(FIELD_LABELS[field]),
     inputRef: index === state.fieldIdx ? inputRef : undefined,
     value: state.draft[field],
-    placeholder: t(FIELD_PLACEHOLDERS[field]),
+    placeholder: fieldPlaceholder(field, state),
     focused: editing && index === state.fieldIdx && !state.submitting,
     size: "comfortable" as const,
     backgroundColor: colors.panel,
@@ -184,6 +190,9 @@ function DesktopPositionsPanel({
         <Box style={{ width: 128, flexShrink: 0 }}>
           <NumberField {...fieldProps("avgCost", 2)} onChange={(value) => state.setField("avgCost", value)} />
         </Box>
+        <Box style={{ width: 80, flexShrink: 0 }}>
+          <TextField {...fieldProps("currency", 3)} onChange={(value) => state.setField("currency", value)} />
+        </Box>
         <Box style={{ flexShrink: 0 }}>
           <Button
             label={state.submitting ? "Adding..." : "Add"}
@@ -229,7 +238,7 @@ function TuiFieldRow({
   const colors = useThemeColors();
   const active = editing && index === state.fieldIdx;
   const value = state.draft[field];
-  const Field = field === "ticker" ? TextField : NumberField;
+  const Field = field === "ticker" || field === "currency" ? TextField : NumberField;
   return (
     <Box height={1} flexDirection="row">
       <Box width={10} flexShrink={0}>
@@ -242,7 +251,7 @@ function TuiFieldRow({
           <Field
             inputRef={inputRef}
             value={value}
-            placeholder={t(FIELD_PLACEHOLDERS[field])}
+            placeholder={fieldPlaceholder(field, state)}
             focused={!state.submitting}
             backgroundColor={colors.panel}
             textColor={colors.text}
@@ -250,7 +259,7 @@ function TuiFieldRow({
             onChange={(next) => state.setField(field, next)}
           />
         ) : (
-          <Text fg={value ? colors.text : colors.textMuted}>{value || t(FIELD_PLACEHOLDERS[field])}</Text>
+          <Text fg={value ? colors.text : colors.textMuted}>{value || fieldPlaceholder(field, state)}</Text>
         )}
       </Box>
       {field === "ticker" ? (

package/src/components/onboarding/wizard-model.ts

@@ -5,6 +5,7 @@ import type { AppConfig, OnboardingProgress, OnboardingStage } from "../../types
 import type { Quote } from "../../types/financials";
 import type { TickerRecord } from "../../types/ticker";
 import { getManualPortfolioPosition } from "../../plugins/builtin/portfolio-list/mutations";
+import { resolveCurrencyUnit } from "../../utils/currency-units";
 
 /**
  * Stages older builds persisted that the wizard no longer renders. A profile
@@ -96,18 +97,25 @@ export function listOnboardingPositions(
   for (const ticker of tickers) {
     if (!ticker.metadata.portfolios.includes(portfolioId)) continue;
     const position = getManualPortfolioPosition(ticker, portfolioId);
-    const price = quotes(ticker.metadata.ticker)?.price;
+    const quote = quotes(ticker.metadata.ticker);
+    const price = typeof quote?.price === "number" && Number.isFinite(quote.price) ? quote.price : null;
     const shares = position?.shares ?? null;
     const avgCost = position?.avgCost ?? null;
-    const basis = typeof price === "number" && Number.isFinite(price) ? price : avgCost;
+    const costCurrency = position?.currency || ticker.metadata.currency || "USD";
+    // Priced, the row is worth the quote in the listing's own currency (pence
+    // in pounds), whatever currency the cost was entered in.
+    const quoteUnit = price !== null ? resolveCurrencyUnit(quote?.currency || costCurrency) : null;
     rows.push({
       symbol: ticker.metadata.ticker,
       name: ticker.metadata.name || "",
-      currency: position?.currency ?? ticker.metadata.currency ?? "USD",
+      currency: quoteUnit?.currency || costCurrency,
       shares,
       avgCost,
-      price: typeof price === "number" && Number.isFinite(price) ? price : null,
-      value: shares !== null && basis !== null ? shares * basis : null,
+      price,
+      value: shares === null ? null
+        : price !== null ? shares * price / quoteUnit!.divisor
+        : avgCost !== null ? shares * avgCost
+        : null,
     });
   }
   return rows;