From ffdd5310941941091dbd5a8550c4ecd594410132 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 12:50:14 +0200
Subject: [PATCH 01/21] Show gain on net invested in portfolio summary

---
 CHANGELOG.md                                  |  2 ++
 .../PortfolioSummary.test.tsx                 | 35 +++++++++++++++++++
 .../investments-module/PortfolioSummary.tsx   | 10 ++++--
 docs/investment-metrics.md                    |  2 +-
 docs/investment-overview.md                   |  2 +-
 5 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 client/src/components/investments-module/PortfolioSummary.test.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04a83ca..3ddc280 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method (#171).
+
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
 - Investment price returns explicitly exclude dividends. Dividend events no longer block known purchase costs, gains or history or trigger misleading purchase-review warnings; split and missing-history safeguards remain (#161).
diff --git a/client/src/components/investments-module/PortfolioSummary.test.tsx b/client/src/components/investments-module/PortfolioSummary.test.tsx
new file mode 100644
index 0000000..2d5e010
--- /dev/null
+++ b/client/src/components/investments-module/PortfolioSummary.test.tsx
@@ -0,0 +1,35 @@
+import {cleanup,render,screen,within} from '@testing-library/react'
+import {afterEach,expect,it} from 'vitest'
+import {portfolioMetrics} from '../../../../shared/investment-metrics'
+import type {CurrencyMetrics} from '../../../../shared/investment-metrics'
+import {PortfolioSummary} from './PortfolioSummary'
+
+const metrics=(gain:number|null,invested:number|null):CurrencyMetrics=>({
+ ...portfolioMetrics([]),currency:'HUF',total_gain:gain,total_invested:invested,
+ market_today:{gain:10,estimated_return_percent:1,currency:'HUF',date:'2026-10-19',prior_date:'2026-10-18',
+  covered_holdings:1,total_holdings:1,excluded:[],method:'daily_linked_estimate',boundary:'Daily closes'},
+})
+const total=()=>within(screen.getByRole('heading',{name:'Total gain'}).parentElement!)
+afterEach(cleanup)
+
+it.each([[-100,-10],[100,10],[0,0]])('shows gain % on net invested without substituting the daily-linked estimate (%s)',(gain,percent)=>{
+ render(<PortfolioSummary metrics={metrics(gain,1000)} hidden={false} currency="HUF"/>)
+ expect(total().getByText(`${percent>0?'+':''}${percent}% · Gain on net invested`)).toBeVisible()
+ expect(total().queryByText('Estimated return unavailable')).not.toBeInTheDocument()
+ expect(screen.getByText('+1% estimated')).toBeVisible()
+})
+
+it.each([[100,0],[100,-50],[null,1000],[100,null],[Infinity,1000],[100,NaN],[Number.MAX_VALUE,Number.MIN_VALUE]])('omits the ratio with unavailable or unsupported inputs (%s, %s)',(gain,invested)=>{
+ render(<PortfolioSummary metrics={metrics(gain,invested)} hidden={false} currency="HUF"/>)
+ expect(total().queryByText(/Gain on net invested|Estimated return unavailable|%/)).not.toBeInTheDocument()
+})
+
+it('recomputes from the selected currency amounts and masks percentage and money in privacy mode',()=>{
+ const {rerender}=render(<PortfolioSummary metrics={metrics(20,100)} hidden={false} currency="EUR"/>)
+ expect(total().getByText('+20% · Gain on net invested')).toBeVisible()
+ rerender(<PortfolioSummary metrics={metrics(-10,200)} hidden={false} currency="USD"/>)
+ expect(total().getByText('-5% · Gain on net invested')).toBeVisible()
+ rerender(<PortfolioSummary metrics={metrics(-10,200)} hidden currency="USD"/>)
+ expect(total().queryByText(/-5%|-10 USD/)).not.toBeInTheDocument()
+ expect(total().getByTitle(/Total gain divided by net invested/)).toHaveTextContent('••••')
+})
diff --git a/client/src/components/investments-module/PortfolioSummary.tsx b/client/src/components/investments-module/PortfolioSummary.tsx
index de274d5..1f2254a 100644
--- a/client/src/components/investments-module/PortfolioSummary.tsx
+++ b/client/src/components/investments-module/PortfolioSummary.tsx
@@ -1,12 +1,16 @@
 import type {CurrencyMetrics} from '../../../../shared/investment-metrics'
 import {amount,signedAmount,percentage,tone} from './overview'
+
 export function PortfolioSummary({metrics,hidden,currency}:{metrics?:CurrencyMetrics;hidden:boolean;currency:string}) {
  const today=metrics?.market_today
- const rows=[{label:'Net invested',value:metrics?.total_invested,percent:null,note:'Exact cash paid minus proceeds · all active holdings',signed:false},
-  {label:'Total gain',value:metrics?.total_gain,percent:metrics?.estimated_return_percent,note:'Realized + unrealized · lifetime, where known · excludes dividends',signed:true},
+ const gain=metrics?.total_gain,invested=metrics?.total_invested
+ const ratio=gain!=null&&Number.isFinite(gain)&&invested!=null&&Number.isFinite(invested)&&invested>0?gain/invested*100:null
+ const gainPercent=ratio!=null&&Number.isFinite(ratio)?ratio:null
+ const rows=[{label:'Net invested',value:invested,percent:null,note:'Exact cash paid minus proceeds · all active holdings',signed:false},
+  {label:'Total gain',value:gain,percent:gainPercent,note:'Realized + unrealized · lifetime, where known · excludes dividends',signed:true},
   {label:'Today',value:today?.gain,percent:today?.estimated_return_percent,note:`${today?.covered_holdings??0}/${today?.total_holdings??0} eligible market holdings · includes FX movement · excludes dividends`,signed:true}]
  return <section aria-label="Portfolio summaries" className="overflow-hidden rounded-2xl border border-border bg-card divide-y divide-border">
-  {rows.map(r=><div key={r.label} className="px-5 py-4"><h2 className="text-xs font-medium text-muted-foreground">{r.label}</h2><div className="mt-1.5 flex flex-wrap items-baseline gap-x-2 gap-y-1"><p className={`max-w-full break-words text-xl font-semibold tracking-tight tabular-nums ${r.signed?tone(r.value,hidden):''}`}>{r.signed?signedAmount(r.value,currency,hidden):amount(r.value,currency,hidden)}</p>{r.label!=='Net invested'&&<span className={`text-xs tabular-nums ${tone(r.percent,hidden)}`}>{hidden?'••••':r.percent==null?'Estimated return unavailable':`${percentage(r.percent)} estimated`}</span>}</div><p className="mt-1 text-[11px] leading-relaxed text-muted-foreground">{r.note}</p></div>)}
+  {rows.map(r=><div key={r.label} className="px-5 py-4"><h2 className="text-xs font-medium text-muted-foreground">{r.label}</h2><div className="mt-1.5 flex flex-wrap items-baseline gap-x-2 gap-y-1"><p className={`max-w-full break-words text-xl font-semibold tracking-tight tabular-nums ${r.signed?tone(r.value,hidden):''}`}>{r.signed?signedAmount(r.value,currency,hidden):amount(r.value,currency,hidden)}</p>{r.label==='Total gain'?(gainPercent!=null&&<span title="Total gain divided by net invested. This simple ratio does not account for when money was invested; withdrawals can make it less useful." className={`text-xs tabular-nums ${tone(gainPercent,hidden)}`}>{hidden?'••••':`${percentage(gainPercent)} · Gain on net invested`}</span>):r.label==='Today'&&<span className={`text-xs tabular-nums ${tone(r.percent,hidden)}`}>{hidden?'••••':r.percent==null?'Estimated return unavailable':`${percentage(r.percent)} estimated`}</span>}</div><p className="mt-1 text-[11px] leading-relaxed text-muted-foreground">{r.note}</p></div>)}
   {today&&<details className="px-5 py-3 text-[11px] text-muted-foreground"><summary className="cursor-pointer">Today coverage</summary><p className="mt-2">{today.boundary} Manual values and stale or missing market inputs are excluded.</p></details>}
  </section>
 }
diff --git a/docs/investment-metrics.md b/docs/investment-metrics.md
index 07c80c8..13bdd06 100644
--- a/docs/investment-metrics.md
+++ b/docs/investment-metrics.md
@@ -34,7 +34,7 @@ Instrument price change uses normalized native previous-session close and source
 
 **Market Today is a daily-close estimate, not exact local-midnight/intraday valuation.** Its prior price is the completed daily observation for the previous calendar date (bounded weekend carry for exchange assets); source markets can close in different time zones. Missing weekday observations, provisional prior closes, unknown prior positions, unsupported events and missing FX exclude the holding. The response states this boundary. Manual valuation jumps never enter Market Today.
 
-The pure `estimatedReturn` function implements range gain and daily geometric linking: contributions at the start, withdrawals at the end, preserving same-day round trips, inactive days, missing active days and complete losses. The current-metrics response keeps lifetime **Estimated return** percentages explicitly null (`daily_history_required`). The [portfolio history read](investment-history.md) supplies separately bounded range gain and daily-linked percentages with its own coverage; selected-range percentages must not be paired with lifetime gain headlines. No gain/net-invested shortcut is displayed. The [overview](investment-overview.md) and [holding detail/editor](investment-detail.md) retain these scopes and coverage rules.
+The pure `estimatedReturn` function implements range gain and daily geometric linking: contributions at the start, withdrawals at the end, preserving same-day round trips, inactive days, missing active days and complete losses. The current-metrics response keeps lifetime **Estimated return** percentages explicitly null (`daily_history_required`). The [portfolio history read](investment-history.md) supplies separately bounded range gain and daily-linked percentages with its own coverage; selected-range percentages must not be paired with lifetime gain headlines. The overview separately labels a simple total-gain/net-invested ratio **Gain on net invested**, with a positive, finite denominator and known finite gain; this is not the daily-linked Estimated return. The [overview](investment-overview.md) and [holding detail/editor](investment-detail.md) retain these scopes and coverage rules.
 
 ## Verification
 
diff --git a/docs/investment-overview.md b/docs/investment-overview.md
index 1c80e47..1e4daa6 100644
--- a/docs/investment-overview.md
+++ b/docs/investment-overview.md
@@ -14,7 +14,7 @@ The history chart remains a separate bounded request for the selected calendar r
 
 Values, cash invested, gains, Today and allocation weights come from the shared accounting and FX contracts. Native market unit prices retain small-coin precision and the provider's actual quote currency. Missing conversion rates never become rate 1 or raw foreign totals. Incomplete allocation withholds full-portfolio weights and the proportional bar. Currency allocation groups quote/appraisal currency, not geographical exposure.
 
-Total gain is the known lifetime realized plus unrealized amount. Its Estimated return remains unavailable when complete daily history is absent; the UI does not attach a selected-range percentage to a lifetime gain. The history chart reports its own covered range gain and daily-linked estimate. Today shows eligible market holdings and exposes its coverage; manual appraisals and stale inputs are excluded. See [metrics](investment-metrics.md) and [market inputs](investment-market-data.md).
+Total gain is the known lifetime realized plus unrealized amount. The summary shows **Gain on net invested** as total gain / net invested × 100 only when both amounts are finite and net invested is positive; otherwise it omits the percentage. This simple ratio does not account for cash-flow timing, and withdrawals can make it less useful. It is distinct from Estimated return; the UI does not attach a selected-range percentage to a lifetime gain. The history chart reports its own covered range gain and daily-linked estimate. Today shows eligible market holdings and exposes its coverage; manual appraisals and stale inputs are excluded. See [metrics](investment-metrics.md) and [market inputs](investment-market-data.md).
 
 ## Interaction and retained state
 

From c850eae88351dbae9112ce53d26da8a60d47cd52 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 12:53:57 +0200
Subject: [PATCH 02/21] Remove investment explanatory copy requested in review

---
 CHANGELOG.md                                        |  2 +-
 .../components/investments-module/HoldingsList.tsx  |  1 -
 .../investments-module/InvestmentChart.tsx          | 13 +------------
 .../investments-module/InvestmentDetailModal.tsx    | 12 ++----------
 .../components/investments-module/Investments.tsx   |  1 -
 .../investments-module/MarketInputs.test.tsx        |  1 -
 .../investments-module/PortfolioHistoryChart.tsx    |  8 --------
 .../investments-module/PortfolioSummary.tsx         |  9 ++++-----
 docs/investment-overview.md                         |  2 +-
 9 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ddc280..fe8c953 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method (#171).
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/investments-module/HoldingsList.tsx b/client/src/components/investments-module/HoldingsList.tsx
index faf0235..8e14e02 100644
--- a/client/src/components/investments-module/HoldingsList.tsx
+++ b/client/src/components/investments-module/HoldingsList.tsx
@@ -29,7 +29,6 @@ export function HoldingsList(props:Props) {
     {categories.filter(([key])=>key!=='other'||positions.some(p=>category(p)==='other')).map(([key,label])=><button key={key} type="button" aria-pressed={view.filter===key} onClick={()=>update({filter:key})} className={`inline-flex min-h-10 shrink-0 items-center gap-2 rounded-lg border px-3 text-xs ${view.filter===key?'border-primary/40 bg-primary/10 font-medium text-foreground':'border-border text-muted-foreground hover:bg-secondary'}`}>{label}{' '}<span className="tabular-nums text-muted-foreground">{key==='all'?positions.length:positions.filter(p=>category(p)===key).length}</span></button>)}
    </div>
   </div>
-  <p className="px-4 pt-3 text-xs text-muted-foreground sm:px-5">Return shows unrealized gain and its percentage of remaining cost. Filters affect holdings only.</p>
   <div className="px-4 py-3 @min-[900px]:hidden"><Select aria-label="Sort holdings" value={`${view.sort}:${view.direction}`} onChange={e=>{const [sort,direction]=e.target.value.split(':');update({sort:sort as OverviewView['sort'],direction:direction as OverviewView['direction']})}} className="h-10 text-xs">
    <option value="value:desc">Value · largest first</option><option value="value:asc">Value · smallest first</option><option value="name:asc">Holding · A to Z</option><option value="name:desc">Holding · Z to A</option><option value="return:desc">Unrealized gain · highest first</option><option value="return:asc">Unrealized gain · lowest first</option><option value="day:desc">Today move · highest first</option><option value="day:asc">Today move · lowest first</option>
   </Select></div>
diff --git a/client/src/components/investments-module/InvestmentChart.tsx b/client/src/components/investments-module/InvestmentChart.tsx
index 70590d5..411ee5e 100644
--- a/client/src/components/investments-module/InvestmentChart.tsx
+++ b/client/src/components/investments-module/InvestmentChart.tsx
@@ -12,7 +12,7 @@ import {
 } from 'recharts'
 import type { PriceHistory } from '../../../../shared/market-data'
 import { API_BASE_URL, apiFetch } from '../../config'
-import { costPrice, unitPrice } from './overview'
+import { unitPrice } from './overview'
 import { Select } from '../common/select'
 type Trade = {
   id: string
@@ -320,17 +320,6 @@ export function InvestmentChart({
           </ResponsiveContainer>
         )}
       </div>
-      <p className="text-[11px] text-muted-foreground">
-        Buy / Sell markers use recorded execution prices in {history?.currency ?? 'quote currency'}.
-        Unverified or other-currency executions remain in the dated list below.
-      </p>
-      <p className="text-[11px] text-muted-foreground">
-        Current average remaining cost:{' '}
-        {currentCost === null
-          ? 'Unavailable in this chart currency'
-          : costPrice(currentCost, history?.currency ?? '')}
-        . Dashed reference is today's remaining basis per unit, not a historical cost series.
-      </p>
       {dates.length > 0 && (
         <label className="block text-xs text-muted-foreground">
           Read chart day
diff --git a/client/src/components/investments-module/InvestmentDetailModal.tsx b/client/src/components/investments-module/InvestmentDetailModal.tsx
index a81c936..c5b0096 100644
--- a/client/src/components/investments-module/InvestmentDetailModal.tsx
+++ b/client/src/components/investments-module/InvestmentDetailModal.tsx
@@ -11,7 +11,7 @@ import { InvestmentChart } from './InvestmentChart'
 import type { HoldingChartCache } from './InvestmentChart'
 import type { Account, MarketQuote, Transaction } from './types'
 import { calculatePosition } from './utils'
-import { amount, costPrice, unitPrice, signedAmount, percentage, tone } from './overview'
+import { amount, costPrice, unitPrice, signedAmount, tone } from './overview'
 type Props = {
   account: Account | null
   allTransactions: Transaction[]
@@ -109,15 +109,7 @@ export function InvestmentDetailModal({
             {amount(p.currentValue, reportingCurrency, hidden)}
           </p>
           <p className={`mt-2 text-sm tabular-nums ${tone(p.gainLoss, hidden)}`}>
-            {signedAmount(p.gainLoss, reportingCurrency, hidden)}{' '}
-            <span className="text-xs font-normal text-muted-foreground">
-              total gain · excludes dividends ·{' '}
-              {hidden
-                ? '••••'
-                : p.gainLossPercent === null
-                  ? 'Estimated return unavailable'
-                  : `${percentage(p.gainLossPercent)} estimated`}
-            </span>
+            {signedAmount(p.gainLoss, reportingCurrency, hidden)}
           </p>
         </div>
         {(protectedAccount || (market && freshness.needsAttention) || p.priceFetchError) && (
diff --git a/client/src/components/investments-module/Investments.tsx b/client/src/components/investments-module/Investments.tsx
index 03ef440..82bd500 100644
--- a/client/src/components/investments-module/Investments.tsx
+++ b/client/src/components/investments-module/Investments.tsx
@@ -58,7 +58,6 @@ export function Investments() {
     <div role="group" aria-label="Investment reporting currency" className="flex rounded-lg border border-border p-0.5">{investmentReportingCurrencies.map(c=><button key={c} type="button" aria-pressed={currencyDisplay===c} onClick={()=>setCurrencyDisplay(c)} className={`min-h-9 rounded-md px-3 text-xs font-semibold ${c===currencyDisplay?'bg-secondary text-foreground':'text-muted-foreground'}`}>{c}</button>)}</div>
     {canTrade?<Button type="button" onClick={()=>setEditor({})} className="h-10"><Plus className="h-4 w-4"/>Record trade</Button>:<Link to="/accounts" state={{addAccount:true,investment:accounts.length===0}} className="inline-flex min-h-10 items-center rounded-lg bg-primary px-3 text-xs font-semibold text-primary-foreground">{accounts.length===0?'Add first holding':'Set up trade accounts'}</Link>}
    </header>
-   <details className="text-[11px] text-muted-foreground"><summary className="cursor-pointer">All active investment holdings · {currencyDisplay} · About this view</summary><p className="mt-2">This page includes all active holdings. Net-worth exclusions apply in net-worth views. Buy and sell directly with a cash account.{!canTrade&&accounts.length>0?' An unlocked cash account and holding are needed to record a trade.':''}</p></details>
    <div className="grid min-w-0 items-stretch gap-4 @min-[900px]:grid-cols-[minmax(0,1fr)_320px]">
     <InvestmentAttention positions={positions} quotes={quotes} refreshing={status.loading} onRefresh={()=>{void refresh()}} onOpen={a=>setSelected(a.id)} className="order-2 @min-[900px]:order-first @min-[900px]:col-span-2"/>
     <div className="order-1 min-w-0"><PortfolioHistoryChart history={investments.history} hidden={hidden} currency={currencyDisplay} currentValue={metrics?.total_value}/></div>
diff --git a/client/src/components/investments-module/MarketInputs.test.tsx b/client/src/components/investments-module/MarketInputs.test.tsx
index bb2a99b..9fea1fd 100644
--- a/client/src/components/investments-module/MarketInputs.test.tsx
+++ b/client/src/components/investments-module/MarketInputs.test.tsx
@@ -77,7 +77,6 @@ it('retains every same-day execution, its actual date/currency and the current r
  const list=screen.getByRole('list',{name:`Executions on ${date}`})
  expect(list.children).toHaveLength(4)
  expect(list).toHaveTextContent('101 EUR');expect(list).toHaveTextContent('102 EUR');expect(list).toHaveTextContent('110 EUR');expect(list).toHaveTextContent('99 USD')
- expect(screen.getByText(/Current average remaining cost: 98,5 EUR/)).toBeVisible()
 })
 it('reuses an owned detail cache until its source key changes',async()=>{
  const fetcher=vi.fn<typeof fetch>().mockResolvedValue(Response.json(value)),cache=new Map()
diff --git a/client/src/components/investments-module/PortfolioHistoryChart.tsx b/client/src/components/investments-module/PortfolioHistoryChart.tsx
index 4f29de0..af41614 100644
--- a/client/src/components/investments-module/PortfolioHistoryChart.tsx
+++ b/client/src/components/investments-module/PortfolioHistoryChart.tsx
@@ -45,14 +45,6 @@ export function PortfolioHistoryChart({history,hidden,currency,currentValue}:{hi
   {!hidden&&data&&data.points.length>1&&<label className="sr-only focus-within:not-sr-only"><span>Read a day: {selected?.date??data.to}</span><input type="range" aria-label="Read portfolio history by date" min={0} max={data.points.length-1} value={selected?selection!.index:data.points.length-1} onChange={e=>readDay(Number(e.target.value))} aria-valuetext={`${selected?.date??data.to} · ${money(displayedValue)}`} className="w-full accent-primary"/></label>}
   {data&&<>
    <p className="text-[10px] leading-relaxed text-muted-foreground">{data.from} – {data.to} · {data.timezone} · read {new Date(data.as_of).toLocaleString()}{data.points.at(-1)?.provisional?' · today is provisional':''}</p>
-   <details className="text-xs text-muted-foreground"><summary className="cursor-pointer">History method and coverage{summary?.status==='partial'?' · incomplete':''}</summary>
-    <div className="mt-2 space-y-2"><p>History includes sold and archived holdings. Gain excludes contributions, withdrawals and dividends. Estimated return links daily factors, assuming contributions at the start and withdrawals at the end of each day. Missing inputs leave gaps.</p><p>{data.method.price_timing}</p><p>{data.method.fx_timing}</p><p>{data.method.current_endpoint}</p>
-     {summary?.reasons.length!==0&&<p>Range coverage: {summary?.reasons.join(', ').replaceAll('_',' ')}.</p>}
-     <p>Unknown legacy history starts at its first supported boundary. Net invested requires known lifetime cash flows; it is not remaining cost basis. All is bounded to the last ten years.</p>
-     <ul className="space-y-1">{data.coverage_ranges.slice(0,30).map((c,i)=><li key={i}>{data.holdings.find(h=>h.account_id===c.account_id)?.name??'Holding'} · {c.from} – {c.to} · {c.kind}: {c.reasons.join(', ').replaceAll('_',' ')}</li>)}</ul>
-     {data.coverage_ranges.length>30&&<p>{data.coverage_ranges.length-30} more coverage intervals in this response.</p>}
-    </div>
-   </details>
   </>}
  </section>
 }
diff --git a/client/src/components/investments-module/PortfolioSummary.tsx b/client/src/components/investments-module/PortfolioSummary.tsx
index 1f2254a..ac196d7 100644
--- a/client/src/components/investments-module/PortfolioSummary.tsx
+++ b/client/src/components/investments-module/PortfolioSummary.tsx
@@ -6,11 +6,10 @@ export function PortfolioSummary({metrics,hidden,currency}:{metrics?:CurrencyMet
  const gain=metrics?.total_gain,invested=metrics?.total_invested
  const ratio=gain!=null&&Number.isFinite(gain)&&invested!=null&&Number.isFinite(invested)&&invested>0?gain/invested*100:null
  const gainPercent=ratio!=null&&Number.isFinite(ratio)?ratio:null
- const rows=[{label:'Net invested',value:invested,percent:null,note:'Exact cash paid minus proceeds · all active holdings',signed:false},
-  {label:'Total gain',value:gain,percent:gainPercent,note:'Realized + unrealized · lifetime, where known · excludes dividends',signed:true},
-  {label:'Today',value:today?.gain,percent:today?.estimated_return_percent,note:`${today?.covered_holdings??0}/${today?.total_holdings??0} eligible market holdings · includes FX movement · excludes dividends`,signed:true}]
+ const rows=[{label:'Net invested',value:invested,percent:null,signed:false},
+  {label:'Total gain',value:gain,percent:gainPercent,signed:true},
+  {label:'Today',value:today?.gain,percent:today?.estimated_return_percent,signed:true}]
  return <section aria-label="Portfolio summaries" className="overflow-hidden rounded-2xl border border-border bg-card divide-y divide-border">
-  {rows.map(r=><div key={r.label} className="px-5 py-4"><h2 className="text-xs font-medium text-muted-foreground">{r.label}</h2><div className="mt-1.5 flex flex-wrap items-baseline gap-x-2 gap-y-1"><p className={`max-w-full break-words text-xl font-semibold tracking-tight tabular-nums ${r.signed?tone(r.value,hidden):''}`}>{r.signed?signedAmount(r.value,currency,hidden):amount(r.value,currency,hidden)}</p>{r.label==='Total gain'?(gainPercent!=null&&<span title="Total gain divided by net invested. This simple ratio does not account for when money was invested; withdrawals can make it less useful." className={`text-xs tabular-nums ${tone(gainPercent,hidden)}`}>{hidden?'••••':`${percentage(gainPercent)} · Gain on net invested`}</span>):r.label==='Today'&&<span className={`text-xs tabular-nums ${tone(r.percent,hidden)}`}>{hidden?'••••':r.percent==null?'Estimated return unavailable':`${percentage(r.percent)} estimated`}</span>}</div><p className="mt-1 text-[11px] leading-relaxed text-muted-foreground">{r.note}</p></div>)}
-  {today&&<details className="px-5 py-3 text-[11px] text-muted-foreground"><summary className="cursor-pointer">Today coverage</summary><p className="mt-2">{today.boundary} Manual values and stale or missing market inputs are excluded.</p></details>}
+  {rows.map(r=><div key={r.label} className="px-5 py-4"><h2 className="text-xs font-medium text-muted-foreground">{r.label}</h2><div className="mt-1.5 flex flex-wrap items-baseline gap-x-2 gap-y-1"><p className={`max-w-full break-words text-xl font-semibold tracking-tight tabular-nums ${r.signed?tone(r.value,hidden):''}`}>{r.signed?signedAmount(r.value,currency,hidden):amount(r.value,currency,hidden)}</p>{r.label==='Total gain'?(gainPercent!=null&&<span title="Total gain divided by net invested. This simple ratio does not account for when money was invested; withdrawals can make it less useful." className={`text-xs tabular-nums ${tone(gainPercent,hidden)}`}>{hidden?'••••':`${percentage(gainPercent)} · Gain on net invested`}</span>):r.label==='Today'&&<span className={`text-xs tabular-nums ${tone(r.percent,hidden)}`}>{hidden?'••••':r.percent==null?'Estimated return unavailable':`${percentage(r.percent)} estimated`}</span>}</div></div>)}
  </section>
 }
diff --git a/docs/investment-overview.md b/docs/investment-overview.md
index 1e4daa6..e10c533 100644
--- a/docs/investment-overview.md
+++ b/docs/investment-overview.md
@@ -14,7 +14,7 @@ The history chart remains a separate bounded request for the selected calendar r
 
 Values, cash invested, gains, Today and allocation weights come from the shared accounting and FX contracts. Native market unit prices retain small-coin precision and the provider's actual quote currency. Missing conversion rates never become rate 1 or raw foreign totals. Incomplete allocation withholds full-portfolio weights and the proportional bar. Currency allocation groups quote/appraisal currency, not geographical exposure.
 
-Total gain is the known lifetime realized plus unrealized amount. The summary shows **Gain on net invested** as total gain / net invested × 100 only when both amounts are finite and net invested is positive; otherwise it omits the percentage. This simple ratio does not account for cash-flow timing, and withdrawals can make it less useful. It is distinct from Estimated return; the UI does not attach a selected-range percentage to a lifetime gain. The history chart reports its own covered range gain and daily-linked estimate. Today shows eligible market holdings and exposes its coverage; manual appraisals and stale inputs are excluded. See [metrics](investment-metrics.md) and [market inputs](investment-market-data.md).
+Total gain is the known lifetime realized plus unrealized amount. The summary shows **Gain on net invested** as total gain / net invested × 100 only when both amounts are finite and net invested is positive; otherwise it omits the percentage. This simple ratio does not account for cash-flow timing, and withdrawals can make it less useful. It is distinct from Estimated return; the UI does not attach a selected-range percentage to a lifetime gain. The history chart reports its own covered range gain and daily-linked estimate. Today includes eligible market holdings; manual appraisals and stale inputs are excluded. Coverage metadata stays in the read contract; the overview omits the About this view, summary notes and coverage/method prose panels at the user's request (#171). See [metrics](investment-metrics.md) and [market inputs](investment-market-data.md).
 
 ## Interaction and retained state
 

From 904fb35c77bf3a37703b861f877f05d1bcefbcc6 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 12:57:34 +0200
Subject: [PATCH 03/21] Move allocation below portfolio chart and summary

---
 CHANGELOG.md                                             | 2 +-
 client/src/components/investments-module/Investments.tsx | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe8c953..284f8de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view (#171).
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/investments-module/Investments.tsx b/client/src/components/investments-module/Investments.tsx
index 82bd500..309458b 100644
--- a/client/src/components/investments-module/Investments.tsx
+++ b/client/src/components/investments-module/Investments.tsx
@@ -61,8 +61,9 @@ export function Investments() {
    <div className="grid min-w-0 items-stretch gap-4 @min-[900px]:grid-cols-[minmax(0,1fr)_320px]">
     <InvestmentAttention positions={positions} quotes={quotes} refreshing={status.loading} onRefresh={()=>{void refresh()}} onOpen={a=>setSelected(a.id)} className="order-2 @min-[900px]:order-first @min-[900px]:col-span-2"/>
     <div className="order-1 min-w-0"><PortfolioHistoryChart history={investments.history} hidden={hidden} currency={currencyDisplay} currentValue={metrics?.total_value}/></div>
-    <div className="order-3 grid min-w-0 gap-4 sm:grid-cols-2 @min-[900px]:grid-cols-1"><PortfolioSummary metrics={metrics} hidden={hidden} currency={currencyDisplay}/><PortfolioAllocation positions={positions} view={overviewView} onChange={updateOverview} onOpen={a=>setSelected(a.id)} hidden={hidden} currency={currencyDisplay}/></div>
+    <div className="order-3 min-w-0"><PortfolioSummary metrics={metrics} hidden={hidden} currency={currencyDisplay}/></div>
    </div>
+   <PortfolioAllocation positions={positions} view={overviewView} onChange={updateOverview} onOpen={a=>setSelected(a.id)} hidden={hidden} currency={currencyDisplay}/>
    <HoldingsList positions={positions} quotes={quotes} trends={data?.trends} privacyMode={privacyMode} view={overviewView} onViewChange={updateOverview} refreshing={status.loading} onOpenDetail={a=>setSelected(a.id)}/>
    {!editor&&!legacyTradeId&&<InvestmentDetailModal key={selected} account={opening} allTransactions={trades} quotes={quotes} exchangeRates={data?.exchangeRates??{}} privacyMode={privacyMode}
     onClose={closeDetail} metrics={metrics?.holdings.find(h=>h.account_id===selected)} reportingCurrency={currencyDisplay} onValuationSaved={()=>{void saved()}}

From ecf8b30f5b25ae1853cc04b3d04b86dd81215107 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 12:59:31 +0200
Subject: [PATCH 04/21] Emphasize total gain in portfolio history tooltip

---
 CHANGELOG.md                                  |  2 +-
 .../PortfolioHistoryChart.tsx                 |  3 ++-
 .../PortfolioHistoryTooltip.test.tsx          | 24 +++++++++++++++++++
 .../PortfolioHistoryTooltip.tsx               | 20 ++++++++++++++++
 .../src/test/PortfolioHistoryChart.test.tsx   |  4 +---
 docs/investment-overview.md                   |  2 ++
 6 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 client/src/components/investments-module/PortfolioHistoryTooltip.test.tsx
 create mode 100644 client/src/components/investments-module/PortfolioHistoryTooltip.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 284f8de..512486d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries (#171).
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/investments-module/PortfolioHistoryChart.tsx b/client/src/components/investments-module/PortfolioHistoryChart.tsx
index af41614..e362581 100644
--- a/client/src/components/investments-module/PortfolioHistoryChart.tsx
+++ b/client/src/components/investments-module/PortfolioHistoryChart.tsx
@@ -1,4 +1,5 @@
 import {amount} from './overview'
+import {PortfolioHistoryTooltip} from './PortfolioHistoryTooltip'
 import {useId,useState} from 'react'
 import {Area,CartesianGrid,ComposedChart,Line,ResponsiveContainer,Tooltip,XAxis,YAxis} from 'recharts'
 import type {usePortfolioHistory} from '../../hooks/usePortfolioHistory'
@@ -35,7 +36,7 @@ export function PortfolioHistoryChart({history,hidden,currency,currentValue}:{hi
      <YAxis width={64} tick={{fontSize:10}} tickFormatter={n=>Intl.NumberFormat(undefined,{notation:'compact',maximumFractionDigits:1}).format(n)} domain={['auto','auto']}/>
      <Tooltip filterNull={false} content={({active,payload})=>{
       const p=active&&payload?.[0]?.payload as PortfolioHistoryPoint|undefined
-      return p?<div className="rounded-lg border border-border bg-card p-3 text-xs shadow-lg space-y-1"><p>{p.date}{p.provisional?' · provisional':''}</p><p>Portfolio value: {money(p.value)}</p><p>Net invested: {money(p.net_invested)}</p><p>Contributions: {money(p.contribution)} · Withdrawals: {money(p.withdrawal)}</p>{p.price_as_of_oldest&&<p className="text-muted-foreground">Price observations: {p.price_as_of_oldest}{p.price_as_of_latest!==p.price_as_of_oldest?` – ${p.price_as_of_latest}`:''}</p>}{p.fx_as_of_oldest&&<p className="text-muted-foreground">FX observation: {p.fx_as_of_oldest}</p>}</div>:null
+      return p?<PortfolioHistoryTooltip point={p} currency={currency} hidden={hidden}/>:null
      }}/>
      <Area type="linear" dataKey="value" name="Portfolio value" stroke="hsl(var(--primary))" strokeWidth={2} fill={`url(#${id})`} dot={{r:1.5,strokeWidth:0,fill:'hsl(var(--primary))'}} connectNulls={false} isAnimationActive={false}/>
      <Line type="stepAfter" dataKey="net_invested" name="Net invested" stroke="hsl(var(--muted-foreground))" strokeDasharray="5 5" dot={false} connectNulls={false} isAnimationActive={false}/>
diff --git a/client/src/components/investments-module/PortfolioHistoryTooltip.test.tsx b/client/src/components/investments-module/PortfolioHistoryTooltip.test.tsx
new file mode 100644
index 0000000..8b6910b
--- /dev/null
+++ b/client/src/components/investments-module/PortfolioHistoryTooltip.test.tsx
@@ -0,0 +1,24 @@
+import {cleanup,render,screen} from '@testing-library/react'
+import {afterEach,expect,it} from 'vitest'
+import type {PortfolioHistoryPoint} from '../../../../shared/investment-history-contract'
+import {PortfolioHistoryTooltip} from './PortfolioHistoryTooltip'
+const point=(value:number|null,invested:number|null):PortfolioHistoryPoint=>({date:'2026-10-03',value,net_invested:invested,contribution:0,withdrawal:0,provisional:false,event:false,coverage:'complete',price_as_of_oldest:'2026-10-02',price_as_of_latest:'2026-10-02',fx_as_of_oldest:'2026-10-02',fx_as_of_latest:'2026-10-02'})
+afterEach(cleanup)
+it.each([[1200,1000,'+200 EUR','+20%'],[800,1000,'-200 EUR','-20%'],[1000,1000,'0 EUR','0%']])('shows selected-day total gain and its ratio (%s)',(value,invested,gain,percent)=>{
+ render(<PortfolioHistoryTooltip point={point(value,invested)} currency="EUR"/>)
+ expect(screen.getByText(gain)).toBeVisible();expect(screen.getByText(percent)).toBeVisible()
+ expect(document.querySelector('time')).toHaveAttribute('dateTime','2026-10-03')
+ expect(document.querySelector('time')?.textContent).toBe(new Date('2026-10-03T00:00:00Z').toLocaleDateString(undefined,{month:'short',day:'numeric',year:'numeric',timeZone:'UTC'}))
+ expect(screen.getByText('Portfolio value')).toBeVisible()
+ expect(screen.queryByText(/Contributions:|Withdrawals:|Price observations:|FX observation:|Net invested:/)).not.toBeInTheDocument()
+})
+it.each([[null,1000],[1200,null],[1200,0],[1200,-100],[Infinity,1000]])('does not invent a percentage with missing or invalid values (%s, %s)',(value,invested)=>{
+ render(<PortfolioHistoryTooltip point={point(value,invested)} currency="USD"/>)
+ expect(screen.queryByTitle('Gain on net invested')).not.toBeInTheDocument()
+ if(value==null||invested==null||!Number.isFinite(value))expect(screen.getAllByText('Unavailable').length).toBeGreaterThan(0)
+})
+it('masks all financial figures including the percentage',()=>{
+ render(<PortfolioHistoryTooltip point={point(1200,1000)} currency="EUR" hidden/>)
+ expect(screen.getAllByText('••••••')).toHaveLength(3)
+ expect(screen.queryByText(/200 EUR|20%/)).not.toBeInTheDocument()
+})
diff --git a/client/src/components/investments-module/PortfolioHistoryTooltip.tsx b/client/src/components/investments-module/PortfolioHistoryTooltip.tsx
new file mode 100644
index 0000000..3b91cec
--- /dev/null
+++ b/client/src/components/investments-module/PortfolioHistoryTooltip.tsx
@@ -0,0 +1,20 @@
+import type {PortfolioHistoryPoint} from '../../../../shared/investment-history-contract'
+import {amount,percentage,signedAmount,tone} from './overview'
+
+export function PortfolioHistoryTooltip({point,currency,hidden=false}:{point:PortfolioHistoryPoint;currency:string;hidden?:boolean}) {
+ const {value,net_invested:invested}=point
+ const difference=value!=null&&Number.isFinite(value)&&invested!=null&&Number.isFinite(invested)?value-invested:null
+ const gain=difference!=null&&Number.isFinite(difference)?difference:null
+ const ratio=gain!=null&&invested!=null&&invested>0?gain/invested*100:null
+ const gainPercent=ratio!=null&&Number.isFinite(ratio)?ratio:null
+ const date=new Date(`${point.date}T00:00:00Z`).toLocaleDateString(undefined,{month:'short',day:'numeric',year:'numeric',timeZone:'UTC'})
+ return <div className="w-max max-w-[calc(100vw-3rem)] rounded-xl border border-border bg-card p-4 shadow-lg">
+  <p className="text-xs text-muted-foreground"><time dateTime={point.date}>{date}</time>{point.provisional?' · provisional':''}</p>
+  <p className="mt-3 text-xs text-muted-foreground">Total gain</p>
+  <div className={`mt-1 flex flex-wrap items-baseline gap-x-3 gap-y-1 tabular-nums ${tone(gain,hidden)}`}>
+   <p className="text-2xl font-semibold tracking-tight">{signedAmount(gain,currency,hidden)}</p>
+   {gainPercent!=null&&<p className="text-lg font-semibold" title="Gain on net invested">{percentage(gainPercent,hidden)}</p>}
+  </div>
+  <div className="mt-3 border-t border-border pt-3"><p className="text-xs text-muted-foreground">Portfolio value</p><p className="mt-1 text-base font-medium tabular-nums">{amount(value,currency,hidden)}</p></div>
+ </div>
+}
diff --git a/client/src/test/PortfolioHistoryChart.test.tsx b/client/src/test/PortfolioHistoryChart.test.tsx
index 3f1d4ad..0db6f44 100644
--- a/client/src/test/PortfolioHistoryChart.test.tsx
+++ b/client/src/test/PortfolioHistoryChart.test.tsx
@@ -15,7 +15,7 @@ it('hides financial values, return percentage, axes and tooltips in privacy mode
  expect(screen.getAllByText('••••••')).toHaveLength(2)
  expect(screen.getByText('•••••• estimated return')).toBeVisible()
 })
-it('preserves the selected range and displays coverage without inventing missing totals',()=>{
+it('preserves the selected range without inventing missing totals',()=>{
  const history=fixture();history.data.summary.gain=null;history.data.summary.estimated_return_percent=null
  history.data.points=history.data.points.map(p=>({...p,value:null}))
  history.data.summary.status='partial';history.data.summary.reasons=['unknown_opening']
@@ -24,8 +24,6 @@ it('preserves the selected range and displays coverage without inventing missing
  expect(screen.getByText('Unavailable estimated return')).toBeVisible()
  expect(screen.getByText('No known portfolio values in this range.')).toBeVisible()
  fireEvent.click(screen.getByRole('button',{name:'YTD'}));expect(history.setRange).toHaveBeenCalledWith('ytd')
- fireEvent.click(screen.getByText('History method and coverage · incomplete'))
- expect(screen.getByText('Range coverage: unknown opening.')).toBeVisible()
 })
 it('retains saved data with an actionable retry after a failed refresh',()=>{
  const history=fixture();history.error=true
diff --git a/docs/investment-overview.md b/docs/investment-overview.md
index e10c533..f950a0c 100644
--- a/docs/investment-overview.md
+++ b/docs/investment-overview.md
@@ -16,6 +16,8 @@ Values, cash invested, gains, Today and allocation weights come from the shared
 
 Total gain is the known lifetime realized plus unrealized amount. The summary shows **Gain on net invested** as total gain / net invested × 100 only when both amounts are finite and net invested is positive; otherwise it omits the percentage. This simple ratio does not account for cash-flow timing, and withdrawals can make it less useful. It is distinct from Estimated return; the UI does not attach a selected-range percentage to a lifetime gain. The history chart reports its own covered range gain and daily-linked estimate. Today includes eligible market holdings; manual appraisals and stale inputs are excluded. Coverage metadata stays in the read contract; the overview omits the About this view, summary notes and coverage/method prose panels at the user's request (#171). See [metrics](investment-metrics.md) and [market inputs](investment-market-data.md).
 
+The history tooltip shows the selected calendar date, total gain (`value − net_invested`) and its gain-on-net-invested ratio, with portfolio value secondary. Both dated amounts must be known and finite for gain; the percentage additionally requires positive net invested. Unknown gain stays unavailable and unsupported percentages are omitted. This is lifetime gain as of that date, not the selected range's daily-linked return. Observation/flow diagnostics remain in the API contract rather than the tooltip. Calendar dates are formatted without a local-timezone day shift.
+
 ## Interaction and retained state
 
 Desktop tables become cards at narrower available widths, with a mobile sort selector. Allocation by type filters the table; allocation by holding and holding names open the existing detail panel. Category, sort, allocation mode and reporting currency survive route changes only in App-owned session memory. Financial snapshots are never persisted to browser storage. Superseded and hidden overview reads are aborted and invalidated; return visits revalidate while retaining the last complete snapshot. Failed reads preserve that snapshot with retry feedback.

From 819f92c7ddcfdad3fc0ff29fb8eaa701e65938e6 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 13:03:25 +0200
Subject: [PATCH 05/21] Compact investment overview into balanced responsive
 sections

---
 CHANGELOG.md                                              | 2 +-
 client/src/components/investments-module/Investments.tsx  | 8 +++-----
 .../components/investments-module/InvestmentsSkeleton.tsx | 7 +++----
 .../components/investments-module/PortfolioAllocation.tsx | 6 +++---
 .../investments-module/PortfolioHistoryChart.tsx          | 4 ++--
 .../components/investments-module/PortfolioSummary.tsx    | 8 ++++----
 docs/investment-overview.md                               | 4 ++++
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 512486d..e8a836c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value (#171).
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/investments-module/Investments.tsx b/client/src/components/investments-module/Investments.tsx
index 309458b..26271d2 100644
--- a/client/src/components/investments-module/Investments.tsx
+++ b/client/src/components/investments-module/Investments.tsx
@@ -58,11 +58,9 @@ export function Investments() {
     <div role="group" aria-label="Investment reporting currency" className="flex rounded-lg border border-border p-0.5">{investmentReportingCurrencies.map(c=><button key={c} type="button" aria-pressed={currencyDisplay===c} onClick={()=>setCurrencyDisplay(c)} className={`min-h-9 rounded-md px-3 text-xs font-semibold ${c===currencyDisplay?'bg-secondary text-foreground':'text-muted-foreground'}`}>{c}</button>)}</div>
     {canTrade?<Button type="button" onClick={()=>setEditor({})} className="h-10"><Plus className="h-4 w-4"/>Record trade</Button>:<Link to="/accounts" state={{addAccount:true,investment:accounts.length===0}} className="inline-flex min-h-10 items-center rounded-lg bg-primary px-3 text-xs font-semibold text-primary-foreground">{accounts.length===0?'Add first holding':'Set up trade accounts'}</Link>}
    </header>
-   <div className="grid min-w-0 items-stretch gap-4 @min-[900px]:grid-cols-[minmax(0,1fr)_320px]">
-    <InvestmentAttention positions={positions} quotes={quotes} refreshing={status.loading} onRefresh={()=>{void refresh()}} onOpen={a=>setSelected(a.id)} className="order-2 @min-[900px]:order-first @min-[900px]:col-span-2"/>
-    <div className="order-1 min-w-0"><PortfolioHistoryChart history={investments.history} hidden={hidden} currency={currencyDisplay} currentValue={metrics?.total_value}/></div>
-    <div className="order-3 min-w-0"><PortfolioSummary metrics={metrics} hidden={hidden} currency={currencyDisplay}/></div>
-   </div>
+   <InvestmentAttention positions={positions} quotes={quotes} refreshing={status.loading} onRefresh={()=>{void refresh()}} onOpen={a=>setSelected(a.id)}/>
+   <PortfolioSummary metrics={metrics} hidden={hidden} currency={currencyDisplay}/>
+   <PortfolioHistoryChart history={investments.history} hidden={hidden} currency={currencyDisplay} currentValue={metrics?.total_value}/>
    <PortfolioAllocation positions={positions} view={overviewView} onChange={updateOverview} onOpen={a=>setSelected(a.id)} hidden={hidden} currency={currencyDisplay}/>
    <HoldingsList positions={positions} quotes={quotes} trends={data?.trends} privacyMode={privacyMode} view={overviewView} onViewChange={updateOverview} refreshing={status.loading} onOpenDetail={a=>setSelected(a.id)}/>
    {!editor&&!legacyTradeId&&<InvestmentDetailModal key={selected} account={opening} allTransactions={trades} quotes={quotes} exchangeRates={data?.exchangeRates??{}} privacyMode={privacyMode}
diff --git a/client/src/components/investments-module/InvestmentsSkeleton.tsx b/client/src/components/investments-module/InvestmentsSkeleton.tsx
index 6f65ab5..6ca7ef0 100644
--- a/client/src/components/investments-module/InvestmentsSkeleton.tsx
+++ b/client/src/components/investments-module/InvestmentsSkeleton.tsx
@@ -5,10 +5,9 @@ import { Skeleton } from '../common/Skeleton'
 export function InvestmentsSkeleton({ accounts }: { accounts?: Account[] }) {
   return <div className="@container space-y-4">
     <div className="flex justify-end gap-2"><Skeleton className="h-7 w-14 rounded-lg" /><Skeleton className="h-7 w-14 rounded-lg" /></div>
-    <div className="grid gap-4 @min-[900px]:grid-cols-[minmax(0,1fr)_320px]">
-      <Panel widget="portfolio-history" className="space-y-4 p-5"><Heading/><Skeleton className="h-9 w-48"/><Skeleton className="h-64 w-full rounded-lg"/><Skeleton className="h-3 w-40"/></Panel>
-      <div className="space-y-4"><Panel widget="summary-cards" className="space-y-4 p-5">{[0,1,2].map(i=><div key={i} className="space-y-2"><Skeleton className="h-3 w-24"/><Skeleton className="h-7 w-36"/></div>)}</Panel><Panel widget="allocation" className="space-y-4 p-5"><Heading/><Skeleton className="h-2 w-full"/><Rows count={2}/></Panel></div>
-    </div>
+    <Panel widget="summary-cards" className="grid grid-cols-2 gap-4 p-4 @min-[640px]:grid-cols-3">{[0,1,2].map(i=><div key={i} className="min-w-0 space-y-2 first:col-span-2 @min-[640px]:first:col-span-1"><Skeleton className="h-3 w-24"/><Skeleton className="h-8 w-36 max-w-full"/></div>)}</Panel>
+    <Panel widget="portfolio-history" className="space-y-3 p-5"><Heading/><Skeleton className="h-9 w-48"/><Skeleton className="h-[220px] w-full rounded-lg @min-[640px]:h-[300px]"/><Skeleton className="h-3 w-40"/></Panel>
+    <Panel widget="allocation" className="space-y-4 p-5"><Heading/><Skeleton className="h-2 w-full"/><div className="grid gap-2 @min-[560px]:grid-cols-2 @min-[1000px]:grid-cols-4">{[0,1,2,3].map(i=><Skeleton key={i} className="h-16 w-full rounded-lg"/>)}</div></Panel>
     <Panel widget="holdings" className="overflow-hidden rounded-2xl"><div className="border-b border-border/50 p-4"><Heading /></div>
       <Rows count={accounts ? Math.max(1, accounts.filter(account => account.type === 'investment' && account.archived_at == null).length) : 3} holdings />
     </Panel>
diff --git a/client/src/components/investments-module/PortfolioAllocation.tsx b/client/src/components/investments-module/PortfolioAllocation.tsx
index 5c830f5..a967786 100644
--- a/client/src/components/investments-module/PortfolioAllocation.tsx
+++ b/client/src/components/investments-module/PortfolioAllocation.tsx
@@ -6,10 +6,10 @@ export function PortfolioAllocation({positions,view,onChange,onOpen,hidden,curre
  return <section aria-label="Portfolio allocation" className="min-w-0 rounded-2xl border border-border bg-card p-4 sm:p-5">
   <div className="flex flex-wrap items-center justify-between gap-2"><h2 className="text-[15px] font-semibold">Allocation</h2><div role="group" aria-label="Allocation mode" className="flex rounded-lg border border-border bg-background p-0.5">{(['holding','type','currency'] as const).map(mode=><button type="button" key={mode} aria-pressed={view.allocation===mode} onClick={()=>onChange({allocation:mode})} className={`min-h-9 rounded-md px-2 text-[11px] capitalize ${view.allocation===mode?'bg-secondary font-semibold':'text-muted-foreground'}`}>{mode}</button>)}</div></div>
   <div className="my-4 flex h-2 gap-0.5 overflow-hidden rounded-full bg-secondary" aria-hidden="true">{!hidden&&complete&&rows.map(r=><span key={r.key} style={{width:`${r.weight}%`,background:r.color}}/>)}</div>
-  {!rows.length?<p className="text-xs text-muted-foreground">Allocation appears when you add holdings with known values.</p>:<ul className="max-h-56 space-y-1 overflow-y-auto pr-1">{rows.map(r=>{
+  {!rows.length?<p className="text-xs text-muted-foreground">Allocation appears when you add holdings with known values.</p>:<ul className="grid max-h-64 grid-cols-1 gap-2 overflow-y-auto @min-[560px]:grid-cols-2 @min-[1000px]:grid-cols-4">{rows.map(r=>{
    const clickable=view.allocation!=='currency'
-   const content=<><span className="h-2 w-2 shrink-0 rounded-sm" style={{background:r.color}}/><span className="min-w-0 flex-1 truncate text-left">{r.label}</span><span className="min-w-0 break-words text-right text-[11px] tabular-nums text-muted-foreground">{amount(r.value,currency,hidden)}</span><span className="w-12 text-right text-xs font-medium tabular-nums">{hidden?'••••':r.weight==null?'—':percentage(r.weight).replace('+','')}</span></>
-   return <li key={r.key}>{clickable?<button type="button" onClick={()=>view.allocation==='type'?onChange({filter:r.key as HoldingFilter}):onOpen(r.items[0].account)} aria-pressed={view.allocation==='type'?view.filter===r.key:undefined} className="flex min-h-10 w-full items-center gap-2 rounded-lg px-1.5 text-xs hover:bg-secondary focus-visible:outline-2 focus-visible:outline-primary">{content}</button>:<div className="flex min-h-10 items-center gap-2 px-1.5 text-xs">{content}</div>}</li>
+   const content=<><span className="flex min-w-0 items-center gap-2"><span className="h-2 w-2 shrink-0 rounded-sm" style={{background:r.color}}/><span className="truncate text-xs font-medium">{r.label}</span></span><span className="text-right text-xs font-semibold tabular-nums">{hidden?'••••':r.weight==null?'—':percentage(r.weight).replace('+','')}</span><span className="col-span-2 min-w-0 break-words pl-4 text-left text-xs tabular-nums text-muted-foreground">{amount(r.value,currency,hidden)}</span></>
+   return <li key={r.key}>{clickable?<button type="button" onClick={()=>view.allocation==='type'?onChange({filter:r.key as HoldingFilter}):onOpen(r.items[0].account)} aria-pressed={view.allocation==='type'?view.filter===r.key:undefined} className="grid min-h-16 w-full grid-cols-[minmax(0,1fr)_auto] items-center gap-x-3 gap-y-1 rounded-lg bg-secondary/40 px-3 py-2.5 text-xs hover:bg-secondary focus-visible:outline-2 focus-visible:outline-primary">{content}</button>:<div className="grid min-h-16 grid-cols-[minmax(0,1fr)_auto] items-center gap-x-3 gap-y-1 rounded-lg bg-secondary/40 px-3 py-2.5 text-xs">{content}</div>}</li>
   })}</ul>}
   <p className="mt-3 text-[11px] leading-relaxed text-muted-foreground">{!complete?'Complete weights unavailable until every holding has a known value. ':''}{view.allocation==='type'?'Select a type to filter holdings.':view.allocation==='currency'?'Quote / valuation currency, not geographic exposure.':'Full portfolio · select a holding for details.'}</p>
  </section>
diff --git a/client/src/components/investments-module/PortfolioHistoryChart.tsx b/client/src/components/investments-module/PortfolioHistoryChart.tsx
index e362581..b9998c2 100644
--- a/client/src/components/investments-module/PortfolioHistoryChart.tsx
+++ b/client/src/components/investments-module/PortfolioHistoryChart.tsx
@@ -16,7 +16,7 @@ export function PortfolioHistoryChart({history,hidden,currency,currentValue}:{hi
  const displayedValue=selected?selected.value:currentValue!==undefined?currentValue:summary?.end_value
  const readDay=(index:number)=>setSelection({key,index})
  const known=data?.points.some(p=>p.value!==null)
- return <section aria-label="Portfolio history" className="flex h-full min-w-0 flex-col rounded-2xl border border-border bg-card p-4 sm:p-6 space-y-4">
+ return <section aria-label="Portfolio history" className="flex min-w-0 flex-col rounded-2xl border border-border bg-card p-4 sm:p-5 space-y-3">
   <div className="flex flex-wrap items-start justify-between gap-3">
    <div className="min-w-0"><h2 className="text-[13px] font-medium text-muted-foreground">Portfolio value{selected?` · ${selected.date}`:''}</h2><p className="mt-1 break-words text-2xl font-semibold tracking-tight tabular-nums sm:text-[32px]">{money(displayedValue)}</p>
     <p className="mt-2 text-xs text-muted-foreground">Range gain <span className="font-semibold text-foreground">{money(summary?.gain)}</span> · <span>{percent(summary?.estimated_return_percent)} estimated return</span> · Excludes dividends</p>
@@ -27,7 +27,7 @@ export function PortfolioHistoryChart({history,hidden,currency,currentValue}:{hi
   </div>
   {error&&<p role="alert" className="text-sm">{data?'Showing saved history. Refresh failed.':'Portfolio history could not be loaded.'} {history.errorMessage} <button onClick={refresh} className="text-primary underline">Retry history</button></p>}
   {loading&&<p role="status" className="text-xs text-muted-foreground">{data?'Refreshing history…':'Loading portfolio history…'}</p>}
-  <div className="min-h-48 flex-1 sm:min-h-[280px] w-full" aria-label={hidden?'Portfolio chart hidden':'Daily portfolio value and net invested'}>
+  <div className="h-[220px] w-full min-w-0 @min-[640px]:h-[300px]" aria-label={hidden?'Portfolio chart hidden':'Daily portfolio value and net invested'}>
    {hidden?<div className="flex h-full items-center justify-center text-muted-foreground">Chart hidden for privacy</div>:!data?<div className="flex h-full items-center justify-center text-sm text-muted-foreground">{loading?'Loading daily values…':'History unavailable'}</div>:!known?<div className="flex h-full items-center justify-center text-sm text-muted-foreground">No known portfolio values in this range.</div>:
     <ResponsiveContainer width="100%" height="100%"><ComposedChart data={data.points} onMouseMove={s=>{if(s.activeIndex!=null&&Number.isInteger(Number(s.activeIndex)))readDay(Number(s.activeIndex))}} onClick={s=>{if(s.activeIndex!=null&&Number.isInteger(Number(s.activeIndex)))readDay(Number(s.activeIndex))}} onMouseLeave={()=>setSelection(null)} margin={{left:0,right:12,top:8,bottom:0}}>
      <defs><linearGradient id={id} x1="0" y1="0" x2="0" y2="1"><stop offset="0%" stopColor="hsl(var(--primary))" stopOpacity={0.18}/><stop offset="100%" stopColor="hsl(var(--primary))" stopOpacity={0.01}/></linearGradient></defs>
diff --git a/client/src/components/investments-module/PortfolioSummary.tsx b/client/src/components/investments-module/PortfolioSummary.tsx
index ac196d7..5c6dd94 100644
--- a/client/src/components/investments-module/PortfolioSummary.tsx
+++ b/client/src/components/investments-module/PortfolioSummary.tsx
@@ -6,10 +6,10 @@ export function PortfolioSummary({metrics,hidden,currency}:{metrics?:CurrencyMet
  const gain=metrics?.total_gain,invested=metrics?.total_invested
  const ratio=gain!=null&&Number.isFinite(gain)&&invested!=null&&Number.isFinite(invested)&&invested>0?gain/invested*100:null
  const gainPercent=ratio!=null&&Number.isFinite(ratio)?ratio:null
- const rows=[{label:'Net invested',value:invested,percent:null,signed:false},
-  {label:'Total gain',value:gain,percent:gainPercent,signed:true},
+ const rows=[{label:'Total gain',value:gain,percent:gainPercent,signed:true},
+  {label:'Net invested',value:invested,percent:null,signed:false},
   {label:'Today',value:today?.gain,percent:today?.estimated_return_percent,signed:true}]
- return <section aria-label="Portfolio summaries" className="overflow-hidden rounded-2xl border border-border bg-card divide-y divide-border">
-  {rows.map(r=><div key={r.label} className="px-5 py-4"><h2 className="text-xs font-medium text-muted-foreground">{r.label}</h2><div className="mt-1.5 flex flex-wrap items-baseline gap-x-2 gap-y-1"><p className={`max-w-full break-words text-xl font-semibold tracking-tight tabular-nums ${r.signed?tone(r.value,hidden):''}`}>{r.signed?signedAmount(r.value,currency,hidden):amount(r.value,currency,hidden)}</p>{r.label==='Total gain'?(gainPercent!=null&&<span title="Total gain divided by net invested. This simple ratio does not account for when money was invested; withdrawals can make it less useful." className={`text-xs tabular-nums ${tone(gainPercent,hidden)}`}>{hidden?'••••':`${percentage(gainPercent)} · Gain on net invested`}</span>):r.label==='Today'&&<span className={`text-xs tabular-nums ${tone(r.percent,hidden)}`}>{hidden?'••••':r.percent==null?'Estimated return unavailable':`${percentage(r.percent)} estimated`}</span>}</div></div>)}
+ return <section aria-label="Portfolio summaries" className="grid grid-cols-2 gap-px overflow-hidden rounded-2xl border border-border bg-border @min-[640px]:grid-cols-3">
+  {rows.map(r=><div key={r.label} className="min-w-0 bg-card p-4 first:col-span-2 @min-[640px]:first:col-span-1 sm:px-5"><h2 className="text-xs font-medium text-muted-foreground">{r.label}</h2><div className="mt-1.5 flex flex-wrap items-baseline gap-x-2 gap-y-1"><p className={`max-w-full break-words text-2xl font-semibold tracking-tight tabular-nums ${r.signed?tone(r.value,hidden):''}`}>{r.signed?signedAmount(r.value,currency,hidden):amount(r.value,currency,hidden)}</p>{r.label==='Total gain'?(gainPercent!=null&&<span title="Total gain divided by net invested. This simple ratio does not account for when money was invested; withdrawals can make it less useful." className={`text-xs tabular-nums ${tone(gainPercent,hidden)}`}>{hidden?'••••':`${percentage(gainPercent)} · Gain on net invested`}</span>):r.label==='Today'&&<span className={`text-xs tabular-nums ${tone(r.percent,hidden)}`}>{hidden?'••••':r.percent==null?'Estimated return unavailable':`${percentage(r.percent)} estimated`}</span>}</div></div>)}
  </section>
 }
diff --git a/docs/investment-overview.md b/docs/investment-overview.md
index f950a0c..9f553d3 100644
--- a/docs/investment-overview.md
+++ b/docs/investment-overview.md
@@ -18,6 +18,10 @@ Total gain is the known lifetime realized plus unrealized amount. The summary sh
 
 The history tooltip shows the selected calendar date, total gain (`value − net_invested`) and its gain-on-net-invested ratio, with portfolio value secondary. Both dated amounts must be known and finite for gain; the percentage additionally requires positive net invested. Unknown gain stays unavailable and unsupported percentages are omitted. This is lifetime gain as of that date, not the selected range's daily-linked return. Observation/flow diagnostics remain in the API contract rather than the tooltip. Calendar dates are formatted without a local-timezone day shift.
 
+## Layout
+
+The overview stacks a responsive summary strip, a full-width history chart and Allocation before Holdings. Total gain leads the strip; narrow containers place it above Net invested and Today. The plot uses an explicit 220px/300px responsive height rather than stretching to a neighboring column. Allocation entries use one, two or four compact columns based on available container width. The initial skeleton follows the same arrangement.
+
 ## Interaction and retained state
 
 Desktop tables become cards at narrower available widths, with a mobile sort selector. Allocation by type filters the table; allocation by holding and holding names open the existing detail panel. Category, sort, allocation mode and reporting currency survive route changes only in App-owned session memory. Financial snapshots are never persisted to browser storage. Superseded and hidden overview reads are aborted and invalidated; return visits revalidate while retaining the last complete snapshot. Failed reads preserve that snapshot with retry feedback.

From 2e5d42202ee5d82789c6b6b4ff9d2ccb1844fcc5 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 13:04:58 +0200
Subject: [PATCH 06/21] Remove duplicate investment privacy button

---
 CHANGELOG.md                                             | 2 +-
 client/src/components/investments-module/Investments.tsx | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8a836c..c827955 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space (#171).
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space. Investments uses the universal privacy control without a duplicate page-level hide button (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/investments-module/Investments.tsx b/client/src/components/investments-module/Investments.tsx
index 26271d2..745394f 100644
--- a/client/src/components/investments-module/Investments.tsx
+++ b/client/src/components/investments-module/Investments.tsx
@@ -2,7 +2,7 @@ import { investmentReportingCurrencies } from './reporting-currencies'
 import { LegacyTradeDetails } from './LegacyTradeDetails'
 import {useEffect,useRef,useState} from 'react'
 import {Link,useOutletContext} from 'react-router'
-import {Eye,EyeOff,Plus,RefreshCw} from 'lucide-react'
+import {Plus,RefreshCw} from 'lucide-react'
 import type {FinancePageContext} from '../../App'
 import {FinanceDataBoundary} from '../common/FinanceDataStatus'
 import {Button} from '../common/button'
@@ -21,7 +21,7 @@ import {InvestmentDetailModal} from './InvestmentDetailModal'
 export function Investments() {
  const {investments,finance}=useOutletContext<FinancePageContext>()
  const {data,status,refresh,currencyDisplay,setCurrencyDisplay,overviewView,updateOverview}=investments
- const {privacyMode,togglePrivacyMode}=usePrivacy(),hidden=privacyMode==='hidden'
+ const {privacyMode}=usePrivacy(),hidden=privacyMode==='hidden'
  const [legacyTradeId,setLegacyTradeId]=useState<string|null>(null)
  const [selected,setSelected]=useState<string|null>(null)
  const [editor,setEditor]=useState<{holdingId?:string;type?:'buy'|'sell';edit?:TradeEdit}|null>(null)
@@ -54,7 +54,6 @@ export function Investments() {
     <h1 className="mr-auto hidden text-2xl font-semibold tracking-tight lg:block">Investments</h1>
     <p className="order-last w-full text-right text-[10px] text-muted-foreground lg:order-none lg:w-auto">{status.stale?'Saved snapshot':'As of'} {data?.asOf?new Date(data.asOf).toLocaleString(undefined,{month:'short',day:'numeric',hour:'2-digit',minute:'2-digit'}):'unavailable'}</p>
     <Button type="button" variant="outline" size="icon" disabled={status.loading} onClick={()=>{void refresh()}} aria-label="Refresh prices" className="h-10 w-10"><RefreshCw className={`h-4 w-4 ${refreshing?'animate-spin motion-reduce:animate-none':''}`}/></Button>
-    <Button type="button" variant="outline" size="icon" onClick={togglePrivacyMode} aria-label={hidden?'Show investment values':'Hide investment values'} aria-pressed={hidden} className="hidden h-10 w-10 lg:inline-flex">{hidden?<EyeOff className="h-4 w-4"/>:<Eye className="h-4 w-4"/>}</Button>
     <div role="group" aria-label="Investment reporting currency" className="flex rounded-lg border border-border p-0.5">{investmentReportingCurrencies.map(c=><button key={c} type="button" aria-pressed={currencyDisplay===c} onClick={()=>setCurrencyDisplay(c)} className={`min-h-9 rounded-md px-3 text-xs font-semibold ${c===currencyDisplay?'bg-secondary text-foreground':'text-muted-foreground'}`}>{c}</button>)}</div>
     {canTrade?<Button type="button" onClick={()=>setEditor({})} className="h-10"><Plus className="h-4 w-4"/>Record trade</Button>:<Link to="/accounts" state={{addAccount:true,investment:accounts.length===0}} className="inline-flex min-h-10 items-center rounded-lg bg-primary px-3 text-xs font-semibold text-primary-foreground">{accounts.length===0?'Add first holding':'Set up trade accounts'}</Link>}
    </header>

From 426dcdcd2acbfd5aa5485fe571da6d2cbeaf016c Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 13:08:09 +0200
Subject: [PATCH 07/21] Center holding details and show all dated trade markers

---
 CHANGELOG.md                                  |  2 +-
 .../InvestmentChart.render.test.tsx           | 36 +++++++++++++++-
 .../investments-module/InvestmentChart.tsx    | 41 +++++++++++++++----
 .../InvestmentDetailModal.tsx                 |  4 +-
 docs/investment-detail.md                     |  4 +-
 5 files changed, 73 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c827955..6f114d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space. Investments uses the universal privacy control without a duplicate page-level hide button (#171).
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space. Investments uses the universal privacy control without a duplicate page-level hide button. Holding details open centered with a wider chart, green/red buy/sell dots and hollow date-only markers for unverified or other-currency executions (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/investments-module/InvestmentChart.render.test.tsx b/client/src/components/investments-module/InvestmentChart.render.test.tsx
index a1dadeb..775a0be 100644
--- a/client/src/components/investments-module/InvestmentChart.render.test.tsx
+++ b/client/src/components/investments-module/InvestmentChart.render.test.tsx
@@ -1,6 +1,6 @@
 import { cloneElement } from 'react'
 import type { ReactElement } from 'react'
-import { cleanup, render, screen, waitFor } from '@testing-library/react'
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
 import { InvestmentChart } from './InvestmentChart'
 import { normalizeYahoo } from '../../../../shared/market-provider'
@@ -108,3 +108,37 @@ it.each(['dividend', 'split'] as const)(
     else expect(screen.queryByText(/Price history alone/)).not.toBeInTheDocument()
   },
 )
+
+it('shows every long-range buy/sell at its date, including date-only trades and same-day executions',async()=>{
+ const history=normalizeYahoo(yahooFixture(Date.now()),'TEST','2021-10-19',Date.now()).history
+ history.from='2021-10-19';history.to='2026-10-19'
+ history.points=[{date:'2022-01-03',period_start:'2022-01-03T00:00:00Z',close:100,provider_close:100,provisional:false},
+  {date:'2026-10-19',period_start:'2026-10-19T00:00:00Z',close:110,provider_close:110,provisional:false}]
+ const fetcher=vi.fn<typeof fetch>().mockImplementation(async url=>Response.json(String(url).includes('range=5y')?history:{...history,from:'2026-09-19'}))
+ vi.stubGlobal('fetch',fetcher)
+ render(<InvestmentChart symbol="TEST" transactions={[
+  {id:'old-buy',date:'2022-01-03',amount:100,quantity:1,price:100,execution_currency:'EUR'},
+  {id:'same-day-buy',date:'2022-01-03',amount:101,quantity:1,price:101,execution_currency:'EUR'},
+  {id:'sell',date:'2025-01-03',amount:-120,quantity:-1,price:120,execution_currency:'EUR'},
+  {id:'foreign-buy',date:'2023-01-03',amount:110,quantity:1,price:110,execution_currency:'USD'},
+  {id:'unknown-sell',date:'2024-01-03',amount:-1,quantity:-1},
+ ]}/> )
+ await screen.findByText(/110 EUR/)
+ fireEvent.click(screen.getByRole('button',{name:'5Y',exact:true}))
+ await screen.findByText('Buy · 3')
+ expect(fetcher.mock.calls.some(([url])=>String(url).includes('range=5y'))).toBe(true)
+ const plot=screen.getByLabelText('Daily instrument price history')
+ await waitFor(()=>expect(plot.querySelectorAll('.recharts-scatter-symbol')).toHaveLength(5))
+ const dots=[...plot.querySelectorAll('.recharts-scatter-symbol circle')]
+ expect(dots.filter(dot=>dot.getAttribute('stroke')==='hsl(var(--success))')).toHaveLength(3)
+ expect(dots.filter(dot=>dot.getAttribute('stroke')==='hsl(var(--destructive))')).toHaveLength(2)
+ expect(dots.filter(dot=>dot.getAttribute('fill')==='hsl(var(--card))')).toHaveLength(2)
+ const sale=dots.find(dot=>dot.querySelector('title')?.textContent==='Sell · 2025-01-03')!
+ fireEvent.click(sale)
+ expect(screen.getByRole('list',{name:'Executions on 2025-01-03'})).toHaveTextContent('120 EUR')
+ fireEvent.change(screen.getByRole('combobox',{name:'Read instrument history by date'}),{target:{value:'2022-01-03'}})
+ expect(screen.getByRole('list',{name:'Executions on 2022-01-03'}).children).toHaveLength(2)
+ fireEvent.click(screen.getByRole('button',{name:'1Y',exact:true}))
+ await waitFor(()=>expect(plot.querySelectorAll('.recharts-scatter-symbol')).toHaveLength(0))
+ expect(fetcher.mock.calls.some(([url])=>String(url).includes('range=1y'))).toBe(true)
+})
diff --git a/client/src/components/investments-module/InvestmentChart.tsx b/client/src/components/investments-module/InvestmentChart.tsx
index 411ee5e..f49a0b6 100644
--- a/client/src/components/investments-module/InvestmentChart.tsx
+++ b/client/src/components/investments-module/InvestmentChart.tsx
@@ -112,9 +112,16 @@ export function InvestmentChart({
     () => history?.points.map((p) => ({ ...p, time: Date.parse(`${p.date}T00:00:00Z`) })) ?? [],
     [history],
   )
-  const markers = trades
-    .filter((t) => t.price != null && t.execution_currency === history?.currency)
-    .map((t) => ({ ...t, time: Date.parse(`${t.date}T00:00:00Z`), executionPrice: t.price }))
+  const markers = useMemo(() => {
+    // Date-only markers sit in a separate bottom lane, never at an inferred fill.
+    const lowest = Math.min(...points.map(p => p.close))
+    const highest = Math.max(...points.map(p => p.close))
+    const lane = Math.max(0, lowest - Math.max((highest - lowest) * 0.12, lowest * 0.03))
+    return trades.map(t => {
+      const exact = t.price != null && Number.isFinite(t.price) && t.price > 0 && t.execution_currency === history?.currency
+      return {...t, time: Date.parse(`${t.date}T00:00:00Z`), markerPrice: exact ? t.price! : lane, dateOnly: !exact}
+    })
+  }, [trades, points, history?.currency])
   const buys = markers.filter((t) => (t.quantity ?? t.amount) > 0)
   const sells = markers.filter((t) => (t.quantity ?? t.amount) < 0)
   const dates = [...new Set([...points.map((p) => p.date), ...trades.map((t) => t.date)])].sort()
@@ -213,7 +220,7 @@ export function InvestmentChart({
           {history ? 'Refreshing price history…' : 'Loading price history…'}
         </p>
       )}
-      <div className="h-56 w-full" aria-label="Daily instrument price history">
+      <div className="h-64 w-full sm:h-80" aria-label="Daily instrument price history">
         {!points.length ? (
           <p className="p-4 text-xs text-muted-foreground">
             {loading ? 'Loading daily observations…' : 'No known daily closes in this range.'}
@@ -262,13 +269,15 @@ export function InvestmentChart({
                 tickFormatter={(n) => Number(n).toLocaleString(undefined, { maximumFractionDigits: 6 })}
               />
               <Tooltip
+                filterNull={false}
                 content={({ active, payload }) => {
                   const p = (active ? payload?.[0]?.payload : undefined) as
-                    { date?: string; close?: number; time?: number } | undefined
+                    { date?: string; close?: number; time?: number; dateOnly?: boolean } | undefined
                   const d = p?.date ?? (p?.time ? new Date(p.time).toISOString().slice(0, 10) : null)
                   return d ? (
                     <div className="max-w-64 rounded-lg border border-border bg-card p-3 text-xs shadow-lg">
                       <p>{d}</p>
+                      {p?.dateOnly && <p className="text-muted-foreground">Date only · execution price unavailable in chart currency</p>}
                       {p?.close != null && <p>Daily close: {money(p.close)}</p>}
                       {trades
                         .filter((t) => t.date === d)
@@ -294,18 +303,22 @@ export function InvestmentChart({
                 <Scatter
                   name="Buy executions"
                   data={buys}
-                  dataKey="executionPrice"
-                  fill="hsl(var(--primary))"
+                  dataKey="markerPrice"
+                  fill="hsl(var(--success))"
                   isAnimationActive={false}
+                  shape={<TradeDot />}
+                  onClick={entry => setSelected({key, date: entry.date})}
                 />
               )}
               {sells.length > 0 && (
                 <Scatter
                   name="Sell executions"
                   data={sells}
-                  dataKey="executionPrice"
+                  dataKey="markerPrice"
                   fill="hsl(var(--destructive))"
                   isAnimationActive={false}
+                  shape={<TradeDot />}
+                  onClick={entry => setSelected({key, date: entry.date})}
                 />
               )}
               {currentCost !== null && (
@@ -320,6 +333,11 @@ export function InvestmentChart({
           </ResponsiveContainer>
         )}
       </div>
+      {trades.length > 0 && <div className="flex flex-wrap gap-4 text-xs text-muted-foreground" aria-label="Trade marker legend">
+        <span className="inline-flex items-center gap-1.5"><span className="h-2.5 w-2.5 rounded-full bg-success"/>Buy · {buys.length}</span>
+        <span className="inline-flex items-center gap-1.5"><span className="h-2.5 w-2.5 rounded-full bg-destructive"/>Sell · {sells.length}</span>
+        {markers.some(t => t.dateOnly) && <span title="Hollow markers show the actual trade date in the bottom lane, not an execution price.">○ Date only</span>}
+      </div>}
       {dates.length > 0 && (
         <label className="block text-xs text-muted-foreground">
           Read chart day
@@ -356,3 +374,10 @@ export function InvestmentChart({
     </section>
   )
 }
+
+function TradeDot({cx,cy,fill,payload}:{cx?:number;cy?:number;fill?:string;payload?:{dateOnly?:boolean;date?:string;quantity?:number;amount?:number}}) {
+  if(cx==null||cy==null)return <g />
+  return <circle cx={cx} cy={cy} r={5} fill={payload?.dateOnly?'hsl(var(--card))':fill} stroke={fill} strokeWidth={2}>
+    <title>{(payload?.quantity??payload?.amount??0)>0?'Buy':'Sell'} · {payload?.date}{payload?.dateOnly?' · date only':''}</title>
+  </circle>
+}
diff --git a/client/src/components/investments-module/InvestmentDetailModal.tsx b/client/src/components/investments-module/InvestmentDetailModal.tsx
index c5b0096..df144dc 100644
--- a/client/src/components/investments-module/InvestmentDetailModal.tsx
+++ b/client/src/components/investments-module/InvestmentDetailModal.tsx
@@ -98,8 +98,8 @@ export function InvestmentDetailModal({
       onClose={close}
       title={account.symbol || account.name}
       subtitle={`${account.name} · ${account.asset_type?.toUpperCase() ?? 'Holding'}`}
-      placement="drawer"
-      className="flex min-h-0 max-h-[96dvh] flex-col sm:max-w-[540px] sm:h-[calc(100dvh-2rem)]"
+      placement="centered"
+      className="flex min-h-0 max-h-[92dvh] flex-col sm:max-w-4xl"
       contentClassName="flex min-h-0 flex-1 flex-col p-0 sm:p-0"
     >
       <div className="min-h-0 flex-1 space-y-5 overflow-y-auto p-4 sm:p-5">
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index bd2b864..00566ca 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -1,6 +1,6 @@
 # Holding details and direct-cash trade editor
 
-The Investments page owns the selected holding ID, editor and mutation refresh. Desktop uses a side panel; narrow screens use a sheet with sticky Buy/Sell actions for unit holdings. Manual total assets show ownership and Update value instead. Manually priced unit holdings retain their unit trades and their separate per-unit appraisal editor.
+The Investments page owns the selected holding ID, editor and mutation refresh. Holding details open in a centered modal on all screen sizes, with a wider desktop chart and sticky Buy/Sell actions for unit holdings. Manual total assets show ownership and Update value instead. Manually priced unit holdings retain their unit trades and their separate per-unit appraisal editor.
 
 ## Detail reads and chart
 
@@ -8,7 +8,7 @@ Current quantity, native price/source time, reporting value, remaining average c
 
 Instrument price history loads only when a market holding is opened with values visible. Its cache belongs to the App investment-data hook, is bounded to 12 entries and uses source snapshot/symbol/range keys. Returning to a matching detail reuses history; changed financial snapshots and mutations invalidate reuse. Superseded/closed reads abort; failed refreshes preserve the matching last good history. No financial history enters browser storage.
 
-Price charts use native daily unadjusted observations. Each supported execution is a separate marker at its actual date and executed price in the chart currency, including multiple buys/sells on one date. Other-currency and unverified executions remain in the dated list, with their actual currency and no nearest-price substitution. A keyboard date selector and date readout expose every same-day execution. The range list shows at most the latest 100 executions; the ordered holding ledger remains separately paged in the panel. The dashed line is **current remaining native basis per unit**, explicitly not a historical cost series or an all-buys average. Raw split ranges withhold a misleading range-change percentage.
+Price charts use native daily unadjusted observations. Every buy/sell in the selected range is a green/red marker at its actual date. A verified positive finite execution price in the chart currency sets the marker height. Other-currency or unverified executions use hollow markers in a separate bottom lane: these represent dates only, never an inferred fill or a substituted nearby close. Their actual currency/facts remain in the tooltip and dated list. Marker selection opens the actual date; same-day trades remain separate records and all appear in the dated list/tooltip. The 1Y, 5Y and other range controls include all matching trades independently of daily-price sampling. A keyboard date selector and date readout expose every same-day execution. The range list shows at most the latest 100 executions; the ordered holding ledger remains separately paged in the panel. The dashed line is **current remaining native basis per unit**, explicitly not a historical cost series or an all-buys average. Raw split ranges withhold a misleading range-change percentage.
 
 Manual histories remain dated total/per-unit step observations, independently loaded and paged. Their cost reference is current known remaining cost, not a deposit or new appraisal. Corrections pin the saved observation ID/version and retain drafts after failure. A successful appraisal refreshes the overview and account snapshots without cash movement.
 

From 193d754655dbf09d318108ccd2ef4ad940a2a9aa Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 13:16:07 +0200
Subject: [PATCH 08/21] Expose historical review for versioned linked legacy
 trades

---
 CHANGELOG.md                                  |  2 +-
 .../InvestmentDetail.test.tsx                 | 13 +++++++++++
 .../InvestmentDetailModal.tsx                 | 11 +++++----
 docs/investment-detail.md                     |  2 +-
 tests/integration/investment-trades.test.ts   | 23 +++++++++++++++++++
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f114d9..8c7bf4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space. Investments uses the universal privacy control without a duplicate page-level hide button. Holding details open centered with a wider chart, green/red buy/sell dots and hollow date-only markers for unverified or other-currency executions (#171).
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space. Investments uses the universal privacy control without a duplicate page-level hide button. Holding details open centered with a wider chart, green/red buy/sell dots and hollow date-only markers for unverified or other-currency executions. Versioned linked legacy trades expose historical review through the guarded linked editor instead of an inaccessible read-only label (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/investments-module/InvestmentDetail.test.tsx b/client/src/components/investments-module/InvestmentDetail.test.tsx
index 7299dbb..7556005 100644
--- a/client/src/components/investments-module/InvestmentDetail.test.tsx
+++ b/client/src/components/investments-module/InvestmentDetail.test.tsx
@@ -60,3 +60,16 @@ it.each([26,61])('uses the same delayed-price policy for a %s-minute quote in ho
  if(minutes===26){expect(screen.getByText(/Delayed price · updated 26 minutes ago/)).toBeVisible();expect(screen.queryByText(/Market price is stale/)).not.toBeInTheDocument()}
  else expect(screen.getByText(/Market price is stale/)).toBeVisible()
 })
+
+it('opens the canonical editor for a versioned linked legacy trade whose execution/cash facts are missing',()=>{
+ vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({observations:[],valuation_at:null,next_cursor:null})))
+ const legacy={...trade('linked-old',1),execution_currency:undefined,cash_amount:null,trade_version:0}
+ const {rerender}=render(<InvestmentDetailModal {...props} allTransactions={[legacy]}/>)
+ fireEvent.click(screen.getByRole('button',{name:/Review historical details for buy/}))
+ expect(edit).toHaveBeenCalledWith(expect.objectContaining({id:'linked-old',linked_transaction_id:'cash-linked-old',trade_version:0}))
+ expect(screen.queryByText('Legacy record · read only')).not.toBeInTheDocument()
+ rerender(<InvestmentDetailModal {...props} allTransactions={[legacy]} account={{...base,is_locked:true}}/>)
+ expect(screen.getByRole('button',{name:/Review historical details for buy/})).toBeDisabled()
+ rerender(<InvestmentDetailModal {...props} allTransactions={[legacy]} privacyMode="hidden"/>)
+ expect(screen.getByRole('button',{name:/Review historical details for buy/})).toBeDisabled()
+})
diff --git a/client/src/components/investments-module/InvestmentDetailModal.tsx b/client/src/components/investments-module/InvestmentDetailModal.tsx
index df144dc..b2abf8a 100644
--- a/client/src/components/investments-module/InvestmentDetailModal.tsx
+++ b/client/src/components/investments-module/InvestmentDetailModal.tsx
@@ -235,11 +235,14 @@ export function InvestmentDetailModal({
                       : buy
                         ? 'Buy'
                         : 'Sell'
-              const editable =
+              const legacyLinked = !total && !!t.linked_transaction_id &&
+                Number.isSafeInteger(t.trade_version) && t.trade_version! >= 0 &&
+                (!t.execution_currency || t.cash_amount == null)
+              const editable = legacyLinked || (
                 !!t.linked_transaction_id &&
                 t.trade_version != null &&
                 !!t.execution_currency &&
-                t.cash_amount != null
+                t.cash_amount != null)
               return (
                 <li key={t.id} className="space-y-1 py-3">
                   <div className="flex min-w-0 items-start gap-2">
@@ -270,12 +273,12 @@ export function InvestmentDetailModal({
                     {(editable || (!total && !t.linked_transaction_id)) ? (
                       <button
                         type="button"
-                        aria-label={`${t.linked_transaction_id ? 'Edit' : 'Confirm historical details for'} ${label.toLowerCase()} on ${t.date}, trade ${index + 1}`}
+                        aria-label={`${legacyLinked ? 'Review historical details for' : t.linked_transaction_id ? 'Edit' : 'Confirm historical details for'} ${label.toLowerCase()} on ${t.date}, trade ${index + 1}`}
                         disabled={editing || !!protectedAccount || dirty || hidden}
                         onClick={() => onEdit(t)}
                         className="min-h-10 shrink-0 text-xs font-medium text-primary disabled:opacity-50"
                       >
-                        {t.linked_transaction_id ? 'Edit trade' : t.cash_amount == null ? 'Confirm historical details' : 'Review historical details'}
+                        {legacyLinked ? 'Review historical details' : t.linked_transaction_id ? 'Edit trade' : t.cash_amount == null ? 'Confirm historical details' : 'Review historical details'}
                       </button>
                     ) : (
                       <span>Legacy record · read only</span>
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index 00566ca..b678f4a 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -4,7 +4,7 @@ The Investments page owns the selected holding ID, editor and mutation refresh.
 
 ## Detail reads and chart
 
-Current quantity, native price/source time, reporting value, remaining average cost, net invested and gains come from the complete overview snapshot. Selecting a holding does not refetch its ledger: the overview already contains bounded, ordered trade facts. The panel shows 20 rows at a time, ordered by date, effective order and ID. Legacy rows without verified execution/cash facts stay readable and cannot open an inferred trade editor.
+Current quantity, native price/source time, reporting value, remaining average cost, net invested and gains come from the complete overview snapshot. Selecting a holding does not refetch its ledger: the overview already contains bounded, ordered trade facts. The panel shows 20 rows at a time, ordered by date, effective order and ID. Standalone legacy rows use the historical-details form. Versioned linked legacy unit trades with missing execution/cash facts expose Review historical details and use the canonical linked editor: its read verifies the reciprocal cash pair before opening, and its preview/save keep the original IDs and version checks. Missing facts must be entered/confirmed, never inferred from a current quote. Broken/ambiguous pairs remain rejected by the server; locks, archive and privacy still disable review.
 
 Instrument price history loads only when a market holding is opened with values visible. Its cache belongs to the App investment-data hook, is bounded to 12 entries and uses source snapshot/symbol/range keys. Returning to a matching detail reuses history; changed financial snapshots and mutations invalidate reuse. Superseded/closed reads abort; failed refreshes preserve the matching last good history. No financial history enters browser storage.
 
diff --git a/tests/integration/investment-trades.test.ts b/tests/integration/investment-trades.test.ts
index d4a6d0d..816f7e8 100644
--- a/tests/integration/investment-trades.test.ts
+++ b/tests/integration/investment-trades.test.ts
@@ -163,6 +163,29 @@ describe('direct cash investment trade writer', () => {
     expect((await f.request(`/investment-trades/${p.trade_id}`,'DELETE')).status).toBe(200)
     expect(await balance('tiny')).toBe(0)
   })
+  it('reviews a linked legacy trade through the guarded editor without charging cash or units twice', async () => {
+    const p=await post()
+    await f.db.prepare(`UPDATE investment_transactions SET execution_currency=NULL,gross_amount=NULL,cash_amount=NULL,cash_currency=NULL,
+      fee_amount=NULL,fee_currency=NULL,fee_status=NULL,trade_version=0 WHERE id=?`).bind(p.trade_id).run()
+    const before=await state(),cashBefore=await balance('cash'),unitsBefore=await balance('holding')
+    const read=await f.request(`/investment-trades/${p.trade_id}`)
+    expect(read.status).toBe(200)
+    expect(await read.json()).toMatchObject({trade:{id:p.trade_id,trade_version:0,execution_currency:null,cash_amount:null},cash_account_id:'cash'})
+    expect(await state()).toEqual(before)
+    const replacement=input({expected_version:0})
+    const preview=await f.request(`/investment-trades/preview?trade_id=${p.trade_id}`,'POST',replacement)
+    expect(preview.status,await preview.clone().text()).toBe(200)
+    expect(await state()).toEqual(before)
+    const saved=await f.request(`/investment-trades/${p.trade_id}`,'PUT',replacement)
+    expect(saved.status,await saved.clone().text()).toBe(200)
+    expect(await saved.json()).toMatchObject(p)
+    expect(await balance('cash')).toBe(cashBefore);expect(await balance('holding')).toBe(unitsBefore)
+    expect(await f.db.prepare('SELECT execution_currency,cash_amount,trade_version,linked_transaction_id FROM investment_transactions WHERE id=?').bind(p.trade_id).first())
+      .toEqual({execution_currency:'EUR',cash_amount:40400,trade_version:1,linked_transaction_id:p.cash_transaction_id})
+    const after=await state()
+    expect((await f.request(`/investment-trades/${p.trade_id}`,'PUT',input({expected_version:0}))).status).toBe(409)
+    expect(await state()).toEqual(after)
+  })
   it('keeps standalone legacy records read-only and never attaches a synthetic cash movement', async () => {
     await f.db.prepare("INSERT INTO investment_transactions (id,account_id,type,quantity,price,total_amount,date) VALUES ('legacy','holding','buy',1,10,17,'2026-01-05')").run()
     const before = await state()

From 0e19d6b2ff141d2c4d318cb1b1f9c97a9d25b452 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 13:21:02 +0200
Subject: [PATCH 09/21] Prefill legacy trade settlement from verified linked
 cash

---
 CHANGELOG.md                                           |  2 +-
 api/src/services/investment-trade.service.ts           |  4 +++-
 .../components/investments-module/TradeEditor.test.tsx | 10 ++++++++++
 .../src/components/investments-module/trade-editor.ts  |  6 ++++--
 docs/investment-detail.md                              |  2 +-
 tests/integration/investment-trades.test.ts            |  2 +-
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c7bf4d..031c60c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space. Investments uses the universal privacy control without a duplicate page-level hide button. Holding details open centered with a wider chart, green/red buy/sell dots and hollow date-only markers for unverified or other-currency executions. Versioned linked legacy trades expose historical review through the guarded linked editor instead of an inaccessible read-only label (#171).
+- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space. Investments uses the universal privacy control without a duplicate page-level hide button. Holding details open centered with a wider chart, green/red buy/sell dots and hollow date-only markers for unverified or other-currency executions. Versioned linked legacy trades expose historical review through the guarded linked editor instead of an inaccessible read-only label, prefilling actual settlement from their verified linked cash transfer when the legacy investment cash field is missing (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/api/src/services/investment-trade.service.ts b/api/src/services/investment-trade.service.ts
index e2152f7..5a6f212 100644
--- a/api/src/services/investment-trade.service.ts
+++ b/api/src/services/investment-trade.service.ts
@@ -148,7 +148,9 @@ export class InvestmentTradeService {
     if (!trade) throw conflict()
     const {cash} = await this.pair(state,trade)
     if ((await this.repo.revision()) !== state.revision) throw conflict()
-    return {trade,cash_account_id:cash.account_id,source_revision:state.revision}
+    return {trade,cash_account_id:cash.account_id,
+      linked_cash:{amount:Math.abs(cash.amount),currency:state.accounts.find(a=>a.id===cash.account_id)!.currency},
+      source_revision:state.revision}
   }
   private execute(input: TradeInput, clientDate: string | undefined, id: string | undefined, preview: false): Promise<TradeResult>
   private execute(input: TradeInput, clientDate: string | undefined, id: string | undefined, preview: true): Promise<{account: Account; trades: InvestmentTransaction[]; trade_id:string;revision:number;cash_after:{account_id:string;currency:string;balance:number}}>
diff --git a/client/src/components/investments-module/TradeEditor.test.tsx b/client/src/components/investments-module/TradeEditor.test.tsx
index e09783a..8517e3f 100644
--- a/client/src/components/investments-module/TradeEditor.test.tsx
+++ b/client/src/components/investments-module/TradeEditor.test.tsx
@@ -1,6 +1,7 @@
 import {act,cleanup,fireEvent,render,screen,waitFor} from '@testing-library/react'
 import {afterEach,beforeEach,expect,it,vi} from 'vitest'
 import {TradeEditor} from './TradeEditor'
+import {parseAmount} from '../../lib/amount'
 import {apiFetch,ApiRequestError} from '../../config'
 import {investmentFixture} from '../../test/investment-fixture'
 import type {Account} from './types'
@@ -185,3 +186,12 @@ it('allows correcting a definitive validation rejection with a fresh request ins
  const bodies=vi.mocked(apiFetch).mock.calls.filter(([url])=>!String(url).includes('/preview')).map(([,o])=>JSON.parse(String(o?.body)))
  expect(bodies[1].idempotency_key).not.toBe(bodies[0].idempotency_key);expect(bodies[1].notes).toBe('Corrected note')
 })
+
+it('prefills legacy settlement from the verified linked cash leg without guessing execution currency or fee',()=>{
+ const edit:TradeEdit={trade:{id:'legacy',account_id:'holding',type:'buy',quantity:1,price:50,date:'2026-01-10',execution_currency:null,cash_amount:null,fee_status:null,trade_version:0},cash_account_id:'cash',linked_cash:{amount:20000,currency:'HUF'},source_revision:1}
+ render(<TradeEditor {...props} accounts={accounts.map(a=>a.id==='holding'?{...a,quote_currency:undefined}:a)} edit={edit}/>)
+ expect(parseAmount((screen.getByLabelText('Actual cash paid (HUF)') as HTMLInputElement).value)).toBe(20000)
+ expect(screen.getByLabelText('Currency')).toHaveValue('')
+ expect(screen.getByLabelText('Fee (HUF)')).toHaveValue('')
+ expect(screen.getByLabelText('Executed unit price')).toHaveValue('50')
+})
diff --git a/client/src/components/investments-module/trade-editor.ts b/client/src/components/investments-module/trade-editor.ts
index 894b138..23be257 100644
--- a/client/src/components/investments-module/trade-editor.ts
+++ b/client/src/components/investments-module/trade-editor.ts
@@ -19,7 +19,7 @@ export type SavedTrade = TradeFacts & {
   notes?: string | null
   linked_transaction_id?: string | null
 }
-export type TradeEdit = { trade: SavedTrade; cash_account_id: string; source_revision: number }
+export type TradeEdit = { trade: SavedTrade; cash_account_id: string; linked_cash?: {amount:number;currency:string}; source_revision: number }
 export type TradeDraft = {
   holding: string
   cash: string
@@ -48,6 +48,8 @@ export function initialTrade(
     a =
       holdings.find((a) => a.id === (t?.account_id ?? holdingId)) ??
       holdings.find((a) => !a.is_locked && a.archived_at == null)
+  const linked=edit?.linked_cash, cashCurrency=cash.find(a=>a.id===edit?.cash_account_id)?.currency
+  const paid=t?.cash_amount ?? (linked && linked.currency===cashCurrency && Number.isFinite(linked.amount) && linked.amount>=0 ? linked.amount : null)
   return {
     holding: a?.id ?? '',
     cash: edit?.cash_account_id ?? cash.find((a) => !a.is_locked && a.archived_at == null)?.id ?? '',
@@ -55,7 +57,7 @@ export function initialTrade(
     quantity: t ? draftNumber(t.quantity) : a?.asset_type === 'manual' ? '1' : '',
     price: t ? draftNumber(t.price) : '',
     currency: t?.execution_currency ?? (a?.asset_type === 'manual' ? a.currency : a?.quote_currency) ?? '',
-    cashAmount: t?.cash_amount != null ? draftNumber(t.cash_amount) : '',
+    cashAmount: paid != null ? draftNumber(paid) : '',
     feeStatus: t?.fee_status ?? 'known',
     fee: t?.fee_amount != null ? draftNumber(t.fee_amount) : '',
     date: t?.date ?? localAccountDate(),
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index b678f4a..de53836 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -4,7 +4,7 @@ The Investments page owns the selected holding ID, editor and mutation refresh.
 
 ## Detail reads and chart
 
-Current quantity, native price/source time, reporting value, remaining average cost, net invested and gains come from the complete overview snapshot. Selecting a holding does not refetch its ledger: the overview already contains bounded, ordered trade facts. The panel shows 20 rows at a time, ordered by date, effective order and ID. Standalone legacy rows use the historical-details form. Versioned linked legacy unit trades with missing execution/cash facts expose Review historical details and use the canonical linked editor: its read verifies the reciprocal cash pair before opening, and its preview/save keep the original IDs and version checks. Missing facts must be entered/confirmed, never inferred from a current quote. Broken/ambiguous pairs remain rejected by the server; locks, archive and privacy still disable review.
+Current quantity, native price/source time, reporting value, remaining average cost, net invested and gains come from the complete overview snapshot. Selecting a holding does not refetch its ledger: the overview already contains bounded, ordered trade facts. The panel shows 20 rows at a time, ordered by date, effective order and ID. Standalone legacy rows use the historical-details form. Versioned linked legacy unit trades with missing execution/cash facts expose Review historical details and use the canonical linked editor: its read verifies the reciprocal cash pair before opening, and its preview/save keep the original IDs and version checks. The editor read returns the verified linked cash amount/currency separately from stored investment facts. When the legacy investment cash field is missing, the draft prefills that recorded amount only if its currency matches the selected cash account; it never derives cash from execution price or current FX. Missing execution and fee facts must still be entered/confirmed, never inferred from a current quote. Broken/ambiguous pairs remain rejected by the server; locks, archive and privacy still disable review.
 
 Instrument price history loads only when a market holding is opened with values visible. Its cache belongs to the App investment-data hook, is bounded to 12 entries and uses source snapshot/symbol/range keys. Returning to a matching detail reuses history; changed financial snapshots and mutations invalidate reuse. Superseded/closed reads abort; failed refreshes preserve the matching last good history. No financial history enters browser storage.
 
diff --git a/tests/integration/investment-trades.test.ts b/tests/integration/investment-trades.test.ts
index 816f7e8..154c418 100644
--- a/tests/integration/investment-trades.test.ts
+++ b/tests/integration/investment-trades.test.ts
@@ -170,7 +170,7 @@ describe('direct cash investment trade writer', () => {
     const before=await state(),cashBefore=await balance('cash'),unitsBefore=await balance('holding')
     const read=await f.request(`/investment-trades/${p.trade_id}`)
     expect(read.status).toBe(200)
-    expect(await read.json()).toMatchObject({trade:{id:p.trade_id,trade_version:0,execution_currency:null,cash_amount:null},cash_account_id:'cash'})
+    expect(await read.json()).toMatchObject({trade:{id:p.trade_id,trade_version:0,execution_currency:null,cash_amount:null},cash_account_id:'cash',linked_cash:{amount:40400,currency:'HUF'}})
     expect(await state()).toEqual(before)
     const replacement=input({expected_version:0})
     const preview=await f.request(`/investment-trades/preview?trade_id=${p.trade_id}`,'POST',replacement)

From 58122423b476405c593edfbc1b212e1d0a731cc1 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Mon, 19 Oct 2026 19:09:27 +0200
Subject: [PATCH 10/21] Use the shared buy sell editor for investment transfers

---
 CHANGELOG.md                                  |   4 +-
 .../dashboard-module/TransactionList.test.tsx | 120 +-----------------
 .../TransactionList.trade-handoff.test.tsx    |  91 +++++++++++++
 .../dashboard-module/TransactionList.tsx      | 111 +++++++---------
 .../dashboard-module/TransferForm.tsx         |  48 +------
 .../investments-module/TradeEditor.test.tsx   |  10 ++
 .../investments-module/TradeEditor.tsx        |   4 +-
 docs/investment-detail.md                     |   6 +
 8 files changed, 168 insertions(+), 226 deletions(-)
 create mode 100644 client/src/components/dashboard-module/TransactionList.trade-handoff.test.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 031c60c..d6f67f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,9 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 ### Fixed
 
-- Investment summary replaces the unavailable lifetime-return label with a clearly named Gain on net invested percentage when known and positive net invested supports the ratio. Daily-linked chart/Today returns retain their existing method. Remove the requested overview, summary, history-method and holding-chart explanatory copy for a cleaner investment view, and place Allocation in a full-width row below portfolio value and summaries. Portfolio chart tooltips emphasize selected-day total gain and gain-on-net-invested percentage, with a readable date and secondary portfolio value. A responsive summary strip, bounded full-width chart and compact allocation grid remove unused sidebar space. Investments uses the universal privacy control without a duplicate page-level hide button. Holding details open centered with a wider chart, green/red buy/sell dots and hollow date-only markers for unverified or other-currency executions. Versioned linked legacy trades expose historical review through the guarded linked editor instead of an inaccessible read-only label, prefilling actual settlement from their verified linked cash transfer when the legacy investment cash field is missing (#171).
+- Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
+- Center holding details, show green/red trade dots and distinguish date-only legacy markers. Make linked legacy trade review accessible and prefill recorded cash from the verified transfer (#171).
+- Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/dashboard-module/TransactionList.test.tsx b/client/src/components/dashboard-module/TransactionList.test.tsx
index f5f75b4..5d1257a 100644
--- a/client/src/components/dashboard-module/TransactionList.test.tsx
+++ b/client/src/components/dashboard-module/TransactionList.test.tsx
@@ -119,103 +119,7 @@ function mockRates(rate = 0.2) {
   vi.mocked(apiFetch).mockImplementation(async () => ({ ok: true, json: async () => ({ rate }) }) as Response)
 }
 
-it.each(['buy','sell'] as const)('keeps a same-fiat manual %s as 1 ITEM plus separate cash, including zero disposal proceeds',async type=>{
-  mockRates();localStorage.clear()
-  const user=userEvent.setup()
-  const added=renderTransfers({composerOnly:true,openRequest:1,transactions:[],accounts:[...transferAccounts,
-    {id:'manual',name:'Whole manual asset',balance:type==='buy'?0:500,currency:'HUF',quote_currency:'HUF',type:'investment',asset_type:'manual'}]})
-  await user.click(screen.getByRole('button',{name:'Transfer'}))
-  const dialog=screen.getByRole('dialog')
-  await user.selectOptions(within(dialog).getByRole('combobox',{name:'From account'}),type==='buy'?'source':'manual')
-  await user.selectOptions(within(dialog).getByRole('combobox',{name:'To account'}),type==='buy'?'manual':'source')
-  await user.type(within(dialog).getByLabelText('Whole asset (1 ITEM)'),'1')
-  await user.type(within(dialog).getByLabelText(type==='buy'?'Amount to Send (HUF)':'Amount to Receive (HUF)'),type==='buy'?'100':'0')
-  await user.type(within(dialog).getByLabelText('Executed total asset price'),type==='buy'?'100':'0')
-  await user.type(within(dialog).getByLabelText('Fee (HUF)'),'0')
-  await user.click(within(dialog).getByRole('button',{name:type==='buy'?'Record purchase':'Record sale'}))
-  await waitFor(()=>expect(added).toHaveBeenCalledOnce())
-  const save=vi.mocked(apiFetch).mock.calls.find(([url,o])=>url==='/api/investment-trades'&&o?.method==='POST')
-  expect(JSON.parse(String(save?.[1]?.body))).toMatchObject({type,quantity:1,cash_amount:type==='buy'?100:0,price:type==='buy'?100:0,execution_currency:'HUF'})
-})
-
-it.each([0,180])('edits a whole-asset disposal with %s proceeds using its unit direction rather than the cash sign',async proceeds=>{
-  mockRates()
-  const user=userEvent.setup()
-  const added=renderTransfers({accounts:[...transferAccounts,{id:'manual',name:'Whole manual asset',balance:0,currency:'HUF',quote_currency:'HUF',type:'investment',asset_type:'manual'}],transactions:[
-    {id:'cash-sale',account_id:'source',amount:proceeds,linked_transaction_id:'sale',date:'2020-01-01'},
-    {id:'sale',account_id:'manual',amount:-proceeds,quantity:-1,price:proceeds,asset_event:'disposal',execution_currency:'HUF',fee_status:'known',fee_amount:0,trade_version:1,linked_transaction_id:'cash-sale',date:'2020-01-01'},
-  ]})
-  expect(screen.getByText('1 ITEM')).toBeInTheDocument()
-  await user.click(screen.getAllByRole('button',{name:'Edit transfer'})[0])
-  const dialog=screen.getByRole('dialog')
-  expect(within(dialog).getByLabelText('Whole asset (1 ITEM)')).toHaveValue('1')
-  expect(within(dialog).getByLabelText('Amount to Receive (HUF)')).toHaveValue(String(proceeds))
-  await user.type(within(dialog).getByLabelText('Note (optional)'),'Corrected note')
-  await user.click(within(dialog).getByRole('button',{name:'Save changes'}))
-  await waitFor(()=>expect(added).toHaveBeenCalledOnce())
-  const save=vi.mocked(apiFetch).mock.calls.find(([url,o])=>url==='/api/investment-trades/sale'&&o?.method==='PUT')
-  expect(JSON.parse(String(save?.[1]?.body))).toMatchObject({type:'sell',quantity:1,cash_amount:proceeds,price:proceeds,expected_version:1})
-})
-
 describe('TransactionList redesigned transfers', () => {
-  it('records a sale with exact proceeds and preserves the draft and request key after a failed save', async () => {
-    mockRates()
-    localStorage.clear()
-    let attempts=0
-    vi.mocked(apiFetch).mockImplementation(async (url,options) => {
-      if (url==='/api/investment-trades' && options?.method==='POST' && attempts++===0) throw new Error('Temporary failure')
-      return {ok:true,json:async()=>({})} as Response
-    })
-    const user=userEvent.setup()
-    const added=renderTransfers({composerOnly:true,openRequest:1,transactions:[],accounts:[...transferAccounts,
-      {id:'holding',name:'Sale holding',balance:1.5,currency:'SHARE',quote_currency:'EUR',type:'investment'}]})
-    await user.click(screen.getByRole('button',{name:'Transfer'}))
-    const dialog=screen.getByRole('dialog')
-    await user.selectOptions(within(dialog).getByRole('combobox',{name:'From account'}),'holding')
-    await user.selectOptions(within(dialog).getByRole('combobox',{name:'To account'}),'source')
-    await user.type(within(dialog).getByLabelText('Units to Sell'),'0.25')
-    await user.type(within(dialog).getByLabelText('Amount to Receive (HUF)'),'100')
-    await user.type(within(dialog).getByLabelText('Executed unit price'),'1')
-    await user.type(within(dialog).getByLabelText('Fee (HUF)'),'0')
-    await user.click(within(dialog).getByRole('button',{name:'Record sale'}))
-    expect(await within(dialog).findByText('Temporary failure')).toBeInTheDocument()
-    expect(within(dialog).getByLabelText('Units to Sell')).toHaveValue('0.25')
-    expect(within(dialog).getByLabelText('Amount to Receive (HUF)')).toHaveValue('100')
-    await user.click(within(dialog).getByRole('button',{name:'Record sale'}))
-    await waitFor(()=>expect(added).toHaveBeenCalledOnce())
-    const saves=vi.mocked(apiFetch).mock.calls.filter(([url,o])=>url==='/api/investment-trades'&&o?.method==='POST').map(([,o])=>JSON.parse(String(o?.body)))
-    expect(saves).toHaveLength(2)
-    expect(saves[0]).toEqual(saves[1])
-    expect(saves[0]).toMatchObject({type:'sell',quantity:0.25,cash_amount:100,execution_currency:'EUR',fee_amount:0})
-    expect(vi.mocked(apiFetch).mock.calls.some(([url])=>String(url).includes('/market/'))).toBe(false)
-  })
-  it('groups a reciprocal investment pair once and edits it through the cash transaction', async () => {
-    mockRates()
-    const user = userEvent.setup()
-    const added = renderTransfers({
-      accounts: [...transferAccounts, { id: 'holding', name: 'Test holding', balance: 2.125, currency: 'SHARE', quote_currency: 'EUR', type: 'investment' }],
-      transactions: [
-        { id: 'buy', account_id: 'holding', amount: 50, quantity: 0.125, price: 400,
-          linked_transaction_id: 'purchase-cash', date: '2020-01-01', description: 'Transfer from Savings' },
-        { id: 'purchase-cash', account_id: 'source', amount: -100, linked_transaction_id: 'buy',
-          date: '2020-01-01', description: 'Transfer to Test holding' },
-      ],
-    })
-    expect(screen.getByText('1 posted')).toBeInTheDocument()
-    await user.click(screen.getAllByRole('button', { name: 'Edit transfer' })[0])
-    const dialog = screen.getByRole('dialog')
-    expect(within(dialog).getByLabelText('Amount to Send (HUF)')).toHaveValue('100')
-    const quantity = within(dialog).getByLabelText('Units to Buy')
-    expect(quantity).toHaveValue('0.125')
-    await user.clear(quantity)
-    await user.type(quantity, '0.25')
-    await user.click(within(dialog).getByRole('button', { name: 'Save changes' }))
-    await waitFor(() => expect(added).toHaveBeenCalledOnce())
-    const save = vi.mocked(apiFetch).mock.calls.find(([url, options]) => url === '/api/investment-trades/purchase-cash' && options?.method === 'PUT')
-    expect(save).toBeDefined()
-    expect(JSON.parse(String(save?.[1]?.body))).toMatchObject({ cash_amount:100,quantity:0.25,price:400,execution_currency:'EUR',fee_status:'unknown' })
-  })
-
   it('previews posted edit deltas, preserves both native amounts when swapping, and reverts the full edit', async () => {
     mockRates()
     const user = userEvent.setup()
@@ -302,29 +206,7 @@ describe('TransactionList redesigned transfers', () => {
     expect(JSON.parse(String(save?.[1]?.body))).toMatchObject({ from_account_id: 'source', to_account_id: 'other', amount_from: 12.5, amount_to: 12.5 })
   })
 
-  it('keeps investment quantities precise and includes the manual price in the save', async () => {
-    mockRates(0.001)
-    localStorage.clear()
-    const user = userEvent.setup()
-    const added = renderTransfers({ composerOnly: true, openRequest: 1, transactions: [], accounts: [
-      ...transferAccounts,
-      { id: 'holding', name: 'Example holding', balance: 1.5, currency: 'UNIT', quote_currency: 'EUR', type: 'investment' },
-    ] })
-    await user.click(screen.getByRole('button', { name: 'Transfer' }))
-    const dialog = screen.getByRole('dialog')
-    await user.selectOptions(within(dialog).getByRole('combobox', { name: 'From account' }), 'source')
-    await user.selectOptions(within(dialog).getByRole('combobox', { name: 'To account' }), 'holding')
-    await user.type(within(dialog).getByLabelText('Amount to Send (HUF)'), '100')
-    const quantity = within(dialog).getByLabelText('Units to Buy')
-    await user.clear(quantity)
-    await user.type(quantity, '0.123456789123')
-    await user.type(within(dialog).getByLabelText('Executed unit price'), '123.45')
-    await user.type(within(dialog).getByLabelText('Fee (HUF)'), '0')
-    await user.click(within(dialog).getByRole('button', { name:'Record purchase' }))
-    await waitFor(() => expect(added).toHaveBeenCalledOnce())
-    const save = vi.mocked(apiFetch).mock.calls.find(([url, options]) => url === '/api/investment-trades' && options?.method === 'POST')
-    expect(JSON.parse(String(save?.[1]?.body))).toMatchObject({ quantity:0.123456789123,price:123.45,execution_currency:'EUR',fee_status:'known',fee_amount:0,cash_amount:100 })
-  })
+
 })
 
 it('hides balances in cards, account options, projected balances, and insufficient-balance warnings', async () => {
diff --git a/client/src/components/dashboard-module/TransactionList.trade-handoff.test.tsx b/client/src/components/dashboard-module/TransactionList.trade-handoff.test.tsx
new file mode 100644
index 0000000..5c72bfe
--- /dev/null
+++ b/client/src/components/dashboard-module/TransactionList.trade-handoff.test.tsx
@@ -0,0 +1,91 @@
+import {cleanup,render,screen,waitFor,within} from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import {afterEach,beforeEach,expect,it,vi} from 'vitest'
+import type {ComponentProps} from 'react'
+import type {TradeEditor} from '../investments-module/TradeEditor'
+import {TransactionList} from './TransactionList'
+import {apiFetch} from '../../config'
+const editor=vi.hoisted(()=>vi.fn())
+vi.mock('../investments-module/TradeEditor',()=>({TradeEditor:(props:ComponentProps<typeof TradeEditor>)=>{
+ editor(props)
+ return <div role="dialog" aria-label="Shared Buy/Sell"><button onClick={props.onClose}>Close shared editor</button><button onClick={props.onSaved}>Saved shared trade</button></div>
+}}))
+vi.mock('../../config',()=>({API_BASE_URL:'/api',apiFetch:vi.fn()}))
+vi.mock('../../context/PrivacyContext',()=>({usePrivacy:()=>({privacyMode:'visible',shouldHideInvestment:()=>false})}))
+vi.mock('../../context/AlertContext',()=>({useAlert:()=>({confirm:vi.fn(),showAlert:vi.fn()})}))
+const accounts=[{id:'cash',name:'Cash',type:'cash' as const,balance:1000,currency:'HUF'},
+ {id:'holding',name:'Coin',type:'investment' as const,balance:2,currency:'COIN',quote_currency:'EUR'},
+ {id:'manual',name:'Gold',type:'investment' as const,asset_type:'manual' as const,balance:0,currency:'HUF'}]
+function show(options:Partial<ComponentProps<typeof TransactionList>>={}){
+ const saved=vi.fn()
+ render(<TransactionList composerOnly openRequest={1} accounts={accounts} transactions={[]} upcomingTransactions={[]}
+ availableCategories={[]} onTransactionAdded={saved} dateRange={{startDate:'2020-01-01',endDate:'2100-01-01'}}
+ onDateRangeChange={vi.fn()} currentMonth={new Date()} onMonthChange={vi.fn()} masterCurrency="HUF" {...options}/> )
+ return saved
+}
+beforeEach(()=>{localStorage.clear();editor.mockReset();vi.mocked(apiFetch).mockReset().mockResolvedValue(Response.json({rate:1}))})
+afterEach(cleanup)
+it.each(['holding','manual'])('hands cash-to-%s purchases to the shared editor with entered cash/date/note, without writing',async holding=>{
+ const user=userEvent.setup(),saved=show()
+ await user.click(screen.getByRole('button',{name:'Transfer',exact:true}))
+ await user.selectOptions(screen.getByRole('combobox',{name:'From account'}),'cash')
+ await user.type(screen.getByLabelText('Amount to Send (HUF)'),'123.45')
+ await user.type(screen.getByLabelText('Note (optional)'),'My purchase')
+ await user.selectOptions(screen.getByRole('combobox',{name:'To account'}),holding)
+ expect(await screen.findByRole('dialog',{name:'Shared Buy/Sell'})).toBeVisible()
+ expect(screen.getAllByRole('dialog')).toHaveLength(1)
+ expect(editor.mock.lastCall?.[0]).toMatchObject({holdingId:holding,type:'buy',initialDraft:{cash:'cash',cashAmount:'123.45',notes:'My purchase'}})
+ expect(editor.mock.lastCall?.[0].initialDraft).not.toHaveProperty('quantity')
+ expect(vi.mocked(apiFetch).mock.calls.some(([,o])=>o?.method==='POST')).toBe(false)
+ await user.click(screen.getByRole('button',{name:'Saved shared trade'}));expect(saved).toHaveBeenCalledOnce()
+ await user.click(screen.getByRole('button',{name:'Close shared editor'}));expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+})
+it('hands investment-to-cash sales to the shared editor and preserves explicitly entered proceeds',async()=>{
+ const user=userEvent.setup();show()
+ await user.click(screen.getByRole('button',{name:'Transfer',exact:true}))
+ await user.selectOptions(screen.getByRole('combobox',{name:'To account'}),'cash')
+ await user.type(screen.getByLabelText('Amount to Receive (HUF)'),'456')
+ await user.selectOptions(screen.getByRole('combobox',{name:'From account'}),'holding')
+ await screen.findByRole('dialog',{name:'Shared Buy/Sell'})
+ expect(editor.mock.lastCall?.[0]).toMatchObject({holdingId:'holding',type:'sell',initialDraft:{cash:'cash',cashAmount:'456'}})
+})
+it('routes saved investment transfer defaults into the shared editor too',async()=>{
+ localStorage.setItem('finance_last_transfer_from','cash');localStorage.setItem('finance_last_transfer_to','holding')
+ const user=userEvent.setup();show();await user.click(screen.getByRole('button',{name:'Transfer',exact:true}))
+ await screen.findByRole('dialog',{name:'Shared Buy/Sell'})
+ expect(editor.mock.lastCall?.[0]).toMatchObject({holdingId:'holding',type:'buy',initialDraft:{cash:'cash'}})
+})
+it('opens the canonical versioned editor for an existing investment transfer through either linked leg',async()=>{
+ const user=userEvent.setup()
+ const edit={trade:{id:'buy',account_id:'holding',type:'buy',quantity:1,price:10,date:'2026-01-01',linked_transaction_id:'paid',trade_version:0},cash_account_id:'cash',source_revision:7}
+ vi.mocked(apiFetch).mockResolvedValue(Response.json(edit))
+ show({composerOnly:false,openRequest:0,transactions:[{id:'paid',account_id:'cash',amount:-100,date:'2026-01-01',linked_transaction_id:'buy'},
+ {id:'buy',account_id:'holding',amount:10,quantity:1,date:'2026-01-01',linked_transaction_id:'paid',trade_version:0}]})
+ await user.click(screen.getAllByRole('button',{name:'Edit transfer'})[0])
+ await screen.findByRole('dialog',{name:'Shared Buy/Sell'})
+ expect(editor.mock.lastCall?.[0]).toMatchObject({edit,sourceRevision:7})
+ expect(vi.mocked(apiFetch).mock.calls.some(([url])=>String(url).startsWith('/api/investment-trades/'))).toBe(true)
+})
+it('keeps ordinary cash-transfer editing in the cash form with investment accounts excluded',async()=>{
+ const user=userEvent.setup();show({composerOnly:false,openRequest:0,accounts:[...accounts,{id:'cash2',name:'Savings',balance:100,currency:'HUF',type:'cash'}],transactions:[
+ {id:'out',account_id:'cash',amount:-10,date:'2026-01-01',linked_transaction_id:'in'},
+ {id:'in',account_id:'cash2',amount:10,date:'2026-01-01',linked_transaction_id:'out'}]})
+ await user.click(screen.getAllByRole('button',{name:'Edit transfer'})[0])
+ const dialog=screen.getByRole('dialog')
+ expect(within(dialog).getByRole('heading',{name:'Edit Transfer'})).toBeVisible()
+ expect(within(dialog).queryByRole('option',{name:/Coin|Gold/})).not.toBeInTheDocument()
+ expect(editor).not.toHaveBeenCalled()
+})
+
+it('preserves the ledger view and never opens an editor when linked-trade validation fails',async()=>{
+ const user=userEvent.setup()
+ vi.mocked(apiFetch).mockRejectedValue(new Error('The linked pair is inconsistent'))
+ show({composerOnly:false,openRequest:0,transactions:[
+ {id:'paid',account_id:'cash',amount:-100,date:'2026-01-01',linked_transaction_id:'buy'},
+ {id:'buy',account_id:'holding',amount:10,quantity:1,date:'2026-01-01',linked_transaction_id:'paid'}]})
+ await user.click(screen.getAllByRole('button',{name:'Edit transfer'})[0])
+ await waitFor(()=>expect(screen.queryByRole('status')).not.toBeInTheDocument())
+ expect(editor).not.toHaveBeenCalled()
+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
+ expect(screen.getByText('1 posted')).toBeVisible()
+})
diff --git a/client/src/components/dashboard-module/TransactionList.tsx b/client/src/components/dashboard-module/TransactionList.tsx
index 5295d22..8769b90 100644
--- a/client/src/components/dashboard-module/TransactionList.tsx
+++ b/client/src/components/dashboard-module/TransactionList.tsx
@@ -1,3 +1,5 @@
+import { TradeEditor } from '../investments-module/TradeEditor'
+import type { TradeEdit, TradeDraft } from '../investments-module/trade-editor'
 import { LegacyTradeDetails } from '../investments-module/LegacyTradeDetails'
 import type { TradeFacts } from '../../../../shared/investment-trade'
 import type { HoldingFields } from '../../../../shared/holding'
@@ -174,6 +176,10 @@ export function TransactionList({
   const [activeTxId, setActiveTxId] = useState<string | null>(null)
   const [pendingDetails, setPendingDetails] = useState<string | null>(null)
   const [legacyTradeId,setLegacyTradeId]=useState<string|null>(null)
+  const [tradeEditor,setTradeEditor]=useState<{holdingId?:string;type?:'buy'|'sell';initialDraft?:Partial<TradeDraft>;edit?:TradeEdit}|null>(null)
+  const [loadingTrade,setLoadingTrade]=useState(false)
+  const tradeRead=useRef<AbortController|null>(null)
+  useEffect(()=>()=>tradeRead.current?.abort(),[])
   const [formData, setFormData] = useState({
     account_id: '',
     to_account_id: '',
@@ -186,10 +192,6 @@ export function TransactionList({
     manual_price: '', // For investment accounts - manual price override
     exclude_from_estimate: false
   })
-  const [tradeDraft, setTradeDraft] = useState({ execution_currency:'', fee_status:'known' as 'known'|'unknown', fee_amount:'' })
-  const originalTradeVersion = useRef<number | undefined>(undefined)
-  const originalTradeDraft = useRef<typeof tradeDraft | null>(null)
-  const tradeRequest = useRef<{ signature:string; key:string } | null>(null)
   const originalTransferRef = useRef<{ data: typeof formData; rate: number | null; rateDraft: string } | null>(null)
   const [transferSaveError, setTransferSaveError] = useState<string | null>(null)
   const [exchangeRate, setExchangeRate] = useState<number | null>(null)
@@ -500,9 +502,9 @@ export function TransactionList({
   useEffect(() => {
     if (openRequest > lastOpenRequest.current) {
       lastOpenRequest.current = openRequest
-      if (!isAdding) handleOpenForm()
+      if (!isAdding && !tradeEditor && !loadingTrade) handleOpenForm()
     }
-  }, [openRequest, isAdding, handleOpenForm])
+  }, [openRequest, isAdding, tradeEditor, loadingTrade, handleOpenForm])
 
   // Handle type change with saved defaults
   const handleTypeChange = (newType: 'expense' | 'income' | 'transfer') => {
@@ -524,8 +526,11 @@ export function TransactionList({
     field: 'account_id' | 'to_account_id',
     accountId: string,
   ) => {
+    const keepReceived=field==='account_id' && accounts.some(a=>a.id===accountId&&a.type==='investment') &&
+      accounts.some(a=>a.id===formData.to_account_id&&a.type==='cash') && manuallyEditedTransferFieldsRef.current.amount_to
     resetTransferRateState(false)
-    setFormData(prev => ({ ...prev, [field]: accountId, amount_to: '', manual_price: '' }))
+    manuallyEditedTransferFieldsRef.current.amount_to=keepReceived
+    setFormData(prev => ({ ...prev, [field]: accountId, amount_to: keepReceived?prev.amount_to:'', manual_price: '' }))
   }
 
   // Which submit button was used: only expense and income entries can stay open for the next payment.
@@ -652,26 +657,8 @@ export function TransactionList({
           price = parsedPrice
         }
 
-        const holding = sourceAccount.type === 'investment' ? sourceAccount : toAccount.type === 'investment' ? toAccount : null
-        if (holding) {
-          if (sourceAccount.type === 'investment' && toAccount.type === 'investment') throw new Error('Choose one cash account and one holding')
-          const executedPrice = parseAmount(formData.manual_price)
-          const fee = tradeDraft.fee_status === 'known' ? parseAmount(tradeDraft.fee_amount) : null
-          if (executedPrice === null || executedPrice < 0 || (executedPrice === 0 && !(holding.asset_type === 'manual' && sourceAccount.type === 'investment'))) throw new Error('Enter the executed unit price')
-          if (tradeDraft.fee_status === 'known' && fee === null) throw new Error('Enter the included fee, including zero')
-          const body = { ...(editingId ? { expected_version:originalTradeVersion.current } : {}),holding_account_id:holding.id, cash_account_id:sourceAccount.type === 'investment' ? toAccount.id : sourceAccount.id,
-            type:sourceAccount.type === 'investment' ? 'sell' : 'buy', quantity:sourceAccount.type === 'investment' ? amount : amountTo,
-            cash_amount:sourceAccount.type === 'investment' ? amountTo : amount, price:executedPrice,
-            execution_currency:tradeDraft.execution_currency, fee_status:tradeDraft.fee_status, fee_amount:fee,
-            date:formData.date, notes:formData.description }
-          const signature = JSON.stringify([editingId,body])
-          if (tradeRequest.current?.signature !== signature) tradeRequest.current = { signature,key:crypto.randomUUID() }
-          await apiFetch(`${API_BASE_URL}/investment-trades${editingId ? `/${editingId}` : ''}`, {
-            method:editingId ? 'PUT' : 'POST', headers:{ 'Content-Type':'application/json' },
-            body:JSON.stringify({ ...body,idempotency_key:tradeRequest.current.key }) })
-          tradeRequest.current = null
-          setEditingId(null)
-        } else if (editingId) {
+        if(sourceAccount.type==='investment'||toAccount.type==='investment')throw new Error('Use the Buy / Sell editor for investment trades.')
+        if (editingId) {
           await apiFetch(`${API_BASE_URL}/transactions/${editingId}`, {
             method: 'PUT',
             headers: { 'Content-Type': 'application/json' },
@@ -835,7 +822,7 @@ export function TransactionList({
     }
   }
 
-  const handleEdit = (tx: Transaction) => {
+  const handleEdit = async (tx: Transaction) => {
     // Prevent editing if the account is locked
     if (isLocked(tx.account_id)) {
       return
@@ -862,6 +849,18 @@ export function TransactionList({
     const relatedTx = (tx as Transaction & { relatedTx?: Transaction }).relatedTx
       || (tx.linked_transaction_id ? allKnownTransactions.find(t => t.id === tx.linked_transaction_id) : undefined)
 
+    if(tx.linked_transaction_id && (accounts.some(a=>a.type==='investment'&&(a.id===tx.account_id||a.id===relatedTx?.account_id)))) {
+      tradeRead.current?.abort(); const controller=new AbortController();tradeRead.current=controller;setLoadingTrade(true)
+      try {
+        const response=await apiFetch(`${API_BASE_URL}/investment-trades/${encodeURIComponent(tx.id)}`,{throwOnError:true,signal:controller.signal})
+        const edit=await response.json() as TradeEdit
+        const shownTrade=accounts.some(a=>a.id===tx.account_id&&a.type==='investment')?tx:relatedTx
+        if(!edit.trade || (edit.trade.id!==tx.id&&edit.trade.linked_transaction_id!==tx.id) || (shownTrade?.trade_version!=null&&shownTrade.trade_version!==edit.trade.trade_version) || !Number.isSafeInteger(edit.trade.trade_version) || !accounts.some(a=>a.id===edit.trade.account_id&&a.type==='investment') || !accounts.some(a=>a.id===edit.cash_account_id&&a.type==='cash'))throw new Error('Investment records changed. Refresh and reopen the trade.')
+        if(!controller.signal.aborted){setIsAdding(false);setTradeEditor({edit})}
+      }catch(error){if(!controller.signal.aborted)showAlert({type:'error',message:error instanceof Error?error.message:'Could not read the linked trade'})}
+      finally{if(!controller.signal.aborted)setLoadingTrade(false)}
+      return
+    }
     resetTransferRateState()
 
     if (tx.linked_transaction_id && relatedTx) {
@@ -875,15 +874,6 @@ export function TransactionList({
       const incomingValue = incomingAccount?.type === 'investment' && incoming.quantity !== undefined
         ? Math.abs(incoming.quantity)
         : Math.abs(incoming.amount)
-      const investmentRow = outgoingAccount?.type === 'investment' ? outgoing : incoming
-      const investmentPrice = investmentRow.price !== undefined
-        ? formatNumber(investmentRow.price)
-        : ''
-      const tradeRow = outgoingAccount?.type === 'investment' ? outgoing : incomingAccount?.type === 'investment' ? incoming : undefined
-      originalTradeVersion.current = tradeRow?.trade_version ?? 0
-      const draft = { execution_currency:tradeRow?.execution_currency || (outgoingAccount?.type === 'investment' ? outgoingAccount : incomingAccount)?.quote_currency || '',
-        fee_status:tradeRow?.fee_status || 'unknown' as 'known'|'unknown', fee_amount:tradeRow?.fee_amount == null ? '' : formatAmount(tradeRow.fee_amount) }
-      setTradeDraft(draft); originalTradeDraft.current = draft; tradeRequest.current = null
       const existingRate = Math.abs(outgoing.amount) > 0
         ? incomingValue / Math.abs(outgoing.amount)
         : null
@@ -897,7 +887,7 @@ export function TransactionList({
         description: transferNote,
         date: outgoing.date,
         type: 'transfer' as const,
-        manual_price: investmentPrice,
+        manual_price: '',
         exclude_from_estimate: false
       }
       setFormData(transferData)
@@ -1137,19 +1127,19 @@ export function TransactionList({
     return acc ? acc.currency : 'HUF'
   }
 
-  const selectedHoldingId = formData.type === 'transfer' ? accounts.find(a => a.type === 'investment' && (a.id === formData.account_id || a.id === formData.to_account_id))?.id : undefined
-  const selectedHoldingQuote = accounts.find(a => a.id === selectedHoldingId)?.quote_currency || ''
-  useEffect(() => {
-    if (!editingId) setTradeDraft({ execution_currency:selectedHoldingQuote,fee_status:'known',fee_amount:'' })
-  },[selectedHoldingId,selectedHoldingQuote,editingId])
-  const handleTransferPatch = (patch: Partial<TransferFormData>) => {
-    const { execution_currency,fee_status,fee_amount,...regular } = patch
-    setFormData(prev => ({ ...prev,...regular }))
-    setTradeDraft(prev => ({ ...prev,
-      ...(execution_currency !== undefined ? { execution_currency } : {}),
-      ...(fee_status !== undefined ? { fee_status } : {}),
-      ...(fee_amount !== undefined ? { fee_amount } : {}) }))
-  }
+  const selectedHoldingId = formData.type === 'transfer' ? accounts.find(a=>a.id===formData.account_id&&a.type==='investment')?.id ?? accounts.find(a=>a.id===formData.to_account_id&&a.type==='investment')?.id : undefined
+  useEffect(()=>{
+    if(!isAdding||editingId||editingReviewTransfer||!selectedHoldingId)return
+    const from=accounts.find(a=>a.id===formData.account_id),to=accounts.find(a=>a.id===formData.to_account_id)
+    const sell=from?.type==='investment',cash=sell?to:from
+    setTradeEditor({holdingId:selectedHoldingId,type:sell?'sell':'buy',initialDraft:{
+      ...(cash?.type==='cash'?{cash:cash.id}:{}),date:formData.date,notes:formData.description,
+      ...(cash?.type==='cash'&&!sell&&formData.amount?{cashAmount:formData.amount}:{}),
+      ...(cash?.type==='cash'&&sell&&manuallyEditedTransferFieldsRef.current.amount_to&&formData.amount_to?{cashAmount:formData.amount_to}:{}),
+    }})
+    setIsAdding(false)
+  },[isAdding,editingId,editingReviewTransfer,selectedHoldingId,accounts,formData])
+  const handleTransferPatch = (patch: Partial<TransferFormData>) => setFormData(prev=>({...prev,...patch}))
 
   // For transfer preview
   const fromAccount = accounts.find(a => a.id === formData.account_id)
@@ -1163,7 +1153,6 @@ export function TransactionList({
     (['account_id', 'to_account_id', 'date', 'description'] as const).some(key => formData[key] !== originalTransfer.data[key])
     || (['amount', 'amount_to', 'manual_price'] as const).some(key => parseAmount(formData[key]) !== parseAmount(originalTransfer.data[key]))
     || parseAmount(exchangeRateDraft) !== parseAmount(originalTransfer.rateDraft)
-    || !!originalTradeDraft.current && JSON.stringify(tradeDraft) !== JSON.stringify(originalTradeDraft.current)
   )
   // Posted balances already include the old legs. Undo them before previewing
   // the replacement, including when either selected account has changed.
@@ -1237,7 +1226,6 @@ export function TransactionList({
     manuallyEditedTransferFieldsRef.current = { amount_to: true, manual_price: !!originalTransfer.data.manual_price }
     editedTransferPairRef.current = getTransferPairKey(originalTransfer.data.account_id, originalTransfer.data.to_account_id)
     setFormData({ ...originalTransfer.data })
-    if (originalTradeDraft.current) setTradeDraft({ ...originalTradeDraft.current })
     setExchangeRate(originalTransfer.rate)
     setExchangeRateDraft(originalTransfer.rateDraft)
     setIsLoadingRate(false)
@@ -1537,7 +1525,7 @@ export function TransactionList({
       </CardHeader>}
 
       <Modal 
-        isOpen={isAdding} 
+        isOpen={isAdding && !selectedHoldingId}
         onClose={handleCancel} 
         placement={formData.type === 'transfer' ? 'centered' : 'center'}
         className={formData.type === 'transfer' ? 'sm:max-w-[480px] rounded-2xl flex min-h-0 flex-col overflow-hidden' : undefined}
@@ -1551,10 +1539,8 @@ export function TransactionList({
             {/* Transfer Form */}
             {formData.type === 'transfer' ? (
               <TransferForm
-                tradeId={editingId || undefined}
-                tradeVersion={originalTradeVersion.current}
-                accounts={accounts}
-                data={{ ...formData,...tradeDraft }}
+                accounts={editingId?accounts.filter(a=>a.type==='cash'):accounts}
+                data={formData}
                 editing={!!editingId}
                 reviewDraft={editingReviewTransfer}
                 dirty={transferDirty}
@@ -1573,10 +1559,6 @@ export function TransactionList({
                 onUseMarket={() => suggestedRate && handleTransferRateChange(formatCalculatedAmount(suggestedRate, { maximumFractionDigits: 12 }))}
                 onSwap={handleSwapTransfer}
                 onChange={handleTransferPatch}
-                onPriceChange={manualPrice => {
-                  manuallyEditedTransferFieldsRef.current.manual_price = true
-                  setFormData(prev => ({ ...prev, manual_price: manualPrice }))
-                }}
                 onRevert={handleRevertTransfer}
                 onCancel={handleCancel}
               />
@@ -1803,6 +1785,11 @@ export function TransactionList({
         </div>}
       </CardContent>}
 
+      {loadingTrade&&<p role="status" className="p-3 text-sm text-muted-foreground">Loading linked trade…</p>}
+      {tradeEditor&&<TradeEditor accounts={accounts.map(a=>({...a,updated_at:0}))} {...tradeEditor}
+        quotes={{}} rates={{}} hidden={privacyMode==='hidden'||shouldHideInvestment()} currency={masterCurrency}
+        sourceRevision={tradeEditor.edit?.source_revision} onClose={()=>{setTradeEditor(null);resetForm()}}
+        onSaved={async()=>{await onTransactionAdded()}}/>}
       {legacyTradeId&&<LegacyTradeDetails tradeId={legacyTradeId} hidden={privacyMode==='hidden'||shouldHideInvestment()} onClose={()=>setLegacyTradeId(null)} onSaved={async()=>{await onTransactionAdded()}}/>}
     </Card>
   )
diff --git a/client/src/components/dashboard-module/TransferForm.tsx b/client/src/components/dashboard-module/TransferForm.tsx
index a92dbe3..dbd1ced 100644
--- a/client/src/components/dashboard-module/TransferForm.tsx
+++ b/client/src/components/dashboard-module/TransferForm.tsx
@@ -1,4 +1,3 @@
-import {TradeMetricsPreview} from '../investments-module/TradeMetricsPreview'
 import type { ReactNode } from 'react'
 import { AlertCircle, ArrowDownUp, ChevronsUpDown, Loader2 } from 'lucide-react'
 import { AmountInput } from '../common/amount-input'
@@ -7,8 +6,6 @@ import { Input } from '../common/input'
 import { Label } from '../common/label'
 import { formatCalculatedAmount, parseAmount } from '../../lib/amount'
 import { cn } from '../../lib/utils'
-import { tradeCurrencies } from '../../../../shared/investment-trade'
-import { Select } from '../common/select'
 
 export type TransferAccount = {
   id: string
@@ -30,16 +27,12 @@ export type TransferFormData = {
   date: string
   description: string
   manual_price: string
-  execution_currency?: string
-  fee_status?: 'known' | 'unknown'
-  fee_amount?: string
+
 }
 
 type TransferFormProps = {
   accounts: TransferAccount[]
   data: TransferFormData
-  tradeId?: string
-  tradeVersion?: number
   editing: boolean
   reviewDraft: boolean
   dirty: boolean
@@ -58,7 +51,6 @@ type TransferFormProps = {
   onUseMarket: () => void
   onSwap: () => void
   onChange: (patch: Partial<TransferFormData>) => void
-  onPriceChange: (price: string) => void
   onRevert: () => void
   onCancel: () => void
 }
@@ -69,21 +61,15 @@ export function TransferForm(props: TransferFormProps) {
   const { accounts, data, editing, reviewDraft, dirty, submitting } = props
   const from = accounts.find(account => account.id === data.account_id)
   const to = accounts.find(account => account.id === data.to_account_id)
-  const holding = from?.type === 'investment' ? from : to?.type === 'investment' ? to : undefined
-  const total = holding?.asset_type === 'manual'
-  const zeroDisposal = total && from?.type === 'investment' && parseAmount(data.manual_price)===0 && parseAmount(data.amount_to)===0
-  const sameCurrency = !holding && !!from && !!to && from.currency === to.currency
+  const sameCurrency = from?.type!=='investment' && to?.type!=='investment' && !!from && !!to && from.currency === to.currency
   const sameAccount = !!from && from.id === to?.id
   const sent = parseAmount(data.amount)
   const received = sameCurrency ? sent : parseAmount(data.amount_to)
   const rate = parseAmount(props.exchangeRate)
   const selectable = accounts.filter(account => !account.is_locked && account.archived_at == null && (!reviewDraft || account.type === 'cash'))
   const ready = from && to && !sameAccount && selectable.includes(from) && selectable.includes(to)
-    && sent !== null && sent > 0 && received !== null && (received > 0 || zeroDisposal) && data.date
-    && (!total || (from?.type==='investment'?sent:received)===1)
+    && sent !== null && sent > 0 && received !== null && received > 0 && from.type==='cash' && to.type==='cash' && data.date
     && (!editing || dirty)
-    && (!holding || ((parseAmount(data.manual_price) ?? -1) > 0 || zeroDisposal) && !!data.execution_currency
-      && (data.fee_status === 'unknown' || parseAmount(data.fee_amount || '') !== null))
   const overBalance = from && from.asset_type !== 'manual' && sent !== null && sent > props.availableBalance(from)
   const deviation = props.suggestedRate && rate !== null && rate > 0 ? (rate / props.suggestedRate - 1) * 100 : null
   const displayAmount = (account: TransferAccount, value: number) => props.hideBalance(account)
@@ -140,7 +126,7 @@ export function TransferForm(props: TransferFormProps) {
           <div className="flex min-h-12 items-center gap-3 px-1.5 py-2">
             <Button type="button" variant="outline" aria-label="Swap accounts" title="Swap accounts" onClick={props.onSwap}
               disabled={!from || !to || sameAccount} className="h-8 w-8 shrink-0 rounded-full p-0"><ArrowDownUp className="h-[15px] w-[15px]" /></Button>
-            {holding ? <span className="text-xs text-muted-foreground">{total?'Enter exactly 1 ITEM for the complete asset, and actual cash':'Enter exact units and actual cash'} {from?.type === 'investment' ? 'received' : 'paid'}, including any fee.</span> : sameCurrency ? <span className="text-xs text-muted-foreground">Same currency, no conversion</span> : from && to ? (
+            {sameCurrency ? <span className="text-xs text-muted-foreground">Same currency, no conversion</span> : from && to ? (
               <div className="flex min-w-0 flex-1 flex-wrap items-center gap-x-2.5 gap-y-1.5">
                 {reviewDraft ? <p className="text-xs text-muted-foreground">Enter both amounts explicitly. Effective rate: {sent && received ? `${props.hideBalance(from) || props.hideBalance(to) ? '••••••' : formatCalculatedAmount(received / sent, { maximumFractionDigits: 10 })} ${to.currency} per ${from.currency}` : 'enter both amounts'}.</p> : <>
                   <div className="flex h-8 max-w-full items-center gap-1.5 rounded-lg border border-border bg-background px-2 text-xs tabular-nums text-muted-foreground focus-within:border-primary focus-within:ring-[3px] focus-within:ring-primary/15">
@@ -161,30 +147,6 @@ export function TransferForm(props: TransferFormProps) {
           </div>
           {accountCard(to, true)}
         </div>
-        {holding && <div className="space-y-3 rounded-xl border border-border p-3">
-          <div className="grid grid-cols-2 gap-3"><div className="space-y-1.5">
-            <Label htmlFor="transfer_price">{total?'Executed total asset price':'Executed unit price'}</Label>
-            <AmountInput id="transfer_price" value={data.manual_price} onValueChange={props.onPriceChange} placeholder="From your trade confirmation" required />
-          </div><div className="space-y-1.5"><Label htmlFor="trade_execution_currency">Execution currency</Label>
-            <Select id="trade_execution_currency" value={data.execution_currency || ''} onChange={e => props.onChange({ execution_currency:e.target.value })} required>
-              <option value="">Choose currency</option>{tradeCurrencies.map(c => <option key={c}>{c}</option>)}
-            </Select></div></div>
-          <div className="grid grid-cols-2 gap-3"><div className="space-y-1.5"><Label htmlFor="trade_fee_status">Included fee</Label>
-            <Select id="trade_fee_status" value={data.fee_status || 'known'} onChange={e => props.onChange({ fee_status:e.target.value as 'known'|'unknown' })}>
-              <option value="known">Known amount</option><option value="unknown">Breakdown unknown</option>
-            </Select></div>{data.fee_status !== 'unknown' && <div className="space-y-1.5"><Label htmlFor="trade_fee_amount">Fee ({from?.type === 'investment' ? to?.currency : from?.currency})</Label>
-              <AmountInput id="trade_fee_amount" value={data.fee_amount || ''} onValueChange={v => props.onChange({ fee_amount:v })} placeholder="Enter 0 if none" required />
-            </div>}</div>
-          <p className="text-xs text-muted-foreground">The fee is already included in actual cash. It creates no extra expense. Confirm the execution price; a market quote is not a past fill.</p>
-        </div>}
-        {holding && <TradeMetricsPreview tradeId={props.tradeId} hidden={props.hideBalance(holding) || (!!from && props.hideBalance(from)) || (!!to && props.hideBalance(to))}
-          input={from && to && sent!==null && received!==null && parseAmount(data.manual_price)!==null && data.execution_currency && (data.fee_status==='unknown' || parseAmount(data.fee_amount||'')!==null)?{
-            holding_account_id:holding.id,cash_account_id:from.type==='investment'?to.id:from.id,type:from.type==='investment'?'sell':'buy',
-            quantity:from.type==='investment'?sent:received,cash_amount:from.type==='investment'?received:sent,
-            price:parseAmount(data.manual_price)!,execution_currency:data.execution_currency,fee_status:data.fee_status??'known',
-            fee_amount:data.fee_status==='unknown'?null:parseAmount(data.fee_amount||''),date:data.date,notes:data.description,
-            ...(props.editing?{expected_version:props.tradeVersion}:{}),
-          }:null}/>}
         <div className="grid grid-cols-[repeat(auto-fit,minmax(150px,1fr))] gap-3">
           <div className="space-y-1.5"><Label htmlFor="transfer_date">Date</Label><Input id="transfer_date" type="date" value={data.date} onChange={event => props.onChange({ date: event.target.value })} required className="min-w-0 rounded-[10px] bg-background" /></div>
           <div className="space-y-1.5"><Label htmlFor="transfer_description">Note <span className="font-normal text-muted-foreground">(optional)</span></Label><Input id="transfer_description" value={data.description} onChange={event => props.onChange({ description: event.target.value })} placeholder="e.g. Monthly savings" className="rounded-[10px] bg-background" /></div>
@@ -199,7 +161,7 @@ export function TransferForm(props: TransferFormProps) {
         </div>
         <Button type="button" variant="outline" onClick={props.onCancel} className="h-9 px-3.5">Cancel</Button>
         <Button type="submit" disabled={!ready || submitting} className="h-9 max-w-full px-4 font-semibold shadow-none">
-          {submitting ? 'Processing…' : editing ? 'Save changes' : holding ? from?.type === 'investment' ? 'Record sale' : 'Record purchase' : from && sent && !props.hideBalance(from) ? `Transfer ${formatCalculatedAmount(sent, { maximumFractionDigits: from.type === 'investment' ? 12 : 2 })} ${from.currency}` : 'Transfer'}
+          {submitting ? 'Processing…' : editing ? 'Save changes' : from && sent && !props.hideBalance(from) ? `Transfer ${formatCalculatedAmount(sent, { maximumFractionDigits: from.type === 'investment' ? 12 : 2 })} ${from.currency}` : 'Transfer'}
         </Button>
       </div>
     </fieldset>
diff --git a/client/src/components/investments-module/TradeEditor.test.tsx b/client/src/components/investments-module/TradeEditor.test.tsx
index 8517e3f..26a349a 100644
--- a/client/src/components/investments-module/TradeEditor.test.tsx
+++ b/client/src/components/investments-module/TradeEditor.test.tsx
@@ -195,3 +195,13 @@ it('prefills legacy settlement from the verified linked cash leg without guessin
  expect(screen.getByLabelText('Fee (HUF)')).toHaveValue('')
  expect(screen.getByLabelText('Executed unit price')).toHaveValue('50')
 })
+
+it('keeps explicit transfer cash/date/note drafts when opening the shared buy/sell editor',()=>{
+ render(<TradeEditor {...props} holdingId="holding" initialDraft={{cash:'cash',cashAmount:'123.45',date:'2025-02-03',notes:'Transfer purchase'}}/>)
+ expect(screen.getByLabelText('Pay from')).toHaveValue('cash')
+ expect(screen.getByLabelText('Holding')).toHaveValue('holding')
+ expect(parseAmount((screen.getByLabelText('Actual cash paid (HUF)') as HTMLInputElement).value)).toBe(123.45)
+ expect(screen.getByLabelText('Execution date')).toHaveValue('2025-02-03')
+ expect(screen.getByLabelText('Note (optional)')).toHaveValue('Transfer purchase')
+ expect(screen.getByLabelText('Quantity')).toHaveValue('')
+})
diff --git a/client/src/components/investments-module/TradeEditor.tsx b/client/src/components/investments-module/TradeEditor.tsx
index 2ded9f8..c412215 100644
--- a/client/src/components/investments-module/TradeEditor.tsx
+++ b/client/src/components/investments-module/TradeEditor.tsx
@@ -25,6 +25,7 @@ type Props = {
   holdingId?: string
   type?: 'buy' | 'sell'
   edit?: TradeEdit
+  initialDraft?: Partial<TradeDraft>
   quotes: Record<string, MarketQuote>
   rates: Record<string, number>
   hidden: boolean
@@ -46,6 +47,7 @@ export function TradeEditor({
   holdingId,
   type = 'buy',
   edit: providedEdit,
+  initialDraft,
   quotes,
   rates,
   hidden,
@@ -57,7 +59,7 @@ export function TradeEditor({
   const [edit] = useState(providedEdit)
   const holdings = accounts.filter((a) => a.type === 'investment'),
     cashAccounts = accounts.filter((a) => a.type === 'cash')
-  const [draft, setDraft] = useState(() => initialTrade(holdings, cashAccounts, holdingId, type, edit))
+  const [draft, setDraft] = useState(() => ({...initialTrade(holdings, cashAccounts, holdingId, type, edit),...(!edit?initialDraft:{})}))
   const [initial] = useState(draft)
   const [busy, setBusy] = useState(false),
     busyRef = useRef(false),
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index de53836..46edfb1 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -12,6 +12,12 @@ Price charts use native daily unadjusted observations. Every buy/sell in the sel
 
 Manual histories remain dated total/per-unit step observations, independently loaded and paged. Their cost reference is current known remaining cost, not a deposit or new appraisal. Corrections pin the saved observation ID/version and retain drafts after failure. A successful appraisal refreshes the overview and account snapshots without cash movement.
 
+## Transfer entry points
+
+The transaction composer uses the same `TradeEditor` as Investments. Selecting a holding as the destination opens Buy; selecting one as the source opens Sell. The selected cash account, explicit native cash amount, date and note carry into the shared draft. Cash amounts are never reinterpreted as units, and FX-derived received amounts are not reused as confirmed sale proceeds. Selecting a holding before choosing cash lets the canonical editor select a suitable cash account for review. Whole manual assets keep the editor's one-ITEM acquisition/disposal rules.
+
+Editing an existing investment transfer first loads the canonical reciprocal pair and saved version, then opens the same editor. Reads abort when superseded/unmounted; stale versions or invalid pairs reject opening. Save/delete/preview/uncertain retry and refresh ownership are the canonical editor's existing paths. The composer no longer has an investment price/fee form or its own investment save implementation. Cash-to-cash transfers, split transactions and MCP review transfers remain separate; existing cash transfers cannot be retargeted into a holding.
+
 ## Recording and replacing trades
 
 Record trade on Investments or Buy/Sell in a unit holding opens the dedicated editor. Its saved values are string drafts using AmountInput. It collects the holding, exact units, execution price/currency/date, cash account, included fee and actual settlement. Same-currency cash must equal rounded gross plus the buy fee or minus the sale fee. Cross-currency settlement is entered and explicitly confirmed; displayed current FX is only an estimate. Included fees never create another expense. The existing negative-cash policy remains a warning; overselling is rejected locally and by full API timeline replay.

From ce27ae8b577e9bd69cfb2432e04df7b01992f4af Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 03:15:20 +0200
Subject: [PATCH 11/21] Give holding details a clear value gain and position
 hierarchy

---
 CHANGELOG.md                                  |   2 +-
 .../InvestmentDetail.test.tsx                 |  21 +++-
 .../InvestmentDetailModal.tsx                 | 117 +++++++-----------
 docs/investment-detail.md                     |   2 +
 4 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6f67f6..0a66554 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 ### Fixed
 
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
-- Center holding details, show green/red trade dots and distinguish date-only legacy markers. Make linked legacy trade review accessible and prefill recorded cash from the verified transfer (#171).
+- Center holding details and organize them into current value, a labeled gain/net-invested card and compact position facts, with a collapsed gain breakdown and readable source times. Show green/red trade dots and distinguish date-only legacy markers. Make linked legacy trade review accessible and prefill recorded cash from the verified transfer (#171).
 - Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
diff --git a/client/src/components/investments-module/InvestmentDetail.test.tsx b/client/src/components/investments-module/InvestmentDetail.test.tsx
index 7556005..c6cfa88 100644
--- a/client/src/components/investments-module/InvestmentDetail.test.tsx
+++ b/client/src/components/investments-module/InvestmentDetail.test.tsx
@@ -33,7 +33,7 @@ it('shows a manual total once, its known cost and last valuation, with Update va
 it('withholds a missing manual unit price instead of showing a zero, and disables locked mutations',()=>{
  vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({observations:[],valuation_at:null,next_cursor:null})))
  render(<InvestmentDetailModal {...props} account={{...base,manual_price:null,is_locked:true}}/>)
- const price=screen.getByText('Native price').closest('div')!
+ const price=screen.getByText('Current price').closest('div')!
  expect(price).toHaveTextContent('Unavailable');expect(price).not.toHaveTextContent('0 EUR')
  expect(screen.getByRole('button',{name:'Buy',exact:true})).toBeDisabled();expect(screen.getByRole('button',{name:'Update value'})).toBeDisabled()
 })
@@ -56,7 +56,7 @@ it.each([26,61])('uses the same delayed-price policy for a %s-minute quote in ho
  vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({points:[],events:[]})))
  const q={symbol:'TEST',price:110,regularMarketPrice:110,currency:'EUR',status:'stale' as const,as_of:new Date(Date.now()-minutes*60_000).toISOString()}
  render(<InvestmentDetailModal {...props} account={{...base,pricing_method:'market',symbol:'TEST'}} quotes={{TEST:q}}/>)
- expect(screen.getByText('Native price').closest('div')).toHaveTextContent('110 EUR')
+ expect(screen.getByText('Current price').closest('div')).toHaveTextContent('110 EUR')
  if(minutes===26){expect(screen.getByText(/Delayed price · updated 26 minutes ago/)).toBeVisible();expect(screen.queryByText(/Market price is stale/)).not.toBeInTheDocument()}
  else expect(screen.getByText(/Market price is stale/)).toBeVisible()
 })
@@ -73,3 +73,20 @@ it('opens the canonical editor for a versioned linked legacy trade whose executi
  rerender(<InvestmentDetailModal {...props} allTransactions={[legacy]} privacyMode="hidden"/>)
  expect(screen.getByRole('button',{name:/Review historical details for buy/})).toBeDisabled()
 })
+
+it('pairs labeled holding gain with its supported percentage and masks both in privacy mode',()=>{
+ vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({observations:[],valuation_at:null,next_cursor:null})))
+ const metric={...holdingMetrics(base,[],'HUF',undefined,n=>n,n=>n,'2026-10-20'),value:1200,total_gain:200,net_invested:1000}
+ const {rerender}=render(<InvestmentDetailModal {...props} metrics={metric}/>)
+ const summary=within(screen.getByRole('region',{name:'Holding summary'}))
+ expect(summary.getByText('Current value')).toBeVisible()
+ expect(summary.getByText('1200 HUF')).toBeVisible()
+ expect(summary.getByText('Total gain')).toBeVisible()
+ expect(summary.getByText('+200 HUF')).toBeVisible()
+ expect(summary.getByTitle('Gain on net invested')).toHaveTextContent('+20%')
+ rerender(<InvestmentDetailModal {...props} metrics={{...metric,net_invested:0}}/>)
+ expect(summary.queryByTitle('Gain on net invested')).not.toBeInTheDocument()
+ rerender(<InvestmentDetailModal {...props} metrics={metric} privacyMode="hidden"/>)
+ expect(summary.queryByText(/1200 HUF|200 HUF|20%/)).not.toBeInTheDocument()
+ expect(summary.getByTitle('Gain on net invested')).toHaveTextContent('••••••')
+})
diff --git a/client/src/components/investments-module/InvestmentDetailModal.tsx b/client/src/components/investments-module/InvestmentDetailModal.tsx
index b2abf8a..3a62d27 100644
--- a/client/src/components/investments-module/InvestmentDetailModal.tsx
+++ b/client/src/components/investments-module/InvestmentDetailModal.tsx
@@ -1,3 +1,4 @@
+import { holdingSourceTime } from './holding-presentation'
 import { quotePresentation } from './quote-presentation'
 import { useRef, useState } from 'react'
 import type { HoldingMetrics } from '../../../../shared/investment-metrics'
@@ -11,7 +12,7 @@ import { InvestmentChart } from './InvestmentChart'
 import type { HoldingChartCache } from './InvestmentChart'
 import type { Account, MarketQuote, Transaction } from './types'
 import { calculatePosition } from './utils'
-import { amount, costPrice, unitPrice, signedAmount, tone } from './overview'
+import { amount, costPrice, unitPrice, signedAmount, percentage, tone } from './overview'
 type Props = {
   account: Account | null
   allTransactions: Transaction[]
@@ -84,11 +85,15 @@ export function InvestmentDetailModal({
   const p = calculatePosition(account, transactions, quotes, exchangeRates, metrics, reportingCurrency),
     q = quotes[account.symbol?.trim().toUpperCase() ?? '']
   const freshness = quotePresentation(q)
+  const ratio=p.gainLoss!=null&&Number.isFinite(p.gainLoss)&&p.netInvested!=null&&Number.isFinite(p.netInvested)&&p.netInvested>0?p.gainLoss/p.netInvested*100:null
+  const gainPercent=ratio!=null&&Number.isFinite(ratio)?ratio:null
+  const sourceDate=market?q?.as_of:account.manual_valuation?.as_of??account.manual_price_date
+  const sourceTime=holdingSourceTime(sourceDate)
   const protectedAccount = account.is_locked || account.archived_at != null
   const stat = (label: string, value: string, sub?: string) => (
-    <div key={label} className="min-w-0 bg-card px-3 py-3">
+    <div key={label} className="min-w-0">
       <dt className="text-[11px] text-muted-foreground">{label}</dt>
-      <dd className="mt-1 break-words text-sm font-semibold tabular-nums">{value}</dd>
+      <dd className="mt-1.5 break-words text-lg font-semibold tabular-nums">{value}</dd>
       {sub && <p className="mt-1 text-[10px] text-muted-foreground">{sub}</p>}
     </div>
   )
@@ -102,16 +107,25 @@ export function InvestmentDetailModal({
       className="flex min-h-0 max-h-[92dvh] flex-col sm:max-w-4xl"
       contentClassName="flex min-h-0 flex-1 flex-col p-0 sm:p-0"
     >
-      <div className="min-h-0 flex-1 space-y-5 overflow-y-auto p-4 sm:p-5">
-        <div>
-          <p className="text-xs text-muted-foreground">Holding value · {reportingCurrency}</p>
-          <p className="mt-1 break-words text-3xl font-semibold tracking-tight tabular-nums">
-            {amount(p.currentValue, reportingCurrency, hidden)}
-          </p>
-          <p className={`mt-2 text-sm tabular-nums ${tone(p.gainLoss, hidden)}`}>
-            {signedAmount(p.gainLoss, reportingCurrency, hidden)}
-          </p>
-        </div>
+      <div className="@container min-h-0 flex-1 space-y-5 overflow-y-auto p-4 sm:p-6">
+        <section aria-label="Holding summary" className="grid items-center gap-5 @min-[560px]:grid-cols-[1.1fr_1fr]">
+          <div className="min-w-0">
+            <p className="text-xs font-medium text-muted-foreground">Current value</p>
+            <p className="mt-2 break-words text-3xl font-semibold tracking-tight tabular-nums sm:text-4xl">
+              {amount(p.currentValue,reportingCurrency,hidden)}
+            </p>
+          </div>
+          <div className="min-w-0 rounded-xl border border-border bg-secondary/40 p-4">
+            <p className="text-xs font-medium text-muted-foreground">Total gain</p>
+            <div className={`mt-2 flex flex-wrap items-baseline gap-x-3 gap-y-1 tabular-nums ${tone(p.gainLoss,hidden)}`}>
+              <p className="break-words text-2xl font-semibold tracking-tight">{signedAmount(p.gainLoss,reportingCurrency,hidden)}</p>
+              {gainPercent!=null&&<span className="text-sm font-semibold" title="Gain on net invested">{percentage(gainPercent,hidden)}</span>}
+            </div>
+            <div className="mt-3 flex flex-wrap items-baseline justify-between gap-x-4 gap-y-1 border-t border-border pt-3 text-xs">
+              <span className="text-muted-foreground">Net invested</span><span className="font-medium tabular-nums">{amount(p.netInvested,reportingCurrency,hidden)}</span>
+            </div>
+          </div>
+        </section>
         {(protectedAccount || (market && freshness.needsAttention) || p.priceFetchError) && (
           <p
             role="status"
@@ -128,66 +142,29 @@ export function InvestmentDetailModal({
         )}
         {market && freshness.delayed && (
           <p className="text-xs text-muted-foreground">
-            Delayed price · {freshness.ageLabel} · {q?.as_of}. Last known price is shown;
-            Today’s return remains unavailable until a fresh quote arrives.
+            Delayed price · {freshness.ageLabel}. Today’s return is unavailable until a fresh quote arrives.
           </p>
         )}
-        <dl className="grid grid-cols-2 gap-px overflow-hidden rounded-xl border border-border bg-border">
-          {stat(
-            total ? 'Ownership' : 'Quantity',
-            hidden
-              ? '••••••'
-              : total
-                ? (account.manual_ownership ?? 'Unknown')
-                : `${p.actualQuantity.toLocaleString(undefined, { maximumFractionDigits: 12 })} ${account.currency}`,
-          )}
-          {stat(
-            total ? 'Remaining cost' : 'Average remaining cost',
-            costPrice(
-              total ? p.metrics.native.remaining_basis : p.metrics.native.average_cost,
-              p.metrics.native_currency,
-              hidden,
-            ),
-            'Known native basis · includes fees',
-          )}
-          {stat(
-            total ? 'Last valued' : 'Native price',
-            total
-              ? (account.manual_valuation?.as_of ?? 'Unknown')
-              : unitPrice(
-                  market ? (q?.price ?? q?.regularMarketPrice) : (account.manual_price ?? null),
-                  market ? q?.currency || p.quoteCurrency : p.quoteCurrency,
-                  hidden,
-                ),
-            market
-              ? (q?.as_of ?? 'Source time unavailable')
-              : (account.manual_valuation?.as_of ?? account.manual_price_date ?? 'No dated observation'),
-          )}
-          {stat(
-            'Net invested',
-            amount(p.netInvested, reportingCurrency, hidden),
-            'Exact cash paid minus received',
-          )}
-        </dl>
-        <details className="rounded-xl border border-border p-3 text-xs text-muted-foreground">
-          <summary className="min-h-7 cursor-pointer">Accounting and return coverage</summary>
-          <dl className="mt-2 grid grid-cols-2 gap-3">
-            {[
-              ['Remaining basis', p.metrics.remaining_basis],
-              ['Realized gain', p.metrics.realized_gain],
-              ['Unrealized gain', p.metrics.unrealized_gain],
-            ].map(([label, value]) =>
-              stat(String(label), amount(value as number | null, reportingCurrency, hidden)),
-            )}
+        <section aria-label="Your position" className="rounded-xl border border-border p-4">
+          <h3 className="mb-4 text-xs font-semibold text-muted-foreground">Your position</h3>
+          <dl className="grid grid-cols-1 gap-4 @min-[480px]:grid-cols-3">
+            {stat(total?'Ownership':'Quantity',hidden?'••••••':total?(account.manual_ownership??'Unknown'):
+              `${p.actualQuantity.toLocaleString(undefined,{maximumFractionDigits:12})} ${account.currency==='SHARE'?'shares':account.currency}`)}
+            <div className="min-w-0">
+              <dt className="text-[11px] text-muted-foreground">{total?'Last valued':'Current price'}</dt>
+              <dd className="mt-1.5 break-words text-lg font-semibold tabular-nums">{total?(sourceTime?.short??'Unknown'):costPrice(market?(q?.price??q?.regularMarketPrice):(account.manual_price??null),market?q?.currency||p.quoteCurrency:p.quoteCurrency,hidden)}</dd>
+              {!total&&sourceTime&&<p className="mt-1 text-[10px] text-muted-foreground">As of <time dateTime={sourceDate??undefined} title={sourceTime.full}>{sourceTime.short}</time></p>}
+            </div>
+            {stat(total?'Remaining cost':'Average cost',costPrice(total?p.metrics.native.remaining_basis:p.metrics.native.average_cost,p.metrics.native_currency,hidden))}
+          </dl>
+        </section>
+        <details className="group rounded-xl border border-border px-4 py-3 text-xs">
+          <summary className="min-h-7 cursor-pointer font-medium text-muted-foreground">Gain breakdown</summary>
+          <dl className="mt-3 grid grid-cols-1 gap-4 border-t border-border pt-4 @min-[480px]:grid-cols-3">
+            {stat('Remaining basis',amount(p.metrics.remaining_basis,reportingCurrency,hidden))}
+            {stat('Realized gain',signedAmount(p.metrics.realized_gain,reportingCurrency,hidden),'From sold units')}
+            {stat('Unrealized gain',signedAmount(p.metrics.unrealized_gain,reportingCurrency,hidden),'From current holdings')}
           </dl>
-          <p className="mt-3">
-            Moving weighted-average remaining cost uses acquisition-date FX. Imported basis does not prove
-            earlier cash or realized gains. Lifetime Estimated return requires complete daily history.
-          </p>
-          <p className="mt-2">
-            {[...new Set(Object.values(p.metrics.coverage).flat())].join(', ').replaceAll('_', ' ') ||
-              'Current accounting inputs covered'}
-          </p>
         </details>
         {!market && (
           <ManualValuations
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index 46edfb1..c9ce3c8 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -2,6 +2,8 @@
 
 The Investments page owns the selected holding ID, editor and mutation refresh. Holding details open in a centered modal on all screen sizes, with a wider desktop chart and sticky Buy/Sell actions for unit holdings. Manual total assets show ownership and Update value instead. Manually priced unit holdings retain their unit trades and their separate per-unit appraisal editor.
 
+The summary leads with Current value beside a labeled Total gain card, including the supported gain-on-net-invested percentage and Net invested. Your position groups quantity/ownership, current native price or valuation date, and remaining average/native cost. The collapsed Gain breakdown retains remaining basis and realized/unrealized gains. Source times use readable local formatting with full observation context in the time element. Missing facts remain unavailable; percentages need known finite gain and positive finite net invested, and privacy masks all financial values and gain styling.
+
 ## Detail reads and chart
 
 Current quantity, native price/source time, reporting value, remaining average cost, net invested and gains come from the complete overview snapshot. Selecting a holding does not refetch its ledger: the overview already contains bounded, ordered trade facts. The panel shows 20 rows at a time, ordered by date, effective order and ID. Standalone legacy rows use the historical-details form. Versioned linked legacy unit trades with missing execution/cash facts expose Review historical details and use the canonical linked editor: its read verifies the reciprocal cash pair before opening, and its preview/save keep the original IDs and version checks. The editor read returns the verified linked cash amount/currency separately from stored investment facts. When the legacy investment cash field is missing, the draft prefills that recorded amount only if its currency matches the selected cash account; it never derives cash from execution price or current FX. Missing execution and fee facts must still be entered/confirmed, never inferred from a current quote. Broken/ambiguous pairs remain rejected by the server; locks, archive and privacy still disable review.

From 790e2191b1068c60b7c6c7b7d8ced44074061fdc Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 03:20:07 +0200
Subject: [PATCH 12/21] Display split-adjusted holding charts and aligned trade
 markers

---
 CHANGELOG.md                                  |  1 +
 .../InvestmentChart.render.test.tsx           | 55 +++++++++++++++++--
 .../investments-module/InvestmentChart.tsx    | 44 ++++++++-------
 .../investments-module/MarketInputs.test.tsx  | 18 +++---
 docs/investment-detail.md                     |  2 +-
 docs/investment-market-data.md                |  2 +-
 6 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a66554..1604772 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 ### Fixed
 
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
+- Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
 - Center holding details and organize them into current value, a labeled gain/net-invested card and compact position facts, with a collapsed gain breakdown and readable source times. Show green/red trade dots and distinguish date-only legacy markers. Make linked legacy trade review accessible and prefill recorded cash from the verified transfer (#171).
 - Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
diff --git a/client/src/components/investments-module/InvestmentChart.render.test.tsx b/client/src/components/investments-module/InvestmentChart.render.test.tsx
index 775a0be..85f0607 100644
--- a/client/src/components/investments-module/InvestmentChart.render.test.tsx
+++ b/client/src/components/investments-module/InvestmentChart.render.test.tsx
@@ -2,7 +2,7 @@ import { cloneElement } from 'react'
 import type { ReactElement } from 'react'
 import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { afterEach, expect, it, vi } from 'vitest'
-import { InvestmentChart } from './InvestmentChart'
+import { InvestmentChart, splitAdjustedTradePrice } from './InvestmentChart'
 import { normalizeYahoo } from '../../../../shared/market-provider'
 import { yahooFixture } from '../../../../tests/fixtures/market-data'
 // Keep the real chart/axes/selectors. Only the physical container size needs a
@@ -45,7 +45,7 @@ it('keeps daily prices in the visible axis domain when execution scatter data is
       ]}
     />,
   )
-  await screen.findByText(/110 EUR/)
+  await screen.findByText(/110,00 EUR/)
   await waitFor(() => {
     const plot = screen.getByLabelText('Daily instrument price history')
     const ticks = [
@@ -69,7 +69,7 @@ it('renders daily history without inventing executions from empty scatter series
     ).history
   vi.stubGlobal('fetch', vi.fn<typeof fetch>().mockResolvedValue(Response.json(history)))
   render(<InvestmentChart symbol="TEST" />)
-  await screen.findByText(/110 EUR/)
+  await screen.findByText(/110,00 EUR/)
   await waitFor(() =>
     expect(
       screen.getByLabelText('Daily instrument price history').querySelector('.recharts-area-curve'),
@@ -102,9 +102,9 @@ it.each(['dividend', 'split'] as const)(
     history.requires_event_review = true
     vi.stubGlobal('fetch', vi.fn<typeof fetch>().mockResolvedValue(Response.json(history)))
     render(<InvestmentChart symbol="TEST" />)
-    await screen.findByText(/110 EUR/)
+    await screen.findByText(/110,00 EUR/)
     expect(screen.getByText(/excludes dividends/)).toBeVisible()
-    if (type === 'split') expect(screen.getByText(/Stock splits occur/)).toBeVisible()
+    if (type === 'split') expect(screen.getByText(/Prices and trade dots use the current share basis/)).toBeVisible()
     else expect(screen.queryByText(/Price history alone/)).not.toBeInTheDocument()
   },
 )
@@ -123,7 +123,7 @@ it('shows every long-range buy/sell at its date, including date-only trades and
   {id:'foreign-buy',date:'2023-01-03',amount:110,quantity:1,price:110,execution_currency:'USD'},
   {id:'unknown-sell',date:'2024-01-03',amount:-1,quantity:-1},
  ]}/> )
- await screen.findByText(/110 EUR/)
+ await screen.findByText(/110,00 EUR/)
  fireEvent.click(screen.getByRole('button',{name:'5Y',exact:true}))
  await screen.findByText('Buy · 3')
  expect(fetcher.mock.calls.some(([url])=>String(url).includes('range=5y'))).toBe(true)
@@ -142,3 +142,46 @@ it('shows every long-range buy/sell at its date, including date-only trades and
  await waitFor(()=>expect(plot.querySelectorAll('.recharts-scatter-symbol')).toHaveLength(0))
  expect(fetcher.mock.calls.some(([url])=>String(url).includes('range=1y'))).toBe(true)
 })
+
+it('plots a continuous split-only series and adjusts trade dots without rewriting recorded executions',async()=>{
+ const history=normalizeYahoo(yahooFixture(Date.now()),'TEST','2021-07-01',Date.now()).history
+ history.from='2021-07-01';history.to='2026-10-20'
+ history.events=[{date:'2021-07-20',type:'split',ratio:4},{date:'2024-06-10',type:'split',ratio:10},{date:'2024-07-01',type:'dividend'}]
+ history.points=[['2021-07-19',2400,60],['2021-07-20',610,61],['2024-06-07',620,62],['2024-06-10',63,63]].map(([date,close,provider])=>({date:String(date),period_start:`${date}T00:00:00Z`,close:Number(close),provider_close:Number(provider),provisional:false}))
+ const trades=[{id:'before-both',date:'2021-07-19',amount:2400,quantity:1,price:2400,execution_currency:'EUR'},
+ {id:'before-second',date:'2024-06-07',amount:-620,quantity:-1,price:620,execution_currency:'EUR'}]
+ const original=JSON.stringify({history,trades})
+ expect(splitAdjustedTradePrice(trades[0],history)).toBe(60)
+ expect(splitAdjustedTradePrice(trades[1],history)).toBe(62)
+ expect(splitAdjustedTradePrice({date:'2024-06-10',price:63},history)).toBe(63)
+ vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json(history)))
+ render(<InvestmentChart symbol="TEST" transactions={trades}/>)
+ await screen.findByText(/63,00 EUR/)
+ expect(screen.getByText(/5.00%.*price change/)).toBeVisible()
+ const plot=screen.getByLabelText('Daily instrument price history')
+ await waitFor(()=>expect(plot.querySelectorAll('.recharts-scatter-symbol')).toHaveLength(2))
+ const ticks=[...plot.querySelectorAll('.recharts-yAxis-tick-labels .recharts-cartesian-axis-tick-value')].map(n=>Number(n.textContent?.replaceAll(',','')))
+ expect(Math.max(...ticks)).toBeLessThan(100)
+ expect(Math.min(...ticks)).toBeGreaterThan(0)
+ fireEvent.change(screen.getByRole('combobox',{name:'Read instrument history by date'}),{target:{value:'2021-07-19'}})
+ expect(screen.getByRole('list',{name:'Executions on 2021-07-19'})).toHaveTextContent('2400 EUR')
+ expect(JSON.stringify({history,trades})).toBe(original)
+})
+
+it('supports reverse splits, ignores dividends and withholds invalid split-adjustment factors',()=>{
+ const history=normalizeYahoo(yahooFixture(Date.now()),'TEST','2020-01-01',Date.now()).history
+ history.events=[{date:'2024-01-01',type:'split',ratio:0.1},{date:'2024-02-01',type:'dividend'}]
+ expect(splitAdjustedTradePrice({date:'2023-01-01',price:10},history)).toBe(100)
+ history.events[0].ratio=0
+ expect(splitAdjustedTradePrice({date:'2023-01-01',price:10},history)).toBeNull()
+})
+
+it('formats normal unit prices as cents without altering the source observation',async()=>{
+ const history=normalizeYahoo(yahooFixture(Date.now()),'TEST','2026-01-01',Date.now()).history
+ history.points.at(-1)!.close=214.130004882813
+ history.points.at(-1)!.provider_close=214.130004882813
+ vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json(history)))
+ render(<InvestmentChart symbol="TEST"/>)
+ expect(await screen.findByText('214,13 EUR')).toBeVisible()
+ expect(history.points.at(-1)!.provider_close).toBe(214.130004882813)
+})
diff --git a/client/src/components/investments-module/InvestmentChart.tsx b/client/src/components/investments-module/InvestmentChart.tsx
index f49a0b6..1fa4b91 100644
--- a/client/src/components/investments-module/InvestmentChart.tsx
+++ b/client/src/components/investments-module/InvestmentChart.tsx
@@ -37,6 +37,17 @@ export function chartTrades(history: PriceHistory, transactions: Trade[]) {
     .filter((t) => t.date >= history.from && t.date <= history.to)
     .sort((a, b) => a.date.localeCompare(b.date) || a.id.localeCompare(b.id))
 }
+/** Presentation only: recorded fills retain their original price and units. */
+export function splitAdjustedTradePrice(trade:Pick<Trade,'date'|'price'>,history:PriceHistory):number|null {
+  if(trade.price==null||!Number.isFinite(trade.price)||trade.price<=0)return null
+  let factor=1
+  for(const event of history.events)if(event.type==='split'&&event.date>trade.date){
+    if(event.ratio==null||!Number.isFinite(event.ratio)||event.ratio<=0)return null
+    factor*=event.ratio
+  }
+  const price=trade.price/factor
+  return Number.isFinite(factor)&&factor>0&&Number.isFinite(price)&&price>0?price:null
+}
 export function InvestmentChart({
   symbol,
   transactions = [],
@@ -88,7 +99,7 @@ export function InvestmentChart({
           !Number.isFinite(Date.parse(value.to)) ||
           !value.currency ||
           value.points.some(
-            (p) => !Number.isFinite(p.close) || p.close <= 0 || !/^\d{4}-\d{2}-\d{2}$/.test(p.date),
+            (p) => !Number.isFinite(p.close) || p.close <= 0 || !Number.isFinite(p.provider_close) || p.provider_close<=0 || !/^\d{4}-\d{2}-\d{2}$/.test(p.date),
           )
         )
           throw new Error('Invalid price history')
@@ -109,7 +120,7 @@ export function InvestmentChart({
   const history = snapshot?.key === key ? snapshot.value : (store.get(key) ?? null)
   const trades = useMemo(() => (history ? chartTrades(history, transactions) : []), [history, transactions])
   const points = useMemo(
-    () => history?.points.map((p) => ({ ...p, time: Date.parse(`${p.date}T00:00:00Z`) })) ?? [],
+    () => history?.points.map((p) => ({ ...p, close:p.provider_close, time: Date.parse(`${p.date}T00:00:00Z`) })) ?? [],
     [history],
   )
   const markers = useMemo(() => {
@@ -118,8 +129,8 @@ export function InvestmentChart({
     const highest = Math.max(...points.map(p => p.close))
     const lane = Math.max(0, lowest - Math.max((highest - lowest) * 0.12, lowest * 0.03))
     return trades.map(t => {
-      const exact = t.price != null && Number.isFinite(t.price) && t.price > 0 && t.execution_currency === history?.currency
-      return {...t, time: Date.parse(`${t.date}T00:00:00Z`), markerPrice: exact ? t.price! : lane, dateOnly: !exact}
+      const adjusted=history&&t.execution_currency===history.currency?splitAdjustedTradePrice(t,history):null
+      return {...t, time: Date.parse(`${t.date}T00:00:00Z`), markerPrice: adjusted ?? lane, dateOnly: adjusted==null}
     })
   }, [trades, points, history?.currency])
   const buys = markers.filter((t) => (t.quantity ?? t.amount) > 0)
@@ -128,10 +139,10 @@ export function InvestmentChart({
   const first = points.at(0),
     last = points.at(-1),
     splitInRange = history?.events.some((e) => e.type === 'split') ?? false
-  const change = first && last && !splitInRange ? last.close - first.close : null,
+  const change = first && last ? last.close - first.close : null,
     rawPercent = change !== null && first ? (change / first.close) * 100 : null
   const percent = rawPercent !== null && Number.isFinite(rawPercent) ? rawPercent : null
-  const money = (n: number | null | undefined) => unitPrice(n, history?.currency ?? '')
+  const money = (n: number | null | undefined) => n==null?'Unavailable':Math.abs(n)>=1?`${n.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})} ${history?.currency??''}`:unitPrice(n,history?.currency??'')
   const date = selected?.key === key ? selected.date : last?.date
   const dayTrades = trades.filter((t) => t.date === date),
     close = points.find((p) => p.date === date)?.close
@@ -174,27 +185,19 @@ export function InvestmentChart({
         {change !== null && percent !== null && (
           <p className="text-xs text-muted-foreground">
             {change >= 0 ? '+' : ''}
-            {money(change)} ({percent.toFixed(2)}%) · selected range
+            {money(change)} ({percent.toFixed(2)}%) · price change
           </p>
         )}
-        {splitInRange && (
-          <p className="text-xs text-muted-foreground">Range change unavailable across split events.</p>
-        )}
       </div>
       {history && (
         <p className="text-[10px] text-muted-foreground">
-          Yahoo Finance · daily unadjusted close · excludes dividends · {history.currency} ·{' '}
+          Yahoo Finance · split-adjusted daily close · excludes dividends · {history.currency} ·{' '}
           {history.status === 'stale' || error ? 'Saved history; refresh unavailable' : 'Retrieved'}{' '}
           {history.retrieved_at}
           {last?.provisional ? ' · current session provisional' : ''}
         </p>
       )}
-      {history?.events.some(event => event.type === 'split') && (
-        <p className="text-xs text-muted-foreground">
-          Stock splits occur in this range. Price history alone does not establish complete portfolio
-          returns.
-        </p>
-      )}
+      {splitInRange&&<p className="text-xs text-muted-foreground">Prices and trade dots use the current share basis. Recorded trades keep their original units and execution prices.</p>}
       <button
         type="button"
         disabled={loading}
@@ -266,19 +269,20 @@ export function InvestmentChart({
                 width={55}
                 domain={['auto', 'auto']}
                 tick={{ fontSize: 10 }}
-                tickFormatter={(n) => Number(n).toLocaleString(undefined, { maximumFractionDigits: 6 })}
+                tickFormatter={(n) => Number(n).toLocaleString(undefined, { maximumFractionDigits: Math.abs(Number(n))>=1?2:12 })}
               />
               <Tooltip
                 filterNull={false}
                 content={({ active, payload }) => {
                   const p = (active ? payload?.[0]?.payload : undefined) as
-                    { date?: string; close?: number; time?: number; dateOnly?: boolean } | undefined
+                    { date?: string; close?: number; time?: number; dateOnly?: boolean; markerPrice?:number } | undefined
                   const d = p?.date ?? (p?.time ? new Date(p.time).toISOString().slice(0, 10) : null)
                   return d ? (
                     <div className="max-w-64 rounded-lg border border-border bg-card p-3 text-xs shadow-lg">
                       <p>{d}</p>
                       {p?.dateOnly && <p className="text-muted-foreground">Date only · execution price unavailable in chart currency</p>}
-                      {p?.close != null && <p>Daily close: {money(p.close)}</p>}
+                      {p?.close != null && <p>Split-adjusted close: {money(p.close)}</p>}
+                      {p?.markerPrice!=null&&!p.dateOnly&&<p>Split-adjusted execution: {money(p.markerPrice)}</p>}
                       {trades
                         .filter((t) => t.date === d)
                         .map((t) => (
diff --git a/client/src/components/investments-module/MarketInputs.test.tsx b/client/src/components/investments-module/MarketInputs.test.tsx
index 9fea1fd..d1785e9 100644
--- a/client/src/components/investments-module/MarketInputs.test.tsx
+++ b/client/src/components/investments-module/MarketInputs.test.tsx
@@ -18,8 +18,8 @@ it('shows native currency/daily bounds and preserves a matching chart on failed
   const fetcher=vi.fn<typeof fetch>().mockResolvedValue(Response.json(value))
   vi.stubGlobal('fetch',fetcher)
   render(<InvestmentChart symbol="TEST"/>)
-  expect(await screen.findByText(/110 EUR/)).toBeInTheDocument()
-  expect(screen.getByText(/daily unadjusted close/)).toBeInTheDocument()
+  expect(await screen.findByText(/110,00 EUR/)).toBeInTheDocument()
+  expect(screen.getByText(/split-adjusted daily close/)).toBeInTheDocument()
   expect(String(fetcher.mock.calls[0][0])).toContain('interval=1d')
   expect(screen.getByTestId('instrument-chart')).toHaveAttribute('data-points','3')
   fetcher.mockRejectedValue(new Error('private error'))
@@ -41,9 +41,9 @@ it('aborts superseded chart reads and ignores their late result',async()=>{
   const view=render(<InvestmentChart symbol="TEST"/>)
   await waitFor(()=>expect(fetcher).toHaveBeenCalledTimes(1))
   view.rerender(<InvestmentChart symbol="OTHER"/>)
-  expect(await screen.findByText(/110 HUF/)).toBeInTheDocument();expect(oldSignal?.aborted).toBe(true)
+  expect(await screen.findByText(/110,00 HUF/)).toBeInTheDocument();expect(oldSignal?.aborted).toBe(true)
   await act(async()=>release(Response.json(value)))
-  expect(screen.queryByText(/110 EUR/)).not.toBeInTheDocument()
+  expect(screen.queryByText(/110,00 EUR/)).not.toBeInTheDocument()
 })
 it('shows a stale source time without inventing a daily zero move and masks privacy badges',()=>{
   const account={id:'holding',name:'Synthetic',type:'investment' as const,balance:2,currency:'SHARE',quote_currency:'EUR',asset_type:'stock' as const,symbol:'TEST',updated_at:1}
@@ -57,11 +57,11 @@ it('shows a stale source time without inventing a daily zero move and masks priv
   expect(screen.queryByText(/12.34%/)).not.toBeInTheDocument()
 })
 
-it('withholds a misleading raw range change across stock splits',async()=>{
+it('uses split-adjusted closes for price change across stock splits',async()=>{
   vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({...value,events:[{date:value.points[1].date,type:'split',ratio:2}],requires_event_review:true})))
   render(<InvestmentChart symbol="TEST"/>)
-  expect(await screen.findByText('Range change unavailable across split events.')).toBeInTheDocument()
-  expect(screen.queryByText(/selected range/)).not.toBeInTheDocument()
+  expect(await screen.findByText(/22.22%.*price change/)).toBeInTheDocument()
+  expect(screen.getByText(/split-adjusted daily close/)).toBeVisible()
 })
 
 it('retains every same-day execution, its actual date/currency and the current remaining-cost reference',async()=>{
@@ -81,8 +81,8 @@ it('retains every same-day execution, its actual date/currency and the current r
 it('reuses an owned detail cache until its source key changes',async()=>{
  const fetcher=vi.fn<typeof fetch>().mockResolvedValue(Response.json(value)),cache=new Map()
  vi.stubGlobal('fetch',fetcher)
- const first=render(<InvestmentChart symbol="TEST" cache={cache} revisionKey="one"/>);await screen.findByText(/110 EUR/);first.unmount()
- const second=render(<InvestmentChart symbol="TEST" cache={cache} revisionKey="one"/>);await screen.findByText(/110 EUR/)
+ const first=render(<InvestmentChart symbol="TEST" cache={cache} revisionKey="one"/>);await screen.findByText(/110,00 EUR/);first.unmount()
+ const second=render(<InvestmentChart symbol="TEST" cache={cache} revisionKey="one"/>);await screen.findByText(/110,00 EUR/)
  expect(fetcher).toHaveBeenCalledTimes(1)
  second.rerender(<InvestmentChart symbol="TEST" cache={cache} revisionKey="two"/>);await waitFor(()=>expect(fetcher).toHaveBeenCalledTimes(2))
 })
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index c9ce3c8..4e61be1 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -10,7 +10,7 @@ Current quantity, native price/source time, reporting value, remaining average c
 
 Instrument price history loads only when a market holding is opened with values visible. Its cache belongs to the App investment-data hook, is bounded to 12 entries and uses source snapshot/symbol/range keys. Returning to a matching detail reuses history; changed financial snapshots and mutations invalidate reuse. Superseded/closed reads abort; failed refreshes preserve the matching last good history. No financial history enters browser storage.
 
-Price charts use native daily unadjusted observations. Every buy/sell in the selected range is a green/red marker at its actual date. A verified positive finite execution price in the chart currency sets the marker height. Other-currency or unverified executions use hollow markers in a separate bottom lane: these represent dates only, never an inferred fill or a substituted nearby close. Their actual currency/facts remain in the tooltip and dated list. Marker selection opens the actual date; same-day trades remain separate records and all appear in the dated list/tooltip. The 1Y, 5Y and other range controls include all matching trades independently of daily-price sampling. A keyboard date selector and date readout expose every same-day execution. The range list shows at most the latest 100 executions; the ordered holding ledger remains separately paged in the panel. The dashed line is **current remaining native basis per unit**, explicitly not a historical cost series or an all-buys average. Raw split ranges withhold a misleading range-change percentage.
+The holding price chart displays the retained provider split-only-adjusted daily close (`provider_close`), excluding dividend adjustment. The shared source cache/read contract still retains contemporaneous raw `close` for dated accounting. Every buy/sell in the selected range is a green/red marker at its actual date. A verified positive finite execution price in the chart currency is divided by all later split ratios through the current chart endpoint to set its display height; original trade prices and quantities remain unchanged in the ledger and dated list. Same-day split executions already use that day's share basis. Other-currency or unverified executions use hollow markers in a separate bottom lane: these represent dates only, never an inferred fill or a substituted nearby close. Their actual currency/facts remain in the tooltip and dated list. Marker selection opens the actual date; same-day trades remain separate records and all appear in the dated list/tooltip. The 1Y, 5Y and other range controls include all matching trades independently of daily-price sampling. A keyboard date selector and date readout expose every same-day execution. The range list shows at most the latest 100 executions; the ordered holding ledger remains separately paged in the panel. The dashed line is **current remaining native basis per unit**, explicitly not a historical cost series or an all-buys average. Range price change uses the first/last split-adjusted closes, including ranges with splits; it is not the holding's cash-flow return. The chart labels its split-adjusted basis. Normal prices display two decimal places, while sub-unit prices keep small-coin precision.
 
 Manual histories remain dated total/per-unit step observations, independently loaded and paged. Their cost reference is current known remaining cost, not a deposit or new appraisal. Corrections pin the saved observation ID/version and retain drafts after failure. A successful appraisal refreshes the overview and account snapshots without cash movement.
 
diff --git a/docs/investment-market-data.md b/docs/investment-market-data.md
index fe5cd18..9f6bcf2 100644
--- a/docs/investment-market-data.md
+++ b/docs/investment-market-data.md
@@ -24,7 +24,7 @@ Statuses distinguish `ok`, `last_close`, `stale`, `missing`, and `unsupported`.
 
 Daily history stores exchange calendar dates and provider bar-start timestamps; a bar-start is not falsely labelled an exact closing timestamp. Current exchange-day bars are provisional. `period2` always stops at actual retrieval time. Read bounds use UTC with a validated adjacent `X-Client-Date` where supplied; no future observations are invented for a local date already underway. End-of-day/cutoff assembly remains #132.
 
-Yahoo chart close is split-adjusted; `adjclose` additionally incorporates distributions ([Yahoo explanation](https://in.help.yahoo.com/kb/adjusted-close-sln28256.html)). The adapter does not use `adjclose`. It requests daily closes plus all split/dividend events from the requested start **through retrieval time**, even when the caller's end is earlier. It reconstructs contemporaneous unadjusted close by multiplying the provider close by every later reported split ratio. Both `provider_close` and raw `close` are explicit. Missing/malformed split facts withhold history instead of assuming raw units. Events inside the requested range set the source-level `requires_event_review` flag. Investment readers distinguish splits, which require supported unit history, from dividends, which are deliberately excluded from price returns and do not require purchase review. They do not use the generic source flag to invalidate otherwise known costs or returns. Dividend ingestion, split posting and tax reporting remain outside this child.
+Yahoo chart close is split-adjusted; `adjclose` additionally incorporates distributions ([Yahoo explanation](https://in.help.yahoo.com/kb/adjusted-close-sln28256.html)). The adapter does not use `adjclose`. It requests daily closes plus all split/dividend events from the requested start **through retrieval time**, even when the caller's end is earlier. It reconstructs contemporaneous unadjusted close by multiplying the provider close by every later reported split ratio. Both `provider_close` and raw `close` are explicit. The holding detail chart deliberately plots `provider_close` for a split-only-adjusted visual series and adjusts recorded marker heights onto that same basis; it does not alter shared raw observations, accounting, unit ledgers or unsupported split-event coverage. It never substitutes dividend-adjusted `adjclose`. Missing/malformed split facts withhold history instead of assuming raw units. Events inside the requested range set the source-level `requires_event_review` flag. Investment readers distinguish splits, which require supported unit history, from dividends, which are deliberately excluded from price returns and do not require purchase review. They do not use the generic source flag to invalidate otherwise known costs or returns. Dividend ingestion, split posting and tax reporting remain outside this child.
 
 Price history contains actual observations only. `dailyPriceAt` permits exact-date observations and equity weekend carry with the original date; it does not bridge missing weekdays, unknown pre-listing dates or crypto gaps. Other exchange holidays require a verified calendar in a future consumer or remain incomplete. A successful provider response is not proof of complete portfolio history.
 

From d7ac6edd2847220842c6e27c0174378022159f96 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 03:23:37 +0200
Subject: [PATCH 13/21] Show gain breakdown as visible zero centered comparison
 cards

---
 CHANGELOG.md                                  |  2 +-
 .../investments-module/GainBreakdown.test.tsx | 23 ++++++++++++++
 .../investments-module/GainBreakdown.tsx      | 30 +++++++++++++++++++
 .../InvestmentDetailModal.tsx                 | 11 ++-----
 docs/investment-detail.md                     |  2 +-
 5 files changed, 58 insertions(+), 10 deletions(-)
 create mode 100644 client/src/components/investments-module/GainBreakdown.test.tsx
 create mode 100644 client/src/components/investments-module/GainBreakdown.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1604772..37c5496 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
-- Center holding details and organize them into current value, a labeled gain/net-invested card and compact position facts, with a collapsed gain breakdown and readable source times. Show green/red trade dots and distinguish date-only legacy markers. Make linked legacy trade review accessible and prefill recorded cash from the verified transfer (#171).
+- Center holding details and organize them into current value, a labeled gain/net-invested card and compact position facts, with an always-visible gain breakdown, compact zero-centered realized/unrealized bars, separate remaining cost and readable source times. Show green/red trade dots and distinguish date-only legacy markers. Make linked legacy trade review accessible and prefill recorded cash from the verified transfer (#171).
 - Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
diff --git a/client/src/components/investments-module/GainBreakdown.test.tsx b/client/src/components/investments-module/GainBreakdown.test.tsx
new file mode 100644
index 0000000..af33746
--- /dev/null
+++ b/client/src/components/investments-module/GainBreakdown.test.tsx
@@ -0,0 +1,23 @@
+import {cleanup,render,screen} from '@testing-library/react'
+import {afterEach,expect,it} from 'vitest'
+import {GainBreakdown} from './GainBreakdown'
+afterEach(cleanup)
+it('compares opposite gains on one zero-centered scale, keeping remaining cost outside the gain bars',()=>{
+ render(<GainBreakdown realized={-100} unrealized={200} basis={1000} currency="EUR" hidden={false}/>)
+ expect(screen.getByText('-100 EUR')).toBeVisible();expect(screen.getByText('+200 EUR')).toBeVisible()
+ const region=screen.getByRole('region',{name:'Gain breakdown'})
+ expect(region.querySelector('.bg-destructive')).toHaveStyle({left:'25%',width:'25%'})
+ expect(region.querySelector('.bg-success')).toHaveStyle({left:'50%',width:'50%'})
+ expect(screen.getByText('1000 EUR')).toBeVisible()
+ expect(region.closest('details')).toBeNull()
+})
+it('withholds comparative bars for incomplete data, preserves known zero and hides values and sign styling in privacy mode',()=>{
+ const {rerender}=render(<GainBreakdown realized={0} unrealized={null} basis={1000} currency="EUR" hidden={false}/>)
+ expect(screen.getByText('0 EUR')).toBeVisible();expect(screen.getByText('Unavailable')).toBeVisible()
+ const region=screen.getByRole('region',{name:'Gain breakdown'})
+ expect(region.querySelector('[style]')).toBeNull()
+ rerender(<GainBreakdown realized={-100} unrealized={200} basis={1000} currency="EUR" hidden/>)
+ expect(screen.getAllByText('••••••')).toHaveLength(3)
+ expect(region.querySelector('[style]')).toBeNull()
+ expect(region.querySelector('.text-success,.text-destructive,.bg-success,.bg-destructive')).toBeNull()
+})
diff --git a/client/src/components/investments-module/GainBreakdown.tsx b/client/src/components/investments-module/GainBreakdown.tsx
new file mode 100644
index 0000000..9f6cc67
--- /dev/null
+++ b/client/src/components/investments-module/GainBreakdown.tsx
@@ -0,0 +1,30 @@
+import {amount,signedAmount,tone} from './overview'
+
+export function GainBreakdown({realized,unrealized,basis,currency,hidden}:{realized:number|null;unrealized:number|null;basis:number|null;currency:string;hidden:boolean}) {
+ const complete=realized!=null&&Number.isFinite(realized)&&unrealized!=null&&Number.isFinite(unrealized)
+ const scale=complete?Math.max(Math.abs(realized),Math.abs(unrealized)):0
+ const rows=[{label:'Realized gain',note:'From sold units',value:realized},{label:'Unrealized gain',note:'From current holdings',value:unrealized}]
+ return <section aria-label="Gain breakdown" className="rounded-xl border border-border p-4">
+  <div className="flex flex-wrap items-baseline justify-between gap-x-4 gap-y-2">
+   <h3 className="text-sm font-semibold">Gain breakdown</h3>
+   <p className="text-xs text-muted-foreground">Cost of current holdings <span className="ml-2 font-medium tabular-nums text-foreground">{amount(basis,currency,hidden)}</span></p>
+  </div>
+  <div className="mt-4 grid grid-cols-1 gap-4 @min-[480px]:grid-cols-2">
+   {rows.map(row=>{
+    const width=complete&&scale>0?Math.abs(row.value!)/scale*50:0
+    return <div key={row.label} className="min-w-0 rounded-lg bg-secondary/40 p-3">
+     <div className="flex flex-wrap items-baseline justify-between gap-x-3 gap-y-1">
+      <p className="text-xs font-medium text-muted-foreground">{row.label}</p>
+      <p className={`break-words text-lg font-semibold tabular-nums ${tone(row.value,hidden)}`}>{signedAmount(row.value,currency,hidden)}</p>
+     </div>
+     <div aria-hidden="true" title="Gain amounts on a shared scale, centered at zero. These bars are not return percentages." className="relative my-3 h-2 overflow-hidden rounded-full bg-secondary">
+      <span className="absolute inset-y-0 left-1/2 w-px bg-muted-foreground/40"/>
+      {!hidden&&complete&&(row.value===0?<span className="absolute inset-y-0 left-1/2 w-1 -translate-x-1/2 rounded-full bg-muted-foreground/60"/>:
+       <span className={`absolute inset-y-0 rounded-full ${row.value!>0?'bg-success':'bg-destructive'}`} style={{left:`${row.value!>=0?50:50-width}%`,width:`${width}%`}}/>)}
+     </div>
+     <p className="text-[10px] text-muted-foreground">{row.note}</p>
+    </div>
+   })}
+  </div>
+ </section>
+}
diff --git a/client/src/components/investments-module/InvestmentDetailModal.tsx b/client/src/components/investments-module/InvestmentDetailModal.tsx
index 3a62d27..c5a065d 100644
--- a/client/src/components/investments-module/InvestmentDetailModal.tsx
+++ b/client/src/components/investments-module/InvestmentDetailModal.tsx
@@ -1,3 +1,4 @@
+import { GainBreakdown } from './GainBreakdown'
 import { holdingSourceTime } from './holding-presentation'
 import { quotePresentation } from './quote-presentation'
 import { useRef, useState } from 'react'
@@ -158,14 +159,8 @@ export function InvestmentDetailModal({
             {stat(total?'Remaining cost':'Average cost',costPrice(total?p.metrics.native.remaining_basis:p.metrics.native.average_cost,p.metrics.native_currency,hidden))}
           </dl>
         </section>
-        <details className="group rounded-xl border border-border px-4 py-3 text-xs">
-          <summary className="min-h-7 cursor-pointer font-medium text-muted-foreground">Gain breakdown</summary>
-          <dl className="mt-3 grid grid-cols-1 gap-4 border-t border-border pt-4 @min-[480px]:grid-cols-3">
-            {stat('Remaining basis',amount(p.metrics.remaining_basis,reportingCurrency,hidden))}
-            {stat('Realized gain',signedAmount(p.metrics.realized_gain,reportingCurrency,hidden),'From sold units')}
-            {stat('Unrealized gain',signedAmount(p.metrics.unrealized_gain,reportingCurrency,hidden),'From current holdings')}
-          </dl>
-        </details>
+        <GainBreakdown realized={p.metrics.realized_gain} unrealized={p.metrics.unrealized_gain}
+          basis={p.metrics.remaining_basis} currency={reportingCurrency} hidden={hidden}/>
         {!market && (
           <ManualValuations
             account={account}
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index 4e61be1..aa0b852 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -2,7 +2,7 @@
 
 The Investments page owns the selected holding ID, editor and mutation refresh. Holding details open in a centered modal on all screen sizes, with a wider desktop chart and sticky Buy/Sell actions for unit holdings. Manual total assets show ownership and Update value instead. Manually priced unit holdings retain their unit trades and their separate per-unit appraisal editor.
 
-The summary leads with Current value beside a labeled Total gain card, including the supported gain-on-net-invested percentage and Net invested. Your position groups quantity/ownership, current native price or valuation date, and remaining average/native cost. The collapsed Gain breakdown retains remaining basis and realized/unrealized gains. Source times use readable local formatting with full observation context in the time element. Missing facts remain unavailable; percentages need known finite gain and positive finite net invested, and privacy masks all financial values and gain styling.
+The summary leads with Current value beside a labeled Total gain card, including the supported gain-on-net-invested percentage and Net invested. Your position groups quantity/ownership, current native price or valuation date, and remaining average/native cost. Gain breakdown is always visible: two compact cards show realized and unrealized amounts with zero-centered bars on a shared absolute-money scale, while remaining basis is labeled Cost of current holdings separately. Bars show gains to the right and losses to the left; they are not return percentages and are withheld when either gain is unknown or privacy is enabled. Known zero remains zero. Source times use readable local formatting with full observation context in the time element. Missing facts remain unavailable; percentages need known finite gain and positive finite net invested, and privacy masks all financial values and gain styling.
 
 ## Detail reads and chart
 

From b534893563b781cad2d710626691562db8a86c11 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 05:07:09 +0200
Subject: [PATCH 14/21] Implement holding detail design 2a with compact chart
 first layout

---
 CHANGELOG.md                                  |   2 +-
 client/src/components/common/modal.tsx        |   8 +-
 .../investments-module/GainBreakdown.test.tsx |  23 ---
 .../investments-module/GainBreakdown.tsx      |  30 ----
 .../InvestmentChart.render.test.tsx           |  38 +++--
 .../investments-module/InvestmentChart.tsx    | 136 +++++++-----------
 .../InvestmentDetail.test.tsx                 |  12 +-
 .../InvestmentDetailModal.tsx                 |  85 ++++++-----
 .../investments-module/MarketInputs.test.tsx  |   6 +-
 docs/investment-detail.md                     |   8 +-
 10 files changed, 140 insertions(+), 208 deletions(-)
 delete mode 100644 client/src/components/investments-module/GainBreakdown.test.tsx
 delete mode 100644 client/src/components/investments-module/GainBreakdown.tsx

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 37c5496..6a91199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
-- Center holding details and organize them into current value, a labeled gain/net-invested card and compact position facts, with an always-visible gain breakdown, compact zero-centered realized/unrealized bars, separate remaining cost and readable source times. Show green/red trade dots and distinguish date-only legacy markers. Make linked legacy trade review accessible and prefill recorded cash from the verified transfer (#171).
+- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
 - Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
diff --git a/client/src/components/common/modal.tsx b/client/src/components/common/modal.tsx
index 9e70631..3309bde 100644
--- a/client/src/components/common/modal.tsx
+++ b/client/src/components/common/modal.tsx
@@ -6,8 +6,9 @@ interface ModalProps {
   isOpen: boolean
   onClose: () => void
   title?: string
-  subtitle?: string
+  subtitle?: React.ReactNode
   subtitleClassName?: string
+  headerLeading?: React.ReactNode
   initialFocus?: string
   headerClassName?: string
   contentClassName?: string
@@ -16,7 +17,7 @@ interface ModalProps {
   placement?: 'center' | 'drawer' | 'centered'
 }
 
-export function Modal({ isOpen, onClose, title, subtitle, subtitleClassName, initialFocus, headerClassName, contentClassName, children, className, placement = 'center' }: ModalProps) {
+export function Modal({ isOpen, onClose, title, subtitle, subtitleClassName, headerLeading, initialFocus, headerClassName, contentClassName, children, className, placement = 'center' }: ModalProps) {
   React.useEffect(() => {
     const handleEscape = (e: KeyboardEvent) => {
       if (e.key === 'Escape' && isOpen) {
@@ -85,7 +86,8 @@ export function Modal({ isOpen, onClose, title, subtitle, subtitleClassName, ini
         {/* Header */}
         {title && (
           <div className={cn("flex shrink-0 items-center justify-between gap-3 p-4 sm:p-6 border-b border-border/50", subtitle && "px-5 py-3 sm:px-6 sm:py-3", headerClassName)}>
-            <div className="min-w-0">
+            {headerLeading}
+            <div className="min-w-0 flex-1">
               <h2 id={titleId} className={subtitle ? "text-xs text-muted-foreground" : "text-lg sm:text-xl font-semibold text-foreground"}>{title}</h2>
               {subtitle && <p className={cn("mt-0.5 truncate text-[17px] font-semibold tracking-tight", subtitleClassName)}>{subtitle}</p>}
             </div>
diff --git a/client/src/components/investments-module/GainBreakdown.test.tsx b/client/src/components/investments-module/GainBreakdown.test.tsx
deleted file mode 100644
index af33746..0000000
--- a/client/src/components/investments-module/GainBreakdown.test.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import {cleanup,render,screen} from '@testing-library/react'
-import {afterEach,expect,it} from 'vitest'
-import {GainBreakdown} from './GainBreakdown'
-afterEach(cleanup)
-it('compares opposite gains on one zero-centered scale, keeping remaining cost outside the gain bars',()=>{
- render(<GainBreakdown realized={-100} unrealized={200} basis={1000} currency="EUR" hidden={false}/>)
- expect(screen.getByText('-100 EUR')).toBeVisible();expect(screen.getByText('+200 EUR')).toBeVisible()
- const region=screen.getByRole('region',{name:'Gain breakdown'})
- expect(region.querySelector('.bg-destructive')).toHaveStyle({left:'25%',width:'25%'})
- expect(region.querySelector('.bg-success')).toHaveStyle({left:'50%',width:'50%'})
- expect(screen.getByText('1000 EUR')).toBeVisible()
- expect(region.closest('details')).toBeNull()
-})
-it('withholds comparative bars for incomplete data, preserves known zero and hides values and sign styling in privacy mode',()=>{
- const {rerender}=render(<GainBreakdown realized={0} unrealized={null} basis={1000} currency="EUR" hidden={false}/>)
- expect(screen.getByText('0 EUR')).toBeVisible();expect(screen.getByText('Unavailable')).toBeVisible()
- const region=screen.getByRole('region',{name:'Gain breakdown'})
- expect(region.querySelector('[style]')).toBeNull()
- rerender(<GainBreakdown realized={-100} unrealized={200} basis={1000} currency="EUR" hidden/>)
- expect(screen.getAllByText('••••••')).toHaveLength(3)
- expect(region.querySelector('[style]')).toBeNull()
- expect(region.querySelector('.text-success,.text-destructive,.bg-success,.bg-destructive')).toBeNull()
-})
diff --git a/client/src/components/investments-module/GainBreakdown.tsx b/client/src/components/investments-module/GainBreakdown.tsx
deleted file mode 100644
index 9f6cc67..0000000
--- a/client/src/components/investments-module/GainBreakdown.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-import {amount,signedAmount,tone} from './overview'
-
-export function GainBreakdown({realized,unrealized,basis,currency,hidden}:{realized:number|null;unrealized:number|null;basis:number|null;currency:string;hidden:boolean}) {
- const complete=realized!=null&&Number.isFinite(realized)&&unrealized!=null&&Number.isFinite(unrealized)
- const scale=complete?Math.max(Math.abs(realized),Math.abs(unrealized)):0
- const rows=[{label:'Realized gain',note:'From sold units',value:realized},{label:'Unrealized gain',note:'From current holdings',value:unrealized}]
- return <section aria-label="Gain breakdown" className="rounded-xl border border-border p-4">
-  <div className="flex flex-wrap items-baseline justify-between gap-x-4 gap-y-2">
-   <h3 className="text-sm font-semibold">Gain breakdown</h3>
-   <p className="text-xs text-muted-foreground">Cost of current holdings <span className="ml-2 font-medium tabular-nums text-foreground">{amount(basis,currency,hidden)}</span></p>
-  </div>
-  <div className="mt-4 grid grid-cols-1 gap-4 @min-[480px]:grid-cols-2">
-   {rows.map(row=>{
-    const width=complete&&scale>0?Math.abs(row.value!)/scale*50:0
-    return <div key={row.label} className="min-w-0 rounded-lg bg-secondary/40 p-3">
-     <div className="flex flex-wrap items-baseline justify-between gap-x-3 gap-y-1">
-      <p className="text-xs font-medium text-muted-foreground">{row.label}</p>
-      <p className={`break-words text-lg font-semibold tabular-nums ${tone(row.value,hidden)}`}>{signedAmount(row.value,currency,hidden)}</p>
-     </div>
-     <div aria-hidden="true" title="Gain amounts on a shared scale, centered at zero. These bars are not return percentages." className="relative my-3 h-2 overflow-hidden rounded-full bg-secondary">
-      <span className="absolute inset-y-0 left-1/2 w-px bg-muted-foreground/40"/>
-      {!hidden&&complete&&(row.value===0?<span className="absolute inset-y-0 left-1/2 w-1 -translate-x-1/2 rounded-full bg-muted-foreground/60"/>:
-       <span className={`absolute inset-y-0 rounded-full ${row.value!>0?'bg-success':'bg-destructive'}`} style={{left:`${row.value!>=0?50:50-width}%`,width:`${width}%`}}/>)}
-     </div>
-     <p className="text-[10px] text-muted-foreground">{row.note}</p>
-    </div>
-   })}
-  </div>
- </section>
-}
diff --git a/client/src/components/investments-module/InvestmentChart.render.test.tsx b/client/src/components/investments-module/InvestmentChart.render.test.tsx
index 85f0607..221b2bd 100644
--- a/client/src/components/investments-module/InvestmentChart.render.test.tsx
+++ b/client/src/components/investments-module/InvestmentChart.render.test.tsx
@@ -48,10 +48,10 @@ it('keeps daily prices in the visible axis domain when execution scatter data is
   await screen.findByText(/110,00 EUR/)
   await waitFor(() => {
     const plot = screen.getByLabelText('Daily instrument price history')
-    const ticks = [
-      ...plot.querySelectorAll('.recharts-yAxis-tick-labels .recharts-cartesian-axis-tick-value'),
-    ].map((n) => Number(n.textContent?.replaceAll(',', '')))
-    expect(Math.max(...ticks)).toBeGreaterThanOrEqual(110)
+    const path=plot.querySelector('.recharts-area-curve')?.getAttribute('d')??''
+    const y=[...path.matchAll(/[ML](-?[\d.]+),(-?[\d.]+)/g)].map(match=>Number(match[2]))
+    expect(y.length).toBeGreaterThan(1)
+    expect(y.every(value=>Number.isFinite(value)&&value>=0&&value<=240)).toBe(true)
     expect(plot.querySelector('.recharts-area-curve')).toHaveAttribute(
       'd',
       expect.stringContaining('L'),
@@ -83,7 +83,7 @@ it('renders daily history without inventing executions from empty scatter series
 })
 
 it.each(['dividend', 'split'] as const)(
-  'only warns about split position review for %s history',
+  'retains a split-adjusted price-only disclosure for %s history',
   async (type) => {
     const now = Date.now()
     const history = normalizeYahoo(
@@ -103,9 +103,7 @@ it.each(['dividend', 'split'] as const)(
     vi.stubGlobal('fetch', vi.fn<typeof fetch>().mockResolvedValue(Response.json(history)))
     render(<InvestmentChart symbol="TEST" />)
     await screen.findByText(/110,00 EUR/)
-    expect(screen.getByText(/excludes dividends/)).toBeVisible()
-    if (type === 'split') expect(screen.getByText(/Prices and trade dots use the current share basis/)).toBeVisible()
-    else expect(screen.queryByText(/Price history alone/)).not.toBeInTheDocument()
+    expect(screen.getByText(/split-adjusted, excluding dividends/)).toBeVisible()
   },
 )
 
@@ -125,12 +123,12 @@ it('shows every long-range buy/sell at its date, including date-only trades and
  ]}/> )
  await screen.findByText(/110,00 EUR/)
  fireEvent.click(screen.getByRole('button',{name:'5Y',exact:true}))
- await screen.findByText('Buy · 3')
+ await screen.findByText('Your buys · 3')
  expect(fetcher.mock.calls.some(([url])=>String(url).includes('range=5y'))).toBe(true)
  const plot=screen.getByLabelText('Daily instrument price history')
  await waitFor(()=>expect(plot.querySelectorAll('.recharts-scatter-symbol')).toHaveLength(5))
  const dots=[...plot.querySelectorAll('.recharts-scatter-symbol circle')]
- expect(dots.filter(dot=>dot.getAttribute('stroke')==='hsl(var(--success))')).toHaveLength(3)
+ expect(dots.filter(dot=>dot.getAttribute('stroke')==='hsl(var(--foreground))')).toHaveLength(3)
  expect(dots.filter(dot=>dot.getAttribute('stroke')==='hsl(var(--destructive))')).toHaveLength(2)
  expect(dots.filter(dot=>dot.getAttribute('fill')==='hsl(var(--card))')).toHaveLength(2)
  const sale=dots.find(dot=>dot.querySelector('title')?.textContent==='Sell · 2025-01-03')!
@@ -157,13 +155,11 @@ it('plots a continuous split-only series and adjusts trade dots without rewritin
  vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json(history)))
  render(<InvestmentChart symbol="TEST" transactions={trades}/>)
  await screen.findByText(/63,00 EUR/)
- expect(screen.getByText(/5.00%.*price change/)).toBeVisible()
+ expect(screen.getByText(/5.00%.*past month/)).toBeVisible()
  const plot=screen.getByLabelText('Daily instrument price history')
  await waitFor(()=>expect(plot.querySelectorAll('.recharts-scatter-symbol')).toHaveLength(2))
- const ticks=[...plot.querySelectorAll('.recharts-yAxis-tick-labels .recharts-cartesian-axis-tick-value')].map(n=>Number(n.textContent?.replaceAll(',','')))
- expect(Math.max(...ticks)).toBeLessThan(100)
- expect(Math.min(...ticks)).toBeGreaterThan(0)
  fireEvent.change(screen.getByRole('combobox',{name:'Read instrument history by date'}),{target:{value:'2021-07-19'}})
+ expect(screen.getByText('60,00 EUR')).toBeVisible()
  expect(screen.getByRole('list',{name:'Executions on 2021-07-19'})).toHaveTextContent('2400 EUR')
  expect(JSON.stringify({history,trades})).toBe(original)
 })
@@ -185,3 +181,17 @@ it('formats normal unit prices as cents without altering the source observation'
  expect(await screen.findByText('214,13 EUR')).toBeVisible()
  expect(history.points.at(-1)!.provider_close).toBe(214.130004882813)
 })
+
+it('ends at a compatible current quote while retaining the source history and rejecting stale or other-currency quotes',async()=>{
+ const history=normalizeYahoo(yahooFixture(Date.now()),'TEST','2026-01-01',Date.now()).history
+ const original=JSON.stringify(history),last=history.points.at(-1)!
+ vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json(history)))
+ const quote={symbol:'TEST',price:111,regularMarketPrice:111,currency:'EUR',status:'ok' as const,session:'closed' as const,session_date:last.date,as_of:new Date(Date.parse(last.period_start)+1000).toISOString()}
+ const {rerender}=render(<InvestmentChart symbol="TEST" quote={quote}/>)
+ expect(await screen.findByText('111,00 EUR')).toBeVisible()
+ expect(JSON.stringify(history)).toBe(original)
+ rerender(<InvestmentChart symbol="TEST" quote={{...quote,price:120,currency:'USD'}}/>)
+ expect(screen.getByText('110,00 EUR')).toBeVisible()
+ rerender(<InvestmentChart symbol="TEST" quote={{...quote,price:120,status:'stale'}}/>)
+ expect(screen.getByText('110,00 EUR')).toBeVisible()
+})
diff --git a/client/src/components/investments-module/InvestmentChart.tsx b/client/src/components/investments-module/InvestmentChart.tsx
index 1fa4b91..5140f23 100644
--- a/client/src/components/investments-module/InvestmentChart.tsx
+++ b/client/src/components/investments-module/InvestmentChart.tsx
@@ -1,7 +1,9 @@
+import type { ReactNode } from 'react'
+import type { MarketQuote } from './types'
+import { holdingSourceTime } from './holding-presentation'
 import { useEffect, useMemo, useState } from 'react'
 import {
   Area,
-  CartesianGrid,
   ComposedChart,
   ReferenceLine,
   ResponsiveContainer,
@@ -55,6 +57,8 @@ export function InvestmentChart({
   costCurrency,
   cache,
   revisionKey = '',
+  quote,
+  children,
 }: {
   symbol: string
   transactions?: Trade[]
@@ -62,6 +66,8 @@ export function InvestmentChart({
   costCurrency?: string
   cache?: HoldingChartCache
   revisionKey?: string
+  quote?: MarketQuote
+  children?: ReactNode
 }) {
   const [localCache] = useState<HoldingChartCache>(() => new Map())
   const store = cache ?? localCache
@@ -119,10 +125,20 @@ export function InvestmentChart({
   }, [key, symbol, range, retry, store])
   const history = snapshot?.key === key ? snapshot.value : (store.get(key) ?? null)
   const trades = useMemo(() => (history ? chartTrades(history, transactions) : []), [history, transactions])
-  const points = useMemo(
-    () => history?.points.map((p) => ({ ...p, close:p.provider_close, time: Date.parse(`${p.date}T00:00:00Z`) })) ?? [],
-    [history],
-  )
+  const points = useMemo(() => {
+    const display=history?.points.map(p=>({...p,close:p.provider_close,time:Date.parse(`${p.date}T00:00:00Z`)}))??[]
+    const price=quote?.price??quote?.regularMarketPrice,time=Date.parse(quote?.as_of??'')
+    if(!history||!quote||quote.symbol.toUpperCase()!==symbol.toUpperCase()||quote.currency!==history.currency||price==null||!Number.isFinite(price)||price<=0||!Number.isFinite(time)||quote.status==='missing'||quote.status==='unsupported'||quote.status==='stale')return display
+    try {
+      const date=quote.session_date??new Intl.DateTimeFormat('sv-SE',{timeZone:quote.timezone??history.timezone,year:'numeric',month:'2-digit',day:'2-digit'}).format(new Date(time))
+      const last=display.at(-1)
+      if(!last||date<last.date||date<history.from||date>history.to||time<Date.parse(last.period_start))return display
+      const endpoint={...last,date,period_start:quote.as_of!,close:price,provider_close:price,time:Date.parse(`${date}T00:00:00Z`),provisional:quote.session!=='closed'}
+      if(date===last.date)display[display.length-1]=endpoint
+      else display.push(endpoint)
+    }catch{/* A source without valid session timing cannot extend the chart. */}
+    return display
+  },[history,quote,symbol])
   const markers = useMemo(() => {
     // Date-only markers sit in a separate bottom lane, never at an inferred fill.
     const lowest = Math.min(...points.map(p => p.close))
@@ -136,18 +152,17 @@ export function InvestmentChart({
   const buys = markers.filter((t) => (t.quantity ?? t.amount) > 0)
   const sells = markers.filter((t) => (t.quantity ?? t.amount) < 0)
   const dates = [...new Set([...points.map((p) => p.date), ...trades.map((t) => t.date)])].sort()
-  const first = points.at(0),
-    last = points.at(-1),
-    splitInRange = history?.events.some((e) => e.type === 'split') ?? false
+  const first = points.at(0),last = points.at(-1)
   const change = first && last ? last.close - first.close : null,
     rawPercent = change !== null && first ? (change / first.close) * 100 : null
   const percent = rawPercent !== null && Number.isFinite(rawPercent) ? rawPercent : null
-  const money = (n: number | null | undefined) => n==null?'Unavailable':Math.abs(n)>=1?`${n.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})} ${history?.currency??''}`:unitPrice(n,history?.currency??'')
+  const money = (n: number | null | undefined) => n==null?'Unavailable':Math.abs(n)>=1||Math.abs(last?.close??0)>=1?`${n.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})} ${history?.currency??''}`:unitPrice(n,history?.currency??'')
   const date = selected?.key === key ? selected.date : last?.date
   const dayTrades = trades.filter((t) => t.date === date),
     close = points.find((p) => p.date === date)?.close
   const tradeText = (t: Trade) =>
     `${(t.quantity ?? t.amount) > 0 ? 'Buy' : 'Sell'} · ${Math.abs(t.quantity ?? 0).toLocaleString(undefined, { maximumFractionDigits: 12 })} units · ${unitPrice(t.price, t.execution_currency ?? 'unverified currency')} · ${t.date}`
+  const updatedAt=quote?.as_of&&last?.period_start===quote.as_of?quote.as_of:history?.retrieved_at
   const currentCost = averageCost != null && costCurrency === history?.currency ? averageCost : null
   const domain = [
     Math.min(...points.map((p) => p.time), ...markers.map((t) => t.time)),
@@ -155,57 +170,17 @@ export function InvestmentChart({
   ]
   return (
     <section aria-label="Instrument price history" className="space-y-3">
-      <div className="flex flex-wrap items-center justify-between gap-2">
-        <h3 className="text-sm font-semibold">Price history</h3>
-        <div
-          role="group"
-          aria-label="Instrument chart range"
-          className="flex max-w-full overflow-x-auto rounded-lg bg-background p-1"
-        >
-          {RANGES.map(([value, label]) => (
-            <button
-              type="button"
-              key={value}
-              aria-pressed={range === value}
-              onClick={() => setRange(value)}
-              className={`min-h-9 rounded-md px-2 text-xs ${range === value ? 'bg-secondary font-semibold' : 'text-muted-foreground'}`}
-            >
-              {label}
-            </button>
-          ))}
+      <div className="flex flex-wrap items-end justify-between gap-x-3 gap-y-3">
+        <div className="min-w-0 flex-1">
+          <h3 className="text-xs font-medium text-muted-foreground">Price</h3>
+          <p className="mt-1 text-lg font-semibold tabular-nums">{close!=null?money(close):date?'Daily close unavailable':'Price unavailable'}</p>
+          {selected?.key===key&&<p className="text-xs text-muted-foreground">{holdingSourceTime(date)?.short??date}</p>}
+          {selected?.key!==key&&change!=null&&percent!=null&&<p className={`mt-0.5 text-xs font-medium tabular-nums ${change===0?'text-muted-foreground':change>0?'text-success':'text-destructive'}`}>{change>0?'+':''}{money(change)} ({percent>0?'+':''}{percent.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})}%) · {{'1d':'past day','5d':'past 5 days','1mo':'past month','6mo':'past 6 months','1y':'past year','5y':'past 5 years','max':'past 10 years'}[range]}</p>}
+        </div>
+        <div role="group" aria-label="Instrument chart range" className="flex max-w-full overflow-x-auto rounded-lg border border-border bg-background p-0.5">
+          {RANGES.map(([value,label])=><button type="button" key={value} aria-pressed={range===value} onClick={()=>setRange(value)} className={`min-h-8 rounded-md px-2 text-[11px] font-semibold ${range===value?'bg-secondary':'text-muted-foreground'}`}>{label}</button>)}
         </div>
       </div>
-      <div>
-        <p className="text-lg font-semibold tabular-nums">
-          {close != null ? money(close) : date ? 'Daily close unavailable' : 'Price unavailable'}
-          {selected?.key === key && (
-            <span className="ml-2 text-xs font-normal text-muted-foreground">{date}</span>
-          )}
-        </p>
-        {change !== null && percent !== null && (
-          <p className="text-xs text-muted-foreground">
-            {change >= 0 ? '+' : ''}
-            {money(change)} ({percent.toFixed(2)}%) · price change
-          </p>
-        )}
-      </div>
-      {history && (
-        <p className="text-[10px] text-muted-foreground">
-          Yahoo Finance · split-adjusted daily close · excludes dividends · {history.currency} ·{' '}
-          {history.status === 'stale' || error ? 'Saved history; refresh unavailable' : 'Retrieved'}{' '}
-          {history.retrieved_at}
-          {last?.provisional ? ' · current session provisional' : ''}
-        </p>
-      )}
-      {splitInRange&&<p className="text-xs text-muted-foreground">Prices and trade dots use the current share basis. Recorded trades keep their original units and execution prices.</p>}
-      <button
-        type="button"
-        disabled={loading}
-        className="min-h-9 text-xs text-primary underline"
-        onClick={() => setRetry((n) => n + 1)}
-      >
-        Refresh history
-      </button>
       {error && (
         <p role="alert" className="text-xs text-destructive">
           {error}{' '}
@@ -223,7 +198,7 @@ export function InvestmentChart({
           {history ? 'Refreshing price history…' : 'Loading price history…'}
         </p>
       )}
-      <div className="h-64 w-full sm:h-80" aria-label="Daily instrument price history">
+      <div className="h-[200px] w-full" aria-label="Daily instrument price history">
         {!points.length ? (
           <p className="p-4 text-xs text-muted-foreground">
             {loading ? 'Loading daily observations…' : 'No known daily closes in this range.'}
@@ -253,20 +228,23 @@ export function InvestmentChart({
                   setSelected({ key, date: new Date(time).toISOString().slice(0, 10) })
               }}
               onMouseLeave={() => setSelected(null)}
-              margin={{ left: 0, right: 6, top: 12, bottom: 0 }}
+              margin={{ left: 6, right: 6, top: 8, bottom: 0 }}
             >
-              <CartesianGrid vertical={false} stroke="hsl(var(--border))" />
               <XAxis
                 dataKey="time"
                 type="number"
                 domain={domain}
                 scale="time"
-                tickFormatter={(t) => new Date(Number(t)).toISOString().slice(5, 10)}
-                minTickGap={38}
+                tickFormatter={t=>new Intl.DateTimeFormat(undefined,{month:'short',...(history&&Date.parse(history.to)-Date.parse(history.from)>200*86400000?{year:'numeric' as const}:{day:'numeric' as const}),timeZone:'UTC'}).format(new Date(Number(t)))}
+                tickLine={false}
+                axisLine={false}
+                tickCount={4}
+                minTickGap={50}
                 tick={{ fontSize: 10 }}
               />
               <YAxis
-                width={55}
+                hide
+                width={0}
                 domain={['auto', 'auto']}
                 tick={{ fontSize: 10 }}
                 tickFormatter={(n) => Number(n).toLocaleString(undefined, { maximumFractionDigits: Math.abs(Number(n))>=1?2:12 })}
@@ -308,7 +286,7 @@ export function InvestmentChart({
                   name="Buy executions"
                   data={buys}
                   dataKey="markerPrice"
-                  fill="hsl(var(--success))"
+                  fill="hsl(var(--foreground))"
                   isAnimationActive={false}
                   shape={<TradeDot />}
                   onClick={entry => setSelected({key, date: entry.date})}
@@ -337,13 +315,14 @@ export function InvestmentChart({
           </ResponsiveContainer>
         )}
       </div>
-      {trades.length > 0 && <div className="flex flex-wrap gap-4 text-xs text-muted-foreground" aria-label="Trade marker legend">
-        <span className="inline-flex items-center gap-1.5"><span className="h-2.5 w-2.5 rounded-full bg-success"/>Buy · {buys.length}</span>
-        <span className="inline-flex items-center gap-1.5"><span className="h-2.5 w-2.5 rounded-full bg-destructive"/>Sell · {sells.length}</span>
+      {(trades.length>0||currentCost!=null)&& <div className="flex flex-wrap gap-4 text-xs text-muted-foreground" aria-label="Trade marker legend">
+        {buys.length>0&&<span className="inline-flex items-center gap-1.5"><span className="h-2 w-2 rounded-full bg-foreground"/>Your buys · {buys.length}</span>}
+        {sells.length>0&&<span className="inline-flex items-center gap-1.5"><span className="h-2 w-2 rounded-full bg-destructive"/>Your sells · {sells.length}</span>}
+        {currentCost!=null&&<span className="inline-flex items-center gap-1.5"><span className="w-3.5 border-t border-dashed border-muted-foreground"/>Average cost {money(currentCost)}</span>}
         {markers.some(t => t.dateOnly) && <span title="Hollow markers show the actual trade date in the bottom lane, not an execution price.">○ Date only</span>}
       </div>}
       {dates.length > 0 && (
-        <label className="block text-xs text-muted-foreground">
+        <label className="sr-only text-xs text-muted-foreground focus-within:not-sr-only">
           Read chart day
           <Select
             aria-label="Read instrument history by date"
@@ -356,25 +335,18 @@ export function InvestmentChart({
           </Select>
         </label>
       )}
-      {dayTrades.length > 0 && (
+      {selected?.key===key&&dayTrades.length > 0 && (
         <ul aria-label={`Executions on ${date}`} className="space-y-1 text-xs">
           {dayTrades.map((t) => (
             <li key={t.id}>{tradeText(t)}</li>
           ))}
         </ul>
       )}
-      {trades.length > 0 && (
-        <details className="text-xs text-muted-foreground">
-          <summary className="min-h-10 cursor-pointer">
-            {trades.length} executions in range{trades.length > 100 ? ' · latest 100 listed' : ''}
-          </summary>
-          <ul className="max-h-40 space-y-2 overflow-y-auto">
-            {trades.slice(-100).map((t) => (
-              <li key={t.id}>{tradeText(t)}</li>
-            ))}
-          </ul>
-        </details>
-      )}
+      {children}
+      {history&&<div className="flex flex-wrap items-baseline gap-x-2 gap-y-1 text-[11px] leading-relaxed text-muted-foreground">
+        <p className="min-w-0 flex-1">Prices from Yahoo Finance: daily close, split-adjusted, excluding dividends. {history.status==='stale'||error?'Saved history; refresh unavailable. ':''}Updated <time dateTime={updatedAt??undefined} title={updatedAt??undefined}>{holdingSourceTime(updatedAt)?.short??'time unavailable'}</time>{last?.provisional?' · provisional':''}.</p>
+        <button type="button" disabled={loading} className="min-h-8 text-primary hover:underline" onClick={()=>setRetry(n=>n+1)}>Refresh history</button>
+      </div>}
     </section>
   )
 }
diff --git a/client/src/components/investments-module/InvestmentDetail.test.tsx b/client/src/components/investments-module/InvestmentDetail.test.tsx
index c6cfa88..a839c7a 100644
--- a/client/src/components/investments-module/InvestmentDetail.test.tsx
+++ b/client/src/components/investments-module/InvestmentDetail.test.tsx
@@ -26,7 +26,7 @@ it('shows a manual total once, its known cost and last valuation, with Update va
  const metrics=holdingMetrics(account,[],'HUF',undefined,(n,s,t)=>s===t?n:null,(n,s,t)=>s===t?n:null,'2026-01-15')
  vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({observations:[],valuation_at:null,next_cursor:null})))
  render(<InvestmentDetailModal {...props} account={account} allTransactions={[]} metrics={metrics}/>)
- expect(screen.getByText('1200 HUF')).toBeVisible();expect(screen.getByText('Remaining cost').parentElement).toHaveTextContent('1000 HUF')
+ expect(screen.getByRole('region',{name:'Holding summary'})).toHaveTextContent(/1200\s*HUF/);expect(screen.getByText('Remaining cost').parentElement).toHaveTextContent('1000 HUF')
  expect(screen.getByRole('button',{name:'Update value'})).toBeEnabled();expect(screen.queryByRole('button',{name:'Buy',exact:true})).not.toBeInTheDocument();expect(screen.queryByRole('button',{name:'Sell',exact:true})).not.toBeInTheDocument()
  expect(await screen.findByText(/Last valued 2026-01-10/)).toBeVisible()
 })
@@ -40,7 +40,7 @@ it('withholds a missing manual unit price instead of showing a zero, and disable
 it('removes values, native prices, gain colors, fee amounts and execution descriptions in privacy mode',()=>{
  vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({observations:[],valuation_at:null,next_cursor:null})))
  render(<InvestmentDetailModal {...props} privacyMode="hidden"/>)
- expect(screen.queryByText(/110 EUR|101 EUR|100 EUR|1 EUR|2 SHARE/)).not.toBeInTheDocument()
+ expect(screen.queryByText(/110(?:,00)? EUR|101 EUR|100 EUR|1 EUR|2 SHARE/)).not.toBeInTheDocument()
  expect(screen.getAllByText('••••••').length).toBeGreaterThan(4)
  expect(screen.getByRole('button',{name:'Buy',exact:true})).toBeDisabled()
  expect(screen.getAllByRole('button',{name:/Edit buy/}).every(b=>(b as HTMLButtonElement).disabled)).toBe(true)
@@ -56,7 +56,7 @@ it.each([26,61])('uses the same delayed-price policy for a %s-minute quote in ho
  vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({points:[],events:[]})))
  const q={symbol:'TEST',price:110,regularMarketPrice:110,currency:'EUR',status:'stale' as const,as_of:new Date(Date.now()-minutes*60_000).toISOString()}
  render(<InvestmentDetailModal {...props} account={{...base,pricing_method:'market',symbol:'TEST'}} quotes={{TEST:q}}/>)
- expect(screen.getByText('Current price').closest('div')).toHaveTextContent('110 EUR')
+ expect(screen.getByText('Current price').closest('div')).toHaveTextContent('110,00 EUR')
  if(minutes===26){expect(screen.getByText(/Delayed price · updated 26 minutes ago/)).toBeVisible();expect(screen.queryByText(/Market price is stale/)).not.toBeInTheDocument()}
  else expect(screen.getByText(/Market price is stale/)).toBeVisible()
 })
@@ -79,9 +79,9 @@ it('pairs labeled holding gain with its supported percentage and masks both in p
  const metric={...holdingMetrics(base,[],'HUF',undefined,n=>n,n=>n,'2026-10-20'),value:1200,total_gain:200,net_invested:1000}
  const {rerender}=render(<InvestmentDetailModal {...props} metrics={metric}/>)
  const summary=within(screen.getByRole('region',{name:'Holding summary'}))
- expect(summary.getByText('Current value')).toBeVisible()
- expect(summary.getByText('1200 HUF')).toBeVisible()
- expect(summary.getByText('Total gain')).toBeVisible()
+ expect(summary.getByText('Position value')).toBeVisible()
+ expect(screen.getByRole('region',{name:'Holding summary'})).toHaveTextContent(/1200\s*HUF/)
+ expect(summary.getByText('total gain')).toBeVisible()
  expect(summary.getByText('+200 HUF')).toBeVisible()
  expect(summary.getByTitle('Gain on net invested')).toHaveTextContent('+20%')
  rerender(<InvestmentDetailModal {...props} metrics={{...metric,net_invested:0}}/>)
diff --git a/client/src/components/investments-module/InvestmentDetailModal.tsx b/client/src/components/investments-module/InvestmentDetailModal.tsx
index c5a065d..a6b776a 100644
--- a/client/src/components/investments-module/InvestmentDetailModal.tsx
+++ b/client/src/components/investments-module/InvestmentDetailModal.tsx
@@ -1,4 +1,3 @@
-import { GainBreakdown } from './GainBreakdown'
 import { holdingSourceTime } from './holding-presentation'
 import { quotePresentation } from './quote-presentation'
 import { useRef, useState } from 'react'
@@ -92,40 +91,53 @@ export function InvestmentDetailModal({
   const sourceTime=holdingSourceTime(sourceDate)
   const protectedAccount = account.is_locked || account.archived_at != null
   const stat = (label: string, value: string, sub?: string) => (
-    <div key={label} className="min-w-0">
+    <div key={label} className="min-w-0 bg-card px-3 py-3 sm:px-4">
       <dt className="text-[11px] text-muted-foreground">{label}</dt>
-      <dd className="mt-1.5 break-words text-lg font-semibold tabular-nums">{value}</dd>
+      <dd className="mt-1.5 break-words text-[15px] font-semibold tabular-nums">{value}</dd>
       {sub && <p className="mt-1 text-[10px] text-muted-foreground">{sub}</p>}
     </div>
   )
+  const unitMoney=(value:number|null|undefined,currency:string)=>hidden?'••••••':value==null?'Unavailable':Math.abs(value)>=1?`${value.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})} ${currency}`:unitPrice(value,currency)
+  const positionGrid=<section aria-label="Your position" className="space-y-3">
+    <h3 className="text-sm font-semibold">Your position</h3>
+    <dl className="grid grid-cols-2 gap-px overflow-hidden rounded-xl border border-border bg-border @min-[480px]:grid-cols-3">
+      <div className="min-w-0 bg-card px-3 py-3 sm:px-4">
+        <dt className="text-[11px] text-muted-foreground">{total?'Ownership':account.currency==='SHARE'?'Shares':`Quantity · ${account.currency}`}</dt>
+        <dd className="mt-1.5 break-words text-[15px] font-semibold tabular-nums" title={hidden?undefined:total?undefined:p.actualQuantity.toLocaleString('hu-HU',{maximumFractionDigits:12})}>
+          {hidden?'••••••':total?(account.manual_ownership??'Unknown'):p.actualQuantity.toLocaleString('hu-HU',{maximumFractionDigits:account.asset_type==='crypto'||(p.actualQuantity!==0&&Math.abs(p.actualQuantity)<0.0001)?12:4})}
+        </dd>
+      </div>
+      {stat(total?'Remaining cost':'Average cost',total?costPrice(p.metrics.native.remaining_basis,p.metrics.native_currency,hidden):unitMoney(p.metrics.native.average_cost,p.metrics.native_currency))}
+      <div className="min-w-0 bg-card px-3 py-3 sm:px-4">
+        <dt className="text-[11px] text-muted-foreground">{total?'Last valued':'Current price'}</dt>
+        <dd className="mt-1.5 break-words text-[15px] font-semibold tabular-nums">{total?(sourceTime?.short??'Unknown'):unitMoney(market?(q?.price??q?.regularMarketPrice):(account.manual_price??null),market?q?.currency||p.quoteCurrency:p.quoteCurrency)}</dd>
+        {!total&&sourceTime&&<p className="mt-1 text-[10px] text-muted-foreground"><time dateTime={sourceDate??undefined} title={sourceTime.full}>{sourceTime.short}</time></p>}
+      </div>
+      {stat('Cost basis',amount(p.metrics.remaining_basis,reportingCurrency,hidden),'Paid for units you hold')}
+      <div className="min-w-0 bg-card px-3 py-3 sm:px-4"><dt className="text-[11px] text-muted-foreground">Unrealized gain</dt><dd className={`mt-1.5 break-words text-[15px] font-semibold tabular-nums ${tone(p.metrics.unrealized_gain,hidden)}`}>{signedAmount(p.metrics.unrealized_gain,reportingCurrency,hidden)}</dd><p className="mt-1 text-[10px] text-muted-foreground">On current holdings</p></div>
+      <div className="min-w-0 bg-card px-3 py-3 sm:px-4"><dt className="text-[11px] text-muted-foreground">Realized gain</dt><dd className={`mt-1.5 break-words text-[15px] font-semibold tabular-nums ${tone(p.metrics.realized_gain,hidden)}`}>{signedAmount(p.metrics.realized_gain,reportingCurrency,hidden)}</dd><p className="mt-1 text-[10px] text-muted-foreground">{p.metrics.realized_gain===0?'No realized profit or loss':'From sold units'}</p></div>
+    </dl>
+  </section>
   return (
     <Modal
       isOpen
       onClose={close}
-      title={account.symbol || account.name}
-      subtitle={`${account.name} · ${account.asset_type?.toUpperCase() ?? 'Holding'}`}
+      title={account.name}
+      subtitle={<span className="flex flex-wrap items-center gap-x-2 gap-y-1"><span className="font-semibold">{account.symbol}</span><span className="rounded border border-border px-1.5 py-0.5 text-[10px]">{account.asset_type?.toUpperCase()??'Holding'}</span>{(q?.exchangeName||q?.exchange||p.quoteCurrency)&&<span>{[q?.exchangeName||q?.exchange,p.quoteCurrency].filter(Boolean).join(' · ')}</span>}</span>}
+      headerLeading={<span aria-hidden="true" className="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-primary/15 text-xs font-bold text-primary">{(account.symbol||account.name).slice(0,2).toUpperCase()}</span>}
+      headerClassName="px-4 py-4 sm:px-6 [&_h2]:text-base [&_h2]:font-semibold [&_h2]:text-foreground"
+      subtitleClassName="text-xs font-normal tracking-normal whitespace-normal"
       placement="centered"
-      className="flex min-h-0 max-h-[92dvh] flex-col sm:max-w-4xl"
+      className="flex min-h-0 max-h-[92dvh] flex-col rounded-2xl sm:max-w-[600px]"
       contentClassName="flex min-h-0 flex-1 flex-col p-0 sm:p-0"
     >
-      <div className="@container min-h-0 flex-1 space-y-5 overflow-y-auto p-4 sm:p-6">
-        <section aria-label="Holding summary" className="grid items-center gap-5 @min-[560px]:grid-cols-[1.1fr_1fr]">
-          <div className="min-w-0">
-            <p className="text-xs font-medium text-muted-foreground">Current value</p>
-            <p className="mt-2 break-words text-3xl font-semibold tracking-tight tabular-nums sm:text-4xl">
-              {amount(p.currentValue,reportingCurrency,hidden)}
-            </p>
-          </div>
-          <div className="min-w-0 rounded-xl border border-border bg-secondary/40 p-4">
-            <p className="text-xs font-medium text-muted-foreground">Total gain</p>
-            <div className={`mt-2 flex flex-wrap items-baseline gap-x-3 gap-y-1 tabular-nums ${tone(p.gainLoss,hidden)}`}>
-              <p className="break-words text-2xl font-semibold tracking-tight">{signedAmount(p.gainLoss,reportingCurrency,hidden)}</p>
-              {gainPercent!=null&&<span className="text-sm font-semibold" title="Gain on net invested">{percentage(gainPercent,hidden)}</span>}
-            </div>
-            <div className="mt-3 flex flex-wrap items-baseline justify-between gap-x-4 gap-y-1 border-t border-border pt-3 text-xs">
-              <span className="text-muted-foreground">Net invested</span><span className="font-medium tabular-nums">{amount(p.netInvested,reportingCurrency,hidden)}</span>
-            </div>
-          </div>
+      <div className="@container min-h-0 flex-1 space-y-7 overflow-y-auto p-4 sm:p-6">
+        <section aria-label="Holding summary" className="space-y-1.5">
+          <p className="text-xs font-medium text-muted-foreground">Position value</p>
+          <p className="break-words text-[34px] font-bold leading-tight tracking-tight tabular-nums">
+            <span>{hidden?'••••••':p.currentValue==null?'Unavailable':p.currentValue.toLocaleString('hu-HU',{maximumFractionDigits:reportingCurrency==='HUF'?0:2})}</span><span className="ml-2 text-[15px] font-semibold tracking-normal text-muted-foreground">{reportingCurrency}</span>
+          </p>
+          <p className="flex flex-wrap items-baseline gap-x-2 text-[13px] tabular-nums"><span className={`font-semibold ${tone(p.gainLoss,hidden)}`}>{signedAmount(p.gainLoss,reportingCurrency,hidden)}</span>{gainPercent!=null&&<span className={`font-semibold ${tone(p.gainLoss,hidden)}`} title="Gain on net invested">{percentage(gainPercent,hidden)}</span>}<span className="text-muted-foreground">total gain</span></p>
         </section>
         {(protectedAccount || (market && freshness.needsAttention) || p.priceFetchError) && (
           <p
@@ -146,21 +158,6 @@ export function InvestmentDetailModal({
             Delayed price · {freshness.ageLabel}. Today’s return is unavailable until a fresh quote arrives.
           </p>
         )}
-        <section aria-label="Your position" className="rounded-xl border border-border p-4">
-          <h3 className="mb-4 text-xs font-semibold text-muted-foreground">Your position</h3>
-          <dl className="grid grid-cols-1 gap-4 @min-[480px]:grid-cols-3">
-            {stat(total?'Ownership':'Quantity',hidden?'••••••':total?(account.manual_ownership??'Unknown'):
-              `${p.actualQuantity.toLocaleString(undefined,{maximumFractionDigits:12})} ${account.currency==='SHARE'?'shares':account.currency}`)}
-            <div className="min-w-0">
-              <dt className="text-[11px] text-muted-foreground">{total?'Last valued':'Current price'}</dt>
-              <dd className="mt-1.5 break-words text-lg font-semibold tabular-nums">{total?(sourceTime?.short??'Unknown'):costPrice(market?(q?.price??q?.regularMarketPrice):(account.manual_price??null),market?q?.currency||p.quoteCurrency:p.quoteCurrency,hidden)}</dd>
-              {!total&&sourceTime&&<p className="mt-1 text-[10px] text-muted-foreground">As of <time dateTime={sourceDate??undefined} title={sourceTime.full}>{sourceTime.short}</time></p>}
-            </div>
-            {stat(total?'Remaining cost':'Average cost',costPrice(total?p.metrics.native.remaining_basis:p.metrics.native.average_cost,p.metrics.native_currency,hidden))}
-          </dl>
-        </section>
-        <GainBreakdown realized={p.metrics.realized_gain} unrealized={p.metrics.unrealized_gain}
-          basis={p.metrics.remaining_basis} currency={reportingCurrency} hidden={hidden}/>
         {!market && (
           <ManualValuations
             account={account}
@@ -184,8 +181,10 @@ export function InvestmentDetailModal({
               costCurrency={p.metrics.native_currency}
               cache={chartCache}
               revisionKey={revisionKey}
-            />
+              quote={q}
+            >{positionGrid}</InvestmentChart>
           ))}
+        {(!market||!account.symbol||hidden)&&positionGrid}
         <section aria-label="Holding trade history">
           <div className="flex items-center gap-2">
             <h3 className="text-sm font-semibold">Trade history</h3>
@@ -278,11 +277,11 @@ export function InvestmentDetailModal({
         </section>
       </div>
       {!total && (
-        <div className="grid shrink-0 grid-cols-2 gap-3 border-t border-border bg-card p-4">
+        <div className="grid shrink-0 grid-cols-2 gap-2.5 border-t border-border bg-card px-4 py-3 sm:px-6">
           <Button
             type="button"
             disabled={!canTrade || !!protectedAccount || hidden || dirty || editing}
-            onClick={() => onTrade('buy')}
+            onClick={() => onTrade('buy')} className="h-10 rounded-xl"
           >
             Buy
           </Button>
@@ -290,7 +289,7 @@ export function InvestmentDetailModal({
             type="button"
             variant="outline"
             disabled={!canTrade || !!protectedAccount || hidden || dirty || editing}
-            onClick={() => onTrade('sell')}
+            onClick={() => onTrade('sell')} className="h-10 rounded-xl"
           >
             Sell
           </Button>
diff --git a/client/src/components/investments-module/MarketInputs.test.tsx b/client/src/components/investments-module/MarketInputs.test.tsx
index d1785e9..f03fd17 100644
--- a/client/src/components/investments-module/MarketInputs.test.tsx
+++ b/client/src/components/investments-module/MarketInputs.test.tsx
@@ -19,7 +19,7 @@ it('shows native currency/daily bounds and preserves a matching chart on failed
   vi.stubGlobal('fetch',fetcher)
   render(<InvestmentChart symbol="TEST"/>)
   expect(await screen.findByText(/110,00 EUR/)).toBeInTheDocument()
-  expect(screen.getByText(/split-adjusted daily close/)).toBeInTheDocument()
+  expect(screen.getByText(/split-adjusted, excluding dividends/)).toBeInTheDocument()
   expect(String(fetcher.mock.calls[0][0])).toContain('interval=1d')
   expect(screen.getByTestId('instrument-chart')).toHaveAttribute('data-points','3')
   fetcher.mockRejectedValue(new Error('private error'))
@@ -60,8 +60,8 @@ it('shows a stale source time without inventing a daily zero move and masks priv
 it('uses split-adjusted closes for price change across stock splits',async()=>{
   vi.stubGlobal('fetch',vi.fn<typeof fetch>().mockResolvedValue(Response.json({...value,events:[{date:value.points[1].date,type:'split',ratio:2}],requires_event_review:true})))
   render(<InvestmentChart symbol="TEST"/>)
-  expect(await screen.findByText(/22.22%.*price change/)).toBeInTheDocument()
-  expect(screen.getByText(/split-adjusted daily close/)).toBeVisible()
+  expect(await screen.findByText(/22.22%.*past month/)).toBeInTheDocument()
+  expect(screen.getByText(/split-adjusted, excluding dividends/)).toBeVisible()
 })
 
 it('retains every same-day execution, its actual date/currency and the current remaining-cost reference',async()=>{
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index aa0b852..00a2060 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -1,8 +1,10 @@
 # Holding details and direct-cash trade editor
 
-The Investments page owns the selected holding ID, editor and mutation refresh. Holding details open in a centered modal on all screen sizes, with a wider desktop chart and sticky Buy/Sell actions for unit holdings. Manual total assets show ownership and Update value instead. Manually priced unit holdings retain their unit trades and their separate per-unit appraisal editor.
+The Investments page owns the selected holding ID, editor and mutation refresh. Holding details open in a centered single-column modal on all screen sizes, with sticky Buy/Sell actions for unit holdings. Manual total assets show ownership and Update value instead. Manually priced unit holdings retain their unit trades and their separate per-unit appraisal editor.
 
-The summary leads with Current value beside a labeled Total gain card, including the supported gain-on-net-invested percentage and Net invested. Your position groups quantity/ownership, current native price or valuation date, and remaining average/native cost. Gain breakdown is always visible: two compact cards show realized and unrealized amounts with zero-centered bars on a shared absolute-money scale, while remaining basis is labeled Cost of current holdings separately. Bars show gains to the right and losses to the left; they are not return percentages and are withheld when either gain is unknown or privacy is enabled. Known zero remains zero. Source times use readable local formatting with full observation context in the time element. Missing facts remain unavailable; percentages need known finite gain and positive finite net invested, and privacy masks all financial values and gain styling.
+The holding popup follows reference **2a**: a centered 600px single-column panel with an instrument avatar, complete saved name, symbol/category/source-currency metadata, position value and compact total gain. Price history precedes a six-cell Your position grid: shares/units or ownership, native average cost, current price/valuation date, reporting cost basis, unrealized gain and realized gain. The prior gain bars and duplicate net-invested card are removed. Stock/ETF quantities use four displayed decimals with full precision in the title (tiny nonzero fractions and crypto retain up to 12); native prices use decimal-comma cents while sub-unit prices retain small-coin precision. Privacy also removes quantity titles and gain colors. Metadata is shown from saved/source facts; prototype names and ETF classifications are never inferred.
+
+The compact 200px chart keeps real daily source data, split-adjusted prices, buy/sell markers, a dashed current average-cost reference and keyboard day selection. Its selected-day header replaces the range-change caption while hovering/selecting. A compatible, timed current quote may extend/replace only the chart endpoint on its source session date, with explicit provisional status; stale, unsupported, mistimed and other-currency quotes cannot overwrite the plotted daily history. The cache/source observations remain unchanged. Native daily behavior remains daily even though the prototype uses illustrative intraday curves. Source information appears after the position grid in plain words and readable local time, with refresh/retry retained. Trade history and legacy review remain available below; Buy/Sell actions stay fixed at the bottom.
 
 ## Detail reads and chart
 
@@ -10,7 +12,7 @@ Current quantity, native price/source time, reporting value, remaining average c
 
 Instrument price history loads only when a market holding is opened with values visible. Its cache belongs to the App investment-data hook, is bounded to 12 entries and uses source snapshot/symbol/range keys. Returning to a matching detail reuses history; changed financial snapshots and mutations invalidate reuse. Superseded/closed reads abort; failed refreshes preserve the matching last good history. No financial history enters browser storage.
 
-The holding price chart displays the retained provider split-only-adjusted daily close (`provider_close`), excluding dividend adjustment. The shared source cache/read contract still retains contemporaneous raw `close` for dated accounting. Every buy/sell in the selected range is a green/red marker at its actual date. A verified positive finite execution price in the chart currency is divided by all later split ratios through the current chart endpoint to set its display height; original trade prices and quantities remain unchanged in the ledger and dated list. Same-day split executions already use that day's share basis. Other-currency or unverified executions use hollow markers in a separate bottom lane: these represent dates only, never an inferred fill or a substituted nearby close. Their actual currency/facts remain in the tooltip and dated list. Marker selection opens the actual date; same-day trades remain separate records and all appear in the dated list/tooltip. The 1Y, 5Y and other range controls include all matching trades independently of daily-price sampling. A keyboard date selector and date readout expose every same-day execution. The range list shows at most the latest 100 executions; the ordered holding ledger remains separately paged in the panel. The dashed line is **current remaining native basis per unit**, explicitly not a historical cost series or an all-buys average. Range price change uses the first/last split-adjusted closes, including ranges with splits; it is not the holding's cash-flow return. The chart labels its split-adjusted basis. Normal prices display two decimal places, while sub-unit prices keep small-coin precision.
+The holding price chart displays the retained provider split-only-adjusted daily close (`provider_close`), excluding dividend adjustment. The shared source cache/read contract still retains contemporaneous raw `close` for dated accounting. Every buy/sell in the selected range is a light/red marker at its actual date. A verified positive finite execution price in the chart currency is divided by all later split ratios through the current chart endpoint to set its display height; original trade prices and quantities remain unchanged in the ledger and dated list. Same-day split executions already use that day's share basis. Other-currency or unverified executions use hollow markers in a separate bottom lane: these represent dates only, never an inferred fill or a substituted nearby close. Their actual currency/facts remain in the tooltip and dated list. Marker selection opens the actual date; same-day trades remain separate records and all appear in the dated list/tooltip. The 1Y, 5Y and other range controls include all matching trades independently of daily-price sampling. A keyboard date selector and date readout expose every same-day execution. The range list shows at most the latest 100 executions; the ordered holding ledger remains separately paged in the panel. The dashed line is **current remaining native basis per unit**, explicitly not a historical cost series or an all-buys average. Range price change uses the first/last split-adjusted closes, including ranges with splits; it is not the holding's cash-flow return. The chart labels its split-adjusted basis. Normal prices display two decimal places, while sub-unit prices keep small-coin precision.
 
 Manual histories remain dated total/per-unit step observations, independently loaded and paged. Their cost reference is current known remaining cost, not a deposit or new appraisal. Corrections pin the saved observation ID/version and retain drafts after failure. A successful appraisal refreshes the overview and account snapshots without cash movement.
 

From 99825de86acb2b5fa122233c07423db7d837a6ea Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 05:33:05 +0200
Subject: [PATCH 15/21] Keep holding chart caption height stable on hover

---
 CHANGELOG.md                                           |  2 +-
 .../components/investments-module/InvestmentChart.tsx  | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a91199..a840716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
-- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
+- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Keep chart caption height stable when hovering between range returns and dates. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
 - Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
diff --git a/client/src/components/investments-module/InvestmentChart.tsx b/client/src/components/investments-module/InvestmentChart.tsx
index 5140f23..53cdd22 100644
--- a/client/src/components/investments-module/InvestmentChart.tsx
+++ b/client/src/components/investments-module/InvestmentChart.tsx
@@ -174,8 +174,14 @@ export function InvestmentChart({
         <div className="min-w-0 flex-1">
           <h3 className="text-xs font-medium text-muted-foreground">Price</h3>
           <p className="mt-1 text-lg font-semibold tabular-nums">{close!=null?money(close):date?'Daily close unavailable':'Price unavailable'}</p>
-          {selected?.key===key&&<p className="text-xs text-muted-foreground">{holdingSourceTime(date)?.short??date}</p>}
-          {selected?.key!==key&&change!=null&&percent!=null&&<p className={`mt-0.5 text-xs font-medium tabular-nums ${change===0?'text-muted-foreground':change>0?'text-success':'text-destructive'}`}>{change>0?'+':''}{money(change)} ({percent>0?'+':''}{percent.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})}%) · {{'1d':'past day','5d':'past 5 days','1mo':'past month','6mo':'past 6 months','1y':'past year','5y':'past 5 years','max':'past 10 years'}[range]}</p>}
+          {/* Keep both captions in the same grid cell so wrapped range text reserves
+              its height while the selected date is visible. */}
+          <div className="mt-0.5 grid min-h-4 text-xs leading-4">
+            <p aria-hidden={selected?.key!==key} className={`col-start-1 row-start-1 text-muted-foreground ${selected?.key===key?'':'invisible'}`}>{holdingSourceTime(date)?.short??date}</p>
+            <p aria-hidden={selected?.key===key} className={`col-start-1 row-start-1 font-medium tabular-nums ${selected?.key===key?'invisible ':''}${change===0?'text-muted-foreground':change!=null&&change>0?'text-success':'text-destructive'}`}>
+              {change!=null&&percent!=null&&<>{change>0?'+':''}{money(change)} ({percent>0?'+':''}{percent.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})}%) · {{'1d':'past day','5d':'past 5 days','1mo':'past month','6mo':'past 6 months','1y':'past year','5y':'past 5 years','max':'past 10 years'}[range]}</>}
+            </p>
+          </div>
         </div>
         <div role="group" aria-label="Instrument chart range" className="flex max-w-full overflow-x-auto rounded-lg border border-border bg-background p-0.5">
           {RANGES.map(([value,label])=><button type="button" key={value} aria-pressed={range===value} onClick={()=>setRange(value)} className={`min-h-8 rounded-md px-2 text-[11px] font-semibold ${range===value?'bg-secondary':'text-muted-foreground'}`}>{label}</button>)}

From a7a280dd71151629c0b3ec00c9a1128a9f8d9a5a Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 09:06:53 +0200
Subject: [PATCH 16/21] Revert "Keep holding chart caption height stable on
 hover"

This reverts commit 99825de86acb2b5fa122233c07423db7d837a6ea.
---
 CHANGELOG.md                                           |  2 +-
 .../components/investments-module/InvestmentChart.tsx  | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a840716..6a91199 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
-- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Keep chart caption height stable when hovering between range returns and dates. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
+- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
 - Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
diff --git a/client/src/components/investments-module/InvestmentChart.tsx b/client/src/components/investments-module/InvestmentChart.tsx
index 53cdd22..5140f23 100644
--- a/client/src/components/investments-module/InvestmentChart.tsx
+++ b/client/src/components/investments-module/InvestmentChart.tsx
@@ -174,14 +174,8 @@ export function InvestmentChart({
         <div className="min-w-0 flex-1">
           <h3 className="text-xs font-medium text-muted-foreground">Price</h3>
           <p className="mt-1 text-lg font-semibold tabular-nums">{close!=null?money(close):date?'Daily close unavailable':'Price unavailable'}</p>
-          {/* Keep both captions in the same grid cell so wrapped range text reserves
-              its height while the selected date is visible. */}
-          <div className="mt-0.5 grid min-h-4 text-xs leading-4">
-            <p aria-hidden={selected?.key!==key} className={`col-start-1 row-start-1 text-muted-foreground ${selected?.key===key?'':'invisible'}`}>{holdingSourceTime(date)?.short??date}</p>
-            <p aria-hidden={selected?.key===key} className={`col-start-1 row-start-1 font-medium tabular-nums ${selected?.key===key?'invisible ':''}${change===0?'text-muted-foreground':change!=null&&change>0?'text-success':'text-destructive'}`}>
-              {change!=null&&percent!=null&&<>{change>0?'+':''}{money(change)} ({percent>0?'+':''}{percent.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})}%) · {{'1d':'past day','5d':'past 5 days','1mo':'past month','6mo':'past 6 months','1y':'past year','5y':'past 5 years','max':'past 10 years'}[range]}</>}
-            </p>
-          </div>
+          {selected?.key===key&&<p className="text-xs text-muted-foreground">{holdingSourceTime(date)?.short??date}</p>}
+          {selected?.key!==key&&change!=null&&percent!=null&&<p className={`mt-0.5 text-xs font-medium tabular-nums ${change===0?'text-muted-foreground':change>0?'text-success':'text-destructive'}`}>{change>0?'+':''}{money(change)} ({percent>0?'+':''}{percent.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})}%) · {{'1d':'past day','5d':'past 5 days','1mo':'past month','6mo':'past 6 months','1y':'past year','5y':'past 5 years','max':'past 10 years'}[range]}</p>}
         </div>
         <div role="group" aria-label="Instrument chart range" className="flex max-w-full overflow-x-auto rounded-lg border border-border bg-background p-0.5">
           {RANGES.map(([value,label])=><button type="button" key={value} aria-pressed={range===value} onClick={()=>setRange(value)} className={`min-h-8 rounded-md px-2 text-[11px] font-semibold ${range===value?'bg-secondary':'text-muted-foreground'}`}>{label}</button>)}

From be0a4850bb20c54575a5540eeb89b7d850828724 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 09:12:41 +0200
Subject: [PATCH 17/21] Reapply "Keep holding chart caption height stable on
 hover"

This reverts commit a7a280dd71151629c0b3ec00c9a1128a9f8d9a5a.
---
 CHANGELOG.md                                           |  2 +-
 .../components/investments-module/InvestmentChart.tsx  | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a91199..a840716 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
-- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
+- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Keep chart caption height stable when hovering between range returns and dates. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
 - Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
diff --git a/client/src/components/investments-module/InvestmentChart.tsx b/client/src/components/investments-module/InvestmentChart.tsx
index 5140f23..53cdd22 100644
--- a/client/src/components/investments-module/InvestmentChart.tsx
+++ b/client/src/components/investments-module/InvestmentChart.tsx
@@ -174,8 +174,14 @@ export function InvestmentChart({
         <div className="min-w-0 flex-1">
           <h3 className="text-xs font-medium text-muted-foreground">Price</h3>
           <p className="mt-1 text-lg font-semibold tabular-nums">{close!=null?money(close):date?'Daily close unavailable':'Price unavailable'}</p>
-          {selected?.key===key&&<p className="text-xs text-muted-foreground">{holdingSourceTime(date)?.short??date}</p>}
-          {selected?.key!==key&&change!=null&&percent!=null&&<p className={`mt-0.5 text-xs font-medium tabular-nums ${change===0?'text-muted-foreground':change>0?'text-success':'text-destructive'}`}>{change>0?'+':''}{money(change)} ({percent>0?'+':''}{percent.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})}%) · {{'1d':'past day','5d':'past 5 days','1mo':'past month','6mo':'past 6 months','1y':'past year','5y':'past 5 years','max':'past 10 years'}[range]}</p>}
+          {/* Keep both captions in the same grid cell so wrapped range text reserves
+              its height while the selected date is visible. */}
+          <div className="mt-0.5 grid min-h-4 text-xs leading-4">
+            <p aria-hidden={selected?.key!==key} className={`col-start-1 row-start-1 text-muted-foreground ${selected?.key===key?'':'invisible'}`}>{holdingSourceTime(date)?.short??date}</p>
+            <p aria-hidden={selected?.key===key} className={`col-start-1 row-start-1 font-medium tabular-nums ${selected?.key===key?'invisible ':''}${change===0?'text-muted-foreground':change!=null&&change>0?'text-success':'text-destructive'}`}>
+              {change!=null&&percent!=null&&<>{change>0?'+':''}{money(change)} ({percent>0?'+':''}{percent.toLocaleString('hu-HU',{minimumFractionDigits:2,maximumFractionDigits:2})}%) · {{'1d':'past day','5d':'past 5 days','1mo':'past month','6mo':'past 6 months','1y':'past year','5y':'past 5 years','max':'past 10 years'}[range]}</>}
+            </p>
+          </div>
         </div>
         <div role="group" aria-label="Instrument chart range" className="flex max-w-full overflow-x-auto rounded-lg border border-border bg-background p-0.5">
           {RANGES.map(([value,label])=><button type="button" key={value} aria-pressed={range===value} onClick={()=>setRange(value)} className={`min-h-8 rounded-md px-2 text-[11px] font-semibold ${range===value?'bg-secondary':'text-muted-foreground'}`}>{label}</button>)}

From 46bf54231e86f4959c7ae94c8ab100e66a025b27 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 09:14:29 +0200
Subject: [PATCH 18/21] Open holding details from the whole row

---
 CHANGELOG.md                                               | 2 +-
 client/src/components/investments-module/HoldingsList.tsx  | 2 +-
 client/src/components/investments-module/Overview.test.tsx | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a840716..d28d1ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,7 +10,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
-- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Keep chart caption height stable when hovering between range returns and dates. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
+- Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Keep chart caption height stable when hovering between range returns and dates. Make the full holding row open details, retaining keyboard-accessible controls. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
 - Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
diff --git a/client/src/components/investments-module/HoldingsList.tsx b/client/src/components/investments-module/HoldingsList.tsx
index 8e14e02..fa05cb7 100644
--- a/client/src/components/investments-module/HoldingsList.tsx
+++ b/client/src/components/investments-module/HoldingsList.tsx
@@ -42,7 +42,7 @@ export function HoldingsList(props:Props) {
     const timestamp=market?q?.as_of:a.manual_valuation?.as_of??a.manual_price_date
     const freshness=quotePresentation(q),sourceTime=holdingSourceTime(timestamp),priceLabel=market?(freshness.label==='Price as of'?'As of':freshness.label):'Valued'
     const gain=p.metrics.unrealized_gain,returnPercent=p.metrics.unrealized_gain_percent
-    return <tr key={a.id} data-holding-id={a.id} className="grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_2.75rem] items-center gap-x-3 gap-y-2 px-4 py-4 transition-colors hover:bg-secondary/20 sm:px-5 @min-[900px]:table-row @min-[900px]:p-0">
+    return <tr key={a.id} data-holding-id={a.id} onClick={event=>{if(!(event.target as Element).closest('button'))onOpenDetail(a)}} className="grid cursor-pointer grid-cols-[minmax(0,1fr)_minmax(0,1fr)_2.75rem] items-center gap-x-3 gap-y-2 px-4 py-4 transition-colors hover:bg-secondary/20 sm:px-5 @min-[900px]:table-row @min-[900px]:p-0">
      <th scope="row" className="col-span-2 col-start-1 row-start-1 min-w-0 text-left font-normal @min-[900px]:px-4 @min-[900px]:py-4"><button type="button" onClick={()=>onOpenDetail(a)} className="group flex min-h-11 w-full items-center gap-3 rounded-lg text-left focus-visible:outline-2 focus-visible:outline-primary" aria-label={`Open ${a.symbol||a.name} details`}>
       <span className={`flex h-10 w-10 shrink-0 items-center justify-center rounded-xl text-xs font-bold ${a.asset_type==='crypto'?'bg-forecast/15 text-forecast':total?'bg-amber-500/10 text-amber-700 dark:text-amber-300':'bg-primary/15 text-primary'}`}>{(a.symbol||a.name).slice(0,2).toUpperCase()}</span>
       <span className="min-w-0"><span className="flex flex-wrap items-center gap-1.5 text-sm font-semibold">{a.symbol||a.name}<span className="rounded border border-border px-1.5 text-[10px] font-medium text-muted-foreground">{categoryLabel(p)}</span></span><span className="mt-1 block truncate text-xs text-muted-foreground">{a.name}</span></span>
diff --git a/client/src/components/investments-module/Overview.test.tsx b/client/src/components/investments-module/Overview.test.tsx
index df3f02c..2ca1c9d 100644
--- a/client/src/components/investments-module/Overview.test.tsx
+++ b/client/src/components/investments-module/Overview.test.tsx
@@ -143,7 +143,12 @@ it('puts the accessible detail arrow in the trailing cell and shows a matching u
  const row=screen.getByRole('button',{name:'View AAA details'}).closest('tr')!
  expect(row.lastElementChild).toContainElement(screen.getByRole('button',{name:'View AAA details'}))
  expect(row.firstElementChild?.querySelector('svg')).toBeNull()
- fireEvent.click(screen.getByRole('button',{name:'View AAA details'}));expect(open).toHaveBeenCalledWith(p.account)
+ open.mockClear()
+ fireEvent.click(within(row).getByText('+20 HUF'));expect(open).toHaveBeenCalledExactlyOnceWith(p.account)
+ open.mockClear()
+ fireEvent.click(screen.getByRole('button',{name:'View AAA details'}));expect(open).toHaveBeenCalledExactlyOnceWith(p.account)
+ open.mockClear()
+ fireEvent.click(screen.getByRole('button',{name:'Open AAA details'}));expect(open).toHaveBeenCalledExactlyOnceWith(p.account)
  expect(within(row).getByText('+20 HUF')).toBeVisible();expect(within(row).getByText('+20%')).toBeVisible()
  expect(within(row).queryByText('+70 HUF')).not.toBeInTheDocument();expect(within(row).queryByText('Estimated return unavailable')).not.toBeInTheDocument()
  const time=row.querySelector('time')!;expect(time).toHaveAttribute('datetime',quotes.AAA.as_of);expect(time.textContent).not.toContain('T12:00:00');expect(time.title).toContain(quotes.AAA.as_of)

From ba6b3239ced1627c0982a112b029cb9ec4c64f0e Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 12:14:07 +0200
Subject: [PATCH 19/21] Restrict Dashboard transfer creation to cash accounts

---
 CHANGELOG.md                                  |  2 +-
 .../TransactionList.trade-handoff.test.tsx    | 39 +++++++------------
 .../dashboard-module/TransactionList.tsx      | 29 ++++----------
 .../dashboard-module/TransferForm.tsx         |  2 +-
 docs/investment-detail.md                     |  2 +-
 5 files changed, 25 insertions(+), 49 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d28d1ad..0240b79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
 - Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Keep chart caption height stable when hovering between range returns and dates. Make the full holding row open details, retaining keyboard-accessible controls. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
-- Investment transfers now open the same Buy/Sell editor as Investments for creation and linked edits, preserving selected cash, explicit cash amount, date and note. Cash transfers and review drafts retain their existing workflow (#171).
+- Restrict Dashboard income, expense and transfer creation to cash accounts; new investment trades start on Investments. Ignore saved investment-account defaults while preserving canonical linked-trade editing from existing ledger rows (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
 
diff --git a/client/src/components/dashboard-module/TransactionList.trade-handoff.test.tsx b/client/src/components/dashboard-module/TransactionList.trade-handoff.test.tsx
index 5c72bfe..3254c34 100644
--- a/client/src/components/dashboard-module/TransactionList.trade-handoff.test.tsx
+++ b/client/src/components/dashboard-module/TransactionList.trade-handoff.test.tsx
@@ -25,35 +25,24 @@ function show(options:Partial<ComponentProps<typeof TransactionList>>={}){
 }
 beforeEach(()=>{localStorage.clear();editor.mockReset();vi.mocked(apiFetch).mockReset().mockResolvedValue(Response.json({rate:1}))})
 afterEach(cleanup)
-it.each(['holding','manual'])('hands cash-to-%s purchases to the shared editor with entered cash/date/note, without writing',async holding=>{
- const user=userEvent.setup(),saved=show()
- await user.click(screen.getByRole('button',{name:'Transfer',exact:true}))
- await user.selectOptions(screen.getByRole('combobox',{name:'From account'}),'cash')
- await user.type(screen.getByLabelText('Amount to Send (HUF)'),'123.45')
- await user.type(screen.getByLabelText('Note (optional)'),'My purchase')
- await user.selectOptions(screen.getByRole('combobox',{name:'To account'}),holding)
- expect(await screen.findByRole('dialog',{name:'Shared Buy/Sell'})).toBeVisible()
- expect(screen.getAllByRole('dialog')).toHaveLength(1)
- expect(editor.mock.lastCall?.[0]).toMatchObject({holdingId:holding,type:'buy',initialDraft:{cash:'cash',cashAmount:'123.45',notes:'My purchase'}})
- expect(editor.mock.lastCall?.[0].initialDraft).not.toHaveProperty('quantity')
- expect(vi.mocked(apiFetch).mock.calls.some(([,o])=>o?.method==='POST')).toBe(false)
- await user.click(screen.getByRole('button',{name:'Saved shared trade'}));expect(saved).toHaveBeenCalledOnce()
- await user.click(screen.getByRole('button',{name:'Close shared editor'}));expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
-})
-it('hands investment-to-cash sales to the shared editor and preserves explicitly entered proceeds',async()=>{
+it('only offers cash accounts on both sides of a new Dashboard transfer',async()=>{
  const user=userEvent.setup();show()
  await user.click(screen.getByRole('button',{name:'Transfer',exact:true}))
- await user.selectOptions(screen.getByRole('combobox',{name:'To account'}),'cash')
- await user.type(screen.getByLabelText('Amount to Receive (HUF)'),'456')
- await user.selectOptions(screen.getByRole('combobox',{name:'From account'}),'holding')
- await screen.findByRole('dialog',{name:'Shared Buy/Sell'})
- expect(editor.mock.lastCall?.[0]).toMatchObject({holdingId:'holding',type:'sell',initialDraft:{cash:'cash',cashAmount:'456'}})
+ for(const name of ['From account','To account']){
+  const select=screen.getByRole('combobox',{name})
+  expect(within(select).queryByRole('option',{name:/Coin|Gold/})).not.toBeInTheDocument()
+  expect(within(select).getByRole('option',{name:/Cash/})).toBeInTheDocument()
+ }
+ expect(editor).not.toHaveBeenCalled()
+ expect(vi.mocked(apiFetch).mock.calls.some(([,o])=>o?.method==='POST')).toBe(false)
 })
-it('routes saved investment transfer defaults into the shared editor too',async()=>{
- localStorage.setItem('finance_last_transfer_from','cash');localStorage.setItem('finance_last_transfer_to','holding')
+it.each(['finance_last_transfer_from','finance_last_transfer_to'])('ignores saved investment default %s without opening a trade editor',async key=>{
+ localStorage.setItem('finance_last_transfer_from','cash');localStorage.setItem('finance_last_transfer_to','cash')
+ localStorage.setItem(key,'holding')
  const user=userEvent.setup();show();await user.click(screen.getByRole('button',{name:'Transfer',exact:true}))
- await screen.findByRole('dialog',{name:'Shared Buy/Sell'})
- expect(editor.mock.lastCall?.[0]).toMatchObject({holdingId:'holding',type:'buy',initialDraft:{cash:'cash'}})
+ expect(screen.getByRole('combobox',{name:key.endsWith('from')?'From account':'To account'})).toHaveValue('')
+ expect(screen.queryByRole('dialog',{name:'Shared Buy/Sell'})).not.toBeInTheDocument()
+ expect(editor).not.toHaveBeenCalled()
 })
 it('opens the canonical versioned editor for an existing investment transfer through either linked leg',async()=>{
  const user=userEvent.setup()
diff --git a/client/src/components/dashboard-module/TransactionList.tsx b/client/src/components/dashboard-module/TransactionList.tsx
index 8769b90..b2f21bc 100644
--- a/client/src/components/dashboard-module/TransactionList.tsx
+++ b/client/src/components/dashboard-module/TransactionList.tsx
@@ -1,5 +1,5 @@
 import { TradeEditor } from '../investments-module/TradeEditor'
-import type { TradeEdit, TradeDraft } from '../investments-module/trade-editor'
+import type { TradeEdit } from '../investments-module/trade-editor'
 import { LegacyTradeDetails } from '../investments-module/LegacyTradeDetails'
 import type { TradeFacts } from '../../../../shared/investment-trade'
 import type { HoldingFields } from '../../../../shared/holding'
@@ -176,7 +176,7 @@ export function TransactionList({
   const [activeTxId, setActiveTxId] = useState<string | null>(null)
   const [pendingDetails, setPendingDetails] = useState<string | null>(null)
   const [legacyTradeId,setLegacyTradeId]=useState<string|null>(null)
-  const [tradeEditor,setTradeEditor]=useState<{holdingId?:string;type?:'buy'|'sell';initialDraft?:Partial<TradeDraft>;edit?:TradeEdit}|null>(null)
+  const [tradeEditor,setTradeEditor]=useState<{edit:TradeEdit}|null>(null)
   const [loadingTrade,setLoadingTrade]=useState(false)
   const tradeRead=useRef<AbortController|null>(null)
   useEffect(()=>()=>tradeRead.current?.abort(),[])
@@ -412,7 +412,7 @@ export function TransactionList({
 
   // Load saved defaults when opening the form
   const loadSavedDefaults = (type: 'expense' | 'income' | 'transfer') => {
-    const availableAccount = (id: string) => accounts.some(account => account.id === id && !isLocked(id)) ? id : ''
+    const availableAccount = (id: string) => accounts.some(account => account.id === id && account.type === 'cash' && account.archived_at == null && !isLocked(id)) ? id : ''
     if (type === 'expense') {
       const savedAccount = localStorage.getItem(STORAGE_KEYS.expenseAccount) || ''
       const savedCategory = localStorage.getItem(STORAGE_KEYS.expenseCategory) || ''
@@ -526,11 +526,10 @@ export function TransactionList({
     field: 'account_id' | 'to_account_id',
     accountId: string,
   ) => {
-    const keepReceived=field==='account_id' && accounts.some(a=>a.id===accountId&&a.type==='investment') &&
-      accounts.some(a=>a.id===formData.to_account_id&&a.type==='cash') && manuallyEditedTransferFieldsRef.current.amount_to
+    if(accountId&&!accounts.some(account=>account.id===accountId&&account.type==='cash'&&account.archived_at==null&&!isLocked(account.id)))return
     resetTransferRateState(false)
-    manuallyEditedTransferFieldsRef.current.amount_to=keepReceived
-    setFormData(prev => ({ ...prev, [field]: accountId, amount_to: keepReceived?prev.amount_to:'', manual_price: '' }))
+    manuallyEditedTransferFieldsRef.current.amount_to=false
+    setFormData(prev => ({ ...prev, [field]: accountId, amount_to:'', manual_price: '' }))
   }
 
   // Which submit button was used: only expense and income entries can stay open for the next payment.
@@ -1127,18 +1126,6 @@ export function TransactionList({
     return acc ? acc.currency : 'HUF'
   }
 
-  const selectedHoldingId = formData.type === 'transfer' ? accounts.find(a=>a.id===formData.account_id&&a.type==='investment')?.id ?? accounts.find(a=>a.id===formData.to_account_id&&a.type==='investment')?.id : undefined
-  useEffect(()=>{
-    if(!isAdding||editingId||editingReviewTransfer||!selectedHoldingId)return
-    const from=accounts.find(a=>a.id===formData.account_id),to=accounts.find(a=>a.id===formData.to_account_id)
-    const sell=from?.type==='investment',cash=sell?to:from
-    setTradeEditor({holdingId:selectedHoldingId,type:sell?'sell':'buy',initialDraft:{
-      ...(cash?.type==='cash'?{cash:cash.id}:{}),date:formData.date,notes:formData.description,
-      ...(cash?.type==='cash'&&!sell&&formData.amount?{cashAmount:formData.amount}:{}),
-      ...(cash?.type==='cash'&&sell&&manuallyEditedTransferFieldsRef.current.amount_to&&formData.amount_to?{cashAmount:formData.amount_to}:{}),
-    }})
-    setIsAdding(false)
-  },[isAdding,editingId,editingReviewTransfer,selectedHoldingId,accounts,formData])
   const handleTransferPatch = (patch: Partial<TransferFormData>) => setFormData(prev=>({...prev,...patch}))
 
   // For transfer preview
@@ -1525,7 +1512,7 @@ export function TransactionList({
       </CardHeader>}
 
       <Modal 
-        isOpen={isAdding && !selectedHoldingId}
+        isOpen={isAdding}
         onClose={handleCancel} 
         placement={formData.type === 'transfer' ? 'centered' : 'center'}
         className={formData.type === 'transfer' ? 'sm:max-w-[480px] rounded-2xl flex min-h-0 flex-col overflow-hidden' : undefined}
@@ -1539,7 +1526,7 @@ export function TransactionList({
             {/* Transfer Form */}
             {formData.type === 'transfer' ? (
               <TransferForm
-                accounts={editingId?accounts.filter(a=>a.type==='cash'):accounts}
+                accounts={accounts.filter(a=>a.type==='cash')}
                 data={formData}
                 editing={!!editingId}
                 reviewDraft={editingReviewTransfer}
diff --git a/client/src/components/dashboard-module/TransferForm.tsx b/client/src/components/dashboard-module/TransferForm.tsx
index dbd1ced..a71d991 100644
--- a/client/src/components/dashboard-module/TransferForm.tsx
+++ b/client/src/components/dashboard-module/TransferForm.tsx
@@ -66,7 +66,7 @@ export function TransferForm(props: TransferFormProps) {
   const sent = parseAmount(data.amount)
   const received = sameCurrency ? sent : parseAmount(data.amount_to)
   const rate = parseAmount(props.exchangeRate)
-  const selectable = accounts.filter(account => !account.is_locked && account.archived_at == null && (!reviewDraft || account.type === 'cash'))
+  const selectable = accounts.filter(account => account.type === 'cash' && !account.is_locked && account.archived_at == null)
   const ready = from && to && !sameAccount && selectable.includes(from) && selectable.includes(to)
     && sent !== null && sent > 0 && received !== null && received > 0 && from.type==='cash' && to.type==='cash' && data.date
     && (!editing || dirty)
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index 00a2060..6c1edb0 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -18,7 +18,7 @@ Manual histories remain dated total/per-unit step observations, independently lo
 
 ## Transfer entry points
 
-The transaction composer uses the same `TradeEditor` as Investments. Selecting a holding as the destination opens Buy; selecting one as the source opens Sell. The selected cash account, explicit native cash amount, date and note carry into the shared draft. Cash amounts are never reinterpreted as units, and FX-derived received amounts are not reused as confirmed sale proceeds. Selecting a holding before choosing cash lets the canonical editor select a suitable cash account for review. Whole manual assets keep the editor's one-ITEM acquisition/disposal rules.
+New buys and sells start on Investments. The Dashboard transaction composer offers only cash accounts for income, expense and both transfer sides; saved investment-account defaults are ignored. Existing linked trade rows can still open the canonical versioned editor for corrections.
 
 Editing an existing investment transfer first loads the canonical reciprocal pair and saved version, then opens the same editor. Reads abort when superseded/unmounted; stale versions or invalid pairs reject opening. Save/delete/preview/uncertain retry and refresh ownership are the canonical editor's existing paths. The composer no longer has an investment price/fee form or its own investment save implementation. Cash-to-cash transfers, split transactions and MCP review transfers remain separate; existing cash transfers cannot be retargeted into a holding.
 

From ac00fd9377377c42cf2028e456a082f53cb597d1 Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 12:17:43 +0200
Subject: [PATCH 20/21] Place settlement confirmation after the trade review

---
 CHANGELOG.md                                  |  1 +
 .../investments-module/TradeEditor.test.tsx   | 17 ++++++++
 .../investments-module/TradeEditor.tsx        | 41 +++++++++++++------
 docs/investment-detail.md                     |  2 +-
 4 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0240b79..556e5a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
 - Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Keep chart caption height stable when hovering between range returns and dates. Make the full holding row open details, retaining keyboard-accessible controls. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
+- Place cross-currency settlement confirmation after the full trade review in a prominent required-action card. Show read-only totals before acknowledgement while keeping saves blocked until confirmed (#171).
 - Restrict Dashboard income, expense and transfer creation to cash accounts; new investment trades start on Investments. Ignore saved investment-account defaults while preserving canonical linked-trade editing from existing ledger rows (#171).
 
 - Main/investment-epic integration preserves both existing 017 migration filenames, transaction split exports/history and direct investment trade paths. Split mutations share guarded decimal cash arithmetic so concurrent trades, pending confirmation and fractional payments retain exact balances (#169).
diff --git a/client/src/components/investments-module/TradeEditor.test.tsx b/client/src/components/investments-module/TradeEditor.test.tsx
index 26a349a..b17105d 100644
--- a/client/src/components/investments-module/TradeEditor.test.tsx
+++ b/client/src/components/investments-module/TradeEditor.test.tsx
@@ -29,6 +29,23 @@ it('requires actual cross-currency confirmation, previews exact cash, and keeps
  expect(JSON.parse(String(requests[0][1]?.body))).toMatchObject({quantity:0.123456789012,price:50,cash_amount:2500,fee_amount:400,execution_currency:'EUR',cash_account_id:'cash',holding_account_id:'holding',type:'buy'})
  expect(close).toHaveBeenCalledOnce()
 })
+it('shows the read-only review before the final settlement confirmation and keeps saving blocked until acknowledged',async()=>{
+ render(<TradeEditor {...props}/>)
+ for(const [label,value] of [['Quantity','0,123456789012'],['Executed unit price','50'],['Fee (HUF)','400'],['Actual cash paid (HUF)','2500']])fireEvent.change(screen.getByLabelText(label),{target:{value}})
+ const checkbox=screen.getByRole('checkbox',{name:/actual cash settlement, including fees/})
+ const save=screen.getByRole('button',{name:'Record purchase'})
+ await waitFor(()=>expect(screen.getByText(/Cash balance after: -1\s?500 HUF/)).toBeVisible())
+ expect(checkbox).not.toBeChecked();expect(save).toBeDisabled()
+ expect(screen.getByText('Required before saving')).toBeVisible()
+ const review=screen.getByRole('region',{name:'Exact trade totals'})
+ expect(review.compareDocumentPosition(checkbox)&Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+ expect(screen.getByLabelText('Note (optional)').compareDocumentPosition(checkbox)&Node.DOCUMENT_POSITION_FOLLOWING).toBeTruthy()
+ expect(vi.mocked(apiFetch).mock.calls.every(([url])=>String(url).includes('/preview'))).toBe(true)
+ fireEvent.click(checkbox);await waitFor(()=>expect(save).toBeEnabled())
+ fireEvent.change(screen.getByLabelText('Actual cash paid (HUF)'),{target:{value:'2501'}})
+ expect(checkbox).not.toBeChecked();expect(save).toBeDisabled()
+ expect(saved).not.toHaveBeenCalled()
+})
 it('requires an authoritative preview for a legacy stored residue and retains the entered units',async()=>{
  const data=preview();data.by_currency.HUF.holdings[0].quantity=0.435802467012
  let release:(r:Response)=>void=()=>{}
diff --git a/client/src/components/investments-module/TradeEditor.tsx b/client/src/components/investments-module/TradeEditor.tsx
index c412215..ade2614 100644
--- a/client/src/components/investments-module/TradeEditor.tsx
+++ b/client/src/components/investments-module/TradeEditor.tsx
@@ -87,8 +87,11 @@ export function TradeEditor({
   const holding = holdings.find((a) => a.id === draft.holding),
     cash = cashAccounts.find((a) => a.id === draft.cash),
     total = holding?.asset_type === 'manual'
-  const validation = validateTrade(draft, holding, cash, edit),
-    signature = tradePreviewKey(validation.input, edit?.trade.id, sourceRevision)
+  const validation = validateTrade(draft, holding, cash, edit)
+  // Read-only review can precede acknowledgement; saving still uses the fully
+  // validated draft, including the user's explicit settlement confirmation.
+  const reviewValidation = validateTrade({ ...draft, cashConfirmed: true }, holding, cash, edit),
+    signature = tradePreviewKey(reviewValidation.input, edit?.trade.id, sourceRevision)
   const cashPreview = preview?.cashAfter
   const serverCash =
     !recovering &&
@@ -499,14 +502,7 @@ export function TradeEditor({
                   : ''}
                 Enter your actual settlement. Market FX does not establish fees or execution cash.
               </p>
-              <Label className="flex min-h-10 items-center gap-2 text-xs">
-                <input
-                  type="checkbox"
-                  checked={draft.cashConfirmed}
-                  onChange={(e) => patch({ cashConfirmed: e.target.checked })}
-                />
-                I confirm this is the actual cash settlement, including fees.
-              </Label>
+
             </>
           )}
           <p className="text-[11px] text-muted-foreground">
@@ -547,8 +543,8 @@ export function TradeEditor({
               balance.
             </p>
           )}
-          {!recovering && validation.error && (
-            <p className="text-xs text-muted-foreground">{validation.error}</p>
+          {!recovering && reviewValidation.error && (
+            <p className="text-xs text-muted-foreground">{reviewValidation.error}</p>
           )}
           {recovering && (
             <p className="rounded-lg bg-secondary p-3 text-xs text-muted-foreground">
@@ -560,7 +556,7 @@ export function TradeEditor({
             </p>
           )}
           <TradeMetricsPreview
-            input={recovering ? null : validation.input}
+            input={recovering ? null : reviewValidation.input}
             tradeId={edit?.trade.id}
             hidden={hidden}
             currency={currency}
@@ -572,6 +568,25 @@ export function TradeEditor({
               {preview.error}
             </p>
           )}
+          {cash && draft.currency !== cash.currency && (
+            <section aria-labelledby="settlement-confirmation-title" className={`rounded-xl border p-4 ${draft.cashConfirmed ? 'border-border bg-background' : 'border-primary/40 bg-primary/5'}`}>
+              <h3 id="settlement-confirmation-title" className="text-sm font-semibold">Confirm settlement</h3>
+              <p id="settlement-confirmation-help" className="mt-1 text-xs text-muted-foreground">
+                Review the trade details and totals above, then confirm the actual cash amount to enable saving.
+              </p>
+              <Label className="mt-3 flex min-h-11 cursor-pointer items-start gap-3 rounded-lg py-2 text-sm leading-5">
+                <input
+                  type="checkbox"
+                  className="mt-0.5 h-5 w-5 shrink-0 accent-primary"
+                  checked={draft.cashConfirmed}
+                  aria-describedby="settlement-confirmation-help"
+                  onChange={(e) => patch({ cashConfirmed: e.target.checked })}
+                />
+                I confirm this is the actual cash settlement, including fees.
+              </Label>
+              {!draft.cashConfirmed && <p className="mt-1 text-xs font-medium text-primary">Required before saving</p>}
+            </section>
+          )}
         </fieldset>
         {hidden && (
           <p className="px-5 pb-3 text-xs text-muted-foreground">Reveal values to edit or save this trade.</p>
diff --git a/docs/investment-detail.md b/docs/investment-detail.md
index 6c1edb0..bc1107f 100644
--- a/docs/investment-detail.md
+++ b/docs/investment-detail.md
@@ -24,7 +24,7 @@ Editing an existing investment transfer first loads the canonical reciprocal pai
 
 ## Recording and replacing trades
 
-Record trade on Investments or Buy/Sell in a unit holding opens the dedicated editor. Its saved values are string drafts using AmountInput. It collects the holding, exact units, execution price/currency/date, cash account, included fee and actual settlement. Same-currency cash must equal rounded gross plus the buy fee or minus the sale fee. Cross-currency settlement is entered and explicitly confirmed; displayed current FX is only an estimate. Included fees never create another expense. The existing negative-cash policy remains a warning; overselling is rejected locally and by full API timeline replay.
+Record trade on Investments or Buy/Sell in a unit holding opens the dedicated editor. Its saved values are string drafts using AmountInput. It collects the holding, exact units, execution price/currency/date, cash account, included fee and actual settlement. Same-currency cash must equal rounded gross plus the buy fee or minus the sale fee. Cross-currency settlement is entered and explicitly confirmed in a required-action card after the totals and nonmutating metrics preview. Review can load before acknowledgement, while saving still requires the confirmed draft and its matching successful preview. Settlement edits clear acknowledgement. Displayed current FX is only an estimate. Included fees never create another expense. The existing negative-cash policy remains a warning; overselling is rejected locally and by full API timeline replay.
 
 Quotes never populate execution facts automatically. Use as draft is available only for today's date, requires confirmation of the actual fill, and clears a quote-derived price if the date or currency changes. Past fills require their recorded execution. Manual total-asset events use exactly one ITEM; appraisals remain a separate action. A confirmed zero-proceeds whole-asset disposal is supported without treating a zero appraisal as missing ownership.
 

From 8d27a0dd8e21d5f99ca3df91b52934738e2f50ad Mon Sep 17 00:00:00 2001
From: 31b4 <szilagyibence@szilagyibence.com>
Date: Tue, 20 Oct 2026 12:21:56 +0200
Subject: [PATCH 21/21] Show asset selection before investment identity fields

---
 CHANGELOG.md                                              | 1 +
 client/src/components/dashboard-module/AddAccountForm.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 556e5a2..cef92ad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ Intermediate package/UI version bumps are grouped under the next published GitHu
 - Investment overview uses a clearly named Gain on net invested ratio, a compact responsive summary/chart/allocation layout, and simpler selected-day gain tooltips. Remove requested explanatory copy and the duplicate privacy button (#171).
 - Holding price charts display split-only-adjusted history and consistently adjusted trade dots, preventing artificial NVDA split crashes while retaining original executions and raw accounting inputs. Format normal chart prices to cents and preserve tiny-coin precision (#171).
 - Apply holding popup design 2a: compact centered 600px layout, instrument header, value/gain summary, chart-first flow, six-cell position grid, readable source footer and smaller Buy/Sell actions. Remove gain bars and duplicate summary cards. Keep chart caption height stable when hovering between range returns and dates. Make the full holding row open details, retaining keyboard-accessible controls. Preserve split-adjusted trade markers, full quantity access and review history; only compatible current quotes can extend the display endpoint (#171).
+- Put asset search/manual selection before category, pricing, trading currency and holding unit in new investment account setup (#171).
 - Place cross-currency settlement confirmation after the full trade review in a prominent required-action card. Show read-only totals before acknowledgement while keeping saves blocked until confirmed (#171).
 - Restrict Dashboard income, expense and transfer creation to cash accounts; new investment trades start on Investments. Ignore saved investment-account defaults while preserving canonical linked-trade editing from existing ledger rows (#171).
 
diff --git a/client/src/components/dashboard-module/AddAccountForm.tsx b/client/src/components/dashboard-module/AddAccountForm.tsx
index 75ce3c9..316840d 100644
--- a/client/src/components/dashboard-module/AddAccountForm.tsx
+++ b/client/src/components/dashboard-module/AddAccountForm.tsx
@@ -60,7 +60,6 @@ export function AddAccountForm({ value, onChange, onTypeChange, onSubmit, onCanc
             })}
           </div>
         </fieldset>
-        {investment && <HoldingAccountFields value={value} onChange={onChange} section="identity" />}
         {investment && <section aria-label="Investment asset" className="space-y-2">
           <div className="flex items-baseline justify-between gap-3">
             <h3 className="text-[13px] font-medium">Asset</h3>
@@ -78,6 +77,7 @@ export function AddAccountForm({ value, onChange, onTypeChange, onSubmit, onCanc
             <button type="button" onClick={onManualAsset} className="text-xs text-primary hover:underline disabled:opacity-50">Enter manually</button>
           </div>}
         </section>}
+        {investment && <HoldingAccountFields value={value} onChange={onChange} section="identity" />}
         <div className="space-y-2">
           <div className="flex flex-wrap items-baseline justify-between gap-x-3 gap-y-1">
             <Label htmlFor="create-account-balance" className="text-[13px]">{marketAsset ? 'Starting quantity' : 'Starting balance'}</Label>