MetaMask
diff --git a/‎.github/scripts/known-feature-flag-constants.ts‎
Lines changed: 1 addition & 0 deletions b/‎.github/scripts/known-feature-flag-constants.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/components/UI/AssetOverview/Price/Price.advanced.test.tsx‎
Lines changed: 11 additions & 0 deletions b/‎app/components/UI/AssetOverview/Price/Price.advanced.test.tsx‎
Lines changed: 11 additions & 0 deletions
diff --git a/‎app/components/UI/AssetOverview/Price/Price.advanced.tsx‎
Lines changed: 59 additions & 3 deletions b/‎app/components/UI/AssetOverview/Price/Price.advanced.tsx‎
Lines changed: 59 additions & 3 deletions
diff --git a/‎app/components/UI/AssetOverview/Price/Price.test.tsx‎
Lines changed: 4 additions & 0 deletions b/‎app/components/UI/AssetOverview/Price/Price.test.tsx‎
Lines changed: 4 additions & 0 deletions
@@ -20,6 +20,7 @@ const FILE_SOURCES: Array<{ key: string; file: string; exportName: string }> = [
   { key: 'FULL_PAGE_ACCOUNT_LIST_FLAG_NAME', file: sel('fullPageAccountList'), exportName: 'FULL_PAGE_ACCOUNT_LIST_FLAG_NAME' },
   { key: 'IMPORT_SRP_WORD_SUGGESTION_FLAG_NAME', file: sel('importSrpWordSuggestion'), exportName: 'IMPORT_SRP_WORD_SUGGESTION_FLAG_NAME' },
   { key: 'ASSETS_UNIFY_STATE_FLAG', file: sel('assetsUnifyState'), exportName: 'ASSETS_UNIFY_STATE_FLAG' },
+  { key: 'TOKEN_DETAILS_OHLCV_WS_INTEGRATION_FLAG_KEY', file: sel('tokenDetailsOhlcvWsIntegration'), exportName: 'TOKEN_DETAILS_OHLCV_WS_INTEGRATION_FLAG_KEY' },
 ];
 
 function resolveConstantFromFile(filePath: string, constantName: string): string | undefined {
 
@@ -28,6 +28,13 @@ jest.mock('../PriceChart/PriceChart.context', () => ({
   }),
 }));
 
