' +
+ // Liquidation price
+ var liqPrice = calculateLiquidationPrice(entryPrice, !!t.long, levNum);
+ var liqHtml = liqPrice > 0 ? '
Liq: $' + liqPrice.toFixed(2) + '' : '';
+
+ // Current TP/SL from trade data
+ var tpRaw = t.tp ? parseFloat(t.tp) / 1e10 : 0;
+ var slRaw = t.sl ? parseFloat(t.sl) / 1e10 : 0;
+ var tpSlHtml = '';
+ if (tpRaw > 0) tpSlHtml += '
TP: $' + tpRaw.toFixed(2) + ' ';
+ if (slRaw > 0) tpSlHtml += '
SL: $' + slRaw.toFixed(2) + '';
+
+ // Manage panel HTML
+ var manageHtml =
+ '
';
+
+ html += '
' +
'
' +
'
' +
'' + dir + ' ' + lev + '' +
'' + pairLabel + '' +
'Entry: ' + entryFmt + (curPrice ? ' / Now: $' + curPrice.toFixed(2) : '') + '' +
- '' + colFmt + ' USDC' +
+ '' + colFmt + ' USDC' +
+ liqHtml +
'
' +
+ (tpSlHtml ? '
' + tpSlHtml + '
' : '') +
(pnlHtml ? '
' + pnlHtml + '
' : '') +
'
' +
+ '
' +
+ '' +
'' +
+ '
' +
+ manageHtml +
'
';
});
+ // Skip full re-render if a manage panel is open (prevents input flicker)
+ var hasOpenPanel = container.querySelector('.manage-panel.open');
+ if (hasOpenPanel) {
+ // Still update P&L and price text in-place without replacing HTML
+ trades.forEach(function(item) {
+ var t = item.trade || item;
+ var tradeIdx = parseInt(t.index || '0');
+ var pairIdx = parseInt(t.pairIndex || '0');
+ var curPrice = livePrices[pairIdx];
+ var pnlEl = container.querySelector('[data-pnl-trade="' + tradeIdx + '"]');
+ if (pnlEl && curPrice) {
+ var entryP = t.openPrice ? parseFloat(t.openPrice) / 1e10 : 0;
+ var levNum = t.leverage ? parseFloat(t.leverage) / 1000 : 0;
+ var colRaw = BigInt(t.collateralAmount || '0');
+ var colIdx2 = parseInt(t.collateralIndex || '3');
+ var colDec = (colIdx2 === 3) ? 6 : 18;
+ var col2 = Number(colRaw) / Math.pow(10, colDec);
+ if (entryP > 0 && levNum > 0) {
+ var pct = t.long ? ((curPrice - entryP) / entryP) * levNum * 100 : ((entryP - curPrice) / entryP) * levNum * 100;
+ var usd = col2 * (pct / 100);
+ var cls = usd >= 0 ? 'positive' : 'negative';
+ var sgn = usd >= 0 ? '+' : '';
+ pnlEl.className = 'trade-pnl ' + cls;
+ pnlEl.textContent = 'Est. ' + sgn + usd.toFixed(2) + ' USDC (' + sgn + pct.toFixed(2) + '%)';
+ }
+ }
+ });
+ return;
+ }
+ _persistOpenCache();
container.innerHTML = html;
} catch (e) {
container.innerHTML = '
Could not load trades
';
}
}
-function loadTradeHistory() {
+async function loadTradeHistory() {
var container = document.getElementById('trade-history-list');
if (!container) return;
- var history = getTradeHistory();
- if (history.length === 0) {
+ if (!walletState.connected) return;
+
+ // Fetch from gTrade backend (includes liquidations, TP/SL hits, all protocol-closed trades)
+ var backendTrades = [];
+ var pairNames = {};
+ try {
+ var resp = await fetch('/api/gtrade/trade-history?address=' + walletState.address);
+ var data = await resp.json();
+ backendTrades = data.history || [];
+ pairNames = data.pair_names || {};
+ } catch (_) {}
+
+ // Build merged history: backend trades + localStorage-only entries
+ var localHistory = getTradeHistory();
+ var localByTx = {};
+ localHistory.forEach(function(h) { if (h.txHash) localByTx[h.txHash.toLowerCase()] = h; });
+
+ var merged = [];
+
+ // Process backend trades (authoritative source for all closed trades including liquidations)
+ backendTrades.forEach(function(item) {
+ var t = item.trade || item;
+ if (t.isOpen) return; // skip still-open trades
+ var pairIdx = parseInt(t.pairIndex || '0');
+ var dir = t.long ? 'LONG' : 'SHORT';
+ var lev = t.leverage ? (parseFloat(t.leverage) / 1000).toFixed(0) + 'x' : '?x';
+ var levNum = t.leverage ? parseFloat(t.leverage) / 1000 : 0;
+ var colRaw = BigInt(t.collateralAmount || '0');
+ var colIdx = parseInt(t.collateralIndex || '3');
+ var colDecimals = (colIdx === 3) ? 6 : 18;
+ var col = Number(colRaw) / Math.pow(10, colDecimals);
+ var entryPrice = t.openPrice ? (parseFloat(t.openPrice) / 1e10) : 0;
+ var pairLabel = pairNames[pairIdx] || ('Pair #' + pairIdx);
+
+ // Extract close data
+ var closeData = item.closeTradeData || item.close_trade_data || {};
+ var closePrice = closeData.closePrice ? parseFloat(closeData.closePrice) / 1e10 : 0;
+ var pnlUsd = null;
+ var pnlPct = null;
+
+ if (closePrice > 0 && entryPrice > 0 && levNum > 0) {
+ var pctRaw = t.long
+ ? ((closePrice - entryPrice) / entryPrice) * levNum * 100
+ : ((entryPrice - closePrice) / entryPrice) * levNum * 100;
+ pnlUsd = col * (pctRaw / 100);
+ pnlPct = pctRaw;
+ }
+
+ // Detect liquidation: close type or -90%+ loss
+ var isLiquidation = false;
+ if (closeData.closeType !== undefined) {
+ // gTrade closeType: 0=market, 1=TP, 2=SL, 3=LIQ
+ isLiquidation = parseInt(closeData.closeType) === 3;
+ } else if (pnlPct !== null && pnlPct <= -89) {
+ isLiquidation = true;
+ }
+
+ merged.push({
+ dir: dir, lev: lev, long: !!t.long,
+ pairLabel: pairLabel,
+ collateral: col.toFixed(2),
+ entryPrice: entryPrice.toFixed(2),
+ closePrice: closePrice > 0 ? closePrice.toFixed(2) : '?',
+ pnlUsd: pnlUsd !== null ? pnlUsd.toFixed(2) : 'pending',
+ pnlPct: pnlPct !== null ? pnlPct.toFixed(1) : 'pending',
+ txHash: null,
+ closedAt: null,
+ isLiquidation: isLiquidation,
+ closeType: closeData.closeType !== undefined ? parseInt(closeData.closeType) : null,
+ _source: 'backend'
+ });
+ });
+
+ // Add localStorage-only entries (recent closes that backend hasn't indexed yet)
+ localHistory.forEach(function(h) {
+ // Check if this local entry is already covered by a backend entry
+ // (match by entry price + collateral + direction as a rough dedup)
+ var dominated = merged.some(function(m) {
+ return m.entryPrice === h.entryPrice && m.collateral === h.collateral && m.dir === h.dir;
+ });
+ if (!dominated) {
+ h._source = 'local';
+ merged.push(h);
+ } else if (h.txHash) {
+ // Enrich the backend entry with the local tx hash
+ for (var i = 0; i < merged.length; i++) {
+ if (merged[i].entryPrice === h.entryPrice && merged[i].collateral === h.collateral && merged[i].dir === h.dir) {
+ if (!merged[i].txHash) merged[i].txHash = h.txHash;
+ if (!merged[i].closedAt && h.closedAt) merged[i].closedAt = h.closedAt;
+ break;
+ }
+ }
+ }
+ });
+
+ // Limit to 20 most recent
+ merged = merged.slice(0, 20);
+
+ if (merged.length === 0) {
container.innerHTML = '
No trade history
';
return;
}
+
var html = '';
- history.forEach(function(h) {
+ merged.forEach(function(h) {
var dirClass = h.long ? 'positive' : 'negative';
var pnlHtml = '';
if (h.pnlUsd === 'pending' || h.pnlPct === 'pending') {
@@ -743,6 +1264,11 @@ function loadTradeHistory() {
var txLink = h.txHash
? '
tx'
: '';
+ var badge = 'CLOSED';
+ var badgeClass = 'history-badge';
+ if (h.isLiquidation) { badge = 'LIQUIDATED'; badgeClass = 'history-badge liq-badge'; }
+ else if (h.closeType === 1) { badge = 'TP HIT'; badgeClass = 'history-badge tp-badge'; }
+ else if (h.closeType === 2) { badge = 'SL HIT'; badgeClass = 'history-badge sl-badge'; }
// Format timestamp
var timeStr = '';
if (h.closedAt) {
@@ -764,7 +1290,7 @@ function loadTradeHistory() {
'