chore: sync with master

* chore: migrate antd ProgressBar to signoz ui component

* fix: homepage progress bar leaking section, resolve comments

* fix: remove stripe animation from progress bars in api monitoring section

* revert: accidental unrelated files

.github/CODEOWNERS

@@ -118,6 +118,9 @@ go.mod @therealpandey
 
 /tests/integration/ @therealpandey
 
+# e2e tests
+/tests/e2e/ @AshwinBhatkal
+
 # Flagger Owners
 
 /pkg/flagger/ @therealpandey
@@ -162,3 +165,7 @@ go.mod @therealpandey
 /frontend/src/lib/dashboard/ @SigNoz/pulse-frontend
 /frontend/src/lib/dashboardVariables/ @SigNoz/pulse-frontend
 /frontend/src/components/NewSelect/ @SigNoz/pulse-frontend
+
+## Dashboard V2
+/frontend/src/pages/DashboardPageV2/ @SigNoz/pulse-frontend
+/frontend/src/pages/DashboardsListPageV2/ @SigNoz/pulse-frontend

frontend/plugins/rules/no-antd-components.mjs

@@ -14,8 +14,11 @@
  */
 
 const BANNED_COMPONENTS = {
-	Typography: 'Use @signozhq/ui Typography instead of antd Typography.',
+	Typography:
+		'Use @signozhq/ui/typography Typography instead of antd Typography.',
+	Switch: 'Use @signozhq/ui/switch Switch instead of antd Switch.',
 	Badge: 'Use @signozhq/ui/badge instead of antd Badge.',
+	Progress: 'Use @signozhq/ui/progress instead of antd Progress.',
 };
 
 export default {

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.styles.scss

@@ -51,13 +51,6 @@
 				background: var(--l1-background);
 			}
 
-			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
-			}
-
 			.ant-table-tbody > tr:hover > td {
 				background: color-mix(in srgb, var(--l1-foreground) 4%, transparent);
 			}

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.tsx

@@ -9,13 +9,13 @@ import {
 	Flex,
 	Input,
 	InputRef,
-	Progress,
 	Space,
 	Spin,
 	TableColumnsType,
 	TableColumnType,
 	Tooltip,
 } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import type { FilterDropdownProps } from 'antd/lib/table/interface';
 import logEvent from 'api/common/logEvent';
@@ -59,7 +59,7 @@ function ProgressRender(item: string | number): JSX.Element {
 			<Progress
 				percent={percent}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const cpuPercent = percent;
 					if (cpuPercent >= 90) {

frontend/src/components/CustomTimePicker/TimezonePicker.tsx

@@ -6,7 +6,7 @@ import {
 	useState,
 } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';
 import { TimezonePickerShortcuts } from 'constants/shortcuts/TimezonePickerShortcuts';

frontend/src/components/ExplorerCard/SaveViewWithName.tsx

@@ -1,5 +1,6 @@
 import { useTranslation } from 'react-i18next';
-import { Card, Form, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Card, Form } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';

frontend/src/components/HeaderRightSection/ShareURLModal.tsx

@@ -4,7 +4,8 @@ import { useSelector } from 'react-redux';
 import { matchPath, useLocation } from 'react-router-dom';
 import { useCopyToClipboard } from 'react-use';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Switch } from 'antd';
+import { Button } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { QueryParams } from 'constants/query';
@@ -125,9 +126,8 @@ function ShareURLModal(): JSX.Element {
 								<Info size={14} color={Color.BG_AMBER_600} />
 							)}
 							<Switch
-								checked={enableAbsoluteTime}
+								value={enableAbsoluteTime}
 								disabled={!isValidateRelativeTime}
-								size="small"
 								onChange={(): void => {
 									setEnableAbsoluteTime((prev) => !prev);
 								}}

frontend/src/components/InputWithLabel/InputWithLabel.tsx

@@ -1,5 +1,6 @@
 import { useState } from 'react';
-import { Button, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
 import { X } from '@signozhq/icons';

frontend/src/components/LogsFormatOptionsMenu/LogsFormatOptionsMenu.tsx

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { Button, Input, InputNumber, Popover, Tooltip } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, InputNumber, Popover, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import type { DefaultOptionType } from 'antd/es/select';
 import cx from 'classnames';

frontend/src/components/QuickFilters/FilterRenderers/Checkbox/Checkbox.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable sonarjs/no-identical-functions */
 import { Fragment, useMemo, useState } from 'react';
-import { Button, Checkbox, Input, Skeleton } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Checkbox, Skeleton } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
 import { removeKeysFromExpression } from 'components/QueryBuilderV2/utils';

frontend/src/components/QuickFilters/QuickFilters.tsx

@@ -14,7 +14,8 @@ import {
 	ComboboxList,
 	ComboboxTrigger,
 } from '@signozhq/ui/combobox';
