Implement pure Drift Protocol automation system
- Remove Jupiter DEX completely from automation system - Implement exclusive Drift Protocol integration with up to 100x leverage - Update executeLiveTrade method to use only Drift API endpoints - Change default DEX provider from Jupiter to Drift - Create minimal professional UI without promotional banners - Add comprehensive leverage options (1x-100x) with risk indicators - Update automation service to route all trades through /api/automation/trade - Fix type definitions to support Drift-only configuration - Add multiple trading pairs support (SOL, BTC, ETH, APT, AVAX, DOGE) - Implement clean configuration interface with essential controls - Remove excessive marketing text and promotional elements - Maintain full automation functionality while simplifying UX
This commit is contained in:
mindesbunister
@@ -23,6 +23,7 @@ export default function AutomationPage() {
|
||||
const [analysisDetails, setAnalysisDetails] = useState(null)
|
||||
const [selectedTrade, setSelectedTrade] = useState(null)
|
||||
const [tradeModalOpen, setTradeModalOpen] = useState(false)
|
||||
const [configCollapsed, setConfigCollapsed] = useState(true)
|
||||
|
||||
useEffect(() => {
|
||||
fetchStatus()
|
||||
@@ -99,13 +100,10 @@ export default function AutomationPage() {
|
||||
// Get enhanced trade data from analysis-details instead of recent-trades
|
||||
const response = await fetch('/api/automation/analysis-details')
|
||||
const data = await response.json()
|
||||
console.log('📊 API Response:', data)
|
||||
console.log('📈 Recent trades in response:', data.data?.recentTrades?.length || 0)
|
||||
console.log('📊 Trade data response:', data.success, data.data?.recentTrades?.length || 0)
|
||||
if (data.success && data.data.recentTrades) {
|
||||
console.log('✅ Setting recent trades:', data.data.recentTrades.length)
|
||||
setRecentTrades(data.data.recentTrades)
|
||||
} else {
|
||||
console.log('❌ No recent trades found in API response')
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Failed to fetch recent trades:', error)
|
||||
@@ -217,22 +215,14 @@ export default function AutomationPage() {
|
||||
setSelectedTrade(null)
|
||||
}
|
||||
|
||||
// Calculate win rate from recent trades
|
||||
const calculateWinRate = () => {
|
||||
if (!recentTrades.length) return 0
|
||||
const completedTrades = recentTrades.filter(t => t.status === 'COMPLETED')
|
||||
if (!completedTrades.length) return 0
|
||||
const winningTrades = completedTrades.filter(t => t.result === 'WIN')
|
||||
return (winningTrades.length / completedTrades.length * 100).toFixed(1)
|
||||
// Use status API data instead of calculating from limited recent trades
|
||||
const getWinRate = () => {
|
||||
return status?.winRate || 0
|
||||
}
|
||||
|
||||
// Calculate total P&L from recent trades
|
||||
const calculateTotalPnL = () => {
|
||||
if (!recentTrades.length) return 0
|
||||
return recentTrades
|
||||
.filter(t => t.status === 'COMPLETED' && t.pnl)
|
||||
.reduce((total, trade) => total + parseFloat(trade.pnl), 0)
|
||||
.toFixed(2)
|
||||
// Use status API data for total P&L
|
||||
const getTotalPnL = () => {
|
||||
return status?.totalPnL || 0
|
||||
}
|
||||
|
||||
return (
|
||||
@@ -285,16 +275,166 @@ export default function AutomationPage() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Real-Time Price Monitor - Top Priority */}
|
||||
<RealTimePriceMonitor />
|
||||
|
||||
<div className="grid grid-cols-1 xl:grid-cols-2 gap-8">
|
||||
{/* Left Column: Configuration & Controls */}
|
||||
{/* Real-Time Price Monitor */}
|
||||
<div className="space-y-6">
|
||||
<RealTimePriceMonitor symbol={config.symbol} />
|
||||
</div>
|
||||
|
||||
{/* Right Side Panel - Active Trades or Status */}
|
||||
<div className="space-y-6">
|
||||
{/* Active Trades Monitor */}
|
||||
{status && status.activeTrades && status.activeTrades.length > 0 ? (
|
||||
<div className="card card-gradient p-6">
|
||||
<h2 className="text-xl font-bold text-white mb-4">Active Trades Monitor</h2>
|
||||
<div className="space-y-3">
|
||||
{status.activeTrades.map((trade, idx) => (
|
||||
<div key={idx} className="p-3 bg-gray-800 rounded border border-gray-700">
|
||||
<div className="flex justify-between items-center mb-2">
|
||||
<span className="font-semibold text-white">
|
||||
{trade.side} {trade.amount} @ ${trade.entryPrice}
|
||||
</span>
|
||||
<span className={`px-2 py-1 rounded text-xs ${
|
||||
trade.unrealizedPnl > 0 ? 'bg-green-600' : 'bg-red-600'
|
||||
} text-white`}>
|
||||
${trade.unrealizedPnl}
|
||||
</span>
|
||||
</div>
|
||||
<div className="text-xs text-gray-400">
|
||||
SL: ${trade.stopLoss} | TP: ${trade.takeProfit}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
/* Trading Status Summary when no active trades */
|
||||
<div className="card card-gradient p-6">
|
||||
<h2 className="text-xl font-bold text-white mb-4">Trading Status</h2>
|
||||
<div className="space-y-4">
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Mode:</span>
|
||||
<span className={`px-2 py-1 rounded text-sm ${
|
||||
config.mode === 'LIVE' ? 'bg-red-600 text-white' : 'bg-blue-600 text-white'
|
||||
}`}>
|
||||
{config.mode}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Status:</span>
|
||||
<span className={`px-2 py-1 rounded text-sm ${
|
||||
status?.isActive ? 'bg-green-600 text-white' :
|
||||
status?.status === 'PAUSED' ? 'bg-yellow-600 text-white' :
|
||||
'bg-gray-600 text-white'
|
||||
}`}>
|
||||
{status?.isActive ? 'ACTIVE' : (status?.status || 'STOPPED')}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Symbol:</span>
|
||||
<span className="text-white font-semibold">{config.symbol}</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Timeframe:</span>
|
||||
<span className="text-white">{config.timeframe}</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Active Trades:</span>
|
||||
<span className="text-white">
|
||||
{status?.activeTrades?.length || 0}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Trading Amount:</span>
|
||||
<span className="text-white">${config.tradingAmount}</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Max Leverage:</span>
|
||||
<span className="text-yellow-400">{config.maxLeverage}x</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Stop Loss:</span>
|
||||
<span className="text-red-400">{config.stopLossPercent}%</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Take Profit:</span>
|
||||
<span className="text-green-400">{config.takeProfitPercent}%</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Max Daily Trades:</span>
|
||||
<span className="text-white">{config.maxDailyTrades}</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Risk Percentage:</span>
|
||||
<span className="text-orange-400">{config.riskPercentage}%</span>
|
||||
</div>
|
||||
{status && (
|
||||
<>
|
||||
<div className="border-t border-gray-700 pt-3 mt-4">
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Total Trades:</span>
|
||||
<span className="text-white">{status.totalTrades || 0}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Win Rate:</span>
|
||||
<span className={`font-bold ${
|
||||
(status.winRate || 0) >= 50 ? 'text-green-400' : 'text-red-400'
|
||||
}`}>
|
||||
{(status.winRate || 0).toFixed(1)}%
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-gray-300">Total P&L:</span>
|
||||
<span className={`font-bold ${
|
||||
(status.totalPnL || 0) > 0 ? 'text-green-400' :
|
||||
(status.totalPnL || 0) < 0 ? 'text-red-400' : 'text-gray-400'
|
||||
}`}>
|
||||
${(status.totalPnL || 0).toFixed(2)}
|
||||
</span>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
{/* Quick Actions */}
|
||||
<div className="border-t border-gray-700 pt-3 mt-4">
|
||||
<div className="text-sm text-gray-400 mb-2">Quick Actions:</div>
|
||||
<div className="flex space-x-2">
|
||||
<button
|
||||
onClick={() => setConfigCollapsed(!configCollapsed)}
|
||||
className="px-3 py-1 bg-blue-600 text-white rounded text-xs hover:bg-blue-700 transition-colors"
|
||||
>
|
||||
{configCollapsed ? 'Show Config' : 'Hide Config'}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => window.location.reload()}
|
||||
className="px-3 py-1 bg-gray-600 text-white rounded text-xs hover:bg-gray-700 transition-colors"
|
||||
>
|
||||
Refresh
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 xl:grid-cols-2 gap-8">
|
||||
{/* Configuration Panel - Collapsible */}
|
||||
<div className="space-y-6">
|
||||
{/* Configuration Panel */}
|
||||
<div className="card card-gradient p-6">
|
||||
<h2 className="text-xl font-bold text-white mb-4">⚙️ Configuration</h2>
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<h2 className="text-xl font-bold text-white">Configuration</h2>
|
||||
<button
|
||||
onClick={() => setConfigCollapsed(!configCollapsed)}
|
||||
className="px-3 py-1 bg-gray-700 text-white rounded hover:bg-gray-600 transition-colors"
|
||||
>
|
||||
{configCollapsed ? 'Show' : 'Hide'}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{!configCollapsed && (
|
||||
<div className="space-y-4">
|
||||
<div>
|
||||
<label className="block text-sm font-medium text-gray-300 mb-2">
|
||||
@@ -428,14 +568,136 @@ export default function AutomationPage() {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* AI Learning Status */}
|
||||
{aiLearningStatus && (
|
||||
<div className="card card-gradient p-6">
|
||||
<h2 className="text-xl font-bold text-white mb-4">🧠 AI Learning Status</h2>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
{/* Learning Phase */}
|
||||
<div className="space-y-4">
|
||||
<div className="flex items-center space-x-3">
|
||||
<div className={`w-3 h-3 rounded-full ${
|
||||
aiLearningStatus.phase === 'EXPERT' ? 'bg-green-500' :
|
||||
aiLearningStatus.phase === 'ADVANCED' ? 'bg-blue-500' :
|
||||
aiLearningStatus.phase === 'PATTERN_RECOGNITION' ? 'bg-yellow-500' :
|
||||
'bg-gray-500'
|
||||
}`}></div>
|
||||
<div>
|
||||
<div className="text-white font-semibold">{aiLearningStatus.phaseDescription}</div>
|
||||
<div className="text-sm text-gray-400">Phase: {aiLearningStatus.phase.replace('_', ' ')}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-white">{aiLearningStatus.totalAnalyses}</div>
|
||||
<div className="text-xs text-gray-400">Total Analyses</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-white">{aiLearningStatus.totalTrades}</div>
|
||||
<div className="text-xs text-gray-400">Total Trades</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Performance Metrics */}
|
||||
<div className="space-y-4">
|
||||
<div className="grid grid-cols-2 gap-4">
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-green-400">{(aiLearningStatus.avgAccuracy * 100).toFixed(1)}%</div>
|
||||
<div className="text-xs text-gray-400">Avg Accuracy</div>
|
||||
</div>
|
||||
<div className="text-center">
|
||||
<div className="text-2xl font-bold text-blue-400">{(aiLearningStatus.winRate * 100).toFixed(1)}%</div>
|
||||
<div className="text-xs text-gray-400">Win Rate</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="text-center">
|
||||
<div className="text-lg font-bold text-white">{aiLearningStatus.confidenceLevel.toFixed(1)}%</div>
|
||||
<div className="text-xs text-gray-400">Confidence Level</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Strengths and Improvements */}
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6 mt-6">
|
||||
<div>
|
||||
<h3 className="text-green-400 font-semibold mb-2">Strengths</h3>
|
||||
<ul className="space-y-1">
|
||||
{aiLearningStatus.strengths.map((strength, idx) => (
|
||||
<li key={idx} className="text-sm text-gray-300">✓ {strength}</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
<div>
|
||||
<h3 className="text-yellow-400 font-semibold mb-2">Areas for Improvement</h3>
|
||||
<ul className="space-y-1">
|
||||
{aiLearningStatus.improvements.map((improvement, idx) => (
|
||||
<li key={idx} className="text-sm text-gray-300">• {improvement}</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Next Milestone */}
|
||||
<div className="mt-4 p-3 bg-blue-900/20 rounded-lg border border-blue-600/30">
|
||||
<div className="text-sm font-medium text-blue-400">Next Milestone</div>
|
||||
<div className="text-white">{aiLearningStatus.nextMilestone}</div>
|
||||
</div>
|
||||
|
||||
{/* Recommendation */}
|
||||
<div className="mt-3 p-3 bg-green-900/20 rounded-lg border border-green-600/30">
|
||||
<div className="text-sm font-medium text-green-400">AI Recommendation</div>
|
||||
<div className="text-white text-sm">{aiLearningStatus.recommendation}</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Learning Insights */}
|
||||
{learningInsights && (
|
||||
<div className="card card-gradient p-6">
|
||||
<h2 className="text-xl font-bold text-white mb-4">AI Learning Insights</h2>
|
||||
<div className="space-y-3">
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Total Analyses:</span>
|
||||
<span className="text-white font-semibold">{learningInsights.totalAnalyses}</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Avg Accuracy:</span>
|
||||
<span className="text-white font-semibold">{(learningInsights.avgAccuracy * 100).toFixed(1)}%</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Best Timeframe:</span>
|
||||
<span className="text-green-400 font-semibold">{learningInsights.bestTimeframe}</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Worst Timeframe:</span>
|
||||
<span className="text-red-400 font-semibold">{learningInsights.worstTimeframe}</span>
|
||||
</div>
|
||||
|
||||
<div className="mt-4">
|
||||
<h3 className="text-lg font-semibold text-white mb-2">Recommendations</h3>
|
||||
<ul className="space-y-1">
|
||||
{learningInsights.recommendations.map((rec, idx) => (
|
||||
<li key={idx} className="text-sm text-gray-300">• {rec}</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Right Column: Status & Performance */}
|
||||
{/* Status and Performance */}
|
||||
<div className="space-y-6">
|
||||
{/* Status Panel */}
|
||||
<div className="card card-gradient p-6">
|
||||
<h2 className="text-xl font-bold text-white mb-4">📊 Automation Status</h2>
|
||||
<h2 className="text-xl font-bold text-white mb-4">Status</h2>
|
||||
{status ? (
|
||||
<div className="space-y-3">
|
||||
<div className="flex items-center justify-between">
|
||||
@@ -469,19 +731,19 @@ export default function AutomationPage() {
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Win Rate:</span>
|
||||
<span className={`font-semibold ${
|
||||
calculateWinRate() > 60 ? 'text-green-400' :
|
||||
calculateWinRate() > 40 ? 'text-yellow-400' : 'text-red-400'
|
||||
getWinRate() > 60 ? 'text-green-400' :
|
||||
getWinRate() > 40 ? 'text-yellow-400' : 'text-red-400'
|
||||
}`}>
|
||||
{calculateWinRate()}%
|
||||
{getWinRate()}%
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Total P&L:</span>
|
||||
<span className={`font-semibold ${
|
||||
calculateTotalPnL() > 0 ? 'text-green-400' :
|
||||
calculateTotalPnL() < 0 ? 'text-red-400' : 'text-gray-300'
|
||||
getTotalPnL() > 0 ? 'text-green-400' :
|
||||
getTotalPnL() < 0 ? 'text-red-400' : 'text-gray-300'
|
||||
}`}>
|
||||
${calculateTotalPnL()}
|
||||
${getTotalPnL()}
|
||||
</span>
|
||||
</div>
|
||||
{status.lastAnalysis && (
|
||||
@@ -506,45 +768,77 @@ export default function AutomationPage() {
|
||||
|
||||
{/* Recent Trades */}
|
||||
<div className="card card-gradient p-6">
|
||||
<h2 className="text-xl font-bold text-white mb-4">Latest 4 Automated Trades (Debug: {recentTrades.length})</h2>
|
||||
<div className="flex items-center justify-between mb-4">
|
||||
<h2 className="text-xl font-bold text-white">
|
||||
Active & Latest Trades
|
||||
<span className="text-sm text-gray-400 ml-2">(Top 4)</span>
|
||||
</h2>
|
||||
<div className="flex items-center space-x-4 text-xs">
|
||||
<div className="flex items-center space-x-1">
|
||||
<div className="w-2 h-2 bg-blue-500 rounded-full animate-pulse"></div>
|
||||
<span className="text-blue-400">Active</span>
|
||||
</div>
|
||||
<div className="text-gray-400">
|
||||
Debug: {recentTrades.length} total trades
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{console.log('🎯 Rendering trades section, count:', recentTrades.length)}
|
||||
{recentTrades.length > 0 ? (
|
||||
<div className="space-y-4">
|
||||
<div className="text-green-400">✅ We have {recentTrades.length} trades to display</div>
|
||||
{recentTrades.slice(0, 4).map((trade, idx) => (
|
||||
{/* Sort trades to show active trades first, then latest completed trades */}
|
||||
{recentTrades
|
||||
.sort((a, b) => {
|
||||
// Active trades first
|
||||
if (a.isActive && !b.isActive) return -1
|
||||
if (!a.isActive && b.isActive) return 1
|
||||
// Then by creation date (most recent first)
|
||||
return new Date(b.createdAt) - new Date(a.createdAt)
|
||||
})
|
||||
.slice(0, 4)
|
||||
.map((trade, idx) => (
|
||||
<div
|
||||
key={trade?.id || idx}
|
||||
className="p-4 bg-gray-800 rounded-lg border border-gray-700"
|
||||
key={idx}
|
||||
className={`p-4 rounded-lg border cursor-pointer hover:bg-gray-750 transition-colors ${
|
||||
trade.isActive
|
||||
? 'bg-blue-900/30 border-blue-500/50 ring-2 ring-blue-500/20'
|
||||
: 'bg-gray-800 border-gray-700'
|
||||
}`}
|
||||
onClick={() => openTradeModal(trade.id)}
|
||||
>
|
||||
<div className="text-white mb-2">
|
||||
<strong>Trade #{idx + 1}:</strong> {trade?.side || 'UNKNOWN'} - ${trade?.amount?.toFixed(4) || 'N/A'} - {trade?.status || 'UNKNOWN'}
|
||||
</div>
|
||||
<div className="text-sm text-gray-300">
|
||||
Entry: ${trade?.entryPrice?.toFixed(2) || trade?.price?.toFixed(2) || '0.00'} |
|
||||
P&L: ${trade?.pnl || trade?.realizedPnl || '0.00'} |
|
||||
Result: {trade?.result || 'UNKNOWN'}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-gray-400">No recent trades</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
<span className="text-white font-semibold">{trade?.amount?.toFixed(4) || 'N/A'}</span>
|
||||
<span className="text-yellow-400 font-semibold">{trade?.leverage || 1}x</span>
|
||||
{/* Trade Header - Enhanced for active trades */}
|
||||
<div className="flex items-center justify-between mb-3">
|
||||
<div className="flex items-center space-x-2">
|
||||
{trade.isActive && (
|
||||
<div className="flex items-center space-x-1">
|
||||
<div className="w-2 h-2 bg-blue-500 rounded-full animate-pulse"></div>
|
||||
<span className="text-blue-400 text-xs font-semibold">LIVE</span>
|
||||
</div>
|
||||
)}
|
||||
<span className={`font-semibold px-2 py-1 rounded text-xs ${
|
||||
trade.side === 'BUY' ? 'bg-green-600 text-white' : 'bg-red-600 text-white'
|
||||
}`}>
|
||||
{trade.side}
|
||||
</span>
|
||||
<span className="text-white font-semibold">{trade.amount}</span>
|
||||
<span className="text-yellow-400 font-semibold">{trade.leverage}x</span>
|
||||
<span className={`px-2 py-1 rounded text-xs ${
|
||||
trade?.isActive ? 'bg-blue-600 text-white' :
|
||||
trade?.result === 'WIN' ? 'bg-green-600 text-white' :
|
||||
trade?.result === 'LOSS' ? 'bg-red-600 text-white' :
|
||||
trade.isActive ? 'bg-blue-600 text-white animate-pulse' :
|
||||
trade.result === 'WIN' ? 'bg-green-600 text-white' :
|
||||
trade.result === 'LOSS' ? 'bg-red-600 text-white' :
|
||||
'bg-gray-600 text-white'
|
||||
}`}>
|
||||
{trade?.isActive ? 'ACTIVE' : (trade?.result || 'UNKNOWN')}
|
||||
{trade.isActive ? 'ACTIVE' : trade.result}
|
||||
</span>
|
||||
</div>
|
||||
<div className="text-right">
|
||||
<div className="text-white font-semibold">${trade?.entryPrice?.toFixed(2) || trade?.price?.toFixed(2) || '0.00'}</div>
|
||||
<div className="text-sm text-gray-400">{trade?.confidence || 0}% confidence</div>
|
||||
<div className="text-white font-semibold">${trade.entryPrice?.toFixed(2) || trade.price?.toFixed(2) || '0.00'}</div>
|
||||
<div className="text-sm text-gray-400">{trade.confidence || 0}% confidence</div>
|
||||
{trade.isActive && (
|
||||
<div className="text-xs text-blue-400 font-semibold">
|
||||
Current: ${trade.currentPrice?.toFixed(2) || '0.00'}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -553,17 +847,17 @@ export default function AutomationPage() {
|
||||
<div className="grid grid-cols-2 gap-2 text-xs">
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Entry Time:</span>
|
||||
<span className="text-white">{trade?.entryTime ? new Date(trade.entryTime).toLocaleTimeString() : 'N/A'}</span>
|
||||
<span className="text-white">{new Date(trade.entryTime).toLocaleTimeString()}</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Exit Time:</span>
|
||||
<span className="text-white">
|
||||
{trade?.exitTime ? new Date(trade.exitTime).toLocaleTimeString() : 'Active'}
|
||||
{trade.exitTime ? new Date(trade.exitTime).toLocaleTimeString() : 'Active'}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between col-span-2">
|
||||
<span className="text-gray-300">Duration:</span>
|
||||
<span className="text-white font-semibold">{trade?.durationText || 'N/A'}</span>
|
||||
<span className="text-white font-semibold">{trade.durationText}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -571,93 +865,141 @@ export default function AutomationPage() {
|
||||
{/* Trading Details */}
|
||||
<div className="mb-3 p-3 bg-gray-900/30 rounded border border-gray-700">
|
||||
<div className="grid grid-cols-2 gap-2 text-xs">
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Trading Mode:</span>
|
||||
<span className={`font-semibold ${
|
||||
trade.tradingMode === 'LIVE' ? 'text-red-400' : 'text-blue-400'
|
||||
}`}>
|
||||
{trade.tradingMode || 'SIMULATION'}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Trading Amount:</span>
|
||||
<span className="text-white">${trade?.tradingAmount || 0}</span>
|
||||
<span className="text-white">
|
||||
{trade.realTradingAmount ? `$${trade.realTradingAmount}` : `$${trade.tradingAmount || '0'}`}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Leverage:</span>
|
||||
<span className="text-yellow-400">{trade?.leverage || 1}x</span>
|
||||
<span className="text-yellow-400">{trade.leverage || 1}x</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Position Size:</span>
|
||||
<span className="text-white">${trade?.positionSize || '0.00'}</span>
|
||||
<span className="text-white">{trade.amount?.toFixed(6) || '0.000000'} SOL</span>
|
||||
</div>
|
||||
{/* Entry Price - Always show for completed trades */}
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Entry Price:</span>
|
||||
<span className="text-white">${trade?.entryPrice?.toFixed(2) || trade?.price?.toFixed(2) || '0.00'}</span>
|
||||
<span className="text-white">${trade.entryPrice?.toFixed(2) || trade.price?.toFixed(2) || '0.00'}</span>
|
||||
</div>
|
||||
{/* Exit Price or Current Price */}
|
||||
{/* Current/Exit Price with real-time updates for active trades */}
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">{trade?.isActive ? 'Current' : 'Exit'} Price:</span>
|
||||
<span className="text-white">
|
||||
{trade?.isActive ?
|
||||
`$${trade?.currentPrice?.toFixed(2) || '0.00'}` :
|
||||
(trade?.exitPrice ?
|
||||
<span className="text-gray-300">{trade.isActive ? 'Current' : 'Exit'} Price:</span>
|
||||
<span className={`${trade.isActive ? 'text-blue-400 font-semibold' : 'text-white'}`}>
|
||||
{trade.isActive ?
|
||||
`$${trade.currentPrice?.toFixed(2) || '0.00'}` :
|
||||
(trade.exitPrice ?
|
||||
`$${trade.exitPrice.toFixed(2)}` :
|
||||
<span className="text-yellow-400">Not recorded</span>
|
||||
)
|
||||
}
|
||||
</span>
|
||||
</div>
|
||||
{/* Live Trade Transaction ID */}
|
||||
{trade.tradingMode === 'LIVE' && trade.driftTxId && (
|
||||
<div className="flex justify-between col-span-2 pt-1 border-t border-gray-700">
|
||||
<span className="text-gray-300">Transaction ID:</span>
|
||||
<span className="text-green-400 font-mono text-xs truncate max-w-24" title={trade.driftTxId}>
|
||||
{trade.driftTxId.slice(0, 8)}...{trade.driftTxId.slice(-8)}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
{/* Live Trade Fees */}
|
||||
{trade.tradingMode === 'LIVE' && trade.fees > 0 && (
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Fees Paid:</span>
|
||||
<span className="text-orange-400">${trade.fees?.toFixed(4) || '0.0000'}</span>
|
||||
</div>
|
||||
)}
|
||||
{/* Price difference for completed trades */}
|
||||
{!trade?.isActive && trade?.exitPrice && trade?.entryPrice && (
|
||||
{!trade.isActive && trade.exitPrice && trade.entryPrice && (
|
||||
<div className="flex justify-between col-span-2 pt-1 border-t border-gray-700">
|
||||
<span className="text-gray-300">Price Difference:</span>
|
||||
<span className={`font-medium ${
|
||||
(trade?.exitPrice - trade?.entryPrice) > 0 ? 'text-green-400' :
|
||||
(trade?.exitPrice - trade?.entryPrice) < 0 ? 'text-red-400' :
|
||||
(trade.exitPrice - trade.entryPrice) > 0 ? 'text-green-400' :
|
||||
(trade.exitPrice - trade.entryPrice) < 0 ? 'text-red-400' :
|
||||
'text-gray-400'
|
||||
}`}>
|
||||
${((trade?.exitPrice - trade?.entryPrice) >= 0 ? '+' : '')}${(trade?.exitPrice - trade?.entryPrice)?.toFixed(2) || '0.00'}
|
||||
${((trade.exitPrice - trade.entryPrice) >= 0 ? '+' : '')}${(trade.exitPrice - trade.entryPrice).toFixed(2)}
|
||||
</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* P&L Display */}
|
||||
<div className="mb-3 p-3 bg-gray-900/50 rounded border border-gray-600">
|
||||
{/* P&L Display - Enhanced for active trades */}
|
||||
<div className={`mb-3 p-3 rounded border ${
|
||||
trade.isActive
|
||||
? 'bg-blue-900/50 border-blue-600'
|
||||
: 'bg-gray-900/50 border-gray-600'
|
||||
}`}>
|
||||
<div className="flex justify-between items-center text-sm">
|
||||
<span className="text-gray-300">P&L:</span>
|
||||
<span className="text-gray-300">
|
||||
{trade.isActive ? 'Unrealized P&L:' : 'Realized P&L:'}
|
||||
</span>
|
||||
<div className="flex items-center space-x-2">
|
||||
<span className={`font-bold ${
|
||||
trade?.isActive ?
|
||||
(trade?.unrealizedPnl && parseFloat(trade.unrealizedPnl) > 0 ? 'text-green-400' : 'text-red-400') :
|
||||
(trade?.realizedPnl && parseFloat(trade.realizedPnl) > 0 ? 'text-green-400' :
|
||||
trade?.realizedPnl && parseFloat(trade.realizedPnl) < 0 ? 'text-red-400' : 'text-gray-400')
|
||||
trade.isActive ?
|
||||
(trade.unrealizedPnl && parseFloat(trade.unrealizedPnl) > 0 ? 'text-green-400' : 'text-red-400') :
|
||||
(trade.realizedPnl && parseFloat(trade.realizedPnl) > 0 ? 'text-green-400' :
|
||||
trade.realizedPnl && parseFloat(trade.realizedPnl) < 0 ? 'text-red-400' : 'text-gray-400')
|
||||
}`}>
|
||||
${trade?.isActive ?
|
||||
(trade?.unrealizedPnl || '0.00') :
|
||||
(trade?.realizedPnl || trade?.pnl || '0.00')
|
||||
${trade.isActive ?
|
||||
(trade.unrealizedPnl || '0.00') :
|
||||
(trade.realizedPnl || '0.00')
|
||||
}
|
||||
</span>
|
||||
{trade?.pnlPercent && (
|
||||
{trade.pnlPercent && (
|
||||
<span className={`text-xs ${
|
||||
trade?.isActive ?
|
||||
(trade?.unrealizedPnl && parseFloat(trade.unrealizedPnl) > 0 ? 'text-green-400' : 'text-red-400') :
|
||||
(trade?.realizedPnl && parseFloat(trade.realizedPnl) > 0 ? 'text-green-400' :
|
||||
trade?.realizedPnl && parseFloat(trade.realizedPnl) < 0 ? 'text-red-400' : 'text-gray-400')
|
||||
trade.isActive ?
|
||||
(trade.unrealizedPnl && parseFloat(trade.unrealizedPnl) > 0 ? 'text-green-400' : 'text-red-400') :
|
||||
(trade.realizedPnl && parseFloat(trade.realizedPnl) > 0 ? 'text-green-400' :
|
||||
trade.realizedPnl && parseFloat(trade.realizedPnl) < 0 ? 'text-red-400' : 'text-gray-400')
|
||||
}`}>
|
||||
({trade?.pnlPercent || '0%'})
|
||||
({trade.pnlPercent})
|
||||
</span>
|
||||
)}
|
||||
<span className="text-xs text-gray-400">
|
||||
{trade?.isActive ? '(Unrealized)' : '(Realized)'}
|
||||
<span className={`text-xs ${
|
||||
trade.isActive ? 'text-blue-400 font-semibold' : 'text-gray-400'
|
||||
}`}>
|
||||
{trade.isActive ? '⚡ Live' : '✓ Final'}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
{/* Additional active trade info */}
|
||||
{trade.isActive && trade.currentPrice && trade.entryPrice && (
|
||||
<div className="mt-2 pt-2 border-t border-blue-500/20">
|
||||
<div className="flex justify-between text-xs">
|
||||
<span className="text-gray-400">Price Change:</span>
|
||||
<span className={`font-semibold ${
|
||||
(trade.currentPrice - trade.entryPrice) > 0 ? 'text-green-400' : 'text-red-400'
|
||||
}`}>
|
||||
${((trade.currentPrice - trade.entryPrice) >= 0 ? '+' : '')}${(trade.currentPrice - trade.entryPrice).toFixed(2)}
|
||||
({(((trade.currentPrice - trade.entryPrice) / trade.entryPrice) * 100).toFixed(2)}%)
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
{/* Debug info for missing data */}
|
||||
{trade?.result === 'UNKNOWN' && (
|
||||
{trade.result === 'UNKNOWN' && (
|
||||
<div className="text-xs text-yellow-400 mt-1">
|
||||
⚠️ Missing exit data: {!trade?.exitPrice ? 'Exit Price ' : ''}{trade?.calculatedProfit === null ? 'Profit' : ''}
|
||||
⚠️ Missing exit data: {!trade.exitPrice ? 'Exit Price ' : ''}{trade.calculatedProfit === null ? 'Profit' : ''}
|
||||
</div>
|
||||
)}
|
||||
{/* Warning for old incorrect trades */}
|
||||
{trade?.isOldWrongTrade && (
|
||||
{trade.isOldWrongTrade && (
|
||||
<div className="text-xs text-orange-400 mt-1">
|
||||
🔧 Old trade with incorrect price data (stored: ${trade?.originalStoredPrice?.toFixed(2)}, should be ~$189)
|
||||
🔧 Old trade with incorrect price data (stored: ${trade.originalStoredPrice?.toFixed(2)}, should be ~$189)
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -665,46 +1007,19 @@ export default function AutomationPage() {
|
||||
{/* Click hint */}
|
||||
<div className="flex justify-between items-center text-xs border-t border-gray-700 pt-2">
|
||||
<div className="text-gray-400">
|
||||
SL: ${trade?.stopLoss || 'N/A'} | TP: ${trade?.takeProfit || 'N/A'}
|
||||
SL: ${trade.stopLoss} | TP: ${trade.takeProfit}
|
||||
</div>
|
||||
<div className="text-blue-400 hover:text-blue-300">
|
||||
📊 Click to view analysis
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Learning Insights */}
|
||||
{learningInsights && (
|
||||
<div className="card card-gradient p-6">
|
||||
<h2 className="text-xl font-bold text-white mb-4">💡 Learning Insights</h2>
|
||||
<div className="space-y-3">
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Total Analyses:</span>
|
||||
<span className="text-white font-semibold">{learningInsights.totalAnalyses}</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Avg Accuracy:</span>
|
||||
<span className="text-white font-semibold">{(learningInsights.avgAccuracy * 100).toFixed(1)}%</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Best Timeframe:</span>
|
||||
<span className="text-green-400 font-semibold">{learningInsights.bestTimeframe}</span>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
<span className="text-gray-300">Worst Timeframe:</span>
|
||||
<span className="text-red-400 font-semibold">{learningInsights.worstTimeframe}</span>
|
||||
</div>
|
||||
|
||||
<div className="mt-4">
|
||||
<h3 className="text-lg font-semibold text-white mb-2">Recommendations</h3>
|
||||
<ul className="space-y-1">
|
||||
{learningInsights.recommendations.map((rec, idx) => (
|
||||
<li key={idx} className="text-sm text-gray-300">• {rec}</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
) : (
|
||||
<p className="text-gray-400">No recent trades</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user