+jest.mock(
+  '../../../../selectors/featureFlagController/tokenDetailsOhlcvWsIntegration',
+  () => ({
+    selectTokenDetailsOhlcvWsEnabled: jest.fn(() => false),
+  }),
+);
+
 jest.mock('react-redux', () => {
   const actual = jest.requireActual('react-redux');
   return {
@@ -89,6 +96,10 @@ jest.mock('../../Charts/AdvancedChart/useOHLCVChart', () => ({
   useOHLCVChart: (...args: unknown[]) => mockUseOHLCVChart(...args),
 }));
 
+jest.mock('../../Charts/AdvancedChart/useOHLCVRealtime', () => ({
+  useOHLCVRealtime: () => ({ latestBar: null }),
+}));
+
 jest.mock('../../Charts/AdvancedChart/TimeRangeSelector', () => {
   // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
   const { View, Pressable, Text } = require('react-native');
 
@@ -36,6 +36,7 @@ import TimeRangeSelector, {
   type TimeRange,
 } from '../../Charts/AdvancedChart/TimeRangeSelector';
 import { useOHLCVChart } from '../../Charts/AdvancedChart/useOHLCVChart';
+import { useOHLCVRealtime } from '../../Charts/AdvancedChart/useOHLCVRealtime';
 import { OHLCVBar } from '../../Charts/AdvancedChart/OHLCVBar/OHLCVBar';
 import {
   Box,
@@ -62,9 +63,23 @@ import {
   TraceName,
   TraceOperation,
 } from '../../../../util/trace';
+import { selectTokenDetailsOhlcvWsEnabled } from '../../../../selectors/featureFlagController/tokenDetailsOhlcvWsIntegration';
 
 const EMPTY_INDICATORS: IndicatorType[] = [];
 
+/**
+ * Maps UI time-range selections to the WebSocket candle interval used by
+ * OHLCVService. These match the default intervals the REST OHLCV API returns
+ * for each timePeriod.
+ */
+const WS_INTERVAL_BY_TIME_RANGE: Record<TimeRange, string> = {
+  '1H': '1m',
+  '1D': '15m',
+  '1W': '1h',
+  '1M': '1d',
+  '1Y': '1d',
+};
+
 const TIME_RANGE_LABELS: Record<TimeRange, string> = {
   '1H': 'asset_overview.chart_time_period.1h',
   '1D': 'asset_overview.chart_time_period.1d',
@@ -134,6 +149,7 @@ const PriceAdvanced = ({
   const { trackEvent, createEventBuilder } = useAnalytics();
   const [timeRange, setTimeRange] = useState<TimeRange>('1D');
   const chartType = useSelector(selectTokenOverviewChartType);
+  const isOhlcvWsEnabled = useSelector(selectTokenDetailsOhlcvWsEnabled);
   const [crosshairData, setCrosshairData] = useState<CrosshairData | null>(
     null,
   );
@@ -293,6 +309,37 @@ const PriceAdvanced = ({
     vsCurrency: currentCurrency,
   });
 
+  const wsInterval = WS_INTERVAL_BY_TIME_RANGE[timeRange];
+  const wsEnabled =
+    isOhlcvWsEnabled &&
+    !chartLoading &&
+    ohlcvData.length >= CHART_DATA_THRESHOLD &&
+    !hasEmptyData &&
+    !chartError;
+
+  const { latestBar } = useOHLCVRealtime({
+    assetId,
+    interval: wsInterval,
+    currency: currentCurrency,
+    timePeriod: timeRange.toLowerCase(),
+    enabled: wsEnabled,
+  });
+
+  // TradingView Advanced Charts Bar.time expects milliseconds
+  // https://www.tradingview.com/charting-library-docs/latest/api/interfaces/Datafeed.Bar/
+  // OHLCVService delivers bars with `timestamp` in Unix seconds — multiply by 1000
+  const realtimeBar = useMemo(() => {
+    if (!wsEnabled || !latestBar) return undefined;
+    return {
+      time: latestBar.timestamp * 1000,
+      open: latestBar.open,
+      high: latestBar.high,
+      low: latestBar.low,
+      close: latestBar.close,
+      volume: latestBar.volume,
+    };
+  }, [wsEnabled, latestBar]);
+
   const ohlcvPagination = useMemo(
     () => ({
       nextCursor,
@@ -346,14 +393,22 @@ const PriceAdvanced = ({
 
   // Use last bar's close price for consistent percentage calculation with chart data
   const lastBarClose = ohlcvData[ohlcvData.length - 1]?.close;
-  const displayPrice = crosshairData?.close ?? lastBarClose ?? currentPrice;
+  const realtimeClose = wsEnabled ? latestBar?.close : undefined;
+  const displayPrice =
+    crosshairData?.close ?? realtimeClose ?? lastBarClose ?? currentPrice;
   const displayDiff = useMemo(() => {
     if (dynamicComparePrice === null) return null;
     return (
-      (crosshairData?.close ?? lastBarClose ?? currentPrice) -
+      (crosshairData?.close ?? realtimeClose ?? lastBarClose ?? currentPrice) -
       dynamicComparePrice
     );
-  }, [crosshairData, lastBarClose, currentPrice, dynamicComparePrice]);
+  }, [
+    crosshairData,
+    realtimeClose,
+    lastBarClose,
+    currentPrice,
+    dynamicComparePrice,
+  ]);
 
   const displayDate = crosshairData
     ? toDateFormat(crosshairData.time)
@@ -554,6 +609,7 @@ const PriceAdvanced = ({
           <AdvancedChart
             ohlcvData={ohlcvData}
             ohlcvSeriesKey={ohlcvSeriesKey}
+            realtimeBar={realtimeBar}
             height={CHART_HEIGHT}
             showVolume={chartType === ChartType.Candles}
             volumeOverlay
 
@@ -52,6 +52,10 @@ jest.mock('../../Charts/AdvancedChart/useOHLCVChart', () => ({
   useOHLCVChart: (...args: unknown[]) => mockUseOHLCVChart(...args),
 }));
 
+jest.mock('../../Charts/AdvancedChart/useOHLCVRealtime', () => ({
+  useOHLCVRealtime: () => ({ latestBar: null }),
+}));
+
 jest.mock('../PriceChart/PriceChart', () => {
   // eslint-disable-next-line @typescript-eslint/no-require-imports, @typescript-eslint/no-var-requires
   const { View } = require('react-native');