-import { Skeleton, Switch, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import getLocalStorageKey from 'api/browser/localstorage/get';
 import setLocalStorageKey from 'api/browser/localstorage/set';
@@ -281,9 +282,8 @@ export default function QuickFilters(props: IQuickFiltersProps): JSX.Element {
 				<div className="api-quick-filters-header">
 					<Typography.Text>Show IP addresses</Typography.Text>
 					<Switch
-						size="small"
 						style={{ marginLeft: 'auto' }}
-						checked={showIP ?? true}
+						value={showIP ?? true}
 						onChange={(checked): void => {
 							logEvent('API Monitoring: Show IP addresses clicked', {
 								showIP: checked,

frontend/src/components/QuickFilters/QuickFiltersSettings/QuickFiltersSettings.tsx

@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
-import { Button, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button } from 'antd';
 import { Check, TableColumnsSplit, X } from '@signozhq/icons';
 import { Filter as FilterType } from 'types/api/quickFilters/getCustomFilters';
 

frontend/src/components/ResizeTable/DynamicColumnTable.tsx

@@ -4,7 +4,8 @@ import type {
 	TableColumnsType as ColumnsType,
 	TableColumnType as ColumnType,
 } from 'antd';
-import { Button, Dropdown, Flex, MenuProps, Switch } from 'antd';
+import { Button, Dropdown, Flex, MenuProps } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import logEvent from 'api/common/logEvent';
 import LaunchChatSupport from 'components/LaunchChatSupport/LaunchChatSupport';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
@@ -60,9 +61,7 @@ function DynamicColumnTable({
 
 	const onToggleHandler =
 		(index: number, column: ColumnGroupType<any> | ColumnType<any>) =>
-		(checked: boolean, event: React.MouseEvent<HTMLButtonElement>): void => {
-			event.stopPropagation();
-
+		(checked: boolean): void => {
 			if (shouldSendAlertsLogEvent) {
 				logEvent('Alert: Column toggled', {
 					column: column?.title,
@@ -88,10 +87,14 @@ function DynamicColumnTable({
 	const items: MenuProps['items'] =
 		dynamicColumns?.map((column, index) => ({
 			label: (
-				<div className="dynamicColumnsTable-items">
+				<div
+					className="dynamicColumnsTable-items"
+					onClick={(e): void => e.stopPropagation()}
+					role="presentation"
+				>
 					<div>{column.title?.toString()}</div>
 					<Switch
-						checked={columnsData?.findIndex((c) => c.key === column.key) !== -1}
+						value={columnsData?.findIndex((c) => c.key === column.key) !== -1}
 						onChange={onToggleHandler(index, column)}
 					/>
 				</div>

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsCard.styles.scss

@@ -45,6 +45,10 @@
 	.contributors-row {
 		height: 80px;
 	}
+	.top-contributors-progress {
+		--progress-background: transparent;
+	}
+
 	&__content {
 		.ant-table {
 			&-cell {

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsRows.tsx

@@ -1,6 +1,7 @@
 import { HTMLAttributes } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Table, TableColumnsType as ColumnsType } from 'antd';
+import { Table, TableColumnsType as ColumnsType } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import logEvent from 'api/common/logEvent';
 import { ConditionalAlertPopover } from 'container/AlertHistory/AlertPopover/AlertPopover';
 import AlertLabels from 'pages/AlertDetails/AlertHeader/AlertLabels/AlertLabels';
@@ -51,8 +52,8 @@ function TopContributorsRows({
 					<Progress
 						percent={(count / totalCurrentTriggers) * 100}
 						showInfo={false}
-						trailColor="rgba(255, 255, 255, 0)"
 						strokeColor={Color.BG_ROBIN_500}
+						className="top-contributors-progress"
 					/>
 				</ConditionalAlertPopover>
 			),

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.styles.scss

@@ -141,12 +141,9 @@
 
 			.progress-container {
 				width: 158px;
-				.ant-progress {
-					margin: 0;
 
-					.ant-progress-text {
-						font-weight: 600;
-					}
+				span {
+					font-weight: 600;
 				}
 			}
 

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/TopErrors.tsx

@@ -1,7 +1,8 @@
 import { useMemo, useState } from 'react';
 import { QueryFunctionContext, useQueries, useQuery } from 'react-query';
-import { Spin, Switch, Table, Tooltip } from 'antd';
+import { Spin, Table, Tooltip } from 'antd';
 import { Info, Loader } from '@signozhq/icons';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { getQueryRangeV5 } from 'api/v5/queryRange/getQueryRange';
 import { MetricRangePayloadV5, ScalarData } from 'api/v5/v5';
@@ -170,11 +171,7 @@ function TopErrors({
 					/>
 				</div>
 				<div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
-					<Switch
-						checked={showStatusCodeErrors}
-						onChange={setShowStatusCodeErrors}
-						size="small"
-					/>
+					<Switch value={showStatusCodeErrors} onChange={setShowStatusCodeErrors} />
 					<span style={{ color: 'white', fontSize: '14px' }}>
 						Status Message Exists
 					</span>

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/DomainMetrics.tsx

@@ -1,7 +1,8 @@
 import { useMemo } from 'react';
 import { useQueries } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Skeleton, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import { ENTITY_VERSION_V5 } from 'constants/app';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
@@ -136,12 +137,11 @@ function DomainMetrics({
 							<Tooltip title={formattedDomainMetricsData.errorRate}>
 								{formattedDomainMetricsData.errorRate !== '-' ? (
 									<Progress
-										status="active"
 										percent={Number(
 											Number(formattedDomainMetricsData.errorRate).toFixed(2),
 										)}
 										strokeLinecap="butt"
-										size="small"
+										showInfo
 										strokeColor={((): string => {
 											const errorRatePercent = Number(
 												Number(formattedDomainMetricsData.errorRate).toFixed(2),

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/EndPointMetrics.tsx

@@ -1,7 +1,8 @@
 import { useMemo } from 'react';
 import { UseQueryResult } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Skeleton, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	getDisplayValue,
@@ -80,10 +81,9 @@ function EndPointMetrics({
 							<Tooltip title={metricsData?.errorRate}>
 								{metricsData?.errorRate !== '-' ? (
 									<Progress
-										status="active"
 										percent={Number(Number(metricsData?.errorRate ?? 0).toFixed(2))}
 										strokeLinecap="butt"
-										size="small"
+										showInfo
 										strokeColor={((): string => {
 											const errorRatePercent = Number(
 												Number(metricsData?.errorRate ?? 0).toFixed(2),

frontend/src/container/ApiMonitoring/utils.tsx

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
+import { TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuilderV2/utils';
 import {
 	FiltersType,
@@ -257,10 +258,9 @@ export const columnsConfig: ColumnType<APIDomainsRowData>[] = [
 				errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate;
 			return (
 				<Progress
-					status="active"
 					percent={Number((errorRateValue as number).toFixed(2))}
 					strokeLinecap="butt"
-					size="small"
+					showInfo
 					strokeColor={((): string => {
 						const errorRatePercent = Number((errorRateValue as number).toFixed(2));
 						if (errorRatePercent >= 90) {
@@ -1022,14 +1022,13 @@ export const getEndPointsColumnsConfig = (
 		className: `column`,
 		render: (errorRate: number | string): React.ReactNode => (
 			<Progress
-				status="active"
 				percent={Number(
 					(
 						(errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate) as number
 					).toFixed(1),
 				)}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const errorRatePercent = Number((errorRate as number).toFixed(1));
 					if (errorRatePercent >= 90) {
@@ -2514,10 +2513,9 @@ export const dependentServicesColumns: ColumnType<DependentServicesData>[] = [
 		render: (errorPercentage: number | string): React.ReactNode =>
 			errorPercentage !== '-' ? (
 				<Progress
-					status="active"
 					percent={Number((errorPercentage as number).toFixed(2))}
 					strokeLinecap="butt"
-					size="small"
+					showInfo
 					strokeColor={((): string => {
 						const errorPercentagePercent = Number(
 							(errorPercentage as number).toFixed(2),
@@ -3022,14 +3020,13 @@ export const getAllEndpointsWidgetData = (
 		),
 		F1: (errorRate: any): ReactNode => (
 			<Progress
-				status="active"
 				percent={Number(
 					(
 						(errorRate === 'n/a' || errorRate === '-' ? 0 : errorRate) as number
 					).toFixed(2),
 				)}
 				strokeLinecap="butt"
-				size="small"
+				showInfo
 				strokeColor={((): string => {
 					const errorRatePercent = Number(
 						(

frontend/src/container/CreateAlertV2/AlertCondition/ThresholdItem.tsx

@@ -1,5 +1,6 @@
 import { useMemo, useState } from 'react';
-import { Button, Input, Select, Tooltip } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Select, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { CircleX, Trash } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';

frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx

@@ -1,4 +1,5 @@
-import { Button, Flex, SelectProps, Switch } from 'antd';
+import { Button, Flex, SelectProps } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import type { BaseOptionType, DefaultOptionType } from 'antd/es/select';
 import { getInvolvedQueriesInTraceOperator } from 'components/QueryBuilderV2/QueryV2/TraceOperator/utils/utils';
@@ -419,8 +420,8 @@ export function RoutingPolicyBanner({
 			</Typography.Text>
 			<div className="routing-policies-info-banner-right">
 				<Switch
-					checked={notificationSettings.routingPolicies}
-					data-testid="routing-policies-switch"
+					value={notificationSettings.routingPolicies}
+					testId="routing-policies-switch"
 					onChange={(value): void => {
 						setNotificationSettings({
 							type: 'SET_ROUTING_POLICIES',

frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptionItem/AdvancedOptionItem.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useState } from 'react';
-import { Switch, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { Info } from '@signozhq/icons';
 
@@ -49,7 +50,7 @@ function AdvancedOptionItem({
 				>
 					{input}
 				</div>
-				<Switch onChange={handleOnToggle} checked={showInput} />
+				<Switch onChange={handleOnToggle} value={showInput} />
 			</div>
 		</div>
 	);

frontend/src/container/CreateAlertV2/EvaluationSettings/AdvancedOptions.tsx

@@ -1,4 +1,5 @@
-import { Collapse, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Collapse } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 
 import { useCreateAlertState } from '../context';

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationWindowPopover/EvaluationWindowDetails.tsx

@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
-import { Input, Select } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Select } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 
 import { ADVANCED_OPTIONS_TIME_UNIT_OPTIONS } from '../../context/constants';

frontend/src/container/CreateAlertV2/EvaluationSettings/TimeInput/TimeInput.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { Input } from 'antd';
-
+import { Input } from '@signozhq/ui/input';
 import './TimeInput.scss';
 
 export interface TimeInputProps {

frontend/src/container/CreateAlertV2/NotificationSettings/NotificationSettings.tsx

@@ -1,4 +1,5 @@
-import { Input, Select } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Select } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 
 import { useCreateAlertState } from '../context';

frontend/src/container/DashboardContainer/DashboardDescription/index.tsx

@@ -16,7 +16,8 @@ import {
 	Plus,
 	X,
 } from '@signozhq/icons';
-import { Button, Card, Input, Modal, Popover, Tag, Tooltip } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Card, Modal, Popover, Tag, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import ConfigureIcon from 'assets/Integrations/ConfigureIcon';

frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.tsx

@@ -5,7 +5,8 @@ import { useQuery } from 'react-query';
 import { useSelector } from 'react-redux';
 import { orange } from '@ant-design/colors';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Collapse, Input, Select, Switch, Tag } from 'antd';
+import { Button, Collapse, Input, Select, Tag } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import dashboardVariablesQuery from 'api/dashboard/variables/dashboardVariablesQuery';
 import cx from 'classnames';
@@ -763,7 +764,7 @@ function VariableItem({
 									</Typography>
 								</LabelContainer>
 								<Switch
-									checked={variableMultiSelect}
+									value={variableMultiSelect}
 									onChange={(e): void => {
 										setVariableMultiSelect(e);
 										if (!e) {
@@ -780,7 +781,7 @@ function VariableItem({
 										</Typography>
 									</LabelContainer>
 									<Switch
-										checked={variableShowALLOption}
+										value={variableShowALLOption}
 										onChange={(e): void => setVariableShowALLOption(e)}
 									/>
 								</VariableItemRow>

frontend/src/container/DashboardContainer/visualization/components/ChartManager/ChartManager.tsx

@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Button, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button } from 'antd';
 import { PrecisionOption, PrecisionOptionsEnum } from 'components/Graph/types';
 import { ResizeTable } from 'components/ResizeTable';
 import { useNotifications } from 'hooks/useNotifications';

frontend/src/container/ExplorerOptions/ExplorerOptions.tsx

@@ -19,11 +19,11 @@ import {
 	Info,
 } from '@signozhq/icons';
 import { Color } from '@signozhq/design-tokens';
+import { Input } from '@signozhq/ui/input';
 import {
 	Button,
 	ColorPicker,
 	Divider,
-	Input,
 	Modal,
 	RefSelectProps,
 	Select,

frontend/src/container/FormAlertChannels/Settings/Email.tsx

@@ -1,7 +1,7 @@
 import { Dispatch, SetStateAction } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Form, Input } from 'antd';
-
+import { Input } from '@signozhq/ui/input';
+import { Form } from 'antd';
 import { EmailChannel } from '../../CreateAlertChannels/config';
 
 function EmailForm({ setSelectedConfig }: EmailFormProps): JSX.Element {

frontend/src/container/FormAlertChannels/Settings/Webhook.tsx

@@ -1,6 +1,7 @@
 import { Dispatch, SetStateAction } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Form, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Form } from 'antd';
 import { MarkdownRenderer } from 'components/MarkdownRenderer/MarkdownRenderer';
 
 import { WebhookChannel } from '../../CreateAlertChannels/config';

frontend/src/container/FormAlertChannels/index.tsx

@@ -1,6 +1,8 @@
 import { Dispatch, ReactElement, SetStateAction } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Form, FormInstance, Input, Select, Switch } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Switch } from '@signozhq/ui/switch';
+import { Form, FormInstance, Select } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import type { Store } from 'antd/lib/form/interface';
 import ROUTES from 'constants/routes';
@@ -82,8 +84,8 @@ function FormAlertChannels({
 					name="send_resolved"
 				>
 					<Switch
-						defaultChecked={initialValue?.send_resolved}
-						data-testid="field-send-resolved-checkbox"
+						defaultValue={initialValue?.send_resolved}
+						testId="field-send-resolved-checkbox"
 						onChange={(value): void => {
 							setSelectedConfig((state) => ({
 								...state,

frontend/src/container/FormAlertRules/BasicInfo.tsx

@@ -2,7 +2,8 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from 'react-query';
 import { Plus } from '@signozhq/icons';
-import { Button, Flex, Form, Select, Switch, Tooltip } from 'antd';
+import { Button, Flex, Form, Select, Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import getAll from 'api/channels/getAll';
 import logEvent from 'api/common/logEvent';
 import { ALERTS_DATA_SOURCE_MAP } from 'constants/alerts';
@@ -198,10 +199,10 @@ function BasicInfo({
 						placement="right"
 					>
 						<Switch
-							checked={shouldBroadCastToAllChannels}
+							value={shouldBroadCastToAllChannels}
 							onChange={handleBroadcastToAllChannels}
 							disabled={noChannels || !!isLoading}
-							data-testid="alert-broadcast-to-all-channels"
+							testId="alert-broadcast-to-all-channels"
 						/>
 					</Tooltip>
 				</FormItemMedium>

frontend/src/container/GridCardLayout/GridCardLayout.tsx

@@ -6,7 +6,8 @@ import { useIsFetching } from 'react-query';
 import { useDispatch } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Form, Input, Modal } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Form, Modal } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';

frontend/src/container/Home/StepsProgress/StepsProgress.styles.scss

@@ -39,7 +39,5 @@
 
 	width: 100% !important;
 
-	.ant-progress-steps-outer {
-		width: 100% !important;
-	}
+	--progress-width: 100%;
 }

frontend/src/container/Home/StepsProgress/StepsProgress.tsx

@@ -1,4 +1,4 @@
-import { Progress } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 
 import { ChecklistItem } from '../HomeChecklist/HomeChecklist';
 
@@ -15,9 +15,7 @@ function StepsProgress({
 
 	const totalChecklistItems = checklistItems.length;
 
-	const progress = Math.round(
-		(completedChecklistItems.length / totalChecklistItems) * 100,
-	);
+	const progress = (completedChecklistItems.length / totalChecklistItems) * 100;
 
 	return (
 		<div className="steps-progress-container">

frontend/src/container/InfraMonitoringHosts/constants.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Tag } from 'antd';
+import { Tag } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	getHostLists,
@@ -79,8 +80,8 @@ export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 		render: (value): React.ReactNode => (
 			<Progress
 				percent={Number(Number(value).toFixed(1))}
-				size="small"
 				strokeColor={getProgressColor(Number(value))}
+				showInfo
 			/>
 		),
 	},
@@ -90,8 +91,8 @@ export const hostDetailsMetadataConfig: K8sDetailsMetadataConfig<HostData>[] = [
 		render: (value): React.ReactNode => (
 			<Progress
 				percent={Number(Number(value).toFixed(1))}
-				size="small"
 				strokeColor={getMemoryProgressColor(Number(value))}
+				showInfo
 			/>
 		),
 	},

frontend/src/container/InfraMonitoringHosts/table.module.scss

@@ -60,11 +60,6 @@
 	& > div {
 		width: 100%;
 	}
-
-	:global(.ant-progress-bg) {
-		height: 8px !important;
-		border-radius: 4px;
-	}
 }
 
 .progressBar {

frontend/src/container/InfraMonitoringK8s/EntityDetailsUtils/entityDetails.styles.scss

@@ -103,12 +103,8 @@
 			.progress-container {
 				width: 158px;
 
-				.ant-progress {
-					margin: 0;
-
-					.ant-progress-text {
-						font-weight: 600;
-					}
+				span {
+					font-weight: 600;
 				}
 			}
 
@@ -292,10 +288,6 @@
 			}
 
 			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
 			}
 
 			.ant-table-tbody > tr:hover > td {

frontend/src/container/InfraMonitoringK8s/components/EntityProgressBar.tsx

@@ -1,4 +1,4 @@
-import { Progress } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import TanStackTable from 'components/TanStackTableView';
 import {
 	getMemoryProgressColor,
@@ -53,7 +53,6 @@ export function EntityProgressBar({
 			<Progress
 				percent={percentage}
 				strokeLinecap="butt"
-				size="small"
 				status="normal"
 				strokeColor={getStrokeColor(type, value)}
 				className={styles.progressBar}

frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx

@@ -5,23 +5,23 @@ import { useCopyToClipboard } from 'react-use';
 import { Color } from '@signozhq/design-tokens';
 import { Badge } from '@signozhq/ui/badge';
 import { Button } from '@signozhq/ui/button';
+import { Input } from '@signozhq/ui/input';
 import {
 	Col,
 	Collapse,
 	DatePicker,
 	Form,
-	Input,
 	InputNumber,
 	Modal,
 	Row,
 	Select,
-	Switch,
 	Table,
 	TablePaginationConfig,
 	TableProps as AntDTableProps,
 	Tag,
 	Tooltip,
 } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import type { NotificationInstance } from 'antd/es/notification/interface';
 import type { CollapseProps } from 'antd/lib';
@@ -1180,8 +1180,7 @@ function MultiIngestionSettings(): JSX.Element {
 																					<div className="limit-enable-disable-toggle">
 																						<Form.Item name="enableDailyLimit">
 																							<Switch
-																								size="small"
-																								checked={activeSignal?.config?.day?.enabled}
+																								value={activeSignal?.config?.day?.enabled}
 																								onChange={(value): void => {
 																									setActiveSignal((prev) =>
 																										prev
@@ -1270,8 +1269,7 @@ function MultiIngestionSettings(): JSX.Element {
 																					<div className="limit-enable-disable-toggle">
 																						<Form.Item name="enableSecondLimit">
 																							<Switch
-																								size="small"
-																								checked={activeSignal?.config?.second?.enabled}
+																								value={activeSignal?.config?.second?.enabled}
 																								onChange={(value): void => {
 																									setActiveSignal((prev) =>
 																										prev

frontend/src/container/Integrations/CloudIntegration/AmazonWebServices/RegionForm/RenderConnectionParams.tsx

@@ -1,4 +1,5 @@
-import { Form, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Form } from 'antd';
 import { CloudintegrationtypesCredentialsDTO } from 'api/generated/services/sigNoz.schemas';
 
 function RenderConnectionFields({

frontend/src/container/Licenses/ApplyLicenseForm.tsx

@@ -1,6 +1,7 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Button, Form, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Form } from 'antd';
 import apply from 'api/v3/licenses/post';
 import { useNotifications } from 'hooks/useNotifications';
 import APIError from 'types/api/error';

frontend/src/container/ListOfDashboard/DashboardTemplates/DashboardTemplatesModal.tsx

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
 import { ChangeEvent, useState } from 'react';
-import { Button, Input, Modal } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Modal } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import ApacheIcon from 'assets/CustomIcons/ApacheIcon';
 import DockerIcon from 'assets/CustomIcons/DockerIcon';

frontend/src/container/ListOfDashboard/DashboardsList.tsx

@@ -12,20 +12,20 @@ import { useTranslation } from 'react-i18next';
 import { generatePath } from 'react-router-dom';
 import { useCopyToClipboard } from 'react-use';
 import { Color } from '@signozhq/design-tokens';
+import { Input } from '@signozhq/ui/input';
 import {
 	Button,
 	Dropdown,
 	Flex,
-	Input,
 	MenuProps,
 	Modal,
 	Popover,
 	Skeleton,
-	Switch,
 	Table,
 	Tag,
 	Tooltip,
 } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import type { TableProps } from 'antd/lib';
 import getLocalStorageKey from 'api/browser/localstorage/get';
@@ -965,8 +965,7 @@ function DashboardsList(): JSX.Element {
 							<div className="connection-line" />
 							<div className="right">
 								<Switch
-									size="small"
-									checked
+									value
 									disabled
 									onChange={(check): void =>
 										setVisibleColumns((prev) => ({
@@ -985,9 +984,8 @@ function DashboardsList(): JSX.Element {
 							<div className="connection-line" />
 							<div className="right">
 								<Switch
-									size="small"
 									disabled
-									checked
+									value
 									onChange={(check): void =>
 										setVisibleColumns((prev) => ({
 											...prev,
@@ -1005,8 +1003,7 @@ function DashboardsList(): JSX.Element {
 							<div className="connection-line" />
 							<div className="right">
 								<Switch
-									size="small"
-									checked={visibleColumns.updatedAt}
+									value={visibleColumns.updatedAt}
 									onChange={(check): void =>
 										setVisibleColumns((prev) => ({
 											...prev,
@@ -1024,8 +1021,7 @@ function DashboardsList(): JSX.Element {
 							<div className="connection-line" />
 							<div className="right">
 								<Switch
-									size="small"
-									checked={visibleColumns.updatedBy}
+									value={visibleColumns.updatedBy}
 									onChange={(check): void =>
 										setVisibleColumns((prev) => ({
 											...prev,

frontend/src/container/ListOfDashboard/RequestDashboardBtn.tsx

@@ -1,7 +1,8 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { LoaderCircle, Check } from '@signozhq/icons';
-import { Button, Input, Space } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Space } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { useNotifications } from 'hooks/useNotifications';

frontend/src/container/LiveLogs/LiveLogsContainer/index.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useLocation } from 'react-router-dom';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import LogsFormatOptionsMenu from 'components/LogsFormatOptionsMenu/LogsFormatOptionsMenu';
 import { MAX_LOGS_LIST_SIZE } from 'constants/liveTail';
@@ -228,9 +228,8 @@ function LiveLogsContainer({
 					<div className="live-logs-frequency-chart-view-controller">
 						<Typography>Frequency chart</Typography>
 						<Switch
-							size="small"
-							checked={showLiveLogsFrequencyChart}
-							defaultChecked
+							value={showLiveLogsFrequencyChart}
+							defaultValue
 							onChange={handleToggleFrequencyChart}
 						/>
 					</div>

frontend/src/container/LogDetailedView/JsonView.tsx

@@ -1,7 +1,7 @@
 import { useMemo, useState } from 'react';
 import MEditor, { EditorProps, Monaco } from '@monaco-editor/react';
 import { Color } from '@signozhq/design-tokens';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 
@@ -81,7 +81,7 @@ function JSONView({ logData }: JSONViewProps): JSX.Element {
 				<div className="log-switch">
 					<div className="wrap-word-switch">
 						<Typography.Text>Wrap text</Typography.Text>
-						<Switch checked={isWrapWord} onChange={handleWrapWord} size="small" />
+						<Switch value={isWrapWord} onChange={handleWrapWord} />
 					</div>
 				</div>
 			</div>

frontend/src/container/LogDetailedView/Overview.tsx

@@ -2,7 +2,9 @@ import { ReactNode, useState } from 'react';
 import MEditor, { EditorProps, Monaco } from '@monaco-editor/react';
 import { Color } from '@signozhq/design-tokens';
 import { Button } from '@signozhq/ui/button';
-import { Collapse, Divider, Input, Switch, Tag } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Switch } from '@signozhq/ui/switch';
+import { Collapse, Divider, Tag } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { AddToQueryHOCProps } from 'components/Logs/AddToQueryHOC';
 import { ChangeViewFunctionType } from 'container/ExplorerOptions/types';
@@ -136,7 +138,7 @@ function Overview({
 								<div className="log-switch">
 									<div className="wrap-word-switch">
 										<Typography.Text>Wrap text</Typography.Text>
-										<Switch checked={isWrapWord} onChange={handleWrapWord} size="small" />
+										<Switch value={isWrapWord} onChange={handleWrapWord} />
 									</div>
 								</div>
 							</div>

frontend/src/container/LogsExplorerViews/LogsActionsContainer.tsx

@@ -1,4 +1,4 @@
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import DownloadOptionsMenu from 'components/DownloadOptionsMenu/DownloadOptionsMenu';
 import LogsFormatOptionsMenu from 'components/LogsFormatOptionsMenu/LogsFormatOptionsMenu';
@@ -69,9 +69,8 @@ function LogsActionsContainer({
 						<div className="frequency-chart-view-controller">
 							<Typography>Frequency chart</Typography>
 							<Switch
-								size="small"
-								checked={showFrequencyChart}
-								defaultChecked
+								value={showFrequencyChart}
+								defaultValue
 								onChange={handleToggleFrequencyChart}
 							/>
 						</div>

frontend/src/container/LogsFilters/index.tsx

@@ -2,7 +2,8 @@ import { ChangeEvent, useCallback, useState } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
 import { CirclePlus, X } from '@signozhq/icons';
-import { Col, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Col } from 'antd';
 import CategoryHeading from 'components/Logs/CategoryHeading';
 import { fieldSearchFilter } from 'lib/logs/fieldSearch';
 import { AppState } from 'store/reducers';

frontend/src/container/LogsSearchFilter/SearchFields/QueryBuilder/QueryBuilder.tsx

@@ -2,7 +2,8 @@ import { useCallback, useMemo, useState } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
 import { SquareX, X } from '@signozhq/icons';
-import { Button, Input, Select } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Select } from 'antd';
 import CategoryHeading from 'components/Logs/CategoryHeading';
 import {
 	ConditionalOperators,

frontend/src/container/MetricsApplication/TopOperationsTable.tsx

@@ -5,11 +5,11 @@ import { useParams } from 'react-router-dom';
 import { Search } from '@signozhq/icons';
 import {
 	InputRef,
-	Switch,
 	TableColumnsType as ColumnsType,
 	TableColumnType as ColumnType,
 	Tooltip,
 } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import { ResizeTable } from 'components/ResizeTable';
 import TextToolTip from 'components/TextToolTip';
@@ -212,11 +212,7 @@ function TopOperationsTable({
 					/>
 				</div>
 				<div className="top-operation__entry-point">
-					<Switch
-						checked={isEntryPoint}
-						onChange={onEntryPointToggle}
-						size="small"
-					/>
+					<Switch value={isEntryPoint} onChange={onEntryPointToggle} />
 					<span className="top-operation__entry-point-label">Entrypoint Spans</span>
 					<TextToolTip
 						text={entryPointSpanInfo.text}

frontend/src/container/MetricsExplorer/Explorer/Explorer.tsx

@@ -2,7 +2,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useQueryClient } from 'react-query';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import * as Sentry from '@sentry/react';
-import { Switch, Tooltip } from 'antd';
+import { Tooltip } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import logEvent from 'api/common/logEvent';
 import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
 import WarningPopover from 'components/WarningPopover/WarningPopover';
@@ -358,10 +359,9 @@ function Explorer(): JSX.Element {
 							title={oneChartPerQueryDisabledTooltip}
 						>
 							<Switch
-								checked={showOneChartPerQuery}
+								value={showOneChartPerQuery}
 								onChange={handleToggleShowOneChartPerQuery}
 								disabled={disableOneChartPerQuery || splitedQueries.length <= 1}
-								size="small"
 							/>
 						</Tooltip>
 					</div>

frontend/src/container/MetricsExplorer/Inspect/GraphView.tsx

@@ -2,7 +2,8 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Skeleton, Switch } from 'antd';
+import { Button, Skeleton } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import Uplot from 'components/Uplot';
@@ -206,7 +207,7 @@ function GraphView({
 				</Button.Group>
 				<div className="view-toggle-button">
 					<Switch
-						checked={viewType === 'graph'}
+						value={viewType === 'graph'}
 						onChange={(checked): void => {
 							const newViewType = checked ? 'graph' : 'table';
 							setViewType(newViewType);

frontend/src/container/MetricsExplorer/Inspect/MetricTimeAggregation.tsx

@@ -1,6 +1,7 @@
-import { Input } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
-import { Select } from 'antd';
+// TODO(@signozhq/ui-input): migrate this <Input> once @signozhq/ui Input
+// supports the `onWheel` handler (used to blur on scroll for number inputs).
+import { Input, Select } from 'antd';
 import classNames from 'classnames';
 
 import { TIME_AGGREGATION_OPTIONS } from './constants';

frontend/src/container/MetricsExplorer/MetricDetails/Metadata.tsx

@@ -1,7 +1,8 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useQueryClient } from 'react-query';
 import type { TableColumnsType as ColumnsType } from 'antd';
-import { Button, Collapse, Input, Select, Spin } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Collapse, Select, Spin } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import {

frontend/src/container/MetricsExplorer/Summary/Summary.styles.scss

@@ -142,13 +142,6 @@
 				}
 			}
 
-			.progress-container {
-				.ant-progress-bg {
-					height: 8px !important;
-					border-radius: 4px;
-				}
-			}
-
 			.ant-table-tbody > tr:hover > td {
 				background: color-mix(in srgb, var(--l1-foreground) 4%, transparent);
 			}

frontend/src/container/MySettings/TimezoneAdaptation/TimezoneAdaptation.tsx

@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import logEvent from 'api/common/logEvent';
 import { Delete } from '@signozhq/icons';
 import { useTimezone } from 'providers/Timezone';
@@ -49,10 +49,10 @@ function TimezoneAdaptation(): JSX.Element {
 			<div className="timezone-adaption__header">
 				<h2 className="timezone-adaption__title">Adapt to my timezone</h2>
 				<Switch
-					checked={isAdaptationEnabled}
+					value={isAdaptationEnabled}
 					onChange={handleSwitchChange}
 					style={getSwitchStyles()}
-					data-testid="timezone-adaptation-switch"
+					testId="timezone-adaptation-switch"
 				/>
 			</div>
 

frontend/src/container/MySettings/index.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useState } from 'react';
 import { useMutation } from 'react-query';
-import { Radio, RadioChangeEvent, Switch, Tag } from 'antd';
+import { Radio, RadioChangeEvent, Tag } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import setLocalStorageApi from 'api/browser/localstorage/set';
 import logEvent from 'api/common/logEvent';
 import updateUserPreference from 'api/v1/user/preferences/name/update';
@@ -218,10 +219,10 @@ function MySettings(): JSX.Element {
 						<div className="user-preference-section-content-item-title-action">
 							Keep the primary sidebar always open{' '}
 							<Switch
-								checked={sideNavPinned}
+								value={sideNavPinned}
 								onChange={handleSideNavPinnedChange}
-								loading={isUpdatingUserPreference}
-								data-testid="side-nav-pinned-switch"
+								disabled={isUpdatingUserPreference}
+								testId="side-nav-pinned-switch"
 							/>
 						</div>
 

frontend/src/container/NewWidget/LeftContainer/ExplorerColumnsRenderer.tsx

@@ -7,7 +7,8 @@ import {
 	DropResult,
 } from 'react-beautiful-dnd';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Divider, Dropdown, Input, MenuProps, Tooltip } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Divider, Dropdown, MenuProps, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { FieldDataType } from 'api/v5/v5';
 import { SOMETHING_WENT_WRONG } from 'constants/api';

frontend/src/container/NewWidget/RightContainer/ContextLinks/UpdateContextLinks.tsx

@@ -1,5 +1,7 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Button, Col, Form, Input as AntInput, Input, Row } from 'antd';
+// TODO(@signozhq/ui-input): migrate <Input> once @signozhq/ui Input
+// supports the `spellCheck` prop on the URL input below.
+import { Button, Col, Form, Input, Input as AntInput, Row } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { CONTEXT_LINK_FIELDS } from 'container/NewWidget/RightContainer/ContextLinks/constants';
 import {

frontend/src/container/NewWidget/RightContainer/SettingSections/ChartAppearanceSection/ChartAppearanceSection.tsx

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	FillMode,
@@ -73,7 +73,7 @@ export default function ChartAppearanceSection({
 							Display individual data points on the chart
 						</Typography.Text>
 					</div>
-					<Switch size="small" checked={showPoints} onChange={setShowPoints} />
+					<Switch value={showPoints} onChange={setShowPoints} />
 				</section>
 			)}
 			{allowSpanGaps && (

frontend/src/container/NewWidget/RightContainer/SettingSections/HistogramBucketsSection/HistogramBucketsSection.tsx

@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
-import { InputNumber, Switch } from 'antd';
+import { InputNumber } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 
 import SettingsSection from '../../components/SettingsSection/SettingsSection';
@@ -61,8 +62,7 @@ export default function HistogramBucketsSection({
 						</span>
 					</Typography.Text>
 					<Switch
-						checked={combineHistogram}
-						size="small"
+						value={combineHistogram}
 						onChange={(checked): void => setCombineHistogram(checked)}
 					/>
 				</section>

frontend/src/container/NewWidget/RightContainer/SettingSections/VisualizationSettingsSection/VisualizationSettingsSection.tsx

@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction, useEffect, useState } from 'react';
-import { Select, Switch } from 'antd';
+import { Select } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 import { Typography } from '@signozhq/ui/typography';
 import TimePreference from 'components/TimePreferenceDropDown';
 import { PANEL_TYPES } from 'constants/queryBuilder';
@@ -104,8 +105,7 @@ export default function VisualizationSettingsSection({
 				<section className="stack-chart control-container">
 					<Typography.Text className="section-heading">Stack series</Typography.Text>
 					<Switch
-						checked={stackedBarChart}
-						size="small"
+						value={stackedBarChart}
 						onChange={(checked): void => setStackedBarChart(checked)}
 					/>
 				</section>
@@ -120,8 +120,7 @@ export default function VisualizationSettingsSection({
 						</Typography.Text>
 					</div>
 					<Switch
-						checked={isFillSpans}
-						size="small"
+						value={isFillSpans}
 						onChange={(checked): void => setIsFillSpans(checked)}
 					/>
 				</section>

frontend/src/container/NewWidget/__test__/NewWidget.test.tsx

@@ -341,10 +341,10 @@ describe('Stacking bar in new panel', () => {
 		const section = container.querySelector('.stack-chart');
 		expect(section).toBeInTheDocument();
 
-		// Verify switch is present and enabled (ant-switch-checked)
-		const switchBtn = section?.querySelector('.ant-switch');
+		// Verify switch is present and enabled
+		const switchBtn = section?.querySelector('[role="switch"]');
 		expect(switchBtn).toBeInTheDocument();
-		expect(switchBtn).toHaveClass('ant-switch-checked');
+		expect(switchBtn).toHaveAttribute('data-state', 'checked');
 
 		// Check that stack series is present and checked
 		checkStackSeriesState(container, true);

frontend/src/container/OnboardingContainer/Steps/DataSource/DataSource.tsx

@@ -1,7 +1,8 @@
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Blocks, Check, LoaderCircle } from '@signozhq/icons';
-import { Button, Card, Form, Input, Select, Space } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Card, Form, Select, Space } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';

frontend/src/container/OnboardingContainer/Steps/EnvironmentDetails/EnvironmentDetails.tsx

@@ -1,7 +1,8 @@
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Check, Server, LoaderCircle } from '@signozhq/icons';
-import { Button, Card, Form, Input, Space } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Card, Form, Space } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';

frontend/src/container/OrganizationSettings/AuthDomain/__tests__/AuthDomain.test.tsx

@@ -58,6 +58,26 @@ describe('AuthDomain', () => {
 			});
 		});
 
+		it('reflects ssoEnabled state from nested config in each row toggle', async () => {
+			server.use(
+				rest.get(AUTH_DOMAINS_LIST_ENDPOINT, (_, res, ctx) =>
+					res(ctx.status(200), ctx.json(mockDomainsListResponse)),
+				),
+			);
+
+			render(<AuthDomain />);
+
+			// mockDomainsListResponse rows:
+			//   [0] signoz.io   → config.ssoEnabled: true
+			//   [1] example.com → config.ssoEnabled: false
+			//   [2] corp.io     → config.ssoEnabled: true
+			const switches = await screen.findAllByRole('switch');
+			expect(switches).toHaveLength(3);
+			expect(switches[0]).toBeChecked();
+			expect(switches[1]).not.toBeChecked();
+			expect(switches[2]).toBeChecked();
+		});
+
 		it('renders empty state when no domains exist', async () => {
 			server.use(
 				rest.get(AUTH_DOMAINS_LIST_ENDPOINT, (_, res, ctx) =>

frontend/src/container/OrganizationSettings/AuthDomain/index.tsx

@@ -121,14 +121,14 @@ function AuthDomain(): JSX.Element {
 			},
 			{
 				title: 'Enforce SSO',
-				dataIndex: 'ssoEnabled',
+				dataIndex: ['config', 'ssoEnabled'],
 				key: 'ssoEnabled',
 				width: 80,
 				render: (
 					value: boolean,
 					record: AuthtypesGettableAuthDomainDTO,
 				): JSX.Element => (
-					<SSOEnforcementToggle isDefaultChecked={value} record={record} />
+					<SSOEnforcementToggle isDefaultChecked={!!value} record={record} />
 				),
 			},
 			{

frontend/src/container/OrganizationSettings/InviteTeamMembers/index.tsx

@@ -1,6 +1,7 @@
 import { useTranslation } from 'react-i18next';
 import { Plus, Trash2 } from '@signozhq/icons';
-import { Button, Form, FormInstance, Input, Select, Space } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Form, FormInstance, Select, Space } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { requireErrorMessage } from 'utils/form/requireErrorMessage';
 

frontend/src/container/PaginatedTraceFlamegraph/PaginatedTraceFlamegraph.styles.scss

@@ -87,12 +87,7 @@
 
 					.service-progress-indicator {
 						width: fit-content;
-						margin-inline-end: 0px !important;
-						margin-bottom: 0px !important;
-
-						.ant-progress-inner {
-							width: 30px;
-						}
+						--progress-width: 30px;
 					}
 
 					.percent-value {

frontend/src/container/PaginatedTraceFlamegraph/PaginatedTraceFlamegraph.tsx

@@ -1,6 +1,7 @@
 import { useEffect, useMemo, useState } from 'react';
 import { useParams } from 'react-router-dom';
-import { Progress, Skeleton, Tooltip } from 'antd';
+import { Skeleton, Tooltip } from 'antd';
+import { Progress } from '@signozhq/ui/progress';
 import { Typography } from '@signozhq/ui/typography';
 import { AxiosError } from 'axios';
 import Spinner from 'components/Spinner';

frontend/src/container/PipelinePage/PipelineListsView/AddNewPipeline/FormFields/NameInput.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next';
-import { Form, Input } from 'antd';
-
+import { Input } from '@signozhq/ui/input';
+import { Form } from 'antd';
 import { ProcessorFormField } from '../../AddNewProcessor/config';
 import { formValidationRules } from '../../config';
 

frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/CSVInput.tsx

@@ -1,4 +1,6 @@
 import { ChangeEventHandler, useState } from 'react';
+// TODO(@signozhq/ui-input): migrate to @signozhq/ui Input once the antd
+// `InputProps` spread (`size`, etc.) is no longer needed on this wrapper.
 import { Input, InputProps } from 'antd';
 
 function CSVInput({ value, onChange, ...otherProps }: InputProps): JSX.Element {

frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/FormFields/JsonFlattening.tsx

@@ -1,6 +1,8 @@
 import { useEffect, useState } from 'react';
 import { Info } from '@signozhq/icons';
-import { Flex, Form, Input, Space, Switch, Tooltip } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Switch } from '@signozhq/ui/switch';
+import { Flex, Form, Space, Tooltip } from 'antd';
 import { ProcessorData } from 'types/api/pipeline/def';
 
 import { PREDEFINED_MAPPING } from '../config';
@@ -58,11 +60,7 @@ function JsonFlattening({
 				initialValue={isAdd ? true : selectedProcessorData?.enable_paths}
 			>
 				<Space>
-					<Switch
-						size="small"
-						checked={enablePaths}
-						onChange={handleEnablePathsChange}
-					/>
+					<Switch value={enablePaths} onChange={handleEnablePathsChange} />
 					Enable Paths
 				</Space>
 			</Form.Item>
@@ -79,11 +77,7 @@ function JsonFlattening({
 
 			<Form.Item className="json-flattening-form__item">
 				<Space>
-					<Switch
-						size="small"
-						checked={enableMapping}
-						onChange={handleEnableMappingChange}
-					/>
+					<Switch value={enableMapping} onChange={handleEnableMappingChange} />
 					<Flex gap="8px" align="center">
 						Enable Mapping
 						<Tooltip title="The order of filled keys will determine the priority of keys i.e. earlier keys have higher precedence">

frontend/src/container/PipelinePage/PipelineListsView/AddNewProcessor/ProcessorForm.tsx

@@ -1,5 +1,7 @@
 import { useTranslation } from 'react-i18next';
-import { Form, Input, Select, Space, Switch } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Switch } from '@signozhq/ui/switch';
+import { Form, Select, Space } from 'antd';
 import { ModalFooterTitle } from 'container/PipelinePage/styles';
 import { ProcessorData } from 'types/api/pipeline/def';
 
@@ -92,8 +94,7 @@ function ProcessorFieldInput({
 					>
 						<Space>
 							<Switch
-								size="small"
-								checked={form.getFieldValue('enable_flattening')}
+								value={form.getFieldValue('enable_flattening')}
 								onChange={(checked: boolean): void => {
 									form.setFieldValue('enable_flattening', checked);
 								}}

frontend/src/container/PipelinePage/PipelineListsView/TableComponents/DragAction.tsx

@@ -1,5 +1,5 @@
 import { GripVertical } from '@signozhq/icons';
-import { Switch } from 'antd';
+import { Switch } from '@signozhq/ui/switch';
 
 import { holdIconStyle } from '../config';
 import { LastActionColumn } from '../styles';
@@ -7,7 +7,7 @@ import { LastActionColumn } from '../styles';
 function DragAction({ isEnabled, onChange }: DragActionProps): JSX.Element {
 	return (
 		<LastActionColumn>
-			<Switch defaultChecked={isEnabled} onChange={onChange} />
+			<Switch defaultValue={isEnabled} onChange={onChange} />
 			<GripVertical size="lg" style={holdIconStyle} />
 		</LastActionColumn>
 	);

frontend/src/container/PipelinePage/tests/PipelineListsView.test.tsx

@@ -191,7 +191,7 @@ describe('PipelinePage container test', () => {
 		await fireEvent.click(expandIcon[0]);
 
 		const switchToggle = document.querySelector(
-			'.ant-table-expanded-row .ant-switch',
+			'.ant-table-expanded-row [role="switch"]',
 		);
 
 		expect(switchToggle).toBeChecked();
@@ -244,7 +244,7 @@ describe('PipelinePage container test', () => {
 		const addNewPipelineBtn = getByText('add_new_pipeline');
 		expect(addNewPipelineBtn).toBeInTheDocument();
 
-		const switchToggle = document.querySelectorAll('.ant-switch');
+		const switchToggle = document.querySelectorAll('[role="switch"]');
 
 		expect(switchToggle[0]).not.toBeChecked();
 		await fireEvent.click(switchToggle[0] as HTMLElement);

frontend/src/container/PipelinePage/tests/__snapshots__/DragAction.test.tsx.snap

@@ -21,26 +21,25 @@ exports[`PipelinePage container test should render DragAction section 1`] = `
 <div
     class="c0"
   >
-    <button
-      aria-checked="true"
-      class="ant-switch css-dev-only-do-not-override-2i2tap ant-switch-checked"
-      role="switch"
-      type="button"
+    <div
+      class="_switch-wrapper_jbsv7_1"
     >
-      <div
-        class="ant-switch-handle"
-      />
-      <span
-        class="ant-switch-inner"
+      <button
+        aria-checked="true"
+        class="_switch_jbsv7_1"
+        data-color="robin"
+        data-state="checked"
+        id=":r0:"
+        role="switch"
+        type="button"
+        value="on"
       >
         <span
-          class="ant-switch-inner-checked"
+          class="_switch__thumb_jbsv7_59"
+          data-state="checked"
         />
-        <span
-          class="ant-switch-inner-unchecked"
-        />
-      </span>
-    </button>
+      </button>
+    </div>
     <svg
       style="font-size: 1rem; cursor: move;"
     />

frontend/src/container/PlannedDowntime/PlannedDowntime.tsx

@@ -2,7 +2,8 @@ import React, { ChangeEvent, useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Plus, Search } from '@signozhq/icons';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Flex, Form, Input, Tooltip } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Flex, Form, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import {
 	useDeleteDowntimeScheduleByID,

frontend/src/container/QueryTable/Drilldown/BreakoutOptions.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useMemo, useState } from 'react';
 import { useQuery } from 'react-query';
-import { Input, Skeleton } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Skeleton } from 'antd';
 import { getKeySuggestions } from 'api/querySuggestions/getKeySuggestions';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import { QUERY_BUILDER_KEY_TYPES } from 'constants/antlrQueryConstants';

frontend/src/container/RoutingPolicies/RoutingPolicies.tsx

@@ -1,7 +1,8 @@
 import { ChangeEvent, useMemo } from 'react';
 import { Plus, Search } from '@signozhq/icons';
 import { Color } from '@signozhq/design-tokens';
-import { Button, Flex, Input, Tooltip } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Flex, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { useAppContext } from 'providers/App/App';
 import { USER_ROLES } from 'types/roles';

frontend/src/container/SpanDetailsDrawer/Attributes/Attributes.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useState } from 'react';
-import { Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
 import { Typography } from '@signozhq/ui/typography';
 import cx from 'classnames';
 import CopyClipboardHOC from 'components/Logs/CopyClipboardHOC';

frontend/src/container/SpanDetailsDrawer/Events/Events.tsx

@@ -1,5 +1,6 @@
 import { useState } from 'react';
-import { Collapse, Input, Modal } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Collapse, Modal } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { getYAxisFormattedValue } from 'components/Graph/yAxisConfig';
 import { Diamond } from '@signozhq/icons';

frontend/src/container/SpanDetailsDrawer/SpanDetailsDrawer.tsx

@@ -9,10 +9,10 @@ import {
 	useState,
 } from 'react';
 import { useMutation, useQuery } from 'react-query';
+import { Input } from '@signozhq/ui/input';
 import {
 	Button,
 	Checkbox,
-	Input,
 	Modal,
 	Select,
 	Skeleton,

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.edge-cases.test.tsx

@@ -0,0 +1,258 @@
+import {
+	act,
+	fireEvent,
+	render,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+import { queryClient, TestWrapper } from './testUtils';
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: ({
+		onSelect,
+	}: {
+		onSelect: (value: string) => void;
+	}): JSX.Element => (
+		<div data-testid="custom-time-picker">
+			<button
+				type="button"
+				data-testid="select-15m"
+				onClick={(): void => onSelect('15m')}
+			>
+				15m
+			</button>
+			<button
+				type="button"
+				data-testid="select-1h"
+				onClick={(): void => onSelect('1h')}
+			>
+				1h
+			</button>
+			<button
+				type="button"
+				data-testid="select-6h"
+				onClick={(): void => onSelect('6h')}
+			>
+				6h
+			</button>
+			<button
+				type="button"
+				data-testid="select-custom"
+				onClick={(): void => onSelect('custom')}
+			>
+				Custom
+			</button>
+		</div>
+	),
+}));
+
+describe('DateTimeSelectionV2 - Edge Cases', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	describe('Fresh Params at Navigation Time (Core Fix)', () => {
+		it('should read params at navigation time, not render time', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams="relativeTime=30m"
+					onUrlUpdate={(event): void => {
+						currentSearchParams = event.searchParams;
+					}}
+				>
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&externalParam=addedLater',
+			);
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-1h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=1h');
+			expect(navigatedUrl).toContain('externalParam=addedLater');
+		});
+
+		it('should preserve multiple externally added params', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&yAxisUnit=bytes&groupBy=host&view=table',
+			);
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-6h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=6h');
+			expect(navigatedUrl).toContain('yAxisUnit=bytes');
+			expect(navigatedUrl).toContain('groupBy=host');
+			expect(navigatedUrl).toContain('view=table');
+		});
+	});
+
+	describe('Empty and Special Values', () => {
+		it('should handle empty URL params gracefully', async () => {
+			currentSearchParams = new URLSearchParams('');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-15m'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=15m');
+		});
+
+		it('should handle special characters in preserved params', async () => {
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&filter=name%3D%22test%22',
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&filter=name%3D%22test%22">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-1h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=1h');
+			expect(navigatedUrl).toContain('filter=');
+		});
+
+		it('should not navigate when selecting custom (opens picker instead)', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-custom'));
+			});
+
+			await new Promise((resolve) => setTimeout(resolve, 100));
+
+			const customNavigationCalls = mockSafeNavigate.mock.calls.filter((call) => {
+				const url = call[0] as string;
+				return url.includes('startTime=') || url.includes('endTime=');
+			});
+
+			expect(customNavigationCalls).toHaveLength(0);
+		});
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.modal-mode.test.tsx

@@ -0,0 +1,180 @@
+import {
+	act,
+	fireEvent,
+	render,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+import { queryClient, TestWrapper } from './testUtils';
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+let mockOnCustomDateHandler: ((range: [unknown, unknown]) => void) | null =
+	null;
+let mockOnValidCustomDateChange: ((data: { timeStr: string }) => void) | null =
+	null;
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: ({
+		onSelect,
+		onCustomDateHandler,
+		onValidCustomDateChange,
+	}: {
+		onSelect: (value: string) => void;
+		onCustomDateHandler?: (range: [unknown, unknown]) => void;
+		onValidCustomDateChange?: (data: { timeStr: string }) => void;
+	}): JSX.Element => {
+		mockOnCustomDateHandler = onCustomDateHandler || null;
+		mockOnValidCustomDateChange = onValidCustomDateChange || null;
+
+		return (
+			<div data-testid="custom-time-picker">
+				<button
+					type="button"
+					data-testid="select-1h"
+					onClick={(): void => onSelect('1h')}
+				>
+					1h
+				</button>
+			</div>
+		);
+	},
+}));
+
+describe('DateTimeSelectionV2 - Modal Mode', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+		mockOnCustomDateHandler = null;
+		mockOnValidCustomDateChange = null;
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	it('should call onTimeChange instead of navigating for relative time', async () => {
+		currentSearchParams = new URLSearchParams('relativeTime=30m');
+		__setSearchParamsGetterForTest(() => currentSearchParams);
+
+		const mockOnTimeChange = jest.fn();
+
+		render(
+			<TestWrapper initialSearchParams="relativeTime=30m">
+				<DateTimeSelection
+					showAutoRefresh
+					isModalTimeSelection
+					onTimeChange={mockOnTimeChange}
+				/>
+			</TestWrapper>,
+		);
+
+		await waitFor(() => {
+			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+		});
+
+		mockSafeNavigate.mockClear();
+
+		act(() => {
+			fireEvent.click(screen.getByTestId('select-1h'));
+		});
+
+		await waitFor(() => {
+			expect(mockOnTimeChange).toHaveBeenCalledWith('1h');
+		});
+
+		expect(mockSafeNavigate).not.toHaveBeenCalled();
+	});
+
+	it('should call onTimeChange with custom and timestamps for custom date', async () => {
+		currentSearchParams = new URLSearchParams('relativeTime=30m');
+		__setSearchParamsGetterForTest(() => currentSearchParams);
+
+		const mockOnTimeChange = jest.fn();
+
+		render(
+			<TestWrapper initialSearchParams="relativeTime=30m">
+				<DateTimeSelection
+					showAutoRefresh
+					isModalTimeSelection
+					onTimeChange={mockOnTimeChange}
+				/>
+			</TestWrapper>,
+		);
+
+		await waitFor(() => {
+			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+		});
+
+		const startMoment = { toDate: (): Date => new Date(1700000000000) };
+		const endMoment = { toDate: (): Date => new Date(1700003600000) };
+
+		mockSafeNavigate.mockClear();
+
+		act(() => {
+			mockOnCustomDateHandler?.([startMoment, endMoment]);
+		});
+
+		await waitFor(() => {
+			expect(mockOnTimeChange).toHaveBeenCalledWith(
+				'custom',
+				[1700000000000, 1700003600000],
+			);
+		});
+
+		expect(mockSafeNavigate).not.toHaveBeenCalled();
+	});
+
+	it('should call onTimeChange for valid custom date string in modal', async () => {
+		currentSearchParams = new URLSearchParams('relativeTime=30m');
+		__setSearchParamsGetterForTest(() => currentSearchParams);
+
+		const mockOnTimeChange = jest.fn();
+
+		render(
+			<TestWrapper initialSearchParams="relativeTime=30m">
+				<DateTimeSelection
+					showAutoRefresh
+					isModalTimeSelection
+					onTimeChange={mockOnTimeChange}
+				/>
+			</TestWrapper>,
+		);
+
+		await waitFor(() => {
+			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+		});
+
+		mockSafeNavigate.mockClear();
+
+		act(() => {
+			mockOnValidCustomDateChange?.({ timeStr: '4h' });
+		});
+
+		await waitFor(() => {
+			expect(mockOnTimeChange).toHaveBeenCalledWith('4h');
+		});
+
+		expect(mockSafeNavigate).not.toHaveBeenCalled();
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.regression.test.tsx

@@ -0,0 +1,207 @@
+// eslint-disable-next-line no-restricted-imports
+import { Provider } from 'react-redux';
+import { MemoryRouter, Route } from 'react-router-dom';
+import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import {
+	act,
+	fireEvent,
+	render,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+import { parseAsString, useQueryState } from 'nuqs';
+import { AppContext } from 'providers/App/App';
+import TimezoneProvider from 'providers/Timezone';
+import { QueryBuilderProvider } from 'providers/QueryBuilder';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import store from 'store';
+import { getAppContextMock } from 'tests/test-utils';
+import { CompatRouter } from 'react-router-dom-v5-compat';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+
+const queryClient = new QueryClient({
+	defaultOptions: {
+		queries: { refetchOnWindowFocus: false, retry: false },
+		mutations: { retry: false },
+	},
+});
+
+const mockStore = configureStore([thunk]);
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: ({
+		onSelect,
+	}: {
+		onSelect: (value: string) => void;
+	}): JSX.Element => (
+		<div data-testid="custom-time-picker">
+			<button
+				type="button"
+				data-testid="select-1h"
+				onClick={(): void => onSelect('1h')}
+			>
+				1h
+			</button>
+		</div>
+	),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+function NuqsParamSetter({ paramValue }: { paramValue: string }): JSX.Element {
+	const [, setYAxisUnit] = useQueryState(
+		'yAxisUnit',
+		parseAsString.withDefault(''),
+	);
+
+	return (
+		<button
+			type="button"
+			data-testid="set-nuqs-param"
+			onClick={(): void => {
+				setYAxisUnit(paramValue);
+			}}
+		>
+			Set yAxisUnit
+		</button>
+	);
+}
+
+interface WrapperProps {
+	children: React.ReactNode;
+	initialSearchParams?: string;
+	initialPath?: string;
+	onUrlUpdate?: (event: { searchParams: URLSearchParams }) => void;
+}
+
+function TestWrapper({
+	children,
+	initialSearchParams = '',
+	initialPath = '/services',
+	onUrlUpdate,
+}: WrapperProps): JSX.Element {
+	const initialEntry = initialSearchParams
+		? `${initialPath}?${initialSearchParams}`
+		: initialPath;
+
+	const mockedStore = mockStore({
+		...store.getState(),
+		app: {
+			...store.getState().app,
+			role: 'ADMIN',
+			user: {
+				userId: 'test-user-id',
+				email: 'test@signoz.io',
+				name: 'TestUser',
+				profilePictureURL: '',
+				accessJwt: '',
+				refreshJwt: '',
+			},
+			isLoggedIn: true,
+		},
+	});
+
+	return (
+		<MemoryRouter initialEntries={[initialEntry]}>
+			<CompatRouter>
+				<NuqsTestingAdapter
+					searchParams={initialSearchParams}
+					onUrlUpdate={onUrlUpdate}
+				>
+					<QueryClientProvider client={queryClient}>
+						<Provider store={mockedStore}>
+							<AppContext.Provider value={getAppContextMock('ADMIN')}>
+								<TimezoneProvider>
+									<QueryBuilderProvider>
+										<Route path="*">{children}</Route>
+									</QueryBuilderProvider>
+								</TimezoneProvider>
+							</AppContext.Provider>
+						</Provider>
+					</QueryClientProvider>
+				</NuqsTestingAdapter>
+			</CompatRouter>
+		</MemoryRouter>
+	);
+}
+
+describe('REGRESSION: DateTimeSelectionV2 preserves nuqs query params on time change', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+
+		// Initialize with test's initial search params
+		currentSearchParams = new URLSearchParams('relativeTime=30m');
+		__setSearchParamsGetterForTest(() => currentSearchParams);
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	it('should preserve yAxisUnit param set via nuqs when changing time selection', async () => {
+		render(
+			<TestWrapper
+				initialSearchParams="relativeTime=30m"
+				onUrlUpdate={(event): void => {
+					// Sync nuqs URL updates to our mock getter
+					// This simulates how window.location.search would be updated in real browser
+					currentSearchParams = event.searchParams;
+				}}
+			>
+				<NuqsParamSetter paramValue="bytes" />
+				<DateTimeSelection showAutoRefresh />
+			</TestWrapper>,
+		);
+
+		await waitFor(() => {
+			expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+		});
+
+		act(() => {
+			fireEvent.click(screen.getByTestId('set-nuqs-param'));
+		});
+
+		await waitFor(() => {
+			expect(currentSearchParams.get('yAxisUnit')).toBe('bytes');
+		});
+
+		mockSafeNavigate.mockClear();
+
+		act(() => {
+			fireEvent.click(screen.getByTestId('select-1h'));
+		});
+
+		await waitFor(() => {
+			expect(mockSafeNavigate).toHaveBeenCalled();
+		});
+
+		const navigatedUrl = mockSafeNavigate.mock.calls[
+			mockSafeNavigate.mock.calls.length - 1
+		][0] as string;
+
+		expect(navigatedUrl).toContain('relativeTime=1h');
+		expect(navigatedUrl).toContain('yAxisUnit=bytes');
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.routes.test.tsx

@@ -0,0 +1,133 @@
+import { render, screen, waitFor } from '@testing-library/react';
+import ROUTES from 'constants/routes';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+import { queryClient, TestWrapper } from './testUtils';
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: (): JSX.Element => <div data-testid="custom-time-picker" />,
+}));
+
+describe('DateTimeSelectionV2 - Route-Specific Behavior', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	describe('Alert Pages', () => {
+		it('should set default time for alert overview when no time params', async () => {
+			currentSearchParams = new URLSearchParams('otherParam=value');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams="otherParam=value"
+					initialPath={ROUTES.ALERT_OVERVIEW}
+				>
+					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[0][0] as string;
+			expect(navigatedUrl).toContain('relativeTime=6h');
+			expect(navigatedUrl).toContain('otherParam=value');
+		});
+
+		it('should set default time for alert history when no time params', async () => {
+			currentSearchParams = new URLSearchParams('filter=active');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams="filter=active"
+					initialPath={ROUTES.ALERT_HISTORY}
+				>
+					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[0][0] as string;
+			expect(navigatedUrl).toContain('relativeTime=6h');
+		});
+
+		it('should NOT override existing time params on alert pages', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=1h&filter=active');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams="relativeTime=1h&filter=active"
+					initialPath={ROUTES.ALERT_OVERVIEW}
+				>
+					<DateTimeSelection showAutoRefresh defaultRelativeTime="6h" />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			const calls = mockSafeNavigate.mock.calls;
+			if (calls.length > 0) {
+				const lastUrl = calls[calls.length - 1][0] as string;
+				expect(lastUrl).toContain('relativeTime=1h');
+			}
+		});
+	});
+
+	describe('disableUrlSync Behavior', () => {
+		it('should not sync URL on mount when disableUrlSync is true', async () => {
+			currentSearchParams = new URLSearchParams('');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="" initialPath="/services">
+					<DateTimeSelection showAutoRefresh disableUrlSync />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			const syncCalls = mockSafeNavigate.mock.calls.filter((call) => {
+				const url = call[0] as string;
+				return url.includes('relativeTime=') && !url.includes('services?');
+			});
+
+			expect(syncCalls).toHaveLength(0);
+		});
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/DateTimeSelectionV2.time-selection.test.tsx

@@ -0,0 +1,353 @@
+import {
+	act,
+	fireEvent,
+	render,
+	screen,
+	waitFor,
+} from '@testing-library/react';
+
+import DateTimeSelection from '../index';
+import {
+	__resetSearchParamsGetter,
+	__setSearchParamsGetterForTest,
+} from '../utils/getUnstableCurrentSearchParams';
+import { queryClient, TestWrapper, createMockMoment } from './testUtils';
+
+const mockSafeNavigate = jest.fn();
+jest.mock('hooks/useSafeNavigate', () => ({
+	useSafeNavigate: (): { safeNavigate: jest.Mock } => ({
+		safeNavigate: mockSafeNavigate,
+	}),
+}));
+
+jest.mock('container/NewExplorerCTA', () => ({
+	__esModule: true,
+	default: (): null => null,
+}));
+
+let mockOnCustomDateHandler: ((range: [unknown, unknown]) => void) | null =
+	null;
+let mockOnValidCustomDateChange: ((data: { timeStr: string }) => void) | null =
+	null;
+
+jest.mock('components/CustomTimePicker/CustomTimePicker', () => ({
+	__esModule: true,
+	default: ({
+		onSelect,
+		onCustomDateHandler,
+		onValidCustomDateChange,
+	}: {
+		onSelect: (value: string) => void;
+		onCustomDateHandler?: (range: [unknown, unknown]) => void;
+		onValidCustomDateChange?: (data: { timeStr: string }) => void;
+	}): JSX.Element => {
+		mockOnCustomDateHandler = onCustomDateHandler || null;
+		mockOnValidCustomDateChange = onValidCustomDateChange || null;
+
+		return (
+			<div data-testid="custom-time-picker">
+				<button
+					type="button"
+					data-testid="select-15m"
+					onClick={(): void => onSelect('15m')}
+				>
+					15m
+				</button>
+				<button
+					type="button"
+					data-testid="select-1h"
+					onClick={(): void => onSelect('1h')}
+				>
+					1h
+				</button>
+				<button
+					type="button"
+					data-testid="select-6h"
+					onClick={(): void => onSelect('6h')}
+				>
+					6h
+				</button>
+			</div>
+		);
+	},
+}));
+
+describe('DateTimeSelectionV2 - Time Selection', () => {
+	let currentSearchParams: URLSearchParams;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		mockSafeNavigate.mockClear();
+		queryClient.clear();
+		mockOnCustomDateHandler = null;
+		mockOnValidCustomDateChange = null;
+	});
+
+	afterEach(() => {
+		__resetSearchParamsGetter();
+	});
+
+	describe('Relative Time', () => {
+		it('should update relativeTime and remove startTime/endTime', async () => {
+			currentSearchParams = new URLSearchParams(
+				'startTime=1000&endTime=2000&otherParam=keep',
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="startTime=1000&endTime=2000&otherParam=keep">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-15m'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=15m');
+			expect(navigatedUrl).not.toContain('startTime=');
+			expect(navigatedUrl).not.toContain('endTime=');
+			expect(navigatedUrl).toContain('otherParam=keep');
+		});
+
+		it('should remove activeLogId param on time change', async () => {
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&activeLogId=log123',
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&activeLogId=log123">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-1h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=1h');
+			expect(navigatedUrl).not.toContain('activeLogId');
+		});
+
+		it('should update compositeQuery with new ID when present', async () => {
+			const compositeQuery = encodeURIComponent(
+				JSON.stringify({ id: 'old-id', builder: { queryData: [] } }),
+			);
+			currentSearchParams = new URLSearchParams(
+				`relativeTime=30m&compositeQuery=${compositeQuery}`,
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams={`relativeTime=30m&compositeQuery=${compositeQuery}`}
+				>
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-6h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('compositeQuery=');
+			expect(navigatedUrl).not.toContain('old-id');
+		});
+
+		it('should preserve all non-time URL params', async () => {
+			currentSearchParams = new URLSearchParams(
+				'relativeTime=30m&param1=a&param2=b&param3=c',
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&param1=a&param2=b&param3=c">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				fireEvent.click(screen.getByTestId('select-1h'));
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=1h');
+			expect(navigatedUrl).toContain('param1=a');
+			expect(navigatedUrl).toContain('param2=b');
+			expect(navigatedUrl).toContain('param3=c');
+		});
+	});
+
+	describe('Custom Date Range', () => {
+		it('should set startTime/endTime and remove relativeTime', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m&keepThis=yes');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&keepThis=yes">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			const startMoment = createMockMoment(1700000000000);
+			const endMoment = createMockMoment(1700003600000);
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				mockOnCustomDateHandler?.([startMoment, endMoment]);
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('startTime=1700000000000');
+			expect(navigatedUrl).toContain('endTime=1700003600000');
+			expect(navigatedUrl).not.toContain('relativeTime=');
+			expect(navigatedUrl).toContain('keepThis=yes');
+		});
+
+		it('should update compositeQuery when present for custom date', async () => {
+			const compositeQuery = encodeURIComponent(
+				JSON.stringify({ id: 'old-id', builder: { queryData: [] } }),
+			);
+			currentSearchParams = new URLSearchParams(
+				`relativeTime=30m&compositeQuery=${compositeQuery}`,
+			);
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper
+					initialSearchParams={`relativeTime=30m&compositeQuery=${compositeQuery}`}
+				>
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			const startMoment = createMockMoment(1700000000000);
+			const endMoment = createMockMoment(1700003600000);
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				mockOnCustomDateHandler?.([startMoment, endMoment]);
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('compositeQuery=');
+			expect(navigatedUrl).not.toContain('old-id');
+		});
+	});
+
+	describe('Valid Custom Date String', () => {
+		it('should handle shorthand date format and preserve params', async () => {
+			currentSearchParams = new URLSearchParams('relativeTime=30m&filter=active');
+			__setSearchParamsGetterForTest(() => currentSearchParams);
+
+			render(
+				<TestWrapper initialSearchParams="relativeTime=30m&filter=active">
+					<DateTimeSelection showAutoRefresh />
+				</TestWrapper>,
+			);
+
+			await waitFor(() => {
+				expect(screen.getByTestId('custom-time-picker')).toBeInTheDocument();
+			});
+
+			mockSafeNavigate.mockClear();
+
+			act(() => {
+				mockOnValidCustomDateChange?.({ timeStr: '2h' });
+			});
+
+			await waitFor(() => {
+				expect(mockSafeNavigate).toHaveBeenCalled();
+			});
+
+			const navigatedUrl = mockSafeNavigate.mock.calls[
+				mockSafeNavigate.mock.calls.length - 1
+			][0] as string;
+
+			expect(navigatedUrl).toContain('relativeTime=2h');
+			expect(navigatedUrl).toContain('filter=active');
+			expect(navigatedUrl).not.toContain('startTime=');
+			expect(navigatedUrl).not.toContain('endTime=');
+		});
+	});
+});

frontend/src/container/TopNav/DateTimeSelectionV2/__tests__/testUtils.tsx

@@ -0,0 +1,95 @@
+// eslint-disable-next-line no-restricted-imports
+import { Provider } from 'react-redux';
+import { MemoryRouter, Route } from 'react-router-dom';
+import { NuqsTestingAdapter } from 'nuqs/adapters/testing';
+import { QueryClient, QueryClientProvider } from 'react-query';
+import { AppContext } from 'providers/App/App';
+import TimezoneProvider from 'providers/Timezone';
+import { QueryBuilderProvider } from 'providers/QueryBuilder';
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import store from 'store';
+import { getAppContextMock } from 'tests/test-utils';
+import { CompatRouter } from 'react-router-dom-v5-compat';
+
+export const queryClient = new QueryClient({
+	defaultOptions: {
+		queries: { refetchOnWindowFocus: false, retry: false },
+		mutations: { retry: false },
+	},
+});
+
+export const mockStore = configureStore([thunk]);
+
+interface WrapperProps {
+	children: React.ReactNode;
+	initialSearchParams?: string;
+	initialPath?: string;
+	onUrlUpdate?: (event: { searchParams: URLSearchParams }) => void;
+}
+
+export function TestWrapper({
+	children,
+	initialSearchParams = '',
+	initialPath = '/services',
+	onUrlUpdate,
+}: WrapperProps): JSX.Element {
+	const initialEntry = initialSearchParams
+		? `${initialPath}?${initialSearchParams}`
+		: initialPath;
+
+	const mockedStore = mockStore({
+		...store.getState(),
+		app: {
+			...store.getState().app,
+			role: 'ADMIN',
+			user: {
+				userId: 'test-user-id',
+				email: 'test@signoz.io',
+				name: 'TestUser',
+				profilePictureURL: '',
+				accessJwt: '',
+				refreshJwt: '',
+			},
+			isLoggedIn: true,
+		},
+	});
+
+	return (
+		<MemoryRouter initialEntries={[initialEntry]}>
+			<CompatRouter>
+				<NuqsTestingAdapter
+					searchParams={initialSearchParams}
+					onUrlUpdate={onUrlUpdate}
+				>
+					<QueryClientProvider client={queryClient}>
+						<Provider store={mockedStore}>
+							<AppContext.Provider value={getAppContextMock('ADMIN')}>
+								<TimezoneProvider>
+									<QueryBuilderProvider>
+										<Route path="*">{children}</Route>
+									</QueryBuilderProvider>
+								</TimezoneProvider>
+							</AppContext.Provider>
+						</Provider>
+					</QueryClientProvider>
+				</NuqsTestingAdapter>
+			</CompatRouter>
+		</MemoryRouter>
+	);
+}
+
+export function createMockMoment(timestamp: number): {
+	toDate: () => Date;
+	toISOString: () => string;
+	format: () => string;
+	toString: () => string;
+} {
+	const date = new Date(timestamp);
+	return {
+		toDate: (): Date => date,
+		toISOString: (): string => date.toISOString(),
+		format: (): string => date.toISOString(),
+		toString: (): string => date.toString(),
+	};
+}

frontend/src/container/TopNav/DateTimeSelectionV2/index.tsx

@@ -2,7 +2,7 @@ import { useCallback, useEffect, useState } from 'react';
 // eslint-disable-next-line no-restricted-imports
 import { connect, useDispatch, useSelector } from 'react-redux';
 import { RouteComponentProps, withRouter } from 'react-router-dom';
-import { useNavigationType, useSearchParams } from 'react-router-dom-v5-compat';
+import { useNavigationType } from 'react-router-dom-v5-compat';
 import { RefreshCw, Undo } from '@signozhq/icons';
 import { Button } from 'antd';
 import getLocalStorageKey from 'api/browser/localstorage/get';
@@ -20,7 +20,6 @@ import {
 } from 'store/globalTime';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
-import useUrlQuery from 'hooks/useUrlQuery';
 import { isValidShortHandDateTimeFormat } from 'lib/getMinMax';
 import getTimeString from 'lib/getTimeString';
 import { cloneDeep, isObject } from 'lodash-es';
@@ -54,6 +53,7 @@ import {
 	Time,
 	TimeRange,
 } from './types';
+import { getUnstableCurrentSearchParams } from './utils/getUnstableCurrentSearchParams';
 
 import './DateTimeSelectionV2.styles.scss';
 
@@ -90,10 +90,12 @@ function DateTimeSelection({
 	const [hasSelectedTimeError, setHasSelectedTimeError] = useState(false);
 	const [isOpen, setIsOpen] = useState<boolean>(false);
 
-	const urlQuery = useUrlQuery();
-	const searchStartTime = urlQuery.get('startTime');
-	const searchEndTime = urlQuery.get('endTime');
-	const relativeTimeFromUrl = urlQuery.get(QueryParams.relativeTime);
+	const currentSearchParams = getUnstableCurrentSearchParams();
+	const searchStartTime = currentSearchParams.get(QueryParams.startTime);
+	const searchEndTime = currentSearchParams.get(QueryParams.endTime);
+	const relativeTimeFromUrl = currentSearchParams.get(QueryParams.relativeTime);
+	const hasTimeParamsInUrl =
+		(searchStartTime && searchEndTime) || relativeTimeFromUrl;
 
 	// Prioritize props for initial modal time, fallback to URL params
 	let initialModalStartTime = 0;
@@ -115,8 +117,6 @@ function DateTimeSelection({
 	);
 	const [modalEndTime, setModalEndTime] = useState<number>(initialModalEndTime);
 
-	const [searchParams] = useSearchParams();
-
 	// Effect to update modal time state when props change
 	useEffect(() => {
 		if (modalInitialStartTime !== undefined) {
@@ -323,14 +323,15 @@ function DateTimeSelection({
 				return;
 			}
 
-			urlQuery.delete('startTime');
-			urlQuery.delete('endTime');
+			const urlQuery = getUnstableCurrentSearchParams();
+			urlQuery.delete(QueryParams.startTime);
+			urlQuery.delete(QueryParams.endTime);
 
 			urlQuery.set(QueryParams.relativeTime, value);
 			// Remove Hidden Filters from URL query parameters on time change
 			urlQuery.delete(QueryParams.activeLogId);
 
-			if (searchParams.has(QueryParams.compositeQuery)) {
+			if (urlQuery.has(QueryParams.compositeQuery)) {
 				const updatedCompositeQuery = getUpdatedCompositeQuery();
 				urlQuery.set(QueryParams.compositeQuery, updatedCompositeQuery);
 			}
@@ -349,8 +350,6 @@ function DateTimeSelection({
 			getUpdatedCompositeQuery,
 			updateLocalStorageForRoutes,
 			updateTimeInterval,
-			urlQuery,
-			searchParams,
 		],
 	);
 
@@ -414,6 +413,7 @@ function DateTimeSelection({
 
 				updateLocalStorageForRoutes(JSON.stringify({ startTime, endTime }));
 
+				const urlQuery = getUnstableCurrentSearchParams();
 				urlQuery.set(
 					QueryParams.startTime,
 					startTime?.toDate().getTime().toString(),
@@ -421,7 +421,7 @@ function DateTimeSelection({
 				urlQuery.set(QueryParams.endTime, endTime?.toDate().getTime().toString());
 				urlQuery.delete(QueryParams.relativeTime);
 
-				if (searchParams.has(QueryParams.compositeQuery)) {
+				if (urlQuery.has(QueryParams.compositeQuery)) {
 					const updatedCompositeQuery = getUpdatedCompositeQuery();
 					urlQuery.set(QueryParams.compositeQuery, updatedCompositeQuery);
 				}
@@ -441,8 +441,9 @@ function DateTimeSelection({
 		updateTimeInterval(dateTimeStr);
 		updateLocalStorageForRoutes(dateTimeStr);
 
-		urlQuery.delete('startTime');
-		urlQuery.delete('endTime');
+		const urlQuery = getUnstableCurrentSearchParams();
+		urlQuery.delete(QueryParams.startTime);
+		urlQuery.delete(QueryParams.endTime);
 
 		urlQuery.set(QueryParams.relativeTime, dateTimeStr);
 
@@ -595,13 +596,12 @@ function DateTimeSelection({
 
 		// set the default relative time for alert history and overview pages if relative time is not specified
 		if (
-			(!urlQuery.has(QueryParams.startTime) ||
-				!urlQuery.has(QueryParams.endTime)) &&
-			!urlQuery.has(QueryParams.relativeTime) &&
+			!hasTimeParamsInUrl &&
 			(currentRoute === ROUTES.ALERT_OVERVIEW ||
 				currentRoute === ROUTES.ALERT_HISTORY)
 		) {
 			updateTimeInterval(defaultRelativeTime);
+			const urlQuery = getUnstableCurrentSearchParams();
 			urlQuery.set(QueryParams.relativeTime, defaultRelativeTime);
 			const generatedUrl = `${location.pathname}?${urlQuery.toString()}`;
 			safeNavigate(generatedUrl);
@@ -625,9 +625,10 @@ function DateTimeSelection({
 			updateTimeInterval(updatedTime, [preStartTime, preEndTime]);
 		}
 
+		const urlQuery = getUnstableCurrentSearchParams();
 		if (updatedTime !== 'custom') {
-			urlQuery.delete('startTime');
-			urlQuery.delete('endTime');
+			urlQuery.delete(QueryParams.startTime);
+			urlQuery.delete(QueryParams.endTime);
 			urlQuery.set(QueryParams.relativeTime, updatedTime);
 		} else {
 			const startTime = preStartTime.toString();

frontend/src/container/TopNav/DateTimeSelectionV2/utils/getUnstableCurrentSearchParams.ts

@@ -0,0 +1,34 @@
+/**
+ * This was introduced to fix a sync bug between Nuqs and react-router-dom
+ *
+ * We are using the wrong adapter for nuqs because the correct one only supports v6/v7,
+ * and we are at version v5. This causes the nuqs/react-router-dom to be out of sync.
+ *
+ * We can revert this commit once we migrate react-router-dom to v6, or once we migrate
+ * to DateTimeSelectionV3
+ */
+
+/**
+ * This was created to help testing the regression introduced between nuqs/react-router-dom
+ */
+type SearchParamsGetter = () => URLSearchParams;
+let getter: SearchParamsGetter = (): URLSearchParams =>
+	new URLSearchParams(window.location.search);
+
+/**
+ * This function will return a fresh instance of URLSearchParams every time it's called.
+ *
+ * DO NOT USE IT FOR useEffect/useCallback dependencies, use Nuqs instead.
+ */
+export function getUnstableCurrentSearchParams(): URLSearchParams {
+	return getter();
+}
+
+// Testing helpers
+export function __setSearchParamsGetterForTest(fn: SearchParamsGetter): void {
+	getter = fn;
+}
+
+export function __resetSearchParamsGetter(): void {
+	getter = (): URLSearchParams => new URLSearchParams(window.location.search);
+}

frontend/src/container/Trace/Filters/Panel/PanelBody/Duration/styles.ts

@@ -1,5 +1,7 @@
-import { Input } from 'antd';
+// TODO(@signozhq/ui-input): migrate this styled(Input) once @signozhq/ui
+// Input supports `addonAfter` (the consumer renders `<InputComponent addonAfter="ms">`).
 import { Typography } from '@signozhq/ui/typography';
+import { Input } from 'antd';
 import styled from 'styled-components';
 
 export const DurationText = styled.div`

frontend/src/container/Trace/Search/AllTags/Tag/TagKey.tsx

@@ -8,7 +8,8 @@ import {
 import { useQuery } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
-import { AutoComplete, Input } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { AutoComplete } from 'antd';
 import getTagFilters from 'api/trace/getTagFilter';
 import { AppState } from 'store/reducers';
 import { GlobalReducer } from 'types/reducer/globalTime';

frontend/src/container/Trace/TraceGraphFilter/index.tsx

@@ -2,7 +2,8 @@ import { useMemo, useState } from 'react';
 import { useQuery } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
-import { AutoComplete, Input, Space } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { AutoComplete, Space } from 'antd';
 import getTagFilters from 'api/trace/getTagFilter';
 import { AppState } from 'store/reducers';
 import { GlobalReducer } from 'types/reducer/globalTime';

frontend/src/container/TraceWaterfall/AddSpanToFunnelModal/AddSpanToFunnelModal.tsx

@@ -1,6 +1,7 @@
 import { ChangeEvent, useEffect, useMemo, useState } from 'react';
 import { ArrowLeft, Check, Loader, Plus, Search } from '@signozhq/icons';
-import { Button, Input, Spin } from 'antd';
+import { Input } from '@signozhq/ui/input';
+import { Button, Spin } from 'antd';
 import cx from 'classnames';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import SignozModal from 'components/SignozModal/SignozModal';