diff --git a/__mocks__/expo-video.tsx b/__mocks__/expo-video.tsx
index 9ba8c9426ad9..77300c26f195 100644
--- a/__mocks__/expo-video.tsx
+++ b/__mocks__/expo-video.tsx
@@ -101,7 +101,6 @@ const VideoView = forwardRef((props: VideoViewProps, ref: ForwardedRef<View>) =>
     <View
         ref={ref}
         accessibilityLabel="MockVideoView"
-        // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
     />
 ));
diff --git a/__mocks__/react-native-safe-area-context.tsx b/__mocks__/react-native-safe-area-context.tsx
index 7748e5f1a853..a65ecbd647eb 100644
--- a/__mocks__/react-native-safe-area-context.tsx
+++ b/__mocks__/react-native-safe-area-context.tsx
@@ -23,7 +23,6 @@ function withSafeAreaInsets(WrappedComponent: React.ComponentType<WithSafeAreaIn
     function WithSafeAreaInsets(props: WithSafeAreaInsetsProps & {ref: React.ForwardedRef<unknown>}) {
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 ref={props.ref}
                 insets={insets}
@@ -34,7 +33,6 @@ function withSafeAreaInsets(WrappedComponent: React.ComponentType<WithSafeAreaIn
     function WithSafeAreaInsetsWithRef(props: WithSafeAreaInsetsProps & {ref: ForwardedRef<unknown>}) {
         return (
             <WithSafeAreaInsets
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 ref={props.ref}
             />
diff --git a/package-lock.json b/package-lock.json
index 09fcb3a54030..fcce3e812837 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -237,7 +237,7 @@
         "dotenv": "^16.0.3",
         "eslint": "^9.36.0",
         "eslint-config-airbnb-typescript": "^18.0.0",
-        "eslint-config-expensify": "3.0.1",
+        "eslint-config-expensify": "3.0.2",
         "eslint-config-prettier": "^9.1.0",
         "eslint-plugin-file-progress": "3.0.1",
         "eslint-plugin-jest": "^29.0.1",
@@ -22673,9 +22673,9 @@
       }
     },
     "node_modules/eslint-config-expensify": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-3.0.1.tgz",
-      "integrity": "sha512-rBUkUhwpJ3Ul94DDXdQ36zfmU0/sZsbhVj5dWA/d46/cw/+kS8ZnOX840Qh91y2feEQ02Q5zghsL6pfwYW0Qow==",
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-config-expensify/-/eslint-config-expensify-3.0.2.tgz",
+      "integrity": "sha512-ulH1Gl3Uu2fh0E918Rt2R76nMidY1BuxezBBtT20+v2K8O/bFs5v83oX1cwvg3Kz97anhf64aqpA2h2KIG8p9w==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
diff --git a/package.json b/package.json
index 086e8ff6b0e4..482052c9b75b 100644
--- a/package.json
+++ b/package.json
@@ -301,7 +301,7 @@
     "dotenv": "^16.0.3",
     "eslint": "^9.36.0",
     "eslint-config-airbnb-typescript": "^18.0.0",
-    "eslint-config-expensify": "3.0.1",
+    "eslint-config-expensify": "3.0.2",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-file-progress": "3.0.1",
     "eslint-plugin-jest": "^29.0.1",
diff --git a/src/components/AccountSwitcher.tsx b/src/components/AccountSwitcher.tsx
index 00e616dc519d..ae451830defe 100644
--- a/src/components/AccountSwitcher.tsx
+++ b/src/components/AccountSwitcher.tsx
@@ -223,7 +223,6 @@ function AccountSwitcher({isScreenFocused}: AccountSwitcherProps) {
 
     return (
         <>
-            {/* eslint-disable-next-line react/jsx-props-no-spreading */}
             <TooltipToRender {...tooltipProps}>
                 <PressableWithFeedback
                     accessible
diff --git a/src/components/ActionSheetAwareScrollView/index.android.tsx b/src/components/ActionSheetAwareScrollView/index.android.tsx
index b4c594bd6378..c7507674e83c 100644
--- a/src/components/ActionSheetAwareScrollView/index.android.tsx
+++ b/src/components/ActionSheetAwareScrollView/index.android.tsx
@@ -12,7 +12,6 @@ function ActionSheetAwareScrollView({style, children, ref, ...restProps}: Action
 
     return (
         <Reanimated.ScrollView
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             ref={onRef}
             style={style}
@@ -28,7 +27,6 @@ function ActionSheetAwareScrollView({style, children, ref, ...restProps}: Action
  * @returns - ActionSheetAwareScrollView
  */
 const renderScrollComponent: RenderActionSheetAwareScrollViewComponent = (props) => {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <ActionSheetAwareScrollView {...props} />;
 };
 
diff --git a/src/components/ActionSheetAwareScrollView/index.ios.tsx b/src/components/ActionSheetAwareScrollView/index.ios.tsx
index 52ddbac4788d..1987f940eb75 100644
--- a/src/components/ActionSheetAwareScrollView/index.ios.tsx
+++ b/src/components/ActionSheetAwareScrollView/index.ios.tsx
@@ -18,7 +18,6 @@ function ActionSheetAwareScrollView({style, children, ref, ...restProps}: Action
 
     return (
         <Reanimated.ScrollView
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             ref={onRef}
             style={[style, animatedStyle]}
@@ -34,7 +33,6 @@ function ActionSheetAwareScrollView({style, children, ref, ...restProps}: Action
  * @returns - ActionSheetAwareScrollView
  */
 const renderScrollComponent: RenderActionSheetAwareScrollViewComponent = (props) => {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <ActionSheetAwareScrollView {...props} />;
 };
 
diff --git a/src/components/ActionSheetAwareScrollView/index.tsx b/src/components/ActionSheetAwareScrollView/index.tsx
index a351d4621544..5190aa51d860 100644
--- a/src/components/ActionSheetAwareScrollView/index.tsx
+++ b/src/components/ActionSheetAwareScrollView/index.tsx
@@ -11,7 +11,6 @@ function ActionSheetAwareScrollView({children, ref, ...restProps}: ActionSheetAw
 
     return (
         <Reanimated.ScrollView
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             ref={onRef}
         >
@@ -30,7 +29,6 @@ function ActionSheetAwareScrollView({children, ref, ...restProps}: ActionSheetAw
  */
 
 const renderScrollComponent: RenderActionSheetAwareScrollViewComponent = (props) => {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <ActionSheetAwareScrollView {...props} />;
 };
 
diff --git a/src/components/ActivityIndicator.tsx b/src/components/ActivityIndicator.tsx
index 51a86c2adc52..d7674a941b62 100644
--- a/src/components/ActivityIndicator.tsx
+++ b/src/components/ActivityIndicator.tsx
@@ -40,7 +40,6 @@ function ActivityIndicator({timeout = CONST.TIMING.ACTIVITY_INDICATOR_TIMEOUT, e
     return (
         <RNActivityIndicator
             color={theme.spinner}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/components/AmountPicker/AmountSelectorModal.tsx b/src/components/AmountPicker/AmountSelectorModal.tsx
index 0aec31b250b9..8a68813f7ed4 100644
--- a/src/components/AmountPicker/AmountSelectorModal.tsx
+++ b/src/components/AmountPicker/AmountSelectorModal.tsx
@@ -65,7 +65,6 @@ function AmountSelectorModal({value, description = '', onValueSelected, isVisibl
                 >
                     <View style={styles.flex1}>
                         <NumberWithSymbolForm
-                            // eslint-disable-next-line react/jsx-props-no-spreading
                             {...rest}
                             value={currentValue}
                             onInputChange={setValue}
diff --git a/src/components/AmountPicker/index.tsx b/src/components/AmountPicker/index.tsx
index 519e821f8f4d..f3b36f383a9b 100644
--- a/src/components/AmountPicker/index.tsx
+++ b/src/components/AmountPicker/index.tsx
@@ -41,7 +41,6 @@ function AmountPicker({value, description, title, errorText = '', onInputChange,
                 errorText={errorText}
             />
             <AmountSelectorModal
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
                 value={value}
                 isVisible={isPickerVisible}
diff --git a/src/components/AmountTextInput.tsx b/src/components/AmountTextInput.tsx
index 9461f2f5872f..fa20c06e149f 100644
--- a/src/components/AmountTextInput.tsx
+++ b/src/components/AmountTextInput.tsx
@@ -108,7 +108,6 @@ function AmountTextInput({
             shouldApplyPaddingToContainer={shouldApplyPaddingToContainer}
             rightHandSideComponent={rightHandSideComponent}
             navigation={navigation}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/components/AmountWithoutCurrencyInput.tsx b/src/components/AmountWithoutCurrencyInput.tsx
index eeb4a905e43c..2ca5ee42584b 100644
--- a/src/components/AmountWithoutCurrencyInput.tsx
+++ b/src/components/AmountWithoutCurrencyInput.tsx
@@ -97,7 +97,6 @@ function AmountWithoutCurrencyInput({
             // On android autoCapitalize="words" is necessary when keyboardType="decimal-pad" or inputMode="decimal" to prevent input lag.
             // See https://github.com/Expensify/App/issues/51868 for more information
             autoCapitalize="words"
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/components/AnchorForAttachmentsOnly/index.native.tsx b/src/components/AnchorForAttachmentsOnly/index.native.tsx
index 5ce1f17ef64c..d3a968d3bd99 100644
--- a/src/components/AnchorForAttachmentsOnly/index.native.tsx
+++ b/src/components/AnchorForAttachmentsOnly/index.native.tsx
@@ -7,7 +7,6 @@ function AnchorForAttachmentsOnly(props: AnchorForAttachmentsOnlyProps) {
     const styles = useThemeStyles();
     return (
         <BaseAnchorForAttachmentsOnly
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             style={styles.mw100}
         />
diff --git a/src/components/AnchorForAttachmentsOnly/index.tsx b/src/components/AnchorForAttachmentsOnly/index.tsx
index 8d0dd5f8d2a2..e96de414a181 100644
--- a/src/components/AnchorForAttachmentsOnly/index.tsx
+++ b/src/components/AnchorForAttachmentsOnly/index.tsx
@@ -7,7 +7,6 @@ import type AnchorForAttachmentsOnlyProps from './types';
 function AnchorForAttachmentsOnly(props: AnchorForAttachmentsOnlyProps) {
     return (
         <BaseAnchorForAttachmentsOnly
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             onPressIn={() => DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
             onPressOut={() => ControlSelection.unblock()}
diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx
index 884dcf5d9436..3b01c2584c5c 100644
--- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx
+++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.tsx
@@ -101,7 +101,6 @@ function BaseAnchorForCommentsOnly({
                     suppressHighlighting
                     // Add testID so it gets selected as an anchor tag by SelectionScraper
                     testID="a"
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...rest}
                 >
                     {children}
diff --git a/src/components/AnchorForCommentsOnly/index.native.tsx b/src/components/AnchorForCommentsOnly/index.native.tsx
index a33128c65ab2..c7b9ea270cd9 100644
--- a/src/components/AnchorForCommentsOnly/index.native.tsx
+++ b/src/components/AnchorForCommentsOnly/index.native.tsx
@@ -14,7 +14,6 @@ function AnchorForCommentsOnly({onPress, href = '', ...props}: AnchorForComments
 
     return (
         <BaseAnchorForCommentsOnly
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             href={href}
             onPress={onLinkPress}
diff --git a/src/components/AnchorForCommentsOnly/index.tsx b/src/components/AnchorForCommentsOnly/index.tsx
index ca6c527d1e73..94d65148e9fe 100644
--- a/src/components/AnchorForCommentsOnly/index.tsx
+++ b/src/components/AnchorForCommentsOnly/index.tsx
@@ -7,7 +7,6 @@ import type {AnchorForCommentsOnlyProps} from './types';
 function AnchorForCommentsOnly(props: AnchorForCommentsOnlyProps) {
     return (
         <BaseAnchorForCommentsOnly
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             onPressIn={() => DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
             onPressOut={() => ControlSelection.unblock()}
diff --git a/src/components/AnimatedFlatListWithCellRenderer.tsx b/src/components/AnimatedFlatListWithCellRenderer.tsx
index 6a79ef36bcfd..d67621580be8 100644
--- a/src/components/AnimatedFlatListWithCellRenderer.tsx
+++ b/src/components/AnimatedFlatListWithCellRenderer.tsx
@@ -25,7 +25,6 @@ const createCellRendererComponent = <Item,>(CellRendererComponentProp?: CellRend
                 onLayout={props.onLayout}
                 style={CellRendererComponentProp ? undefined : props.style}
             >
-                {/* eslint-disable-next-line react/jsx-props-no-spreading */}
                 {CellRendererComponentProp ? <CellRendererComponentProp {...props}>{props.children}</CellRendererComponentProp> : props.children}
             </Animated.View>
         );
@@ -82,7 +81,6 @@ function FlatListRender<Item = any>(props: AnimatedFlatListWithCellRendererProps
         // @ts-expect-error In its current type state, createAnimatedComponent cannot create generic components.
         <AnimatedFlatList
             ref={ref}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             CellRendererComponent={CellRendererComponent}
         />
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx
index 6b2cda577a46..a72a0a1a1988 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx
+++ b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.android.tsx
@@ -62,7 +62,6 @@ function AttachmentViewPdf(props: AttachmentViewPdfProps) {
     const Content = useMemo(
         () => (
             <BaseAttachmentViewPdf
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 onScaleChanged={(newScale) => {
                     // The react-native-pdf's onScaleChanged event will sometimes give us scale values of e.g. 0.99... instead of 1,
diff --git a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.ios.tsx b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.ios.tsx
index 4ee60e9dfff5..cf30208dde1e 100644
--- a/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.ios.tsx
+++ b/src/components/Attachments/AttachmentView/AttachmentViewPdf/index.ios.tsx
@@ -3,12 +3,7 @@ import BaseAttachmentViewPdf from './BaseAttachmentViewPdf';
 import type AttachmentViewPdfProps from './types';
 
 function AttachmentViewPdf(props: AttachmentViewPdfProps) {
-    return (
-        <BaseAttachmentViewPdf
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-        />
-    );
+    return <BaseAttachmentViewPdf {...props} />;
 }
 
 export default memo(AttachmentViewPdf);
diff --git a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.native.tsx b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.native.tsx
index 8ff3abc2322e..3e092b96187c 100644
--- a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.native.tsx
+++ b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.native.tsx
@@ -27,10 +27,8 @@ function AutoCompleteSuggestionsPortal<TSuggestion>({
         <Portal hostName="suggestions">
             <TransparentOverlay onPress={resetSuggestions} />
             <View style={styles}>
-                {}
                 <BaseAutoCompleteSuggestions<TSuggestion>
                     width={width}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                 />
             </View>
diff --git a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.tsx b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.tsx
index ef913628d226..b7f8f1ab74c3 100644
--- a/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.tsx
+++ b/src/components/AutoCompleteSuggestions/AutoCompleteSuggestionsPortal/index.tsx
@@ -32,7 +32,6 @@ function AutoCompleteSuggestionsPortal<TSuggestion>({
     const componentToRender = (
         <BaseAutoCompleteSuggestions<TSuggestion>
             width={width}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/AutoCompleteSuggestions/index.tsx b/src/components/AutoCompleteSuggestions/index.tsx
index 89ffabe87f16..15f7a8d13a15 100644
--- a/src/components/AutoCompleteSuggestions/index.tsx
+++ b/src/components/AutoCompleteSuggestions/index.tsx
@@ -182,7 +182,6 @@ function AutoCompleteSuggestions<TSuggestion>({measureParentContainerAndReportCu
 
     return (
         <AutoCompleteSuggestionsPortal
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             left={containerState.left}
             width={containerState.width}
diff --git a/src/components/BaseWidgetItem.tsx b/src/components/BaseWidgetItem.tsx
index af3b3f376901..2b1368966777 100644
--- a/src/components/BaseWidgetItem.tsx
+++ b/src/components/BaseWidgetItem.tsx
@@ -72,7 +72,7 @@ function BaseWidgetItem({icon, iconBackgroundColor, title, subtitle, ctaText, on
                         small
                         style={styles.widgetItemButton}
                         // Prop spreading allows parent components to pass additional button styling props (e.g., danger: true, success: true)
-                        // eslint-disable-next-line react/jsx-props-no-spreading
+
                         {...buttonProps}
                     />
                 </View>
diff --git a/src/components/Button/ButtonDisabledWhenOffline.tsx b/src/components/Button/ButtonDisabledWhenOffline.tsx
index d9f3b805b977..f8971e412044 100644
--- a/src/components/Button/ButtonDisabledWhenOffline.tsx
+++ b/src/components/Button/ButtonDisabledWhenOffline.tsx
@@ -11,7 +11,6 @@ function ButtonDisabledWhenOffline({disabledWhenOffline = true, ...props}: Butto
     const {isOffline} = useNetwork();
     return (
         <Button
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             isDisabled={disabledWhenOffline && isOffline}
         />
diff --git a/src/components/CardFeedIcon.tsx b/src/components/CardFeedIcon.tsx
index 425d4c9d4a3d..080f3d9f34f3 100644
--- a/src/components/CardFeedIcon.tsx
+++ b/src/components/CardFeedIcon.tsx
@@ -24,7 +24,6 @@ function CardFeedIcon({iconProps, selectedFeed, isExpensifyCardFeed = false, use
     const isPlaidCardFeed = !!getPlaidInstitutionId(selectedFeed);
 
     if (isExpensifyCardFeed) {
-        // eslint-disable-next-line react/jsx-props-no-spreading
         return <ExpensifyCardFeedIcon {...iconProps} />;
     }
 
@@ -33,7 +32,6 @@ function CardFeedIcon({iconProps, selectedFeed, isExpensifyCardFeed = false, use
             <PlaidCardFeedIcon
                 plaidUrl={getPlaidInstitutionIconUrl(selectedFeed)}
                 useSkeletonLoader={useSkeletonLoader}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...restIconProps}
             />
         );
@@ -46,7 +44,6 @@ function CardFeedIcon({iconProps, selectedFeed, isExpensifyCardFeed = false, use
     return (
         <Icon
             src={src ?? getCardFeedIcon(selectedFeed, illustrations, companyCardFeedIcons)}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restIconProps}
         />
     );
@@ -60,7 +57,6 @@ function ExpensifyCardFeedIcon(iconProps: Partial<IconProps>) {
     return (
         <Icon
             src={memoizedIllustrations.ExpensifyCardImage}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restIconProps}
         />
     );
diff --git a/src/components/Charts/BarChart/index.native.tsx b/src/components/Charts/BarChart/index.native.tsx
index 54f47ea8bb1a..04f0cf3d95fb 100644
--- a/src/components/Charts/BarChart/index.native.tsx
+++ b/src/components/Charts/BarChart/index.native.tsx
@@ -3,7 +3,6 @@ import type {BarChartProps} from './BarChartContent';
 import BarChartContent from './BarChartContent';
 
 function BarChart(props: BarChartProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <BarChartContent {...props} />;
 }
 
diff --git a/src/components/Charts/LineChart/index.native.tsx b/src/components/Charts/LineChart/index.native.tsx
index db7c218db9ab..4c35db52c442 100644
--- a/src/components/Charts/LineChart/index.native.tsx
+++ b/src/components/Charts/LineChart/index.native.tsx
@@ -3,7 +3,6 @@ import type {LineChartProps} from './LineChartContent';
 import LineChartContent from './LineChartContent';
 
 function LineChart(props: LineChartProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <LineChartContent {...props} />;
 }
 
diff --git a/src/components/Charts/PieChart/index.native.tsx b/src/components/Charts/PieChart/index.native.tsx
index 3b8728020939..89fa7b8376e2 100644
--- a/src/components/Charts/PieChart/index.native.tsx
+++ b/src/components/Charts/PieChart/index.native.tsx
@@ -3,7 +3,6 @@ import type {PieChartProps} from './PieChartContent';
 import PieChartContent from './PieChartContent';
 
 function PieChart(props: PieChartProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <PieChartContent {...props} />;
 }
 
diff --git a/src/components/Composer/implementation/index.native.tsx b/src/components/Composer/implementation/index.native.tsx
index af914146a3d8..5d235e54dfd1 100644
--- a/src/components/Composer/implementation/index.native.tsx
+++ b/src/components/Composer/implementation/index.native.tsx
@@ -133,7 +133,6 @@ function Composer({
             textAlignVertical="center"
             style={[composerStyle, maxHeightStyle]}
             markdownStyle={markdownStyle}
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
             autoFocus={isInLandscapeMode ? false : props.autoFocus}
             readOnly={isDisabled}
diff --git a/src/components/Composer/implementation/index.tsx b/src/components/Composer/implementation/index.tsx
index 6a2fc650c2f5..36b1b2fe5780 100755
--- a/src/components/Composer/implementation/index.tsx
+++ b/src/components/Composer/implementation/index.tsx
@@ -359,7 +359,6 @@ function Composer({
             value={value}
             defaultValue={defaultValue}
             autoFocus={autoFocus}
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
             onSelectionChange={addCursorPositionToSelectionChange}
             onContentSizeChange={(e) => {
diff --git a/src/components/CurrencySelectionList/index.tsx b/src/components/CurrencySelectionList/index.tsx
index 4256ebc4bbbe..18a2480cd637 100644
--- a/src/components/CurrencySelectionList/index.tsx
+++ b/src/components/CurrencySelectionList/index.tsx
@@ -98,7 +98,6 @@ function CurrencySelectionList({
 
     return (
         <SelectionListWithSections
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             sections={sections}
             ListItem={SingleSelectListItem}
diff --git a/src/components/DistanceMapView/index.android.tsx b/src/components/DistanceMapView/index.android.tsx
index 9461409fadbe..daa7d6d99258 100644
--- a/src/components/DistanceMapView/index.android.tsx
+++ b/src/components/DistanceMapView/index.android.tsx
@@ -23,7 +23,6 @@ function DistanceMapView({overlayStyle, requireRouteToDisplayMap, ...rest}: Dist
     return (
         <>
             <MapView
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
                 onMapReady={() => {
                     if (isMapReady) {
diff --git a/src/components/DistanceMapView/index.tsx b/src/components/DistanceMapView/index.tsx
index fa138c515df6..61c38014e6d9 100644
--- a/src/components/DistanceMapView/index.tsx
+++ b/src/components/DistanceMapView/index.tsx
@@ -3,7 +3,6 @@ import MapView from '@components/MapView';
 import type DistanceMapViewProps from './types';
 
 function DistanceMapView({overlayStyle, ...rest}: DistanceMapViewProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <MapView {...rest} />;
 }
 
diff --git a/src/components/DraggableList/SortableItem.tsx b/src/components/DraggableList/SortableItem.tsx
index 67aa4a57b624..eb88f8c21e66 100644
--- a/src/components/DraggableList/SortableItem.tsx
+++ b/src/components/DraggableList/SortableItem.tsx
@@ -76,9 +76,7 @@ function SortableItem({id, children, disabled = false, isFocused = false}: Sorta
             // Use capture phase to intercept Enter before inner MenuItem handles it
             onKeyDownCapture={handleKeyDown}
             onClick={handleClick}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...attributes}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...(disabled ? {} : listeners)}
             role="button"
             tabIndex={0}
diff --git a/src/components/DraggableList/index.native.tsx b/src/components/DraggableList/index.native.tsx
index ea9b85cf93a2..f82f8c7d82f6 100644
--- a/src/components/DraggableList/index.native.tsx
+++ b/src/components/DraggableList/index.native.tsx
@@ -12,7 +12,6 @@ function DraggableList<T>({ref, onSelectRow, focusedIndex, isItemDragDisabled, i
             containerStyle={styles.flex1}
             contentContainerStyle={styles.flexGrow1}
             ListFooterComponentStyle={styles.flex1}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...viewProps}
         />
     );
diff --git a/src/components/EmbeddedDemo/index.native.tsx b/src/components/EmbeddedDemo/index.native.tsx
index cb425b0fd730..2a7bd55e9f01 100644
--- a/src/components/EmbeddedDemo/index.native.tsx
+++ b/src/components/EmbeddedDemo/index.native.tsx
@@ -13,7 +13,6 @@ function EmbeddedDemo({url, webViewProps}: EmbeddedDemoProps) {
             source={{uri: url}}
             originWhitelist={testDrive.EMBEDDED_DEMO_WHITELIST}
             style={styles.flex1}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...webViewProps}
         />
     );
diff --git a/src/components/EmbeddedDemo/index.tsx b/src/components/EmbeddedDemo/index.tsx
index 4ddd0ab59151..75dd3a6c7da6 100644
--- a/src/components/EmbeddedDemo/index.tsx
+++ b/src/components/EmbeddedDemo/index.tsx
@@ -10,7 +10,6 @@ function EmbeddedDemo({url, iframeTitle, iframeProps}: EmbeddedDemoProps) {
             title={iframeTitle}
             src={url}
             style={styles.embeddedDemoIframe}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...iframeProps}
         />
     );
diff --git a/src/components/EmptyStateComponent/GenericEmptyStateComponent.tsx b/src/components/EmptyStateComponent/GenericEmptyStateComponent.tsx
index 2af734e63ca4..0a4c9c48cbcd 100644
--- a/src/components/EmptyStateComponent/GenericEmptyStateComponent.tsx
+++ b/src/components/EmptyStateComponent/GenericEmptyStateComponent.tsx
@@ -5,7 +5,6 @@ import type {GenericEmptyStateComponentProps} from './types';
 // Only use this component when you need to pass/spread the props in a generic way, as
 // EmptyStateComponent component wouldn't allow it in some cases.
 function GenericEmptyStateComponent(props: GenericEmptyStateComponentProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <EmptyStateComponent {...props} />;
 }
 
diff --git a/src/components/FlashList/InvertedFlashList/CellRendererComponent.tsx b/src/components/FlashList/InvertedFlashList/CellRendererComponent.tsx
index 65397e70a570..dfe56ec13e34 100644
--- a/src/components/FlashList/InvertedFlashList/CellRendererComponent.tsx
+++ b/src/components/FlashList/InvertedFlashList/CellRendererComponent.tsx
@@ -10,7 +10,6 @@ type CellRendererComponentProps = ViewProps & {
 function CellRendererComponent(props: CellRendererComponentProps) {
     return (
         <View
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             style={[
                 props.style,
diff --git a/src/components/FlashList/InvertedFlashList/index.tsx b/src/components/FlashList/InvertedFlashList/index.tsx
index 10910efb9c8c..30ec578d6e96 100644
--- a/src/components/FlashList/InvertedFlashList/index.tsx
+++ b/src/components/FlashList/InvertedFlashList/index.tsx
@@ -52,7 +52,6 @@ function InvertedFlashList<T>({
 
     return (
         <FlashList<T>
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             inverted
             onStartReached={onStartReached}
diff --git a/src/components/FlashList/index.tsx b/src/components/FlashList/index.tsx
index 888821e8d1a3..bb24311df0fc 100644
--- a/src/components/FlashList/index.tsx
+++ b/src/components/FlashList/index.tsx
@@ -15,7 +15,6 @@ function FlashList<T>({onScroll: onScrollProp, inverted, ...restProps}: FlashLis
 
     return (
         <ShopifyFlashList<T>
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             inverted={inverted}
             onScroll={handleScroll}
diff --git a/src/components/FlatList/FlatList/index.android.tsx b/src/components/FlatList/FlatList/index.android.tsx
index ceefd9d455c7..17e637ba84d9 100644
--- a/src/components/FlatList/FlatList/index.android.tsx
+++ b/src/components/FlatList/FlatList/index.android.tsx
@@ -48,7 +48,6 @@ function CustomFlatList<T>({ref, enableAnimatedKeyboardDismissal = false, onMome
     if (enableAnimatedKeyboardDismissal) {
         return (
             <KeyboardDismissibleFlatList
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 ref={ref}
                 onScroll={handleScroll}
@@ -60,7 +59,6 @@ function CustomFlatList<T>({ref, enableAnimatedKeyboardDismissal = false, onMome
 
     return (
         <FlatList<T>
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
             onScroll={handleScroll}
diff --git a/src/components/FlatList/FlatList/index.ios.tsx b/src/components/FlatList/FlatList/index.ios.tsx
index 44e6244ddca8..8a6732dbfd79 100644
--- a/src/components/FlatList/FlatList/index.ios.tsx
+++ b/src/components/FlatList/FlatList/index.ios.tsx
@@ -63,7 +63,6 @@ function CustomFlatList<T>({
     if (enableAnimatedKeyboardDismissal) {
         return (
             <KeyboardDismissibleFlatList
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...restProps}
                 ref={listRef}
                 maintainVisibleContentPosition={maintainVisibleContentPosition}
@@ -78,7 +77,6 @@ function CustomFlatList<T>({
 
     return (
         <FlatList<T>
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             ref={listRef}
             maintainVisibleContentPosition={maintainVisibleContentPosition}
diff --git a/src/components/FlatList/FlatList/index.tsx b/src/components/FlatList/FlatList/index.tsx
index f7423a3ae555..cb6cdc05bd6c 100644
--- a/src/components/FlatList/FlatList/index.tsx
+++ b/src/components/FlatList/FlatList/index.tsx
@@ -251,7 +251,6 @@ function MVCPFlatList<T>({
     );
     return (
         <FlatList
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             maintainVisibleContentPosition={maintainVisibleContentPosition}
             horizontal={horizontal}
diff --git a/src/components/FlatList/FlatListWithScrollKey/BaseFlatListWithScrollKey.tsx b/src/components/FlatList/FlatListWithScrollKey/BaseFlatListWithScrollKey.tsx
index 98c43ea4bbfb..110f04fd3c35 100644
--- a/src/components/FlatList/FlatListWithScrollKey/BaseFlatListWithScrollKey.tsx
+++ b/src/components/FlatList/FlatListWithScrollKey/BaseFlatListWithScrollKey.tsx
@@ -51,7 +51,6 @@ function BaseFlatListWithScrollKey<T>({ref, ...props}: BaseFlatListWithScrollKey
     return (
         <FlatList
             ref={listRef}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             data={displayedData}
             maintainVisibleContentPosition={maintainVisibleContentPosition}
diff --git a/src/components/FlatList/FlatListWithScrollKey/index.ios.tsx b/src/components/FlatList/FlatListWithScrollKey/index.ios.tsx
index a2a74434f328..e912917994b8 100644
--- a/src/components/FlatList/FlatListWithScrollKey/index.ios.tsx
+++ b/src/components/FlatList/FlatListWithScrollKey/index.ios.tsx
@@ -54,7 +54,6 @@ function FlatListWithScrollKey<T>({ref, ...props}: FlatListWithScrollKeyProps<T>
             initialScrollKey={initialScrollKey}
             onLayout={onLayoutInner}
             onContentSizeChange={onContentSizeChangeInner}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/components/FlatList/FlatListWithScrollKey/index.tsx b/src/components/FlatList/FlatListWithScrollKey/index.tsx
index 6194f8fc0e19..e487843c3897 100644
--- a/src/components/FlatList/FlatListWithScrollKey/index.tsx
+++ b/src/components/FlatList/FlatListWithScrollKey/index.tsx
@@ -9,7 +9,6 @@ function FlatListWithScrollKey<T>({ref, ...props}: FlatListWithScrollKeyProps<T>
     return (
         <BaseFlatListWithScrollKey
             ref={ref}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/FocusTrap/FocusTrapContainerElement/index.web.tsx b/src/components/FocusTrap/FocusTrapContainerElement/index.web.tsx
index aa18d895529e..359899df5392 100644
--- a/src/components/FocusTrap/FocusTrapContainerElement/index.web.tsx
+++ b/src/components/FocusTrap/FocusTrapContainerElement/index.web.tsx
@@ -17,7 +17,6 @@ function FocusTrapContainerElement({onContainerElementChanged, ref, ...props}: F
                 }
                 onContainerElementChanged?.(node as unknown as HTMLElement | null);
             }}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/FocusableMenuItem.tsx b/src/components/FocusableMenuItem.tsx
index 19172555a93b..def0d7429cd5 100644
--- a/src/components/FocusableMenuItem.tsx
+++ b/src/components/FocusableMenuItem.tsx
@@ -12,7 +12,6 @@ function FocusableMenuItem(props: MenuItemProps) {
 
     return (
         <MenuItem
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
         />
diff --git a/src/components/Form/FormProvider.tsx b/src/components/Form/FormProvider.tsx
index 6853ae849742..05a177783ee2 100644
--- a/src/components/Form/FormProvider.tsx
+++ b/src/components/Form/FormProvider.tsx
@@ -522,7 +522,6 @@ function FormProvider({
 
     return (
         <FormContext.Provider value={value}>
-            {/* eslint-disable react/jsx-props-no-spreading */}
             <FormWrapper
                 {...rest}
                 formID={formID}
diff --git a/src/components/Form/InputWrapper.tsx b/src/components/Form/InputWrapper.tsx
index b37719693db8..e7526c9185f9 100644
--- a/src/components/Form/InputWrapper.tsx
+++ b/src/components/Form/InputWrapper.tsx
@@ -88,7 +88,7 @@ function InputWrapper<TInput extends ValidInputs, TValue extends ValueTypeKey>({
         <InputComponent
             key={key}
             // TODO: Sometimes we return too many props with register input, so we need to consider if it's better to make the returned type more general and disregard the issue, or we would like to omit the unused props somehow.
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...registerInputProps}
         />
     );
diff --git a/src/components/FormElement/index.native.tsx b/src/components/FormElement/index.native.tsx
index 582e96673c07..709008d0dfb9 100644
--- a/src/components/FormElement/index.native.tsx
+++ b/src/components/FormElement/index.native.tsx
@@ -6,7 +6,6 @@ function FormElement({ref, ...props}: FormElementProps) {
     return (
         <View
             ref={ref}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/FormElement/index.tsx b/src/components/FormElement/index.tsx
index 408794d95e24..e6e14f6d9645 100644
--- a/src/components/FormElement/index.tsx
+++ b/src/components/FormElement/index.tsx
@@ -43,7 +43,6 @@ function FormElement({ref, ...props}: FormElementProps) {
         <View
             role={ACCESSIBILITY_ROLE_FORM}
             ref={mergedRef}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/FormScrollView.tsx b/src/components/FormScrollView.tsx
index c8ff2fe4bbca..02f52b0c9969 100644
--- a/src/components/FormScrollView.tsx
+++ b/src/components/FormScrollView.tsx
@@ -21,7 +21,6 @@ function FormScrollView({children, ref, ...rest}: FormScrollViewProps) {
             ref={ref}
             contentContainerStyle={styles.flexGrow1}
             keyboardShouldPersistTaps="handled"
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         >
             {children}
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
index c2da0cb56168..4ea6c2572295 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.tsx
@@ -147,7 +147,6 @@ function AnchorRenderer({tnode, style, key}: AnchorRendererProps) {
             key={key}
             // Only pass the press handler for internal links. For public links or whitelisted internal links fallback to default link handling
             onPress={onLinkPress}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...bind}
             linkHasImage={linkHasImage}
         >
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
index e5ad7e1bc7ef..297da40e89d7 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/EditedRenderer.tsx
@@ -15,7 +15,6 @@ function EditedRenderer({tnode, TDefaultRenderer, style, ...defaultRendererProps
         <Text fontSize={variables.fontSizeSmall}>
             <Text fontSize={variables.fontSizeSmall}> </Text>
             <Text
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...defaultRendererProps}
                 fontSize={variables.fontSizeSmall}
                 color={theme.textSupporting}
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx
index 61356097deee..7a1ff55c6e5a 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/index.tsx
@@ -55,7 +55,6 @@ function MentionReportRenderer({style, tnode, TDefaultRenderer, ...defaultRender
 
     return (
         <Text
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...defaultRendererProps}
             style={
                 isGroupPolicyReport && (!exactlyMatch || navigationRoute)
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx
index 90a9e3b3bfb9..0f6dd62834e4 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/MentionUserRenderer.tsx
@@ -101,7 +101,6 @@ function MentionUserRenderer({style, tnode, TDefaultRenderer, currentUserPersona
                 }}
             >
                 <Text
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...defaultRendererProps}
                     style={[
                         styles.link,
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer.tsx
index 2ee14ec61fab..5a3e8c8bbb16 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/PreRenderer.tsx
@@ -43,7 +43,6 @@ function PreRenderer({TDefaultRenderer, onPressIn, onPressOut, onLongPress, ...d
     if (isChildOfTaskTitle) {
         return (
             <TDefaultRenderer
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...defaultRendererProps}
                 style={styles.taskTitleMenuItem}
             />
@@ -71,7 +70,6 @@ function PreRenderer({TDefaultRenderer, onPressIn, onPressOut, onLongPress, ...d
             >
                 <View>
                     <Text style={{fontSize}}>
-                        {/* eslint-disable-next-line react/jsx-props-no-spreading */}
                         <TDefaultRenderer {...defaultRendererProps} />
                     </Text>
                 </View>
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/ShortMentionRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/ShortMentionRenderer.tsx
index d2815e9fa034..07947afe03e5 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/ShortMentionRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/ShortMentionRenderer.tsx
@@ -15,12 +15,10 @@ function ShortMentionRenderer(props: CustomRendererProps<TText | TPhrasing>) {
     const mentionLogin = mentionValue.substring(1);
 
     if (currentUserMentions?.includes(mentionLogin)) {
-        // eslint-disable-next-line react/jsx-props-no-spreading
         return <MentionHereRenderer {...props} />;
     }
 
     if (availableLoginsList.includes(mentionLogin)) {
-        // eslint-disable-next-line react/jsx-props-no-spreading
         return <MentionUserRenderer {...props} />;
     }
 
diff --git a/src/components/HTMLEngineProvider/HTMLRenderers/UserDetailsRenderer.tsx b/src/components/HTMLEngineProvider/HTMLRenderers/UserDetailsRenderer.tsx
index 9a893ea2e1fe..650d98de7071 100644
--- a/src/components/HTMLEngineProvider/HTMLRenderers/UserDetailsRenderer.tsx
+++ b/src/components/HTMLEngineProvider/HTMLRenderers/UserDetailsRenderer.tsx
@@ -26,7 +26,6 @@ function UserDetailsRenderer({tnode, ...defaultRendererProps}: UserDetailsRender
         <UserDetailsTooltip accountID={accountID}>
             {isOptimistic ? (
                 <Text
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...defaultRendererProps}
                     style={[styles.textStrong]}
                 >
@@ -34,7 +33,6 @@ function UserDetailsRenderer({tnode, ...defaultRendererProps}: UserDetailsRender
                 </Text>
             ) : (
                 <Text
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...defaultRendererProps}
                     style={[styles.textStrong]}
                     onPress={() => Navigation.navigate(ROUTES.PROFILE.getRoute(accountID, Navigation.getActiveRoute()))}
diff --git a/src/components/HeaderPageLayout.tsx b/src/components/HeaderPageLayout.tsx
index 6a67011417de..f43f8f076ecd 100644
--- a/src/components/HeaderPageLayout.tsx
+++ b/src/components/HeaderPageLayout.tsx
@@ -89,7 +89,6 @@ function HeaderPageLayout({
             {({safeAreaPaddingBottomStyle}) => (
                 <>
                     <HeaderWithBackButton
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...rest}
                         titleColor={titleColor}
                         iconFill={iconFill}
diff --git a/src/components/HighlightableMenuItem.tsx b/src/components/HighlightableMenuItem.tsx
index 8a54d5270cc8..612ce7c7844e 100644
--- a/src/components/HighlightableMenuItem.tsx
+++ b/src/components/HighlightableMenuItem.tsx
@@ -28,7 +28,6 @@ function HighlightableMenuItem({wrapperStyle, highlighted, ...restOfProps}: Prop
 
     return (
         <MenuItem
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restOfProps}
             outerWrapperStyle={animatedHighlightStyle}
             wrapperStyle={wrapperStyle}
diff --git a/src/components/Hoverable/index.tsx b/src/components/Hoverable/index.tsx
index a9a7461fdf6f..d6bb88398ea4 100644
--- a/src/components/Hoverable/index.tsx
+++ b/src/components/Hoverable/index.tsx
@@ -20,7 +20,6 @@ function Hoverable({isDisabled, ref, ...props}: HoverableProps) {
 
     return (
         <ActiveHoverable
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
         />
diff --git a/src/components/IllustratedHeaderPageLayout.tsx b/src/components/IllustratedHeaderPageLayout.tsx
index 6c75bd0c3d7d..62c419c09df5 100644
--- a/src/components/IllustratedHeaderPageLayout.tsx
+++ b/src/components/IllustratedHeaderPageLayout.tsx
@@ -43,7 +43,6 @@ function IllustratedHeaderPageLayout({backgroundColor, children, illustration, t
             }
             testID={testID}
             headerContainerStyles={[styles.justifyContentCenter, styles.w100, shouldLimitHeight && styles.centralPaneAnimation]}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         >
             {children}
diff --git a/src/components/Image/BaseImage.native.tsx b/src/components/Image/BaseImage.native.tsx
index fd9a161847cf..32942b0eaff5 100644
--- a/src/components/Image/BaseImage.native.tsx
+++ b/src/components/Image/BaseImage.native.tsx
@@ -49,7 +49,6 @@ function BaseImage({onLoad, source, style, ...props}: BaseImageProps) {
             source={source}
             recyclingKey={getImageRecyclingKey(source)}
             style={style as ExpoImageProps['style']}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/Image/BaseImage.tsx b/src/components/Image/BaseImage.tsx
index 2818ec3934bc..cdf81c7cb3c1 100644
--- a/src/components/Image/BaseImage.tsx
+++ b/src/components/Image/BaseImage.tsx
@@ -50,7 +50,6 @@ function BaseImage({onLoad, onLoadStart, source, style, ...props}: BaseImageProp
             source={resolvedSource}
             recyclingKey={getImageRecyclingKey(source)}
             style={style as ExpoImageProps['style']}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/Image/index.tsx b/src/components/Image/index.tsx
index 19b3df8654ac..e6ae5ca173ba 100644
--- a/src/components/Image/index.tsx
+++ b/src/components/Image/index.tsx
@@ -160,7 +160,6 @@ function Image({
 
     return (
         <BaseImage
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...forwardedProps}
             onLoad={handleLoad}
             style={[style, aspectRatioStyle, shouldOpacityBeZero && {opacity: 0}]}
diff --git a/src/components/ImageSVG/index.android.tsx b/src/components/ImageSVG/index.android.tsx
index adb18f4ad353..298703d35217 100644
--- a/src/components/ImageSVG/index.android.tsx
+++ b/src/components/ImageSVG/index.android.tsx
@@ -43,7 +43,6 @@ function ImageSVG({src, width = '100%', height = '100%', fill, contentFit = 'cov
                 width={width}
                 height={height}
                 style={style}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...additionalProps}
             />
         );
@@ -61,7 +60,6 @@ function ImageSVG({src, width = '100%', height = '100%', fill, contentFit = 'cov
             source={src}
             recyclingKey={getImageRecyclingKey(src)}
             style={[{width, height}, style as ExpoImageProps['style']]}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...tintColorProp}
         />
     );
diff --git a/src/components/ImageSVG/index.ios.tsx b/src/components/ImageSVG/index.ios.tsx
index 5990331da03a..2b732cae02bf 100644
--- a/src/components/ImageSVG/index.ios.tsx
+++ b/src/components/ImageSVG/index.ios.tsx
@@ -28,7 +28,6 @@ function ImageSVG({src, width = '100%', height = '100%', fill, contentFit = 'cov
                 width={width}
                 height={height}
                 style={style}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...additionalProps}
             />
         );
@@ -48,7 +47,6 @@ function ImageSVG({src, width = '100%', height = '100%', fill, contentFit = 'cov
             source={src}
             recyclingKey={getImageRecyclingKey(src)}
             style={[{width, height}, style as ExpoImageProps['style']]}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...tintColorProp}
         />
     );
diff --git a/src/components/ImageSVG/index.tsx b/src/components/ImageSVG/index.tsx
index 9242ba7bf15c..e8f465107306 100644
--- a/src/components/ImageSVG/index.tsx
+++ b/src/components/ImageSVG/index.tsx
@@ -30,7 +30,6 @@ function ImageSVG({src, width = '100%', height = '100%', fill, hovered = false,
             hovered={`${hovered}`}
             pressed={`${pressed}`}
             aria-hidden={ariaHidden}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...additionalProps}
         />
     );
diff --git a/src/components/ImageWithLoading.tsx b/src/components/ImageWithLoading.tsx
index 798474f33200..bb16e4cced3b 100644
--- a/src/components/ImageWithLoading.tsx
+++ b/src/components/ImageWithLoading.tsx
@@ -85,7 +85,6 @@ function ImageWithLoading({
         >
             {/* eslint-disable-next-line react-native-a11y/has-valid-accessibility-ignores-invert-colors -- Custom Image wrapper does not support this prop. */}
             <Image
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
                 style={[styles.w100, styles.h100, style]}
                 resizeMode={resizeMode}
diff --git a/src/components/ImportSpreadsheet.tsx b/src/components/ImportSpreadsheet.tsx
index 35a3508c3685..7e8565b19b23 100644
--- a/src/components/ImportSpreadsheet.tsx
+++ b/src/components/ImportSpreadsheet.tsx
@@ -191,7 +191,6 @@ function ImportSpreadsheet({backTo, goTo, shouldForceReplaceNavigation = false,
             </View>
             <View
                 style={[styles.uploadFileViewTextContainer, styles.userSelectNone]}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...panResponder.panHandlers}
             >
                 <Text style={[styles.textFileUpload, styles.mb1]}>{isImportingMultiLevelTags ? translate('spreadsheet.import') : translate('spreadsheet.upload')}</Text>
diff --git a/src/components/InlineCodeBlock/index.native.tsx b/src/components/InlineCodeBlock/index.native.tsx
index 04e3713d2f42..4d06e29a3873 100644
--- a/src/components/InlineCodeBlock/index.native.tsx
+++ b/src/components/InlineCodeBlock/index.native.tsx
@@ -23,10 +23,7 @@ function InlineCodeBlock<TComponent extends TTextOrTPhrasing>({TDefaultRenderer,
     const data = getCurrentData(defaultRendererProps);
 
     return (
-        <TDefaultRenderer
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...defaultRendererProps}
-        >
+        <TDefaultRenderer {...defaultRendererProps}>
             <Text style={[boxModelStyle, textStyle]}>{data}</Text>
         </TDefaultRenderer>
     );
diff --git a/src/components/InlineCodeBlock/index.tsx b/src/components/InlineCodeBlock/index.tsx
index 2cae055a6fad..5c8547fc408c 100644
--- a/src/components/InlineCodeBlock/index.tsx
+++ b/src/components/InlineCodeBlock/index.tsx
@@ -62,10 +62,7 @@ function InlineCodeBlock<TComponent extends TTextOrTPhrasing>({TDefaultRenderer,
     const elements = renderElements(defaultRendererProps, textStyles, styles);
 
     return (
-        <TDefaultRenderer
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...defaultRendererProps}
-        >
+        <TDefaultRenderer {...defaultRendererProps}>
             <Text style={[boxModelStyle, textStyles]}>{elements}</Text>
         </TDefaultRenderer>
     );
diff --git a/src/components/KYCWall/index.tsx b/src/components/KYCWall/index.tsx
index 2a764ea383bb..d9abbab15ddc 100644
--- a/src/components/KYCWall/index.tsx
+++ b/src/components/KYCWall/index.tsx
@@ -5,7 +5,6 @@ import type {KYCWallProps} from './types';
 function KYCWall({ref, ...props}: KYCWallProps) {
     return (
         <BaseKYCWall
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             shouldListenForResize
             ref={ref}
diff --git a/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.android.tsx b/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.android.tsx
index c7c9e5d81319..9ceff29d8d23 100644
--- a/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.android.tsx
+++ b/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.android.tsx
@@ -3,7 +3,6 @@ import type {KeyboardAvoidingViewProps} from 'react-native-keyboard-controller';
 import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-native-keyboard-controller';
 
 function BaseKeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <KeyboardAvoidingViewComponent {...props} />;
 }
 
diff --git a/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.ios.tsx b/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.ios.tsx
index 7b556049ff1e..66a381f1444d 100644
--- a/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.ios.tsx
+++ b/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.ios.tsx
@@ -3,7 +3,6 @@ import {KeyboardAvoidingView as KeyboardAvoidingViewComponent} from 'react-nativ
 import type {KeyboardAvoidingViewProps} from 'react-native-keyboard-controller';
 
 function BaseKeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <KeyboardAvoidingViewComponent {...props} />;
 }
 
diff --git a/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.tsx b/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.tsx
index 4d8888a5235a..df8a9f5d4757 100644
--- a/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.tsx
+++ b/src/components/KeyboardAvoidingView/BaseKeyboardAvoidingView/index.tsx
@@ -51,7 +51,6 @@ function BaseKeyboardAvoidingView(props: KeyboardAvoidingViewProps) {
 
     return (
         <Animated.View
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             style={[style, isMobileSafariIos26 && animatedStyle]}
         />
diff --git a/src/components/KeyboardAvoidingView/index.tsx b/src/components/KeyboardAvoidingView/index.tsx
index 811a73fc6fb7..b44e22b59ca1 100644
--- a/src/components/KeyboardAvoidingView/index.tsx
+++ b/src/components/KeyboardAvoidingView/index.tsx
@@ -13,7 +13,6 @@ function KeyboardAvoidingView({shouldOffsetBottomSafeAreaPadding = false, keyboa
 
     return (
         <BaseKeyboardAvoidingView
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             keyboardVerticalOffset={keyboardVerticalOffset}
         />
diff --git a/src/components/KeyboardDismissibleFlatList/index.ios.tsx b/src/components/KeyboardDismissibleFlatList/index.ios.tsx
index 7c27b323bdb4..fcb4a6819dab 100644
--- a/src/components/KeyboardDismissibleFlatList/index.ios.tsx
+++ b/src/components/KeyboardDismissibleFlatList/index.ios.tsx
@@ -41,7 +41,6 @@ function KeyboardDismissibleFlatList<T>({onScroll: onScrollProp, ref, ...restPro
 
     return (
         <AnimatedFlatListWithCellRenderer
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             ref={ref}
             onScroll={onScroll}
diff --git a/src/components/KeyboardDismissibleFlatList/index.tsx b/src/components/KeyboardDismissibleFlatList/index.tsx
index 6fec5c54521a..35e660869248 100644
--- a/src/components/KeyboardDismissibleFlatList/index.tsx
+++ b/src/components/KeyboardDismissibleFlatList/index.tsx
@@ -18,7 +18,6 @@ function KeyboardDismissibleFlatList<T>({onScroll: onScrollProp, inverted, ref,
 
     return (
         <AnimatedFlatListWithCellRenderer
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             ref={ref}
             onScroll={onScroll}
diff --git a/src/components/LHNOptionsList/LHNEmptyState.tsx b/src/components/LHNOptionsList/LHNEmptyState.tsx
index c126ff66f56d..820195bfd259 100644
--- a/src/components/LHNOptionsList/LHNEmptyState.tsx
+++ b/src/components/LHNOptionsList/LHNEmptyState.tsx
@@ -70,7 +70,6 @@ function LHNEmptyState() {
 
     return (
         <BlockingView
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...(emptyLHNIllustration as BlockingViewProps)}
             title={translate('common.emptyLHN.title')}
             CustomSubtitle={subtitle}
diff --git a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
index 672e4e5ec2dd..c797dfcef367 100644
--- a/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
+++ b/src/components/LHNOptionsList/OptionRowLHN/OptionRowLHNData.tsx
@@ -192,7 +192,6 @@ function OptionRowLHNData({
 
     return (
         <OptionRowLHN
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...propsToForward}
             viewMode={viewMode}
             isOptionFocused={isReportFocused}
diff --git a/src/components/LHNOptionsList/OptionRowRendererComponent/index.native.tsx b/src/components/LHNOptionsList/OptionRowRendererComponent/index.native.tsx
index b4f8e6025ce8..54416503fc83 100644
--- a/src/components/LHNOptionsList/OptionRowRendererComponent/index.native.tsx
+++ b/src/components/LHNOptionsList/OptionRowRendererComponent/index.native.tsx
@@ -15,7 +15,6 @@ type OptionRowRendererComponentProps = {
 function OptionRowRendererComponent({...props}: OptionRowRendererComponentProps) {
     return (
         <View
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             style={[props.style, {zIndex: -props.index}]}
         />
diff --git a/src/components/LocationErrorMessage/index.native.tsx b/src/components/LocationErrorMessage/index.native.tsx
index be3ffabfac88..3c9dfc8ed778 100644
--- a/src/components/LocationErrorMessage/index.native.tsx
+++ b/src/components/LocationErrorMessage/index.native.tsx
@@ -11,7 +11,6 @@ const openAppSettings = () => {
 function LocationErrorMessage(props: LocationErrorMessageProps) {
     return (
         <BaseLocationErrorMessage
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             onAllowLocationLinkPress={openAppSettings}
         />
diff --git a/src/components/LocationErrorMessage/index.tsx b/src/components/LocationErrorMessage/index.tsx
index 625350a859e8..db0bd22d5149 100644
--- a/src/components/LocationErrorMessage/index.tsx
+++ b/src/components/LocationErrorMessage/index.tsx
@@ -12,7 +12,6 @@ const navigateToExpensifyHelpSite = () => {
 function LocationErrorMessage(props: LocationErrorMessageProps) {
     return (
         <BaseLocationErrorMessage
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             onAllowLocationLinkPress={navigateToExpensifyHelpSite}
         />
diff --git a/src/components/Lottie/index.tsx b/src/components/Lottie/index.tsx
index 4e76b8b19bd6..d132efe379ca 100644
--- a/src/components/Lottie/index.tsx
+++ b/src/components/Lottie/index.tsx
@@ -116,7 +116,6 @@ function Lottie({source, webStyle, shouldLoadAfterInteractions, ...props}: Props
 
     return (
         <LottieView
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             source={animationFile}
             key={`${hasNavigatedAway}`}
diff --git a/src/components/MapView/MapView.tsx b/src/components/MapView/MapView.tsx
index 43e53f108b11..1df2dc289cdc 100644
--- a/src/components/MapView/MapView.tsx
+++ b/src/components/MapView/MapView.tsx
@@ -267,7 +267,6 @@ function MapView({
                 compassEnabled
                 compassPosition={{...styles.l2, ...styles.t5}}
                 logoPosition={{...styles.l2, ...styles.b2}}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...responder.panHandlers}
             >
                 <Mapbox.Camera
diff --git a/src/components/MapView/MapView.web.tsx b/src/components/MapView/MapView.web.tsx
index 8c32ff28aefc..78c0b3a010bb 100644
--- a/src/components/MapView/MapView.web.tsx
+++ b/src/components/MapView/MapView.web.tsx
@@ -54,7 +54,6 @@ function MapView({ref, ...props}: MapViewProps) {
                 {!isOffline ? (
                     <MapViewImpl
                         ref={ref}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...props}
                     />
                 ) : (
diff --git a/src/components/MapView/MapViewImpl.web.tsx b/src/components/MapView/MapViewImpl.web.tsx
index d8c6506335a3..3068dcf6c74c 100644
--- a/src/components/MapView/MapViewImpl.web.tsx
+++ b/src/components/MapView/MapViewImpl.web.tsx
@@ -255,7 +255,6 @@ function MapViewImpl({
     return !isOffline && !!accessToken && !!initialViewState ? (
         <View
             style={style}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...responder.panHandlers}
         >
             <Map
diff --git a/src/components/MapView/ToggleDistanceUnitButton/index.android.tsx b/src/components/MapView/ToggleDistanceUnitButton/index.android.tsx
index 8aa86e493c18..3814690b4c87 100644
--- a/src/components/MapView/ToggleDistanceUnitButton/index.android.tsx
+++ b/src/components/MapView/ToggleDistanceUnitButton/index.android.tsx
@@ -43,7 +43,6 @@ function ToggleDistanceUnitButton({onPress, children, ...rest}: PressableProps)
             onTouchStart={handleTouchStart}
             onTouchMove={handleTouchMove}
             onTouchEnd={handleTouchEnd}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         >
             {children}
diff --git a/src/components/MapView/index.tsx b/src/components/MapView/index.tsx
index d9da7f1dfea3..110b3c268d9b 100644
--- a/src/components/MapView/index.tsx
+++ b/src/components/MapView/index.tsx
@@ -3,7 +3,6 @@ import MapView from './MapView';
 import type {MapViewProps} from './MapViewTypes';
 
 function MapViewComponent(props: MapViewProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <MapView {...props} />;
 }
 
diff --git a/src/components/MenuItem.tsx b/src/components/MenuItem.tsx
index b5404c1f2c83..f8e7a748565e 100644
--- a/src/components/MenuItem.tsx
+++ b/src/components/MenuItem.tsx
@@ -904,7 +904,6 @@ function MenuItem({
                                                     ]}
                                                 >
                                                     {!!leftComponent && <View style={[styles.mr3]}>{leftComponent}</View>}
-                                                    {}
                                                     {isIDPassed && (
                                                         <ReportActionAvatars
                                                             subscriptAvatarBorderColor={getSubscriptAvatarBackgroundColor(isHovered, pressed, theme.hoverComponentBG, theme.buttonHoveredBG)}
diff --git a/src/components/MenuItemList.tsx b/src/components/MenuItemList.tsx
index 78f882d008bf..275a5491ea5f 100644
--- a/src/components/MenuItemList.tsx
+++ b/src/components/MenuItemList.tsx
@@ -104,7 +104,6 @@ function MenuItemList({menuItems = [], shouldUseSingleExecution = false, wrapper
                     icon={icon}
                     iconWidth={iconWidth}
                     iconHeight={iconHeight}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...menuItemProps}
                     disabled={!!menuItemProps.disabled || isExecuting}
                     onPress={shouldUseSingleExecution ? singleExecution(menuItemProps.onPress) : menuItemProps.onPress}
diff --git a/src/components/MenuItemWithTopDescription.tsx b/src/components/MenuItemWithTopDescription.tsx
index 6fb725c28d94..4f59d1fda285 100644
--- a/src/components/MenuItemWithTopDescription.tsx
+++ b/src/components/MenuItemWithTopDescription.tsx
@@ -19,7 +19,6 @@ function MenuItemWithTopDescription({highlighted, outerWrapperStyle, ref, ...pro
 
     return (
         <MenuItem
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
             shouldShowBasicTitle
diff --git a/src/components/Modal/Global/ConfirmModalWrapper.tsx b/src/components/Modal/Global/ConfirmModalWrapper.tsx
index 6190dab658b4..1dbcb548438f 100644
--- a/src/components/Modal/Global/ConfirmModalWrapper.tsx
+++ b/src/components/Modal/Global/ConfirmModalWrapper.tsx
@@ -47,7 +47,6 @@ function ConfirmModalWrapper({closeModal, onModalHide, ...props}: ConfirmModalWr
 
     return (
         <ConfirmModal
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             isVisible={isVisible}
             onConfirm={handleConfirm}
diff --git a/src/components/Modal/Global/DecisionModalWrapper.tsx b/src/components/Modal/Global/DecisionModalWrapper.tsx
index c650379b7965..942f1de8db73 100644
--- a/src/components/Modal/Global/DecisionModalWrapper.tsx
+++ b/src/components/Modal/Global/DecisionModalWrapper.tsx
@@ -35,7 +35,7 @@ function DecisionModalWrapper({closeModal, onModalHide, ...props}: DecisionModal
     return (
         <DecisionModal
             // Spreading is needed to forward all modal configuration props from the wrapper to the underlying DecisionModal.
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...props}
             isVisible={isVisible}
             isSmallScreenWidth={isSmallScreenWidth}
diff --git a/src/components/Modal/Global/ModalContext.tsx b/src/components/Modal/Global/ModalContext.tsx
index 520c15f6f6bd..7b0fba46cab2 100644
--- a/src/components/Modal/Global/ModalContext.tsx
+++ b/src/components/Modal/Global/ModalContext.tsx
@@ -106,7 +106,6 @@ function ModalProvider({children}: {children: React.ReactNode}) {
             {children}
             {!!ModalComponent && (
                 <ModalComponent
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...modalToRender.props}
                     key={modalToRender.id}
                     closeModal={closeModal}
diff --git a/src/components/Modal/ReanimatedModal/Container/index.tsx b/src/components/Modal/ReanimatedModal/Container/index.tsx
index d8ec179f4519..a2a60da37111 100644
--- a/src/components/Modal/ReanimatedModal/Container/index.tsx
+++ b/src/components/Modal/ReanimatedModal/Container/index.tsx
@@ -48,7 +48,6 @@ function Container({
     return (
         <View
             style={style}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         >
             <GestureHandler
diff --git a/src/components/Modal/ReanimatedModal/Container/index.web.tsx b/src/components/Modal/ReanimatedModal/Container/index.web.tsx
index 952d40333d68..047e8829a74d 100644
--- a/src/components/Modal/ReanimatedModal/Container/index.web.tsx
+++ b/src/components/Modal/ReanimatedModal/Container/index.web.tsx
@@ -64,7 +64,6 @@ function Container({
         <Animated.View
             style={[style, type !== CONST.MODAL.MODAL_TYPE.RIGHT_DOCKED && type !== CONST.MODAL.MODAL_TYPE.POPOVER && styles.modalAnimatedContainer, animatedStyles, {zIndex: 1}]}
             exiting={Exiting}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         >
             {props.children}
diff --git a/src/components/Modal/ReanimatedModal/index.tsx b/src/components/Modal/ReanimatedModal/index.tsx
index 5d550fd2d53d..d17adcb493c9 100644
--- a/src/components/Modal/ReanimatedModal/index.tsx
+++ b/src/components/Modal/ReanimatedModal/index.tsx
@@ -245,7 +245,6 @@ function ReanimatedModal({
                     }
                 }}
                 style={modalStyle}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             >
                 {isBackdropMounted && hasBackdrop && backdropView}
diff --git a/src/components/Modal/index.android.tsx b/src/components/Modal/index.android.tsx
index 05ee270a5e32..6bd49b6efef3 100644
--- a/src/components/Modal/index.android.tsx
+++ b/src/components/Modal/index.android.tsx
@@ -3,14 +3,7 @@ import BaseModal from './BaseModal';
 import type BaseModalProps from './types';
 
 function Modal({children, ...rest}: BaseModalProps) {
-    return (
-        <BaseModal
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...rest}
-        >
-            {children}
-        </BaseModal>
-    );
+    return <BaseModal {...rest}>{children}</BaseModal>;
 }
 
 export default Modal;
diff --git a/src/components/Modal/index.ios.tsx b/src/components/Modal/index.ios.tsx
index db9296f41b28..5c3b59bf2d5c 100644
--- a/src/components/Modal/index.ios.tsx
+++ b/src/components/Modal/index.ios.tsx
@@ -11,7 +11,6 @@ function Modal({children, ...rest}: BaseModalProps) {
 
     return (
         <BaseModal
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             animationInTiming={animationInTiming}
             animationOutTiming={animationOutTiming}
diff --git a/src/components/Modal/index.tsx b/src/components/Modal/index.tsx
index 206f2e395fa0..332c92cd71a3 100644
--- a/src/components/Modal/index.tsx
+++ b/src/components/Modal/index.tsx
@@ -105,7 +105,6 @@ function Modal({fullscreen = true, onModalHide = () => {}, type, onModalShow = (
 
     return (
         <BaseModal
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             onModalHide={hideModal}
             onModalShow={showModal}
diff --git a/src/components/MoneyReportHeaderKYCDropdown.tsx b/src/components/MoneyReportHeaderKYCDropdown.tsx
index 91a4e4ddd9a3..7c25d6e11151 100644
--- a/src/components/MoneyReportHeaderKYCDropdown.tsx
+++ b/src/components/MoneyReportHeaderKYCDropdown.tsx
@@ -64,7 +64,6 @@ function MoneyReportHeaderKYCDropdown({
 
     return (
         <KYCWall
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             onSuccessfulKYC={onSuccessfulKYC}
             enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
diff --git a/src/components/MultifactorAuthentication/components/Modals/createCancelConfirmModal.tsx b/src/components/MultifactorAuthentication/components/Modals/createCancelConfirmModal.tsx
index 1a7e0fdbda30..7892dbb5f5ae 100644
--- a/src/components/MultifactorAuthentication/components/Modals/createCancelConfirmModal.tsx
+++ b/src/components/MultifactorAuthentication/components/Modals/createCancelConfirmModal.tsx
@@ -37,12 +37,7 @@ function createCancelConfirmModal(displayName: string, baseProps: BaseProps): (p
     function CancelConfirmModal(mutableProps: CancelConfirmModalProps) {
         const props = {...baseProps, ...mutableProps};
 
-        return (
-            <CancelConfirmModalBase
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-            />
-        );
+        return <CancelConfirmModalBase {...props} />;
     }
 
     CancelConfirmModal.displayName = displayName;
diff --git a/src/components/MultifactorAuthentication/components/OutcomeScreen/createScreenWithDefaults.tsx b/src/components/MultifactorAuthentication/components/OutcomeScreen/createScreenWithDefaults.tsx
index 55cd6b70e00d..c2fe82670bfb 100644
--- a/src/components/MultifactorAuthentication/components/OutcomeScreen/createScreenWithDefaults.tsx
+++ b/src/components/MultifactorAuthentication/components/OutcomeScreen/createScreenWithDefaults.tsx
@@ -35,7 +35,6 @@ function createScreenWithDefaults<P extends Record<string, unknown>>(Component:
     function Screen(overrideProps: Partial<P>) {
         const mergedProps: P = {...defaultProps, ...overrideProps};
 
-        // eslint-disable-next-line react/jsx-props-no-spreading
         return <Component {...mergedProps} />;
     }
 
diff --git a/src/components/PercentageForm.tsx b/src/components/PercentageForm.tsx
index 5bc9d6eeb1c4..cf16007e38a0 100644
--- a/src/components/PercentageForm.tsx
+++ b/src/components/PercentageForm.tsx
@@ -96,7 +96,6 @@ function PercentageForm({
             // On android autoCapitalize="words" is necessary when keyboardType="decimal-pad" or inputMode="decimal" to prevent input lag.
             // See https://github.com/Expensify/App/issues/51868 for more information
             autoCapitalize="words"
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/components/Picker/BasePicker.tsx b/src/components/Picker/BasePicker.tsx
index 40456bc95525..01f3d6dbfb12 100644
--- a/src/components/Picker/BasePicker.tsx
+++ b/src/components/Picker/BasePicker.tsx
@@ -103,7 +103,6 @@ function BasePicker<TPickerValue>({
             <Icon
                 fill={theme.icon}
                 src={icons.DownArrow}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(size === 'small' ? {width: styles.pickerSmall().icon.width, height: styles.pickerSmall().icon.height} : {})}
             />
         );
diff --git a/src/components/Picker/index.native.tsx b/src/components/Picker/index.native.tsx
index 872f8dd5864b..d91e8154c053 100644
--- a/src/components/Picker/index.native.tsx
+++ b/src/components/Picker/index.native.tsx
@@ -5,7 +5,6 @@ import type {BasePickerProps} from './types';
 function Picker<TPickerValue>({ref, ...props}: BasePickerProps<TPickerValue>) {
     return (
         <BasePicker<TPickerValue>
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             key={props.inputID}
             ref={ref}
diff --git a/src/components/Picker/index.tsx b/src/components/Picker/index.tsx
index 57e297822c57..01d98c5a2635 100644
--- a/src/components/Picker/index.tsx
+++ b/src/components/Picker/index.tsx
@@ -17,7 +17,6 @@ function Picker<TPickerValue>({ref, ...props}: BasePickerProps<TPickerValue>) {
 
     return (
         <BasePicker<TPickerValue>
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             // Forward the ref to Picker, as we implement imperative methods there
             ref={ref}
diff --git a/src/components/PlaidLink/index.android.tsx b/src/components/PlaidLink/index.android.tsx
index ccd777786253..94ce7d7ac622 100644
--- a/src/components/PlaidLink/index.android.tsx
+++ b/src/components/PlaidLink/index.android.tsx
@@ -19,7 +19,6 @@ function PlaidLink({onExit = () => {}, ...restProps}: PlaidLinkProps) {
                     onExit();
                 });
             }}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
         />
     );
diff --git a/src/components/PlaidLink/index.ios.tsx b/src/components/PlaidLink/index.ios.tsx
index 47c2728dc458..2f08efe4114b 100644
--- a/src/components/PlaidLink/index.ios.tsx
+++ b/src/components/PlaidLink/index.ios.tsx
@@ -2,12 +2,7 @@ import BaseNativePlaidLink from './BaseNativePlaidLink';
 import type PlaidLinkProps from './types';
 
 function PlaidLink(props: PlaidLinkProps) {
-    return (
-        <BaseNativePlaidLink
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-        />
-    );
+    return <BaseNativePlaidLink {...props} />;
 }
 
 export default PlaidLink;
diff --git a/src/components/Popover/index.native.tsx b/src/components/Popover/index.native.tsx
index 4e6e8dff9248..dbeeb6e3deaf 100644
--- a/src/components/Popover/index.native.tsx
+++ b/src/components/Popover/index.native.tsx
@@ -12,7 +12,6 @@ function Popover({animationIn, animationOut, popoverAnchorPosition, disableAnima
         <Modal
             type={fromSidebarMediumScreen ? CONST.MODAL.MODAL_TYPE.POPOVER : CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
             popoverAnchorPosition={fromSidebarMediumScreen ? anchorPosition : undefined}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...propsWithoutAnimation}
             // Mobile will always has fullscreen menu
             fullscreen
diff --git a/src/components/Popover/index.tsx b/src/components/Popover/index.tsx
index 6584b9b7078f..c3d8fa8328d6 100644
--- a/src/components/Popover/index.tsx
+++ b/src/components/Popover/index.tsx
@@ -78,7 +78,6 @@ function Popover(props: PopoverProps) {
     if (!fullscreen && !shouldUseNarrowLayout) {
         return createPortal(
             <Modal
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 onClose={onCloseWithPopoverContext}
                 type={CONST.MODAL.MODAL_TYPE.POPOVER}
@@ -96,7 +95,6 @@ function Popover(props: PopoverProps) {
     if (withoutOverlay && !shouldUseNarrowLayout) {
         return createPortal(
             <PopoverWithoutOverlay
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 withoutOverlayRef={withoutOverlayRef}
                 animationIn={animationIn}
@@ -108,7 +106,6 @@ function Popover(props: PopoverProps) {
 
     return (
         <Modal
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             onClose={onCloseWithPopoverContext}
             shouldHandleNavigationBack={props.shouldHandleNavigationBack}
diff --git a/src/components/PopoverMenu.tsx b/src/components/PopoverMenu.tsx
index 2fb0ca3b2837..145f6744e043 100644
--- a/src/components/PopoverMenu.tsx
+++ b/src/components/PopoverMenu.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import {deepEqual} from 'fast-equals';
 import type {ReactNode, RefObject} from 'react';
 import React, {useCallback, useEffect, useLayoutEffect, useMemo, useState} from 'react';
diff --git a/src/components/PopoverWithMeasuredContent/PopoverWithMeasuredContentBase.tsx b/src/components/PopoverWithMeasuredContent/PopoverWithMeasuredContentBase.tsx
index 0429274bf28e..9d3a8bfadfc6 100644
--- a/src/components/PopoverWithMeasuredContent/PopoverWithMeasuredContentBase.tsx
+++ b/src/components/PopoverWithMeasuredContent/PopoverWithMeasuredContentBase.tsx
@@ -205,7 +205,6 @@ function PopoverWithMeasuredContentBase({
             hideModalContentWhileAnimating={hideModalContentWhileAnimating}
             modalId={modalId}
             shouldEnableNewFocusManagement={shouldEnableNewFocusManagement}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             anchorPosition={shiftedAnchorPosition}
         >
diff --git a/src/components/PopoverWithMeasuredContent/index.tsx b/src/components/PopoverWithMeasuredContent/index.tsx
index a76434244264..9c063dce4982 100644
--- a/src/components/PopoverWithMeasuredContent/index.tsx
+++ b/src/components/PopoverWithMeasuredContent/index.tsx
@@ -31,7 +31,6 @@ function PopoverWithMeasuredContent({shouldWrapModalChildrenInScrollViewIfBottom
     if (isSmallScreenWidth) {
         return (
             <Modal
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 type={CONST.MODAL.MODAL_TYPE.BOTTOM_DOCKED}
                 animationIn="slideInUp"
@@ -45,7 +44,6 @@ function PopoverWithMeasuredContent({shouldWrapModalChildrenInScrollViewIfBottom
         return null;
     }
 
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <PopoverWithMeasuredContentBase {...props} />;
 }
 
diff --git a/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx b/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
index 9cf9b015b63e..e6b6e90d184a 100644
--- a/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
+++ b/src/components/Pressable/GenericPressable/implementation/BaseGenericPressable.tsx
@@ -209,7 +209,6 @@ function GenericPressable({
             onAccessibilityTap={!isDisabled ? voidOnPressHandler : undefined}
             accessible={accessible}
             fsClass={forwardedFSClass}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             onHoverOut={(event) => {
                 if (event?.type === 'pointerenter' || event?.type === 'mouseenter') {
diff --git a/src/components/Pressable/GenericPressable/implementation/index.native.tsx b/src/components/Pressable/GenericPressable/implementation/index.native.tsx
index 6f27367fd782..aeffc35b77d8 100644
--- a/src/components/Pressable/GenericPressable/implementation/index.native.tsx
+++ b/src/components/Pressable/GenericPressable/implementation/index.native.tsx
@@ -7,7 +7,6 @@ function NativeGenericPressable({ref, ...props}: PressableProps) {
         <GenericPressable
             focusable
             accessible
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
             accessibilityHint={props.accessibilityHint ?? props.accessibilityLabel}
diff --git a/src/components/Pressable/GenericPressable/implementation/index.tsx b/src/components/Pressable/GenericPressable/implementation/index.tsx
index aa67087859a7..1e89ed3f9816 100644
--- a/src/components/Pressable/GenericPressable/implementation/index.tsx
+++ b/src/components/Pressable/GenericPressable/implementation/index.tsx
@@ -27,7 +27,6 @@ function WebGenericPressable({focusable = true, ref, sentryLabel, ...props}: Pre
 
     return (
         <GenericPressable
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={mergeRefs(internalRef, ref)}
             // change native accessibility props to web accessibility props
diff --git a/src/components/Pressable/PressableWithDelayToggle.tsx b/src/components/Pressable/PressableWithDelayToggle.tsx
index afcd0aab5c8e..9ba33c078bd1 100644
--- a/src/components/Pressable/PressableWithDelayToggle.tsx
+++ b/src/components/Pressable/PressableWithDelayToggle.tsx
@@ -153,7 +153,6 @@ function PressableWithDelayToggle({
                     text={tooltipTexts}
                     shouldRender
                 >
-                    {}
                     <PressableWithoutFeedback
                         tabIndex={-1}
                         accessible={false}
diff --git a/src/components/Pressable/PressableWithFeedback.tsx b/src/components/Pressable/PressableWithFeedback.tsx
index 851a7c245d38..5218679854ea 100644
--- a/src/components/Pressable/PressableWithFeedback.tsx
+++ b/src/components/Pressable/PressableWithFeedback.tsx
@@ -73,7 +73,6 @@ function PressableWithFeedback({
         >
             <GenericPressable
                 ref={ref}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
                 disabled={rest.disabled}
                 onHoverIn={(event) => {
diff --git a/src/components/Pressable/PressableWithoutFeedback.tsx b/src/components/Pressable/PressableWithoutFeedback.tsx
index 84c2abc36ed6..bd257e41f77e 100644
--- a/src/components/Pressable/PressableWithoutFeedback.tsx
+++ b/src/components/Pressable/PressableWithoutFeedback.tsx
@@ -5,7 +5,6 @@ import type PressableProps from './GenericPressable/types';
 function PressableWithoutFeedback({pressStyle, focusStyle, screenReaderActiveStyle, shouldUseHapticsOnPress, shouldUseHapticsOnLongPress = false, ref, ...rest}: PressableProps) {
     return (
         <GenericPressable
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             ref={ref}
             shouldUseHapticsOnLongPress={shouldUseHapticsOnLongPress}
diff --git a/src/components/Pressable/PressableWithoutFocus.tsx b/src/components/Pressable/PressableWithoutFocus.tsx
index 43de8121fe78..6a8e9dde29f7 100644
--- a/src/components/Pressable/PressableWithoutFocus.tsx
+++ b/src/components/Pressable/PressableWithoutFocus.tsx
@@ -23,7 +23,6 @@ function PressableWithoutFocus({children, onPress, onLongPress, ...rest}: Pressa
             onPress={pressAndBlur}
             onLongPress={onLongPress}
             ref={ref}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         >
             {children}
diff --git a/src/components/PressableWithSecondaryInteraction/index.native.tsx b/src/components/PressableWithSecondaryInteraction/index.native.tsx
index 96fb72fdb6bc..8dea83b409a7 100644
--- a/src/components/PressableWithSecondaryInteraction/index.native.tsx
+++ b/src/components/PressableWithSecondaryInteraction/index.native.tsx
@@ -29,7 +29,7 @@ function PressableWithSecondaryInteraction({
         return (
             <Text
                 // ESLint is disabled here to propagate all the props, enhancing PressableWithSecondaryInteraction's versatility across different use cases.
-                // eslint-disable-next-line react/jsx-props-no-spreading
+
                 {...(rest as TextProps)}
                 suppressHighlighting={suppressHighlighting}
                 onLongPress={onSecondaryInteraction ? executeSecondaryInteraction : undefined}
@@ -42,7 +42,7 @@ function PressableWithSecondaryInteraction({
     return (
         <PressableWithFeedback
             // ESLint is disabled here to propagate all the props, enhancing PressableWithSecondaryInteraction's versatility across different use cases.
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...rest}
             ref={ref}
             onLongPress={onSecondaryInteraction ? executeSecondaryInteraction : undefined}
diff --git a/src/components/PressableWithSecondaryInteraction/index.tsx b/src/components/PressableWithSecondaryInteraction/index.tsx
index 16141d927444..b04bfb4bbf94 100644
--- a/src/components/PressableWithSecondaryInteraction/index.tsx
+++ b/src/components/PressableWithSecondaryInteraction/index.tsx
@@ -93,7 +93,7 @@ function PressableWithSecondaryInteraction({
     return (
         <PressableWithFeedback
             // ESLint is disabled here to propagate all the props, enhancing PressableWithSecondaryInteraction's versatility across different use cases.
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...rest}
             wrapperStyle={[StyleUtils.combineStyles(canUseTouchScreen() ? [styles.userSelectNone, styles.noSelect] : [], inlineStyle), wrapperStyle]}
             onLongPress={onSecondaryInteraction ? executeSecondaryInteraction : undefined}
diff --git a/src/components/QRShare/QRShareWithDownload/index.native.tsx b/src/components/QRShare/QRShareWithDownload/index.native.tsx
index bace918f06ef..7406123d5eed 100644
--- a/src/components/QRShare/QRShareWithDownload/index.native.tsx
+++ b/src/components/QRShare/QRShareWithDownload/index.native.tsx
@@ -25,7 +25,6 @@ function QRShareWithDownload({ref, ...props}: QRShareWithDownloadProps) {
     return (
         <ViewShot ref={qrCodeScreenshotRef}>
             <QRShare
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 logo={isOffline ? undefined : props.logo}
             />
diff --git a/src/components/QRShare/QRShareWithDownload/index.tsx b/src/components/QRShare/QRShareWithDownload/index.tsx
index f6dffa5573dd..da9bdfd723ac 100644
--- a/src/components/QRShare/QRShareWithDownload/index.tsx
+++ b/src/components/QRShare/QRShareWithDownload/index.tsx
@@ -32,7 +32,6 @@ function QRShareWithDownload({ref, ...props}: QRShareWithDownloadProps) {
     return (
         <QRShare
             ref={qrShareRef}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             logo={isOffline ? undefined : props.logo}
         />
diff --git a/src/components/Reactions/QuickEmojiReactions/index.native.tsx b/src/components/Reactions/QuickEmojiReactions/index.native.tsx
index a1573fec6b3d..b6c80e82bd7d 100644
--- a/src/components/Reactions/QuickEmojiReactions/index.native.tsx
+++ b/src/components/Reactions/QuickEmojiReactions/index.native.tsx
@@ -9,7 +9,6 @@ function QuickEmojiReactions({closeContextMenu, ...rest}: QuickEmojiReactionsPro
 
     return (
         <BaseQuickEmojiReactions
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             onPressOpenPicker={onPressOpenPicker}
         />
diff --git a/src/components/Reactions/QuickEmojiReactions/index.tsx b/src/components/Reactions/QuickEmojiReactions/index.tsx
index b8e28ee930de..3b8c880c49ff 100644
--- a/src/components/Reactions/QuickEmojiReactions/index.tsx
+++ b/src/components/Reactions/QuickEmojiReactions/index.tsx
@@ -14,7 +14,6 @@ function QuickEmojiReactions({closeContextMenu, ...rest}: QuickEmojiReactionsPro
 
     return (
         <BaseQuickEmojiReactions
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             onPressOpenPicker={onPressOpenPicker}
             onWillShowPicker={closeContextMenu}
diff --git a/src/components/ReceiptImage/index.tsx b/src/components/ReceiptImage/index.tsx
index 85cdc0eace58..fd22c83efdb1 100644
--- a/src/components/ReceiptImage/index.tsx
+++ b/src/components/ReceiptImage/index.tsx
@@ -206,7 +206,6 @@ function ReceiptImage({
                 <EReceiptThumbnail
                     transactionID={transactionID}
                     iconSize={iconSize}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                 />
             </View>
diff --git a/src/components/ReportActionAvatars/ReportActionAvatar.tsx b/src/components/ReportActionAvatars/ReportActionAvatar.tsx
index 6e759ba70994..9eb56371e21e 100644
--- a/src/components/ReportActionAvatars/ReportActionAvatar.tsx
+++ b/src/components/ReportActionAvatars/ReportActionAvatar.tsx
@@ -71,10 +71,7 @@ function ProfileAvatar(props: Parameters<typeof Avatar>[0] & {useProfileNavigati
     const {avatarID, useProfileNavigationWrapper, type, name, reportID} = props;
 
     if (!useProfileNavigationWrapper) {
-        return (
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
-            <Avatar {...{...props, useProfileNavigationWrapper: undefined}} />
-        );
+        return <Avatar {...{...props, useProfileNavigationWrapper: undefined}} />;
     }
 
     const isWorkspace = type === CONST.ICON_TYPE_WORKSPACE;
@@ -98,7 +95,6 @@ function ProfileAvatar(props: Parameters<typeof Avatar>[0] & {useProfileNavigati
             accessibilityRole={CONST.ROLE.BUTTON}
             sentryLabel={CONST.SENTRY_LABEL.REPORT.REPORT_ACTION_AVATAR}
         >
-            {/* eslint-disable-next-line react/jsx-props-no-spreading */}
             <Avatar {...{...props, useProfileNavigationWrapper: undefined}} />
         </PressableWithoutFocus>
     );
diff --git a/src/components/ReportActionAvatars/index.tsx b/src/components/ReportActionAvatars/index.tsx
index 323b7b7e8844..cb6812468b96 100644
--- a/src/components/ReportActionAvatars/index.tsx
+++ b/src/components/ReportActionAvatars/index.tsx
@@ -180,7 +180,6 @@ function ReportActionAvatars({
     if (avatarType === CONST.REPORT_ACTION_AVATARS.TYPE.MULTIPLE_HORIZONTAL) {
         return (
             <ReportActionAvatar.Multiple.Horizontal
-                /* eslint-disable-next-line react/jsx-props-no-spreading */
                 {...(isHorizontalStackingAnObject ? horizontalStacking : {})}
                 size={size}
                 icons={icons}
diff --git a/src/components/ReportActionItem/ReportActionItemImage.tsx b/src/components/ReportActionItem/ReportActionItemImage.tsx
index fd11424ac00a..7521fc839f78 100644
--- a/src/components/ReportActionItem/ReportActionItemImage.tsx
+++ b/src/components/ReportActionItem/ReportActionItemImage.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import {Str} from 'expensify-common';
 import React from 'react';
 import type {ViewStyle} from 'react-native';
diff --git a/src/components/ReportActionItem/TransactionPreview/index.tsx b/src/components/ReportActionItem/TransactionPreview/index.tsx
index 0f94aa3dc99b..f32f1c9bedc1 100644
--- a/src/components/ReportActionItem/TransactionPreview/index.tsx
+++ b/src/components/ReportActionItem/TransactionPreview/index.tsx
@@ -119,7 +119,6 @@ function TransactionPreview(props: TransactionPreviewProps) {
                 sentryLabel={CONST.SENTRY_LABEL.TRANSACTION_PREVIEW.CARD}
             >
                 <TransactionPreviewContent
-                    /* eslint-disable-next-line react/jsx-props-no-spreading */
                     {...props}
                     action={iouAction}
                     isBillSplit={isBillSplit && !transaction?.comment?.originalTransactionID}
@@ -144,7 +143,6 @@ function TransactionPreview(props: TransactionPreviewProps) {
 
     return (
         <TransactionPreviewContent
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
             action={iouAction}
             isBillSplit={isBillSplit}
diff --git a/src/components/RoomNameInput/index.native.tsx b/src/components/RoomNameInput/index.native.tsx
index ce044d7b52f0..014de62e3543 100644
--- a/src/components/RoomNameInput/index.native.tsx
+++ b/src/components/RoomNameInput/index.native.tsx
@@ -28,7 +28,6 @@ function RoomNameInput({disabled = false, autoFocus = false, isFocused, value, o
 
     return (
         <TextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
             disabled={disabled}
diff --git a/src/components/RoomNameInput/index.tsx b/src/components/RoomNameInput/index.tsx
index 0167ac8c1774..32c383e29865 100644
--- a/src/components/RoomNameInput/index.tsx
+++ b/src/components/RoomNameInput/index.tsx
@@ -40,7 +40,6 @@ function RoomNameInput({disabled = false, autoFocus = false, isFocused, value =
 
     return (
         <TextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
             disabled={disabled}
diff --git a/src/components/ScreenWrapper/ScreenWrapperContainer.tsx b/src/components/ScreenWrapper/ScreenWrapperContainer.tsx
index 9b99c513d7ef..415c7dd60260 100644
--- a/src/components/ScreenWrapper/ScreenWrapperContainer.tsx
+++ b/src/components/ScreenWrapper/ScreenWrapperContainer.tsx
@@ -212,7 +212,6 @@ function ScreenWrapperContainer({
             ref={ref}
             // This style gives the background for the screens. Stack cards are transparent to make different width screens in RHP possible.
             style={[styles.flex1, styles.appBG, styles.screenWrapperContainerMinHeight(minHeight)]}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...panResponder.panHandlers}
             testID={testID}
             fsClass={forwardedFSClass}
@@ -222,7 +221,6 @@ function ScreenWrapperContainer({
         >
             <View
                 style={[shouldEnableMaxHeight && {marginTop: viewportOffsetTop}, style, paddingTopStyle]}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...keyboardDismissPanResponder.panHandlers}
             >
                 <KeyboardAvoidingView
diff --git a/src/components/ScreenWrapper/index.tsx b/src/components/ScreenWrapper/index.tsx
index de761f6393b5..27171266f323 100644
--- a/src/components/ScreenWrapper/index.tsx
+++ b/src/components/ScreenWrapper/index.tsx
@@ -281,7 +281,6 @@ function ScreenWrapper({
                 includeSafeAreaPaddingBottom={includeSafeAreaPaddingBottom}
                 isFocused={isFocused}
                 shouldHideFromAccessibility={shouldHideFromAccessibility}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...restContainerProps}
             >
                 {isDevelopment && <CustomDevMenu />}
diff --git a/src/components/ScrollView.tsx b/src/components/ScrollView.tsx
index fc30e8c26299..7c5385628324 100644
--- a/src/components/ScrollView.tsx
+++ b/src/components/ScrollView.tsx
@@ -40,7 +40,6 @@ function ScrollView({
             // See: https://github.com/Expensify/App/issues/31441
             contentContainerStyle={contentContainerStyle}
             scrollIndicatorInsets={scrollIndicatorInsets ?? {right: Number.MIN_VALUE}}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         >
             {children}
diff --git a/src/components/ScrollViewWithContext.tsx b/src/components/ScrollViewWithContext.tsx
index 7d2636c0056e..21e11c77c14d 100644
--- a/src/components/ScrollViewWithContext.tsx
+++ b/src/components/ScrollViewWithContext.tsx
@@ -51,7 +51,6 @@ function ScrollViewWithContext({onScroll, scrollEventThrottle, children, ref, ..
 
     return (
         <ScrollView
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...restProps}
             ref={scrollViewRef}
             onScroll={setContextScrollPosition}
diff --git a/src/components/Search/DeferredSearchAutocompleteList/index.native.tsx b/src/components/Search/DeferredSearchAutocompleteList/index.native.tsx
index 98fd9db561e5..acbdd80e7f86 100644
--- a/src/components/Search/DeferredSearchAutocompleteList/index.native.tsx
+++ b/src/components/Search/DeferredSearchAutocompleteList/index.native.tsx
@@ -37,7 +37,6 @@ function DeferredAutocompleteList(props: SearchAutocompleteListProps) {
         );
     }
 
-    // eslint-disable-next-line react/jsx-props-no-spreading -- This is a transparent wrapper that forwards all props to SearchAutocompleteList
     return <SearchAutocompleteList {...props} />;
 }
 
diff --git a/src/components/Search/FilterComponents/ListFilterViewWrapper.tsx b/src/components/Search/FilterComponents/ListFilterViewWrapper.tsx
index de0638adb3f6..e4a04a300361 100644
--- a/src/components/Search/FilterComponents/ListFilterViewWrapper.tsx
+++ b/src/components/Search/FilterComponents/ListFilterViewWrapper.tsx
@@ -48,7 +48,6 @@ function ListFilterWrapper({children, ...props}: ListFilterWrapperProps) {
         return children;
     }
 
-    // eslint-disable-next-line react/jsx-props-no-spreading -- ListFilterWrapper is a wrapper that forwards all props to the underlying ListFilterView
     return <ListFilterView {...props}>{children}</ListFilterView>;
 }
 
diff --git a/src/components/Search/FilterDropdowns/DropdownButton.tsx b/src/components/Search/FilterDropdowns/DropdownButton.tsx
index 1b584bf742f7..a7d0ab764559 100644
--- a/src/components/Search/FilterDropdowns/DropdownButton.tsx
+++ b/src/components/Search/FilterDropdowns/DropdownButton.tsx
@@ -172,7 +172,6 @@ function DropdownButton({
                         onPress={calculatePopoverPositionAndToggleOverlay}
                         sentryLabel={sentryLabel}
                         shouldRemoveRightBorderRadius={shouldShowCloseButton}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...(medium ? {medium: true} : {small: true})}
                     >
                         <CaretWrapper
diff --git a/src/components/Search/SearchAutocompleteList.tsx b/src/components/Search/SearchAutocompleteList.tsx
index d31b97a9172d..77d2df9ed10a 100644
--- a/src/components/Search/SearchAutocompleteList.tsx
+++ b/src/components/Search/SearchAutocompleteList.tsx
@@ -108,12 +108,7 @@ function SearchRouterItem(props: UserListItemProps<AutocompleteListItem> | Searc
     const styles = useThemeStyles();
 
     if (isSearchQueryListItem(props)) {
-        return (
-            <SearchQueryListItem
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-            />
-        );
+        return <SearchQueryListItem {...props} />;
     }
 
     const {item, isFocused, showTooltip, isDisabled, onSelectRow, onDismissError, shouldPreventEnterKeySubmit, rightHandSideComponent, onFocus, shouldSyncFocus, wrapperStyle} = props;
diff --git a/src/components/Search/SearchInputSelectionWrapper/index.native.tsx b/src/components/Search/SearchInputSelectionWrapper/index.native.tsx
index d61f5f8186b8..e2411a5bef2b 100644
--- a/src/components/Search/SearchInputSelectionWrapper/index.native.tsx
+++ b/src/components/Search/SearchInputSelectionWrapper/index.native.tsx
@@ -30,7 +30,6 @@ function SearchInputSelectionWrapper({ref, skipSkeleton, ...props}: SearchAutoco
     return (
         <SearchAutocompleteInput
             ref={ref}
-            // eslint-disable-next-line react/jsx-props-no-spreading -- thin wrapper forwarding all props to SearchAutocompleteInput
             {...props}
             selection={undefined}
         />
diff --git a/src/components/Search/SearchInputSelectionWrapper/index.tsx b/src/components/Search/SearchInputSelectionWrapper/index.tsx
index 24302783b38d..3a44f5ef609f 100644
--- a/src/components/Search/SearchInputSelectionWrapper/index.tsx
+++ b/src/components/Search/SearchInputSelectionWrapper/index.tsx
@@ -7,7 +7,6 @@ function SearchInputSelectionWrapper({selection, ref, skipSkeleton: _skipSkeleto
         <SearchAutocompleteInput
             selection={selection}
             ref={ref}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/Search/SearchList/ListItem/ActionCell/DeferredActionCell.tsx b/src/components/Search/SearchList/ListItem/ActionCell/DeferredActionCell.tsx
index 13a85cde7fc1..a8687c6f60ae 100644
--- a/src/components/Search/SearchList/ListItem/ActionCell/DeferredActionCell.tsx
+++ b/src/components/Search/SearchList/ListItem/ActionCell/DeferredActionCell.tsx
@@ -32,7 +32,7 @@ function DeferredActionCell(actionCellProps: ActionCellProps) {
     }
 
     // Deferred wrapper intentionally forwards all props to the underlying component
-    // eslint-disable-next-line react/jsx-props-no-spreading
+
     return <ActionCell {...actionCellProps} />;
 }
 
diff --git a/src/components/Search/SearchList/ListItem/TransactionListItem/index.tsx b/src/components/Search/SearchList/ListItem/TransactionListItem/index.tsx
index aacd73588ef6..bb62a66c0d3d 100644
--- a/src/components/Search/SearchList/ListItem/TransactionListItem/index.tsx
+++ b/src/components/Search/SearchList/ListItem/TransactionListItem/index.tsx
@@ -175,7 +175,6 @@ function TransactionListItem<TItem extends ListItem>({
     if (!isLargeScreenWidth) {
         return (
             <TransactionListItemNarrow
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...sharedProps}
                 isLastItem={isLastItem}
                 isFirstItem={isFirstItem}
@@ -185,7 +184,6 @@ function TransactionListItem<TItem extends ListItem>({
 
     return (
         <TransactionListItemWide
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...sharedProps}
             isLastItem={isLastItem}
         />
diff --git a/src/components/SelectionList/ListItem/BaseListItem.tsx b/src/components/SelectionList/ListItem/BaseListItem.tsx
index ab3fe75ba901..523540bb783f 100644
--- a/src/components/SelectionList/ListItem/BaseListItem.tsx
+++ b/src/components/SelectionList/ListItem/BaseListItem.tsx
@@ -176,7 +176,6 @@ function BaseListItem<TItem extends ListItem>({
         >
             <PressableWithFeedback
                 sentryLabel={CONST.SENTRY_LABEL.SELECTION_LIST.BASE_LIST_ITEM}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...bind}
                 ref={pressableRef}
                 lang={item.lang}
@@ -223,7 +222,6 @@ function BaseListItem<TItem extends ListItem>({
                 onFocus={onFocus}
                 role={role}
                 tabIndex={tabIndex}
-                // eslint-disable-next-line react/jsx-props-no-spreading -- we can't pass those props here on their own because this Component expects a discriminated Union
                 {...accessibleAndAccessibilityLabel}
                 accessibilityState={accessibilityState}
                 aria-current={ariaCurrent}
diff --git a/src/components/SelectionList/ListItem/SelectableListItem.tsx b/src/components/SelectionList/ListItem/SelectableListItem.tsx
index dfbab5be4bd1..60b1e02e4a8c 100644
--- a/src/components/SelectionList/ListItem/SelectableListItem.tsx
+++ b/src/components/SelectionList/ListItem/SelectableListItem.tsx
@@ -28,7 +28,6 @@ function SelectableListItem<TItem extends ListItem>({
 
     return (
         <BaseListItem
-            // eslint-disable-next-line react/jsx-props-no-spreading -- props are forwarded from SelectableListItem to BaseListItem as a pass-through layer
             {...baseProps}
             item={item}
             isFocused={isFocused}
diff --git a/src/components/SelectionList/ListItem/SingleSelectWithAvatarListItem.tsx b/src/components/SelectionList/ListItem/SingleSelectWithAvatarListItem.tsx
index d68fed0f65d5..8350e13fc6d3 100644
--- a/src/components/SelectionList/ListItem/SingleSelectWithAvatarListItem.tsx
+++ b/src/components/SelectionList/ListItem/SingleSelectWithAvatarListItem.tsx
@@ -18,7 +18,6 @@ function SingleSelectWithAvatarListItem<TItem extends ListItem>({item, wrapperSt
     if (!icon) {
         return (
             <SingleSelectListItem
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 item={item}
                 wrapperStyle={wrapperStyle}
@@ -42,7 +41,6 @@ function SingleSelectWithAvatarListItem<TItem extends ListItem>({item, wrapperSt
 
     return (
         <SingleSelectListItem
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             item={{...item, leftElement: avatarElement}}
             wrapperStyle={[styles.optionRow, styles.pv0, styles.pv3, styles.w100, wrapperStyle]}
diff --git a/src/components/SelectionList/SelectionListWithSections/index.native.tsx b/src/components/SelectionList/SelectionListWithSections/index.native.tsx
index c54233d2aedb..dc80a74594eb 100644
--- a/src/components/SelectionList/SelectionListWithSections/index.native.tsx
+++ b/src/components/SelectionList/SelectionListWithSections/index.native.tsx
@@ -7,7 +7,7 @@ function SelectionList<TItem extends ListItem>(props: SelectionListWithSectionsP
     return (
         <BaseSelectionList
             // Props spreading is necessary here to pass through all SelectionList props while adding native-specific behavior
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...props}
             onScrollBeginDrag={Keyboard.dismiss}
         />
diff --git a/src/components/SelectionList/SelectionListWithSections/index.tsx b/src/components/SelectionList/SelectionListWithSections/index.tsx
index adc8288029f4..ffc6bb7e1ae5 100644
--- a/src/components/SelectionList/SelectionListWithSections/index.tsx
+++ b/src/components/SelectionList/SelectionListWithSections/index.tsx
@@ -12,7 +12,7 @@ function SelectionList<TItem extends ListItem>({shouldHideKeyboardOnScroll = tru
     return (
         <BaseSelectionList
             // Props spreading is necessary here to pass through all SelectionList props while adding web-specific behavior
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...props}
             ref={ref}
             onScroll={onScroll}
diff --git a/src/components/SelectionList/index.native.tsx b/src/components/SelectionList/index.native.tsx
index 321ad55815fb..8a7b623007dc 100644
--- a/src/components/SelectionList/index.native.tsx
+++ b/src/components/SelectionList/index.native.tsx
@@ -6,7 +6,6 @@ import type {ListItem, SelectionListProps} from './types';
 function SelectionList<TItem extends ListItem>({ref, ...props}: SelectionListProps<TItem>) {
     return (
         <BaseSelectionList
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
             onScrollBeginDrag={() => {
diff --git a/src/components/SelectionList/index.tsx b/src/components/SelectionList/index.tsx
index a5c3e2b8b4ca..fa2eeaad58d4 100644
--- a/src/components/SelectionList/index.tsx
+++ b/src/components/SelectionList/index.tsx
@@ -12,7 +12,6 @@ function SelectionList<TItem extends ListItem>({ref, ...props}: SelectionListPro
 
     return (
         <BaseSelectionList
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
             // Ignore the focus if it's caused by a touch event on mobile chrome.
diff --git a/src/components/SelectionListWithModal/index.tsx b/src/components/SelectionListWithModal/index.tsx
index 8df6dcf62b65..c9c5d2acdb3f 100644
--- a/src/components/SelectionListWithModal/index.tsx
+++ b/src/components/SelectionListWithModal/index.tsx
@@ -101,7 +101,6 @@ function SelectionListWithModal<TItem extends ListItem>({
                 isSmallScreenWidth={isSmallScreenWidth}
                 disableMaintainingScrollPosition
                 style={style}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
             <Modal
diff --git a/src/components/SettlementButton/AnimatedSettlementButton.tsx b/src/components/SettlementButton/AnimatedSettlementButton.tsx
index 9a3b5efceeda..2d3a549609bf 100644
--- a/src/components/SettlementButton/AnimatedSettlementButton.tsx
+++ b/src/components/SettlementButton/AnimatedSettlementButton.tsx
@@ -123,7 +123,6 @@ function AnimatedSettlementButton({
             )}
             {!isAnimationRunning && (
                 <SettlementButton
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...settlementButtonProps}
                     wrapperStyle={wrapperStyle}
                     isDisabled={isAnimationRunning || isDisabled}
diff --git a/src/components/SkeletonRect.tsx b/src/components/SkeletonRect.tsx
index 677420a6993e..46fa87cc5e2e 100644
--- a/src/components/SkeletonRect.tsx
+++ b/src/components/SkeletonRect.tsx
@@ -23,7 +23,6 @@ function SkeletonRect({borderRadius, height, ...rest}: SkeletonRectProps) {
     const radius = borderRadius ?? getDefaultRadius(height);
     return (
         <Rect
-            // eslint-disable-next-line react/jsx-props-no-spreading -- SkeletonRect is a thin wrapper that forwards all remaining RectProps to the underlying SVG Rect
             {...rest}
             height={height}
             rx={radius}
diff --git a/src/components/SkeletonViewContentLoader/index.native.tsx b/src/components/SkeletonViewContentLoader/index.native.tsx
index afd58361947a..641598ecf46f 100644
--- a/src/components/SkeletonViewContentLoader/index.native.tsx
+++ b/src/components/SkeletonViewContentLoader/index.native.tsx
@@ -6,7 +6,6 @@ import type SkeletonViewContentLoaderProps from './types';
 function ContentLoader({style, ...props}: SkeletonViewContentLoaderProps) {
     return (
         <SkeletonViewContentLoader
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             // Using StyleSheet.flatten() because SkeletonViewContentLoader is not able to handle array style notation(eg. style={[style1, style2]}) of style prop
             style={StyleSheet.flatten(style)}
diff --git a/src/components/SkeletonViewContentLoader/index.tsx b/src/components/SkeletonViewContentLoader/index.tsx
index cab7710d02ee..f34078d54acc 100644
--- a/src/components/SkeletonViewContentLoader/index.tsx
+++ b/src/components/SkeletonViewContentLoader/index.tsx
@@ -8,7 +8,6 @@ import type SkeletonViewContentLoaderProps from './types';
 function ContentLoader({style, ...props}: SkeletonViewContentLoaderProps) {
     return (
         <SkeletonViewContentLoader
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             // Using StyleSheet.flatten() because SkeletonViewContentLoader is not able to handle array style notation(eg. style={[style1, style2]}) of style prop
             style={StyleSheet.flatten(style) as CSSProperties}
diff --git a/src/components/SwipeableView/index.native.tsx b/src/components/SwipeableView/index.native.tsx
index d92f3302362f..f2a4915cbc66 100644
--- a/src/components/SwipeableView/index.native.tsx
+++ b/src/components/SwipeableView/index.native.tsx
@@ -22,7 +22,6 @@ function SwipeableView({children, onSwipeDown}: SwipeableViewProps) {
         }),
     ).current;
 
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <View {...panResponder.panHandlers}>{children}</View>;
 }
 
diff --git a/src/components/Table/TableBody.tsx b/src/components/Table/TableBody.tsx
index 76587f776fc2..e2a5eb0a3dc8 100644
--- a/src/components/Table/TableBody.tsx
+++ b/src/components/Table/TableBody.tsx
@@ -79,7 +79,6 @@ function TableBody<T>({contentContainerStyle, ...props}: TableBodyProps) {
     return (
         <View
             style={styles.flex1}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         >
             <FlashList<T>
@@ -87,7 +86,6 @@ function TableBody<T>({contentContainerStyle, ...props}: TableBodyProps) {
                 ListEmptyComponent={isEmptyResult ? EmptyResultComponent : ListEmptyComponent}
                 contentContainerStyle={[filteredAndSortedData.length === 0 && styles.flex1, listContentContainerStyle, contentContainerStyle]}
                 keyboardShouldPersistTaps="handled"
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...restListProps}
             />
         </View>
diff --git a/src/components/Table/TableFilterButtons/index.tsx b/src/components/Table/TableFilterButtons/index.tsx
index 0ae6a83faca3..ba04082fa06a 100644
--- a/src/components/Table/TableFilterButtons/index.tsx
+++ b/src/components/Table/TableFilterButtons/index.tsx
@@ -86,7 +86,6 @@ function TableFilterButtons({contentContainerStyle, ...props}: TableFilterButton
     }
 
     return (
-        // eslint-disable-next-line react/jsx-props-no-spreading
         <View {...props}>
             <FlatList
                 horizontal
@@ -139,7 +138,6 @@ function CellRendererComponent({children, style, ...props}: {children: ReactNode
     const shouldShowResponsiveLayout = shouldUseNarrowLayout || isMediumScreenWidth;
     return (
         <View
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             style={[style, shouldShowResponsiveLayout && styles.flex1]}
         >
diff --git a/src/components/Table/TableHeader.tsx b/src/components/Table/TableHeader.tsx
index b0d94614b6bc..bfa96b68d2d4 100644
--- a/src/components/Table/TableHeader.tsx
+++ b/src/components/Table/TableHeader.tsx
@@ -81,7 +81,6 @@ function TableHeader<T, ColumnKey extends string = string>({style, shouldHideHea
                 !shouldUseNarrowTableLayout && {gridTemplateColumns: `repeat(${columns.length}, 1fr)`},
                 style,
             ]}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         >
             {shouldUseNarrowTableLayout && (
diff --git a/src/components/Table/TableRow.tsx b/src/components/Table/TableRow.tsx
index 55196c58e901..017cb70eed5f 100644
--- a/src/components/Table/TableRow.tsx
+++ b/src/components/Table/TableRow.tsx
@@ -96,7 +96,7 @@ export default function TableRow({
     return (
         <OfflineWithFeedback
             // We need to spread the props due to how the OfflineWithFeedback component handles child components
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...offlineWithFeedback}
         >
             <PressableWithFeedback
@@ -109,7 +109,6 @@ export default function TableRow({
                 hoverStyle={isInteractive && styles.hoveredComponentBG}
                 role={isInteractive ? CONST.ROLE.BUTTON : CONST.ROLE.PRESENTATION}
                 onPress={onPress}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             >
                 {(state) =>
diff --git a/src/components/Text.tsx b/src/components/Text.tsx
index 5c8d75387dea..1b1c6b5f5041 100644
--- a/src/components/Text.tsx
+++ b/src/components/Text.tsx
@@ -77,7 +77,6 @@ function Text({color, fontSize = variables.fontSizeNormal, textAlign = 'left', c
             // On Android, TalkBack reads style metadata (e.g. color codes) along with text content.
             // Setting accessibilityLabel explicitly causes TalkBack to read only the label, skipping style info.
             accessibilityLabel={typeof children === 'string' && !!children && Platform.OS === 'android' ? children : undefined}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         >
             {children}
diff --git a/src/components/TextInput/BaseTextInput/implementation/index.tsx b/src/components/TextInput/BaseTextInput/implementation/index.tsx
index aa97408450cd..1fa92aa59bd0 100644
--- a/src/components/TextInput/BaseTextInput/implementation/index.tsx
+++ b/src/components/TextInput/BaseTextInput/implementation/index.tsx
@@ -341,7 +341,6 @@ function BaseTextInput({
         <>
             <View
                 style={[containerStyles]}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(shouldInterceptSwipe && SwipeInterceptPanResponder.panHandlers)}
             >
                 <PressableWithoutFeedback
diff --git a/src/components/TextInput/index.native.tsx b/src/components/TextInput/index.native.tsx
index ea18b9a60377..e362eadcb6d2 100644
--- a/src/components/TextInput/index.native.tsx
+++ b/src/components/TextInput/index.native.tsx
@@ -32,7 +32,6 @@ function TextInput({ref, navigation, ...props}: BaseTextInputProps) {
 
     return (
         <BaseTextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             // Setting autoCompleteType to new-password throws an error on Android/iOS, so fall back to password in that case
 
diff --git a/src/components/TextInput/index.tsx b/src/components/TextInput/index.tsx
index cce3074a5e32..d858e17e5d02 100644
--- a/src/components/TextInput/index.tsx
+++ b/src/components/TextInput/index.tsx
@@ -93,7 +93,6 @@ function TextInput({ref, ...props}: BaseTextInputProps) {
 
     return (
         <BaseTextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={(element) => {
                 textInputRef.current = element as HTMLFormElement;
diff --git a/src/components/TextInputWithSymbol/BaseTextInputWithSymbol.tsx b/src/components/TextInputWithSymbol/BaseTextInputWithSymbol.tsx
index a5827b9c9602..a1d959ab40ed 100644
--- a/src/components/TextInputWithSymbol/BaseTextInputWithSymbol.tsx
+++ b/src/components/TextInputWithSymbol/BaseTextInputWithSymbol.tsx
@@ -68,7 +68,6 @@ function BaseTextInputWithSymbol({
                 onKeyPress={onKeyPress}
                 style={[styles.pr1, style]}
                 rightHandSideComponent={rightHandSideComponent}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
             {!hideSymbol && symbolPosition === CONST.TEXT_INPUT_SYMBOL_POSITION.SUFFIX && (
diff --git a/src/components/TextInputWithSymbol/index.android.tsx b/src/components/TextInputWithSymbol/index.android.tsx
index f6caebb05dc2..3019229751c0 100644
--- a/src/components/TextInputWithSymbol/index.android.tsx
+++ b/src/components/TextInputWithSymbol/index.android.tsx
@@ -9,7 +9,6 @@ function TextInputWithSymbol({onSelectionChange = () => {}, ref, ...props}: Text
 
     return (
         <BaseTextInputWithSymbol
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
             ref={ref}
             onSelectionChange={(event: TextInputSelectionChangeEvent) => {
diff --git a/src/components/TextInputWithSymbol/index.tsx b/src/components/TextInputWithSymbol/index.tsx
index fa55f4a81f45..80c7395a61a6 100644
--- a/src/components/TextInputWithSymbol/index.tsx
+++ b/src/components/TextInputWithSymbol/index.tsx
@@ -6,7 +6,6 @@ import type {TextInputWithSymbolProps} from './types';
 function TextInputWithSymbol({onSelectionChange = () => {}, ref, ...props}: TextInputWithSymbolProps) {
     return (
         <BaseTextInputWithSymbol
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
             onSelectionChange={(event: TextInputSelectionChangeEvent) => {
diff --git a/src/components/TextInputWithSymbol/index.web.tsx b/src/components/TextInputWithSymbol/index.web.tsx
index 564a1519129c..37b81c2b025d 100644
--- a/src/components/TextInputWithSymbol/index.web.tsx
+++ b/src/components/TextInputWithSymbol/index.web.tsx
@@ -8,7 +8,6 @@ function TextInputWithSymbol({onSelectionChange = () => {}, ref, ...props}: Text
 
     return (
         <BaseTextInputWithSymbol
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={(element) => {
                 textInputRef.current = element as HTMLFormElement;
diff --git a/src/components/TextLink.tsx b/src/components/TextLink.tsx
index 9c879e4df40e..7bf14376966a 100644
--- a/src/components/TextLink.tsx
+++ b/src/components/TextLink.tsx
@@ -72,7 +72,6 @@ function TextLink({href, onPress, children, style, onMouseDown = (event) => even
             ref={ref}
             suppressHighlighting
             accessible
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         >
             {children}
diff --git a/src/components/TextLinkBlock.tsx b/src/components/TextLinkBlock.tsx
index 09e99eaa4965..9304131d62cd 100644
--- a/src/components/TextLinkBlock.tsx
+++ b/src/components/TextLinkBlock.tsx
@@ -56,7 +56,6 @@ function TextLinkBlock({text, style, prefixIcon, ...rest}: TextLinkBlockProps) {
                     {!!prefixIcon && index === 0 && <Text> </Text>}
                     <TextLink
                         style={style}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...rest}
                     >
                         {word}
diff --git a/src/components/TextPicker/TextSelectorModal.tsx b/src/components/TextPicker/TextSelectorModal.tsx
index f235ce4906e3..85f6c7d45950 100644
--- a/src/components/TextPicker/TextSelectorModal.tsx
+++ b/src/components/TextPicker/TextSelectorModal.tsx
@@ -178,7 +178,6 @@ function TextSelectorModal({
                         InputComponent={TextInput}
                         value={currentValue}
                         onValueChange={(changedValue) => setValue(SafeString(changedValue))}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...rest}
                         inputID={rest.inputID}
                         autoGrowHeight={autoGrowHeight}
diff --git a/src/components/TextPicker/index.tsx b/src/components/TextPicker/index.tsx
index 28f0a4a705f3..ac948d7c1be5 100644
--- a/src/components/TextPicker/index.tsx
+++ b/src/components/TextPicker/index.tsx
@@ -82,7 +82,6 @@ function TextPicker({
                 required={required}
                 customValidate={customValidate}
                 shouldUseStrictHtmlTagValidation={shouldUseStrictHtmlTagValidation}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
         </View>
diff --git a/src/components/ThreeDotsMenu/index.tsx b/src/components/ThreeDotsMenu/index.tsx
index 4211368b82a1..8e93abab7222 100644
--- a/src/components/ThreeDotsMenu/index.tsx
+++ b/src/components/ThreeDotsMenu/index.tsx
@@ -153,7 +153,6 @@ function ThreeDotsMenu({
     return (
         <>
             <View>
-                {/* eslint-disable-next-line react/jsx-props-no-spreading */}
                 <TooltipToRender {...tooltipProps}>
                     <PressableWithoutFeedback
                         onPress={onThreeDotsPress}
diff --git a/src/components/Tooltip/BaseTooltip/index.tsx b/src/components/Tooltip/BaseTooltip/index.tsx
index 5d34e0a412db..486d642f78f9 100644
--- a/src/components/Tooltip/BaseTooltip/index.tsx
+++ b/src/components/Tooltip/BaseTooltip/index.tsx
@@ -98,7 +98,6 @@ function Tooltip({children, shouldHandleScroll = false, isFocused = true, ref, .
     }
 
     return (
-        // eslint-disable-next-line react/jsx-props-no-spreading
         <GenericTooltip {...props}>
             {({isVisible, showTooltip, hideTooltip, updateTargetBounds}) =>
                 // Checks if valid element so we can wrap the BoundsObserver around it
diff --git a/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx b/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
index 87799a7ec53c..0e8bdd16ab71 100644
--- a/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
+++ b/src/components/Tooltip/EducationalTooltip/BaseEducationalTooltip.tsx
@@ -154,7 +154,6 @@ function BaseEducationalTooltip({children, shouldRender = false, shouldHideOnNav
             shouldForceAnimate
             shouldRender={shouldRender}
             isEducationTooltip
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         >
             {(genericTooltipState) => {
diff --git a/src/components/Tooltip/EducationalTooltip/index.tsx b/src/components/Tooltip/EducationalTooltip/index.tsx
index 93209ea54ccc..d8d757f261c8 100644
--- a/src/components/Tooltip/EducationalTooltip/index.tsx
+++ b/src/components/Tooltip/EducationalTooltip/index.tsx
@@ -9,14 +9,7 @@ function EducationalTooltip({children, ...props}: TooltipExtendedProps) {
         return children;
     }
 
-    return (
-        <BaseEducationalTooltip
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-        >
-            {children}
-        </BaseEducationalTooltip>
-    );
+    return <BaseEducationalTooltip {...props}>{children}</BaseEducationalTooltip>;
 }
 
 export default EducationalTooltip;
diff --git a/src/components/Tooltip/PopoverAnchorTooltip.tsx b/src/components/Tooltip/PopoverAnchorTooltip.tsx
index b659887dbba7..6d44e26fd295 100644
--- a/src/components/Tooltip/PopoverAnchorTooltip.tsx
+++ b/src/components/Tooltip/PopoverAnchorTooltip.tsx
@@ -25,7 +25,6 @@ function PopoverAnchorTooltip({shouldRender = true, children, ...props}: Tooltip
 
     return (
         <BaseTooltip
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={tooltipRef}
         >
diff --git a/src/components/Tooltip/index.tsx b/src/components/Tooltip/index.tsx
index 21e19048f985..031c8b40ce50 100644
--- a/src/components/Tooltip/index.tsx
+++ b/src/components/Tooltip/index.tsx
@@ -7,14 +7,7 @@ function Tooltip({shouldRender = true, children, ...props}: TooltipExtendedProps
         return children;
     }
 
-    return (
-        <BaseTooltip
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-        >
-            {children}
-        </BaseTooltip>
-    );
+    return <BaseTooltip {...props}>{children}</BaseTooltip>;
 }
 
 export default Tooltip;
diff --git a/src/components/TransactionItemRow/DataCells/DeferredChatBubbleCell.tsx b/src/components/TransactionItemRow/DataCells/DeferredChatBubbleCell.tsx
index 135d66ab3401..8a56ae219dd3 100644
--- a/src/components/TransactionItemRow/DataCells/DeferredChatBubbleCell.tsx
+++ b/src/components/TransactionItemRow/DataCells/DeferredChatBubbleCell.tsx
@@ -20,7 +20,7 @@ function DeferredChatBubbleCell(props: DeferredChatBubbleCellProps) {
     }
 
     // Deferred wrapper intentionally forwards all props to the underlying component
-    // eslint-disable-next-line react/jsx-props-no-spreading
+
     return <ChatBubbleCell {...props} />;
 }
 
diff --git a/src/components/TransactionItemRow/DeferredTransactionItemRowRBR.tsx b/src/components/TransactionItemRow/DeferredTransactionItemRowRBR.tsx
index 014b651ac437..ec1abcd1f7b1 100644
--- a/src/components/TransactionItemRow/DeferredTransactionItemRowRBR.tsx
+++ b/src/components/TransactionItemRow/DeferredTransactionItemRowRBR.tsx
@@ -12,7 +12,7 @@ function DeferredTransactionItemRowRBR(props: DeferredTransactionItemRowRBRProps
     }
 
     // Deferred wrapper intentionally forwards all props to the underlying component
-    // eslint-disable-next-line react/jsx-props-no-spreading
+
     return <TransactionItemRowRBR {...props} />;
 }
 
diff --git a/src/components/TransactionItemRow/index.tsx b/src/components/TransactionItemRow/index.tsx
index 60dd4a10a70b..ffcb97a714cd 100644
--- a/src/components/TransactionItemRow/index.tsx
+++ b/src/components/TransactionItemRow/index.tsx
@@ -144,7 +144,6 @@ function TransactionItemRow({
 
         return (
             <TransactionItemRowNarrow
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...narrowForwardedProps}
                 bgActiveStyles={bgActiveStyles}
                 merchant={merchant}
@@ -207,7 +206,6 @@ function TransactionItemRow({
 
     return (
         <TransactionItemRowWide
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...wideForwardedProps}
             bgActiveStyles={bgActiveStyles}
             merchant={merchant}
diff --git a/src/components/TwoFactorAuthForm/index.android.tsx b/src/components/TwoFactorAuthForm/index.android.tsx
index d6910ef540f9..821d96ebee31 100644
--- a/src/components/TwoFactorAuthForm/index.android.tsx
+++ b/src/components/TwoFactorAuthForm/index.android.tsx
@@ -7,7 +7,6 @@ function TwoFactorAuthForm(props: TwoFactorAuthFormProps) {
     return (
         <BaseTwoFactorAuthForm
             autoComplete={CONST.AUTO_COMPLETE_VARIANTS.SMS_OTP}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/TwoFactorAuthForm/index.tsx b/src/components/TwoFactorAuthForm/index.tsx
index 18e5b0f867f1..a953c1ca96e4 100644
--- a/src/components/TwoFactorAuthForm/index.tsx
+++ b/src/components/TwoFactorAuthForm/index.tsx
@@ -3,12 +3,7 @@ import BaseTwoFactorAuthForm from './BaseTwoFactorAuthForm';
 import type {TwoFactorAuthFormProps} from './types';
 
 function TwoFactorAuthForm(props: TwoFactorAuthFormProps) {
-    return (
-        <BaseTwoFactorAuthForm
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-        />
-    );
+    return <BaseTwoFactorAuthForm {...props} />;
 }
 
 export default TwoFactorAuthForm;
diff --git a/src/components/UserDetailsTooltip/index.tsx b/src/components/UserDetailsTooltip/index.tsx
index 7010608f5198..ef5971c75aec 100644
--- a/src/components/UserDetailsTooltip/index.tsx
+++ b/src/components/UserDetailsTooltip/index.tsx
@@ -7,14 +7,7 @@ function UserDetailsTooltip({shouldRender = true, children, ...props}: UserDetai
         return children;
     }
 
-    return (
-        <BaseUserDetailsTooltip
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-        >
-            {children}
-        </BaseUserDetailsTooltip>
-    );
+    return <BaseUserDetailsTooltip {...props}>{children}</BaseUserDetailsTooltip>;
 }
 
 export default UserDetailsTooltip;
diff --git a/src/components/ValidateCodeActionModal/ValidateCodeForm/index.android.tsx b/src/components/ValidateCodeActionModal/ValidateCodeForm/index.android.tsx
index c5e8a91e10e9..8f14a1d48b74 100644
--- a/src/components/ValidateCodeActionModal/ValidateCodeForm/index.android.tsx
+++ b/src/components/ValidateCodeActionModal/ValidateCodeForm/index.android.tsx
@@ -9,7 +9,6 @@ function ValidateCodeForm(props: ValidateCodeFormProps) {
         <GestureHandlerRootView>
             <BaseValidateCodeForm
                 autoComplete={CONST.AUTO_COMPLETE_VARIANTS.SMS_OTP}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </GestureHandlerRootView>
diff --git a/src/components/ValidateCodeActionModal/ValidateCodeForm/index.tsx b/src/components/ValidateCodeActionModal/ValidateCodeForm/index.tsx
index 6a35103415f1..f08a804938b1 100644
--- a/src/components/ValidateCodeActionModal/ValidateCodeForm/index.tsx
+++ b/src/components/ValidateCodeActionModal/ValidateCodeForm/index.tsx
@@ -7,7 +7,6 @@ function ValidateCodeForm(props: ValidateCodeFormProps) {
     return (
         <BaseValidateCodeForm
             autoComplete={CONST.AUTO_COMPLETE_VARIANTS.ONE_TIME_CODE}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/components/VideoPlayer/index.native.tsx b/src/components/VideoPlayer/index.native.tsx
index 42f5b2a7c8a2..34c99191b676 100644
--- a/src/components/VideoPlayer/index.native.tsx
+++ b/src/components/VideoPlayer/index.native.tsx
@@ -11,7 +11,6 @@ function VideoPlayer({videoControlsStyle, shouldUseControlsBottomMargin = true,
 
     return (
         <BaseVideoPlayer
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             isVideoHovered
             shouldUseSharedVideoElement={false}
diff --git a/src/components/VideoPlayer/index.tsx b/src/components/VideoPlayer/index.tsx
index 2ff53123f703..700545fa56a9 100644
--- a/src/components/VideoPlayer/index.tsx
+++ b/src/components/VideoPlayer/index.tsx
@@ -10,7 +10,6 @@ function VideoPlayer(props: VideoPlayerProps) {
 
     return (
         <BaseVideoPlayer
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             reportID={reportID ?? fakeReportID}
         />
diff --git a/src/components/withCurrentUserPersonalDetails.tsx b/src/components/withCurrentUserPersonalDetails.tsx
index 24c6bec99551..62ff488c3e12 100644
--- a/src/components/withCurrentUserPersonalDetails.tsx
+++ b/src/components/withCurrentUserPersonalDetails.tsx
@@ -15,7 +15,6 @@ export default function <TProps extends WithCurrentUserPersonalDetailsProps>(Wra
         const currentUserPersonalDetails = useCurrentUserPersonalDetails();
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(props as TProps)}
                 currentUserPersonalDetails={currentUserPersonalDetails}
             />
diff --git a/src/components/withNavigationFallback.tsx b/src/components/withNavigationFallback.tsx
index 6618c287a409..274c7089b057 100644
--- a/src/components/withNavigationFallback.tsx
+++ b/src/components/withNavigationFallback.tsx
@@ -28,16 +28,10 @@ export default function <TProps extends Record<string, unknown>>(WrappedComponen
         );
 
         return context ? (
-            <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-            />
+            <WrappedComponent {...props} />
         ) : (
             <NavigationContext.Provider value={navigationContextValue as unknown as NavigationProp<ParamListBase>}>
-                <WrappedComponent
-                    // eslint-disable-next-line react/jsx-props-no-spreading
-                    {...props}
-                />
+                <WrappedComponent {...props} />
             </NavigationContext.Provider>
         );
     }
diff --git a/src/components/withNavigationTransitionEnd.tsx b/src/components/withNavigationTransitionEnd.tsx
index 5c45f2b7ad5f..33e45ff2ad15 100644
--- a/src/components/withNavigationTransitionEnd.tsx
+++ b/src/components/withNavigationTransitionEnd.tsx
@@ -23,7 +23,6 @@ export default function <TProps>(WrappedComponent: ComponentType<TProps>): React
 
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 didScreenTransitionEnd={didScreenTransitionEnd}
             />
diff --git a/src/components/withToggleVisibilityView.tsx b/src/components/withToggleVisibilityView.tsx
index 85805a92bed1..70bb41ff10aa 100644
--- a/src/components/withToggleVisibilityView.tsx
+++ b/src/components/withToggleVisibilityView.tsx
@@ -18,7 +18,6 @@ export default function withToggleVisibilityView<TProps>(WrappedComponent: Compo
                 collapsable={false}
             >
                 <WrappedComponent
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...(rest as TProps)}
                     isVisible={isVisible}
                 />
diff --git a/src/components/withViewportOffsetTop.tsx b/src/components/withViewportOffsetTop.tsx
index 51e56d447c0f..5bf648d1909c 100644
--- a/src/components/withViewportOffsetTop.tsx
+++ b/src/components/withViewportOffsetTop.tsx
@@ -28,7 +28,6 @@ export default function withViewportOffsetTop<TProps extends ViewportOffsetTopPr
 
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(props as TProps)}
                 viewportOffsetTop={viewportOffsetTop}
             />
diff --git a/src/libs/Navigation/AppNavigator/Navigators/Overlay/index.tsx b/src/libs/Navigation/AppNavigator/Navigators/Overlay/index.tsx
index 28a00b62dc06..d82c5d9ede92 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/Overlay/index.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/Overlay/index.tsx
@@ -3,12 +3,7 @@ import type {BaseOverlayProps} from './BaseOverlay';
 import BaseOverlay from './BaseOverlay';
 
 function Overlay({...rest}: Omit<BaseOverlayProps, 'shouldUseNativeStyles'>) {
-    return (
-        <BaseOverlay
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...rest}
-        />
-    );
+    return <BaseOverlay {...rest} />;
 }
 
 export default Overlay;
diff --git a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
index 499988500cc5..81851f3303f4 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/RightModalNavigator.tsx
@@ -53,10 +53,7 @@ const getWideRHPWidth = (windowWidth: number) => variables.sideBarWidth + calcul
 function MissingPersonalDetailsWithPINContext(props: Record<string, unknown>) {
     return (
         <PINContextProvider>
-            <ModalStackNavigators.MissingPersonalDetailsModalStackNavigator
-                /* eslint-disable-next-line react/jsx-props-no-spreading */
-                {...props}
-            />
+            <ModalStackNavigators.MissingPersonalDetailsModalStackNavigator {...props} />
         </PINContextProvider>
     );
 }
diff --git a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
index 18a584bf2e25..cac72b38402c 100644
--- a/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
+++ b/src/libs/Navigation/AppNavigator/Navigators/TabNavigator.tsx
@@ -53,7 +53,6 @@ function withSuspense<P extends Record<string, unknown>>(LazyComponent: React.La
     function SuspenseWrapper(props: P) {
         return (
             <Suspense fallback={<LazyFallback tabSpanName={tabSpanName} />}>
-                {/* eslint-disable-next-line react/jsx-props-no-spreading */}
                 <LazyComponent {...props} />
             </Suspense>
         );
diff --git a/src/libs/Navigation/OnyxTabNavigator.tsx b/src/libs/Navigation/OnyxTabNavigator.tsx
index d5cd04e27cbf..1a79a3b14cce 100644
--- a/src/libs/Navigation/OnyxTabNavigator.tsx
+++ b/src/libs/Navigation/OnyxTabNavigator.tsx
@@ -154,7 +154,6 @@ function OnyxTabNavigator<TTabName extends string = SelectedTabRequest>({
                     shouldShowProductTrainingTooltip={shouldShowProductTrainingTooltip}
                     renderProductTrainingTooltip={renderProductTrainingTooltip}
                     equalWidth={equalWidth}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                 />
             );
@@ -174,7 +173,6 @@ function OnyxTabNavigator<TTabName extends string = SelectedTabRequest>({
     return (
         <TabFocusTrapContext.Provider value={setTabFocusTrapContainerElement}>
             <TopTab.Navigator
-                /* eslint-disable-next-line react/jsx-props-no-spreading */
                 {...rest}
                 id={id}
                 initialRouteName={validInitialTab}
diff --git a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
index f82be8138ba1..4f805af55ca5 100644
--- a/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/ScreenLayout.tsx
@@ -10,7 +10,6 @@ import type {PlatformSpecificNavigationOptions, PlatformStackNavigationOptions,
 function screenLayoutWrapper({navigation, ...rest}: ScreenLayoutArgs<ParamListBase, string, PlatformSpecificNavigationOptions | PlatformStackNavigationOptions, string>) {
     return (
         <ScreenLayout
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             // The type cast is needed because useNavigationBuilder hardcodes the Navigation generic to `string`.
             navigation={navigation as unknown as PlatformStackNavigationProp<ParamListBase>}
diff --git a/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.native.tsx b/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.native.tsx
index 5ecdc7ad47d1..12c6df63d031 100644
--- a/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.native.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.native.tsx
@@ -97,23 +97,18 @@ function createPlatformStackNavigatorComponent<RouterOptions extends PlatformSta
             () => (
                 <NavigationContent>
                     <NativeStackView
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...props}
                         state={state}
                         descriptors={wrappedDescriptors}
                         navigation={navigation}
                         describe={describe}
                     />
-                    {!!ExtraContent && (
-                        // eslint-disable-next-line react/jsx-props-no-spreading
-                        <ExtraContent {...customCodePropsWithCustomState} />
-                    )}
+                    {!!ExtraContent && <ExtraContent {...customCodePropsWithCustomState} />}
                 </NavigationContent>
             ),
             [NavigationContent, customCodePropsWithCustomState, describe, wrappedDescriptors, navigation, props, state],
         );
 
-        // eslint-disable-next-line react/jsx-props-no-spreading
         return NavigationContentWrapper === undefined ? Content : <NavigationContentWrapper {...customCodePropsWithCustomState}>{Content}</NavigationContentWrapper>;
     }
     PlatformNavigator.displayName = displayName;
diff --git a/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.tsx b/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.tsx
index 79302b61f84a..0aa1c56ecb6e 100644
--- a/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.tsx
+++ b/src/libs/Navigation/PlatformStackNavigation/createPlatformStackNavigatorComponent/index.tsx
@@ -109,7 +109,6 @@ function createPlatformStackNavigatorComponent<RouterOptions extends PlatformSta
             () => (
                 <NavigationContent>
                     <StackView
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...props}
                         direction="ltr"
                         state={mappedState}
@@ -118,16 +117,12 @@ function createPlatformStackNavigatorComponent<RouterOptions extends PlatformSta
                         describe={describe}
                     />
 
-                    {!!ExtraContent && (
-                        // eslint-disable-next-line react/jsx-props-no-spreading
-                        <ExtraContent {...customCodePropsWithCustomState} />
-                    )}
+                    {!!ExtraContent && <ExtraContent {...customCodePropsWithCustomState} />}
                 </NavigationContent>
             ),
             [NavigationContent, customCodePropsWithCustomState, describe, wrappedDescriptors, mappedState, navigation, props],
         );
 
-        // eslint-disable-next-line react/jsx-props-no-spreading
         return NavigationContentWrapper === undefined ? Content : <NavigationContentWrapper {...customCodePropsWithCustomState}>{Content}</NavigationContentWrapper>;
     }
     PlatformNavigator.displayName = displayName;
diff --git a/src/pages/Debug/DebugJSON.tsx b/src/pages/Debug/DebugJSON.tsx
index a3cf0b90d495..8fb4625715dc 100644
--- a/src/pages/Debug/DebugJSON.tsx
+++ b/src/pages/Debug/DebugJSON.tsx
@@ -38,10 +38,7 @@ function DebugJSON({data}: DebugJSONProps) {
                 }}
                 icon={icons.Copy}
             />
-            <View
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...SwipeInterceptPanResponder.panHandlers}
-            >
+            <View {...SwipeInterceptPanResponder.panHandlers}>
                 <Text style={[styles.textLabel, styles.mb5, styles.border, styles.p2]}>{json}</Text>
             </View>
         </ScrollView>
diff --git a/src/pages/ErrorPage/NotFoundPage.tsx b/src/pages/ErrorPage/NotFoundPage.tsx
index 714dbab66ba8..f2a7e2c1dcd5 100644
--- a/src/pages/ErrorPage/NotFoundPage.tsx
+++ b/src/pages/ErrorPage/NotFoundPage.tsx
@@ -48,7 +48,6 @@ function NotFoundPage({onBackButtonPress = () => Navigation.goBack(), isReportRe
                     }
                     onBackButtonPress();
                 }}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...fullPageNotFoundViewProps}
                 onLinkPress={isOnGenericErrorScreen ? () => Navigation.goBack(ROUTES.HOME) : fullPageNotFoundViewProps.onLinkPress}
             />
diff --git a/src/pages/OnboardingAccounting/index.native.tsx b/src/pages/OnboardingAccounting/index.native.tsx
index 28f97c4a397f..892ab82b61c8 100644
--- a/src/pages/OnboardingAccounting/index.native.tsx
+++ b/src/pages/OnboardingAccounting/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingAccounting(props: OnboardingAccountingProps) {
     return (
         <BaseOnboardingAccounting
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/pages/OnboardingAccounting/index.tsx b/src/pages/OnboardingAccounting/index.tsx
index 1648f270f5a6..6657443ae78e 100644
--- a/src/pages/OnboardingAccounting/index.tsx
+++ b/src/pages/OnboardingAccounting/index.tsx
@@ -8,7 +8,6 @@ function OnboardingAccounting(props: OnboardingAccountingProps) {
         <OnboardingWrapper>
             <BaseOnboardingAccounting
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingEmployees/index.native.tsx b/src/pages/OnboardingEmployees/index.native.tsx
index 8172801a3349..caf24749e91e 100644
--- a/src/pages/OnboardingEmployees/index.native.tsx
+++ b/src/pages/OnboardingEmployees/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingEmployees(props: OnboardingEmployeesProps) {
     return (
         <BaseOnboardingEmployees
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/pages/OnboardingEmployees/index.tsx b/src/pages/OnboardingEmployees/index.tsx
index ee0c64b7b221..e8f533133f09 100644
--- a/src/pages/OnboardingEmployees/index.tsx
+++ b/src/pages/OnboardingEmployees/index.tsx
@@ -8,7 +8,6 @@ function OnboardingEmployees(props: OnboardingEmployeesProps) {
         <OnboardingWrapper>
             <BaseOnboardingEmployees
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingInterestedFeatures/index.native.tsx b/src/pages/OnboardingInterestedFeatures/index.native.tsx
index d13b06b46679..743f045c1bf2 100644
--- a/src/pages/OnboardingInterestedFeatures/index.native.tsx
+++ b/src/pages/OnboardingInterestedFeatures/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingInterestedFeatures(props: OnboardingInterestedFeaturesProps)
     return (
         <BaseOnboardingInterestedFeatures
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/pages/OnboardingInterestedFeatures/index.tsx b/src/pages/OnboardingInterestedFeatures/index.tsx
index db6d67b8e0b0..6ef9847a351c 100644
--- a/src/pages/OnboardingInterestedFeatures/index.tsx
+++ b/src/pages/OnboardingInterestedFeatures/index.tsx
@@ -8,7 +8,6 @@ function OnboardingInterestedFeatures(props: OnboardingInterestedFeaturesProps)
         <OnboardingWrapper>
             <BaseOnboardingInterestedFeatures
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
index 83a9a7a207c8..d726e8e7be08 100644
--- a/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
+++ b/src/pages/OnboardingPersonalDetails/BaseOnboardingPersonalDetails.tsx
@@ -265,7 +265,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                         aria-label={translate('common.firstName')}
                         role={CONST.ROLE.PRESENTATION}
                         defaultValue={onboardingPersonalDetailsForm?.firstName ?? currentUserPersonalDetails?.firstName ?? ''}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...(currentUserPersonalDetails?.firstName && {defaultValue: currentUserPersonalDetails.firstName})}
                         shouldSaveDraft
                         spellCheck={false}
@@ -281,7 +280,6 @@ function BaseOnboardingPersonalDetails({currentUserPersonalDetails, shouldUseNat
                         aria-label={translate('common.lastName')}
                         role={CONST.ROLE.PRESENTATION}
                         defaultValue={onboardingPersonalDetailsForm?.lastName ?? currentUserPersonalDetails?.lastName ?? ''}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...(currentUserPersonalDetails?.lastName && {defaultValue: currentUserPersonalDetails.lastName})}
                         shouldSaveDraft
                         spellCheck={false}
diff --git a/src/pages/OnboardingPersonalDetails/index.native.tsx b/src/pages/OnboardingPersonalDetails/index.native.tsx
index 49c11d099161..58ca3a0ca466 100644
--- a/src/pages/OnboardingPersonalDetails/index.native.tsx
+++ b/src/pages/OnboardingPersonalDetails/index.native.tsx
@@ -27,7 +27,6 @@ function OnboardingPersonalDetails({...rest}: OnboardingPersonalDetailsProps) {
     return (
         <BaseOnboardingPersonalDetails
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/pages/OnboardingPersonalDetails/index.tsx b/src/pages/OnboardingPersonalDetails/index.tsx
index 40f8b4687c16..61dd493e51b5 100644
--- a/src/pages/OnboardingPersonalDetails/index.tsx
+++ b/src/pages/OnboardingPersonalDetails/index.tsx
@@ -8,7 +8,6 @@ function OnboardingPersonalDetails({...rest}: OnboardingPersonalDetailsProps) {
         <OnboardingWrapper>
             <BaseOnboardingPersonalDetails
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingPrivateDomain/index.native.tsx b/src/pages/OnboardingPrivateDomain/index.native.tsx
index 04e796bfdad2..d8c768246537 100644
--- a/src/pages/OnboardingPrivateDomain/index.native.tsx
+++ b/src/pages/OnboardingPrivateDomain/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingPrivateDomain(props: OnboardingPrivateDomainProps) {
     return (
         <BaseOnboardingPrivateDomain
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/pages/OnboardingPrivateDomain/index.tsx b/src/pages/OnboardingPrivateDomain/index.tsx
index 37f5996507a5..2899084289f8 100644
--- a/src/pages/OnboardingPrivateDomain/index.tsx
+++ b/src/pages/OnboardingPrivateDomain/index.tsx
@@ -8,7 +8,6 @@ function OnboardingPrivateDomain(props: OnboardingPrivateDomainProps) {
         <OnboardingWrapper>
             <BaseOnboardingPrivateDomain
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingPurpose/index.native.tsx b/src/pages/OnboardingPurpose/index.native.tsx
index 2d06bab10e69..716593e47d3f 100644
--- a/src/pages/OnboardingPurpose/index.native.tsx
+++ b/src/pages/OnboardingPurpose/index.native.tsx
@@ -21,7 +21,6 @@ function OnboardingPurpose({...rest}: OnboardingPurposeProps) {
         <BaseOnboardingPurpose
             shouldUseNativeStyles
             shouldEnableMaxHeight={false}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/pages/OnboardingPurpose/index.tsx b/src/pages/OnboardingPurpose/index.tsx
index 1afdfb2ad064..91c3f60f1f53 100644
--- a/src/pages/OnboardingPurpose/index.tsx
+++ b/src/pages/OnboardingPurpose/index.tsx
@@ -9,7 +9,6 @@ function OnboardingPurpose({...rest}: OnboardingPurposeProps) {
             <BaseOnboardingPurpose
                 shouldUseNativeStyles={false}
                 shouldEnableMaxHeight={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingPurpose/index.web.tsx b/src/pages/OnboardingPurpose/index.web.tsx
index bfdc619f203b..95725e2f00cb 100644
--- a/src/pages/OnboardingPurpose/index.web.tsx
+++ b/src/pages/OnboardingPurpose/index.web.tsx
@@ -7,7 +7,6 @@ function OnboardingPurpose({...rest}: OnboardingPurposeProps) {
         <BaseOnboardingPurpose
             shouldUseNativeStyles={false}
             shouldEnableMaxHeight
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/pages/OnboardingWorkEmail/index.native.tsx b/src/pages/OnboardingWorkEmail/index.native.tsx
index c9651f7d834e..044b808c4f77 100644
--- a/src/pages/OnboardingWorkEmail/index.native.tsx
+++ b/src/pages/OnboardingWorkEmail/index.native.tsx
@@ -23,7 +23,6 @@ function OnboardingWorkEmail(props: OnboardingWorkEmailProps) {
     return (
         <BaseOnboardingWorkEmail
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/pages/OnboardingWorkEmail/index.tsx b/src/pages/OnboardingWorkEmail/index.tsx
index 597eafe73197..d30ab7df80d8 100644
--- a/src/pages/OnboardingWorkEmail/index.tsx
+++ b/src/pages/OnboardingWorkEmail/index.tsx
@@ -8,7 +8,6 @@ function OnboardingWorkEmail(props: OnboardingWorkEmailProps) {
         <OnboardingWrapper>
             <BaseOnboardingWorkEmail
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingWorkEmailValidation/index.native.tsx b/src/pages/OnboardingWorkEmailValidation/index.native.tsx
index 238fd02bbf50..5a97e255ae80 100644
--- a/src/pages/OnboardingWorkEmailValidation/index.native.tsx
+++ b/src/pages/OnboardingWorkEmailValidation/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingWorkEmailValidation(props: OnboardingWorkEmailValidationProps
     return (
         <BaseOnboardingWorkEmailValidation
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/pages/OnboardingWorkEmailValidation/index.tsx b/src/pages/OnboardingWorkEmailValidation/index.tsx
index 6f31bbb0e8ef..4d9bc0b16b8d 100644
--- a/src/pages/OnboardingWorkEmailValidation/index.tsx
+++ b/src/pages/OnboardingWorkEmailValidation/index.tsx
@@ -8,7 +8,6 @@ function OnboardingWorkEmailValidation(props: OnboardingWorkEmailValidationProps
         <OnboardingWrapper>
             <BaseOnboardingWorkEmailValidation
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingWorkspaceConfirmation/index.native.tsx b/src/pages/OnboardingWorkspaceConfirmation/index.native.tsx
index 98fa901ef2df..22707b3c6093 100644
--- a/src/pages/OnboardingWorkspaceConfirmation/index.native.tsx
+++ b/src/pages/OnboardingWorkspaceConfirmation/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingWorkspaceConfirmation({...rest}: OnboardingWorkspaceConfirmat
     return (
         <BaseOnboardingWorkspaceConfirmation
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/pages/OnboardingWorkspaceConfirmation/index.tsx b/src/pages/OnboardingWorkspaceConfirmation/index.tsx
index 39f5d53d5dd2..733692ac3070 100644
--- a/src/pages/OnboardingWorkspaceConfirmation/index.tsx
+++ b/src/pages/OnboardingWorkspaceConfirmation/index.tsx
@@ -8,7 +8,6 @@ function OnboardingWorkspaceConfirmation({...rest}: OnboardingWorkspaceConfirmat
         <OnboardingWrapper>
             <BaseOnboardingWorkspaceConfirmation
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingWorkspaceCurrency/index.native.tsx b/src/pages/OnboardingWorkspaceCurrency/index.native.tsx
index b6990c8c48e5..545bcd333d47 100644
--- a/src/pages/OnboardingWorkspaceCurrency/index.native.tsx
+++ b/src/pages/OnboardingWorkspaceCurrency/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingWorkspaceCurrency({...rest}: OnboardingWorkspaceCurrencyProps
     return (
         <BaseOnboardingWorkspaceCurrency
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/pages/OnboardingWorkspaceCurrency/index.tsx b/src/pages/OnboardingWorkspaceCurrency/index.tsx
index c2aba2c8d9d1..071c755c66f1 100644
--- a/src/pages/OnboardingWorkspaceCurrency/index.tsx
+++ b/src/pages/OnboardingWorkspaceCurrency/index.tsx
@@ -8,7 +8,6 @@ function OnboardingWorkspaceCurrency({...rest}: OnboardingWorkspaceCurrencyProps
         <OnboardingWrapper>
             <BaseOnboardingWorkspaceCurrency
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingWorkspaceInvite/index.native.tsx b/src/pages/OnboardingWorkspaceInvite/index.native.tsx
index 865a45850d28..e7c285f83bc6 100644
--- a/src/pages/OnboardingWorkspaceInvite/index.native.tsx
+++ b/src/pages/OnboardingWorkspaceInvite/index.native.tsx
@@ -19,7 +19,6 @@ function OnboardingWorkspaceInvite(props: OnboardingWorkspaceInviteProps) {
     return (
         <BaseOnboardingWorkspaceInvite
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/pages/OnboardingWorkspaceInvite/index.tsx b/src/pages/OnboardingWorkspaceInvite/index.tsx
index d9371564b459..762d58e0f7bd 100644
--- a/src/pages/OnboardingWorkspaceInvite/index.tsx
+++ b/src/pages/OnboardingWorkspaceInvite/index.tsx
@@ -8,7 +8,6 @@ function OnboardingWorkspaceInvite({...rest}: OnboardingWorkspaceInviteProps) {
         <OnboardingWrapper>
             <BaseOnboardingWorkspaceInvite
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingWorkspaceOptional/index.native.tsx b/src/pages/OnboardingWorkspaceOptional/index.native.tsx
index 48566730a123..f2daa4378ee1 100644
--- a/src/pages/OnboardingWorkspaceOptional/index.native.tsx
+++ b/src/pages/OnboardingWorkspaceOptional/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingWorkspaceOptional(props: OnboardingWorkspaceOptionalProps) {
     return (
         <BaseOnboardingWorkspaceOptional
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/pages/OnboardingWorkspaceOptional/index.tsx b/src/pages/OnboardingWorkspaceOptional/index.tsx
index 9d4de6a3cc1a..346d4b643b6a 100644
--- a/src/pages/OnboardingWorkspaceOptional/index.tsx
+++ b/src/pages/OnboardingWorkspaceOptional/index.tsx
@@ -8,7 +8,6 @@ function OnboardingWorkspaceOptional(props: OnboardingWorkspaceOptionalProps) {
         <OnboardingWrapper>
             <BaseOnboardingWorkspaceOptional
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </OnboardingWrapper>
diff --git a/src/pages/OnboardingWorkspaces/index.native.tsx b/src/pages/OnboardingWorkspaces/index.native.tsx
index 79b6136ae2b4..ee8e581a1e8c 100644
--- a/src/pages/OnboardingWorkspaces/index.native.tsx
+++ b/src/pages/OnboardingWorkspaces/index.native.tsx
@@ -6,7 +6,6 @@ function OnboardingWorkspaces({...rest}: OnboardingWorkspacesProps) {
     return (
         <BaseOnboardingWorkspaces
             shouldUseNativeStyles
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/pages/OnboardingWorkspaces/index.tsx b/src/pages/OnboardingWorkspaces/index.tsx
index 1b647c9743e0..caf13f385d5c 100644
--- a/src/pages/OnboardingWorkspaces/index.tsx
+++ b/src/pages/OnboardingWorkspaces/index.tsx
@@ -8,7 +8,6 @@ function OnboardingWorkspaces({...rest}: OnboardingWorkspacesProps) {
         <OnboardingWrapper>
             <BaseOnboardingWorkspaces
                 shouldUseNativeStyles={false}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
         </OnboardingWrapper>
diff --git a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
index 1acfe373f595..4d6dd562a40f 100644
--- a/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
+++ b/src/pages/PrivateNotes/PrivateNotesEditPage.tsx
@@ -201,7 +201,6 @@ function PrivateNotesEditPage({report, ...rest}: PrivateNotesEditPageProps) {
         <PrivateNotesEditPageInternal
             report={report}
             privateNoteDraft={privateNoteDraft ?? ''}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/pages/ReportDescriptionPage.tsx b/src/pages/ReportDescriptionPage.tsx
index 9555ff3505e4..610e8ea9baa3 100644
--- a/src/pages/ReportDescriptionPage.tsx
+++ b/src/pages/ReportDescriptionPage.tsx
@@ -14,11 +14,9 @@ function ReportDescriptionPage(props: ReportDescriptionPageProps) {
     const isTask = ReportUtils.isTaskReport(props.report);
 
     if (isTask) {
-        // eslint-disable-next-line react/jsx-props-no-spreading
         return <TaskDescriptionPage {...props} />;
     }
 
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <RoomDescriptionPage {...props} />;
 }
 
diff --git a/src/pages/Search/SearchPageNarrow/Switches.tsx b/src/pages/Search/SearchPageNarrow/Switches.tsx
index e5ff1d85259e..cdb3ff481566 100644
--- a/src/pages/Search/SearchPageNarrow/Switches.tsx
+++ b/src/pages/Search/SearchPageNarrow/Switches.tsx
@@ -29,7 +29,7 @@ function SearchTypeMenuSwitch({showStatic, ...props}: SearchTypeMenuNarrowProps
     if (showStatic) {
         return props.queryJSON ? <StaticSearchTypeMenu queryJSON={props.queryJSON} /> : null;
     }
-    // eslint-disable-next-line react/jsx-props-no-spreading -- thin wrapper forwarding exact SearchPageTabSelectorProps
+
     return <SearchTypeMenuNarrow {...props} />;
 }
 
@@ -37,7 +37,7 @@ function SearchPageInputSwitch({showStatic, ...props}: SearchPageInputNarrowProp
     if (showStatic) {
         return <StaticSearchPageInput />;
     }
-    // eslint-disable-next-line react/jsx-props-no-spreading -- thin wrapper forwarding exact SearchPageHeaderProps
+
     return <SearchPageInputNarrow {...props} />;
 }
 
@@ -45,7 +45,7 @@ function SearchFiltersBarSwitch({showStatic, ...props}: SearchFiltersBarNarrowPr
     if (showStatic) {
         return null;
     }
-    // eslint-disable-next-line react/jsx-props-no-spreading -- thin wrapper forwarding exact SearchFiltersBarProps
+
     return <SearchFiltersBarNarrow {...props} />;
 }
 
@@ -53,7 +53,7 @@ function SearchActionsBarSwitch({showStatic, ...props}: SearchActionsBarNarrowPr
     if (showStatic) {
         return <StaticSearchActionsBar />;
     }
-    // eslint-disable-next-line react/jsx-props-no-spreading -- thin wrapper forwarding exact SearchPageHeaderProps
+
     return <SearchActionsBarNarrow {...props} />;
 }
 
diff --git a/src/pages/TeachersUnite/SaveTheWorldPage.tsx b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
index da4dadf463da..9212faac09f9 100644
--- a/src/pages/TeachersUnite/SaveTheWorldPage.tsx
+++ b/src/pages/TeachersUnite/SaveTheWorldPage.tsx
@@ -157,7 +157,6 @@ function SaveTheWorldPage() {
                         illustrationBackgroundColor={theme.PAGE_THEMES[SCREENS.SAVE_THE_WORLD.ROOT].backgroundColor}
                         titleStyles={styles.accountSettingsSectionTitle}
                         childrenStyles={styles.pt5}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...saveTheWorldIllustration}
                     >
                         <MenuItemList
diff --git a/src/pages/domain/DomainNotFoundPageWrapper.tsx b/src/pages/domain/DomainNotFoundPageWrapper.tsx
index b8ab7f07c90a..e770ffbc2045 100644
--- a/src/pages/domain/DomainNotFoundPageWrapper.tsx
+++ b/src/pages/domain/DomainNotFoundPageWrapper.tsx
@@ -60,7 +60,6 @@ function DomainNotFoundPageWrapper({domainAccountID, shouldBeBlocked, fullPageNo
                 onBackButtonPress={() => {
                     Navigation.goBack(ROUTES.WORKSPACES_LIST.route);
                 }}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...fullPageNotFoundViewProps}
                 shouldShowBackButton
             />
diff --git a/src/pages/domain/Members/DomainAddMemberPage.tsx b/src/pages/domain/Members/DomainAddMemberPage.tsx
index 30e68c2c194a..65b6e9e58133 100644
--- a/src/pages/domain/Members/DomainAddMemberPage.tsx
+++ b/src/pages/domain/Members/DomainAddMemberPage.tsx
@@ -36,7 +36,6 @@ function DomainEmailInput({onInputChange, ref, ...rest}: BaseTextInputProps) {
                 // https://github.com/Expensify/App/pull/80090#issuecomment-3819449517
                 onInputChange?.(value.replaceAll('@', ''));
             }}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
         />
     );
diff --git a/src/pages/inbox/report/ContextMenu/MiniReportActionContextMenu/index.tsx b/src/pages/inbox/report/ContextMenu/MiniReportActionContextMenu/index.tsx
index 8c5ea5ad8581..2180e21ec232 100644
--- a/src/pages/inbox/report/ContextMenu/MiniReportActionContextMenu/index.tsx
+++ b/src/pages/inbox/report/ContextMenu/MiniReportActionContextMenu/index.tsx
@@ -15,7 +15,6 @@ function MiniReportActionContextMenu({displayAsGroup = false, ...rest}: MiniRepo
         >
             <BaseReportActionContextMenu
                 isMini
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...rest}
             />
         </View>
diff --git a/src/pages/inbox/report/ReportActionCompose/Suggestions.tsx b/src/pages/inbox/report/ReportActionCompose/Suggestions.tsx
index ff38d71404d6..62dc1f09ab05 100644
--- a/src/pages/inbox/report/ReportActionCompose/Suggestions.tsx
+++ b/src/pages/inbox/report/ReportActionCompose/Suggestions.tsx
@@ -164,13 +164,11 @@ function Suggestions({
         <View testID="suggestions">
             <SuggestionEmoji
                 ref={suggestionEmojiRef}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...baseProps}
                 resetKeyboardInput={resetKeyboardInput}
             />
             <SuggestionMention
                 ref={suggestionMentionRef}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...baseProps}
             />
         </View>
diff --git a/src/pages/inbox/report/ReportActionItem.tsx b/src/pages/inbox/report/ReportActionItem.tsx
index fb3db75190f3..fb2d43384fc4 100644
--- a/src/pages/inbox/report/ReportActionItem.tsx
+++ b/src/pages/inbox/report/ReportActionItem.tsx
@@ -58,7 +58,6 @@ function ReportActionItem({
 
     return (
         <PureReportActionItem
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             action={action}
             report={report}
diff --git a/src/pages/inbox/report/withReportAndPrivateNotesOrNotFound.tsx b/src/pages/inbox/report/withReportAndPrivateNotesOrNotFound.tsx
index 78e061c2e769..0c547e9a369a 100644
--- a/src/pages/inbox/report/withReportAndPrivateNotesOrNotFound.tsx
+++ b/src/pages/inbox/report/withReportAndPrivateNotesOrNotFound.tsx
@@ -100,7 +100,6 @@ export default function (pageTitle: TranslationPaths) {
 
             return (
                 <WrappedComponent
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...(props as TProps)}
                     accountID={session?.accountID}
                 />
diff --git a/src/pages/inbox/report/withReportAndReportActionOrNotFound.tsx b/src/pages/inbox/report/withReportAndReportActionOrNotFound.tsx
index ff2dbd5bf5ff..c1dff7a47658 100644
--- a/src/pages/inbox/report/withReportAndReportActionOrNotFound.tsx
+++ b/src/pages/inbox/report/withReportAndReportActionOrNotFound.tsx
@@ -95,7 +95,6 @@ export default function <TProps extends WithReportAndReportActionOrNotFoundProps
 
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 report={report}
                 parentReport={parentReport}
diff --git a/src/pages/inbox/report/withReportOrNotFound.tsx b/src/pages/inbox/report/withReportOrNotFound.tsx
index aaf202cd0f7e..7a00c4105490 100644
--- a/src/pages/inbox/report/withReportOrNotFound.tsx
+++ b/src/pages/inbox/report/withReportOrNotFound.tsx
@@ -128,7 +128,6 @@ export default function (shouldRequireReportID = true): <TProps extends WithRepo
 
             return (
                 <WrappedComponent
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                     report={report}
                     betas={betas}
diff --git a/src/pages/inbox/sidebar/FABPopoverContent/FABFocusableMenuItem.tsx b/src/pages/inbox/sidebar/FABPopoverContent/FABFocusableMenuItem.tsx
index 1e5515bc4314..dc4271847cd3 100644
--- a/src/pages/inbox/sidebar/FABPopoverContent/FABFocusableMenuItem.tsx
+++ b/src/pages/inbox/sidebar/FABPopoverContent/FABFocusableMenuItem.tsx
@@ -21,7 +21,7 @@ function FABFocusableMenuItem({itemId, isVisible = true, onPress, shouldCallAfte
     return (
         <FocusableMenuItem
             // FABFocusableMenuItemProps is a strict subset of MenuItemProps — spreading forwards all remaining props safely
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...(props as MenuItemProps)}
             focused={isFocused}
             onFocus={() => setFocusedIndex(itemIndex)}
diff --git a/src/pages/iou/SplitList/index.tsx b/src/pages/iou/SplitList/index.tsx
index 7fc57461f3fc..3a549e41b873 100644
--- a/src/pages/iou/SplitList/index.tsx
+++ b/src/pages/iou/SplitList/index.tsx
@@ -47,7 +47,6 @@ function SplitList({data, initiallyFocusedOptionKey, onSelectRow, listFooterCont
             ((props: SplitListItemProps) => (
                 <SplitListItem
                     onInputFocus={(item: ListItem) => handleInputFocus(item as SplitListItemType)}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                 />
             )) as typeof SplitListItem,
diff --git a/src/pages/iou/request/step/IOURequestStepOdometerImage/index.tsx b/src/pages/iou/request/step/IOURequestStepOdometerImage/index.tsx
index cb637b40d9d8..e63c6cd62866 100644
--- a/src/pages/iou/request/step/IOURequestStepOdometerImage/index.tsx
+++ b/src/pages/iou/request/step/IOURequestStepOdometerImage/index.tsx
@@ -347,7 +347,6 @@ function IOURequestStepOdometerImage({
             />
             <View
                 style={[styles.uploadFileViewTextContainer, styles.userSelectNone]}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...panResponder.panHandlers}
             >
                 <Text style={[styles.textFileUpload, styles.mb2]}>{title}</Text>
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
index 0b94442ede36..b8b37d6a77e5 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/FileUpload.tsx
@@ -78,7 +78,7 @@ function FileUpload({onDrop, shouldAcceptMultipleFiles = false, onLayout, isRepl
                         <View
                             style={[styles.uploadFileViewTextContainer, styles.userSelectNone]}
                             // PanResponder handlers must be spread onto the View for gesture recognition
-                            // eslint-disable-next-line react/jsx-props-no-spreading
+
                             {...panResponder.panHandlers}
                         >
                             <Text style={[styles.textFileUpload, styles.mb2]}>{translate(shouldAcceptMultipleFiles ? 'receipt.uploadMultiple' : 'receipt.upload')}</Text>
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.tsx
index 0b72070ad777..5974b264fbfa 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/Camera/index.tsx
@@ -14,7 +14,7 @@ function Camera(props: CameraProps) {
         return (
             <CameraCapture
                 // Props are forwarded as-is to the platform-specific Camera variant
-                // eslint-disable-next-line react/jsx-props-no-spreading
+
                 {...props}
             />
         );
@@ -23,7 +23,7 @@ function Camera(props: CameraProps) {
     return (
         <FileUpload
             // Props are forwarded as-is to the platform-specific Camera variant
-            // eslint-disable-next-line react/jsx-props-no-spreading
+
             {...props}
         />
     );
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/DesktopWebUploadView.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/DesktopWebUploadView.tsx
index bd43624dd2aa..dd6f68c0889f 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/DesktopWebUploadView.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/DesktopWebUploadView.tsx
@@ -86,7 +86,6 @@ function DesktopWebUploadView({PDFValidationComponent, shouldAcceptMultipleFiles
                                 />
                                 <View
                                     style={[styles.uploadFileViewTextContainer, styles.userSelectNone]}
-                                    // eslint-disable-next-line react/jsx-props-no-spreading
                                     {...panResponder.panHandlers}
                                 >
                                     <Text style={[styles.textFileUpload, styles.mb2]}>{translate(shouldAcceptMultipleFiles ? 'receipt.uploadMultiple' : 'receipt.upload')}</Text>
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/Camera.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/Camera.tsx
index d7ae3b61f4d5..b70983bf25bb 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/Camera.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/Camera.tsx
@@ -12,7 +12,6 @@ function Camera({cameraTabIndex, ref, forceInactive = false, ...props}: Navigati
         <VisionCamera
             ref={ref}
             photoQualityBalance="quality"
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             isActive={isCameraActive}
         />
diff --git a/src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/WebCamera.tsx b/src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/WebCamera.tsx
index 6784664a8d5b..97cf872a6769 100644
--- a/src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/WebCamera.tsx
+++ b/src/pages/iou/request/step/IOURequestStepScan/components/NavigationAwareCamera/WebCamera.tsx
@@ -20,7 +20,6 @@ function WebCamera({itemRef, ref, ...props}: NavigationAwareCameraProps) {
         // Hide the camera during initialization to prevent random failures on some iOS versions.
         <View style={isInitialized ? [styles.dFlex, styles.flex1] : styles.dNone}>
             <Webcam
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 onUserMedia={() => setIsInitialized(true)}
                 ref={ref as unknown as ForwardedRef<Webcam>}
diff --git a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
index 19555ecfad4e..f37b4127d942 100644
--- a/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
+++ b/src/pages/iou/request/step/withFullTransactionOrNotFound.tsx
@@ -99,7 +99,6 @@ export default function <TProps extends WithFullTransactionOrNotFoundProps<Money
         }
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(props as TProps)}
                 transaction={shouldUseTransactionDraft(userAction, userType) ? transactionDraftData : transaction}
                 isLoadingTransaction={isLoadingTransaction}
diff --git a/src/pages/iou/request/step/withWritableReportOrNotFound.tsx b/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
index 2f56d246d763..5eb13936ed83 100644
--- a/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
+++ b/src/pages/iou/request/step/withWritableReportOrNotFound.tsx
@@ -104,7 +104,6 @@ export default function <TProps extends WithWritableReportOrNotFoundProps<MoneyR
 
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(props as TProps)}
                 report={report}
                 reportDraft={reportDraft}
diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.native.tsx b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.native.tsx
index bb1fea656e6e..c2cc1350646d 100644
--- a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.native.tsx
+++ b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.native.tsx
@@ -59,7 +59,6 @@ function AttachmentModalContainer<Screen extends AttachmentModalScreenType>({con
             >
                 <AttachmentStateContextProvider>
                     <AttachmentModalBaseContent
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...contentProps}
                         onClose={closeScreen}
                     />
diff --git a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx
index 4be50adf6e47..69ebc7a5c078 100644
--- a/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx
+++ b/src/pages/media/AttachmentModalScreen/AttachmentModalContainer/index.tsx
@@ -55,7 +55,6 @@ function AttachmentModalContainer<Screen extends AttachmentModalScreenType>({
             >
                 <AttachmentStateContextProvider>
                     <AttachmentModalBaseContent
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...contentProps}
                         shouldDisplayHelpButton={false}
                         onClose={closeModal}
diff --git a/src/pages/settings/AboutPage/AboutPage.tsx b/src/pages/settings/AboutPage/AboutPage.tsx
index 42b883c62c57..c2ce2381fdb1 100644
--- a/src/pages/settings/AboutPage/AboutPage.tsx
+++ b/src/pages/settings/AboutPage/AboutPage.tsx
@@ -180,7 +180,6 @@ function AboutPage() {
                         illustrationBackgroundColor={colors.yellow600}
                         titleStyles={styles.accountSettingsSectionTitle}
                         overlayContent={overlayContent}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...aboutIllustration}
                     >
                         <View style={[styles.flex1, styles.mt5]}>
diff --git a/src/pages/settings/Preferences/PreferencesPage.tsx b/src/pages/settings/Preferences/PreferencesPage.tsx
index b3426c834830..ae8e6ad16fe9 100755
--- a/src/pages/settings/Preferences/PreferencesPage.tsx
+++ b/src/pages/settings/Preferences/PreferencesPage.tsx
@@ -75,7 +75,6 @@ function PreferencesPage() {
                         isCentralPane
                         illustrationContainerStyle={styles.cardSectionIllustrationContainer}
                         illustrationBackgroundColor={colors.blue500}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...preferencesIllustration}
                     >
                         <View style={[styles.flex1, styles.mt5]}>
diff --git a/src/pages/settings/Rules/ExpenseRulesPage.tsx b/src/pages/settings/Rules/ExpenseRulesPage.tsx
index 2d340c6ecdcc..f52e43ecc8f7 100644
--- a/src/pages/settings/Rules/ExpenseRulesPage.tsx
+++ b/src/pages/settings/Rules/ExpenseRulesPage.tsx
@@ -270,7 +270,6 @@ function ExpenseRulesPage() {
             {!hasRules && !isLoading && (
                 <ScrollView contentContainerStyle={[styles.flexGrow1, styles.flexShrink0]}>
                     <GenericEmptyStateComponent
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...genericIllustration}
                         title={translate('expenseRulesPage.emptyRules.title')}
                         subtitle={translate('expenseRulesPage.emptyRules.subtitle')}
diff --git a/src/pages/settings/Security/SecuritySettingsPage.tsx b/src/pages/settings/Security/SecuritySettingsPage.tsx
index b4347f5cd7b5..5117f17703d5 100644
--- a/src/pages/settings/Security/SecuritySettingsPage.tsx
+++ b/src/pages/settings/Security/SecuritySettingsPage.tsx
@@ -444,7 +444,6 @@ function SecuritySettingsPage() {
                                 illustrationBackgroundColor={colors.ice500}
                                 titleStyles={styles.accountSettingsSectionTitle}
                                 childrenStyles={styles.pt5}
-                                // eslint-disable-next-line react/jsx-props-no-spreading
                                 {...securitySettingsIllustration}
                             >
                                 <MenuItemList
diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx
index ec5bd60d9e2d..0de403524503 100644
--- a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthPage.tsx
@@ -16,7 +16,6 @@ function TwoFactorAuthPage(props: TwoFactorAuthPageProps) {
         return <EnabledPage />;
     }
 
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <CopyCodesPage {...props} />;
 }
 
diff --git a/src/pages/settings/Subscription/CardSection/CardSectionButton/index.tsx b/src/pages/settings/Subscription/CardSection/CardSectionButton/index.tsx
index 834305243d68..722bcd457efd 100644
--- a/src/pages/settings/Subscription/CardSection/CardSectionButton/index.tsx
+++ b/src/pages/settings/Subscription/CardSection/CardSectionButton/index.tsx
@@ -3,7 +3,6 @@ import type {ButtonProps} from '@components/Button';
 import Button from '@components/Button';
 
 function CardSectionButton(props: ButtonProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <Button {...props} />;
 }
 
diff --git a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
index 1a275e1dc12f..bd9932fa0249 100644
--- a/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
+++ b/src/pages/settings/Troubleshoot/TroubleshootPage.tsx
@@ -215,7 +215,6 @@ function TroubleshootPage() {
                         illustrationBackgroundColor={colors.blue700}
                         titleStyles={styles.accountSettingsSectionTitle}
                         renderSubtitle={() => <SectionSubtitleHTML html={translate('initialSettingsPage.troubleshoot.description')} />}
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...troubleshootIllustration}
                     >
                         <View style={[styles.flex1, styles.mt5]}>
diff --git a/src/pages/settings/Wallet/WalletPage/index.tsx b/src/pages/settings/Wallet/WalletPage/index.tsx
index 9991c7097167..d42e574f3d25 100644
--- a/src/pages/settings/Wallet/WalletPage/index.tsx
+++ b/src/pages/settings/Wallet/WalletPage/index.tsx
@@ -700,7 +700,6 @@ function WalletPage() {
                             titleStyles={styles.accountSettingsSectionTitle}
                             illustrationContainerStyle={styles.cardSectionIllustrationContainer}
                             illustrationBackgroundColor="#411103"
-                            // eslint-disable-next-line react/jsx-props-no-spreading
                             {...walletIllustration}
                         >
                             <PaymentMethodList
diff --git a/src/pages/signin/LoginForm/index.native.tsx b/src/pages/signin/LoginForm/index.native.tsx
index 4d97b1db6664..1b160625c044 100644
--- a/src/pages/signin/LoginForm/index.native.tsx
+++ b/src/pages/signin/LoginForm/index.native.tsx
@@ -29,7 +29,6 @@ function LoginForm({scrollPageToTop, ref, ...rest}: LoginFormProps) {
 
     return (
         <BaseLoginForm
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...rest}
             scrollPageToTop={scrollPageToTop}
             ref={loginFormRef}
diff --git a/src/pages/signin/LoginForm/index.tsx b/src/pages/signin/LoginForm/index.tsx
index 732e7a95d200..09974da70280 100644
--- a/src/pages/signin/LoginForm/index.tsx
+++ b/src/pages/signin/LoginForm/index.tsx
@@ -5,7 +5,6 @@ import type LoginFormProps from './types';
 function LoginForm({ref, ...props}: LoginFormProps) {
     return (
         <BaseLoginForm
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             ref={ref}
         />
diff --git a/src/pages/signin/ValidateCodeForm/index.android.tsx b/src/pages/signin/ValidateCodeForm/index.android.tsx
index bb727d4db937..c46f33bbf4e5 100644
--- a/src/pages/signin/ValidateCodeForm/index.android.tsx
+++ b/src/pages/signin/ValidateCodeForm/index.android.tsx
@@ -8,7 +8,6 @@ function ValidateCodeForm({ref, ...props}: ValidateCodeFormProps) {
         <BaseValidateCodeForm
             autoComplete={CONST.AUTO_COMPLETE_VARIANTS.SMS_OTP}
             ref={ref}
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
         />
     );
diff --git a/src/pages/signin/ValidateCodeForm/index.tsx b/src/pages/signin/ValidateCodeForm/index.tsx
index 4634296c11ad..18ea7c6b28ba 100644
--- a/src/pages/signin/ValidateCodeForm/index.tsx
+++ b/src/pages/signin/ValidateCodeForm/index.tsx
@@ -8,7 +8,6 @@ function ValidateCodeForm({ref, ...props}: ValidateCodeFormProps) {
         <BaseValidateCodeForm
             autoComplete={CONST.AUTO_COMPLETE_VARIANTS.ONE_TIME_CODE}
             ref={ref}
-            /* eslint-disable-next-line react/jsx-props-no-spreading */
             {...props}
         />
     );
diff --git a/src/pages/workspace/AccessOrNotFoundWrapper.tsx b/src/pages/workspace/AccessOrNotFoundWrapper.tsx
index 636662d1062d..fedb89da1a6f 100644
--- a/src/pages/workspace/AccessOrNotFoundWrapper.tsx
+++ b/src/pages/workspace/AccessOrNotFoundWrapper.tsx
@@ -124,7 +124,6 @@ function PageNotFoundFallback({policyID, fullPageNotFoundViewProps, isFeatureEna
                 }
                 Navigation.goBack(policyID && !isMoneyRequest ? ROUTES.WORKSPACE_OVERVIEW.getRoute(policyID) : undefined);
             }}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...fullPageNotFoundViewProps}
             shouldShowBackButton={fullPageNotFoundViewProps?.shouldShowBackButton ?? (!shouldShowFullScreenFallback ? shouldUseNarrowLayout : undefined)}
         />
diff --git a/src/pages/workspace/WorkspacesEmptyStateComponent.tsx b/src/pages/workspace/WorkspacesEmptyStateComponent.tsx
index f919e84e44cb..4d256eb72f81 100644
--- a/src/pages/workspace/WorkspacesEmptyStateComponent.tsx
+++ b/src/pages/workspace/WorkspacesEmptyStateComponent.tsx
@@ -16,7 +16,6 @@ function WorkspacesEmptyStateComponent() {
 
     return (
         <GenericEmptyStateComponent
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...illustration}
             title={translate('workspace.emptyWorkspace.title')}
             subtitle={translate('workspace.emptyWorkspace.subtitle')}
diff --git a/src/pages/workspace/accounting/ClaimOfferPage.tsx b/src/pages/workspace/accounting/ClaimOfferPage.tsx
index a7a609881e7b..c23ff6afcf36 100644
--- a/src/pages/workspace/accounting/ClaimOfferPage.tsx
+++ b/src/pages/workspace/accounting/ClaimOfferPage.tsx
@@ -179,10 +179,7 @@ ClaimOfferPage.displayName = 'ClaimOfferPage';
 function ClaimOfferPageWrapper(props: ClaimOfferPageProps) {
     return (
         <AccountingContextProvider policy={props.policy}>
-            <ClaimOfferPage
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-            />
+            <ClaimOfferPage {...props} />
         </AccountingContextProvider>
     );
 }
diff --git a/src/pages/workspace/accounting/PolicyAccountingPage.tsx b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
index d1e2a950c91b..c1dd3dfc0b11 100644
--- a/src/pages/workspace/accounting/PolicyAccountingPage.tsx
+++ b/src/pages/workspace/accounting/PolicyAccountingPage.tsx
@@ -638,7 +638,6 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
                                         <MenuItem
                                             brickRoadIndicator={menuItem.brickRoadIndicator}
                                             key={menuItem.title}
-                                            // eslint-disable-next-line react/jsx-props-no-spreading
                                             {...menuItem}
                                         />
                                     </OfflineWithFeedback>
@@ -719,10 +718,7 @@ function PolicyAccountingPage({policy}: PolicyAccountingPageProps) {
 function PolicyAccountingPageWrapper(props: PolicyAccountingPageProps) {
     return (
         <AccountingContextProvider policy={props.policy}>
-            <PolicyAccountingPage
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-            />
+            <PolicyAccountingPage {...props} />
         </AccountingContextProvider>
     );
 }
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
index cc51c3115eae..6933346b4a3e 100644
--- a/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctNonReimbursableExpensesPage.tsx
@@ -170,7 +170,6 @@ function SageIntacctNonReimbursableExpensesPage({policy}: WithPolicyConnectionsP
                             return (
                                 <ToggleSettingOptionRow
                                     key={key}
-                                    // eslint-disable-next-line react/jsx-props-no-spreading
                                     {...rest}
                                     wrapperStyle={[styles.mv3, styles.ph5]}
                                 />
diff --git a/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
index d9628d39806e..4433e4a3d648 100644
--- a/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
+++ b/src/pages/workspace/accounting/intacct/export/SageIntacctReimbursableExpensesPage.tsx
@@ -138,7 +138,6 @@ function SageIntacctReimbursableExpensesPage({policy}: WithPolicyConnectionsProp
                             return (
                                 <ToggleSettingOptionRow
                                     key={key}
-                                    // eslint-disable-next-line react/jsx-props-no-spreading
                                     {...rest}
                                     wrapperStyle={[styles.mv3, styles.ph5]}
                                 />
diff --git a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
index 44ee877b9d02..9913c5931b71 100644
--- a/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/advanced/NetSuiteAdvancedPage.tsx
@@ -292,7 +292,6 @@ function NetSuiteAdvancedPage({policy}: WithPolicyConnectionsProps) {
                             return (
                                 <ToggleSettingOptionRow
                                     key={rest.title}
-                                    // eslint-disable-next-line react/jsx-props-no-spreading
                                     {...rest}
                                     wrapperStyle={[styles.mv3, styles.ph5]}
                                 />
diff --git a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
index 0dda40d3b1b7..3bde0439327a 100644
--- a/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
+++ b/src/pages/workspace/accounting/netsuite/export/NetSuiteExportConfigurationPage.tsx
@@ -235,7 +235,6 @@ function NetSuiteExportConfigurationPage({policy}: WithPolicyConnectionsProps) {
                             return (
                                 <ToggleSettingOptionRow
                                     key={rest.title}
-                                    // eslint-disable-next-line react/jsx-props-no-spreading
                                     {...rest}
                                     wrapperStyle={[styles.mv3, styles.ph5]}
                                 />
diff --git a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm.tsx b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm.tsx
index 9c49845e795d..10017368defc 100644
--- a/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm.tsx
+++ b/src/pages/workspace/accounting/netsuite/import/NetSuiteImportCustomFieldNew/NetSuiteMenuWithTopDescriptionForm.tsx
@@ -13,7 +13,6 @@ type NetSuiteMenuWithTopDescriptionFormProps = MenuItemProps & {
 function NetSuiteMenuWithTopDescriptionForm({value, valueRenderer, ...props}: NetSuiteMenuWithTopDescriptionFormProps) {
     return (
         <MenuItemWithTopDescription
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             title={valueRenderer ? valueRenderer(value) : value}
         />
diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
index 627148909707..1fe6313ce7b2 100644
--- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
+++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx
@@ -786,7 +786,6 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) {
                 {!hasVisibleCategories && !isLoading && inputValue.length === 0 && (
                     <ScrollView contentContainerStyle={[styles.flexGrow1, styles.flexShrink0]}>
                         <GenericEmptyStateComponent
-                            // eslint-disable-next-line react/jsx-props-no-spreading
                             {...genericIllustration}
                             title={translate('workspace.categories.emptyCategories.title')}
                             subtitleText={subtitleText}
diff --git a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
index 2a7f36e8a22e..e1d5213ac625 100644
--- a/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
+++ b/src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx
@@ -507,7 +507,6 @@ function WorkspacePerDiemPage({route}: WorkspacePerDiemPageProps) {
                 {!hasVisibleSubRates && !isLoading && (
                     <ScrollView contentContainerStyle={[styles.flexGrow1, styles.flexShrink0]}>
                         <GenericEmptyStateComponent
-                            // eslint-disable-next-line react/jsx-props-no-spreading
                             {...genericIllustration}
                             title={translate('workspace.perDiem.emptyList.title')}
                             subtitle={translate('workspace.perDiem.emptyList.subtitle')}
diff --git a/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx b/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
index ec880e1d2321..cb034fa156a0 100644
--- a/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
+++ b/src/pages/workspace/receiptPartners/WorkspaceReceiptPartnersPage.tsx
@@ -298,7 +298,6 @@ function WorkspaceReceiptPartnersPage({route}: WorkspaceReceiptPartnersPageProps
                                             errorTextStyle={styles.mt3}
                                             brickRoadIndicator={menuItem.brickRoadIndicator}
                                             key={menuItem.title}
-                                            // eslint-disable-next-line react/jsx-props-no-spreading
                                             {...menuItem}
                                         />
                                     </OfflineWithFeedback>
diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
index e52f385cf813..62ccf1846c29 100644
--- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx
+++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx
@@ -931,7 +931,6 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                     {!hasVisibleTags && !isLoading && (
                         <ScrollView contentContainerStyle={[styles.flexGrow1, styles.flexShrink0]}>
                             <GenericEmptyStateComponent
-                                // eslint-disable-next-line react/jsx-props-no-spreading
                                 {...genericIllustration}
                                 title={translate('workspace.tags.emptyTags.title')}
                                 subtitleText={subtitleText}
diff --git a/src/pages/workspace/withPolicy.tsx b/src/pages/workspace/withPolicy.tsx
index 4fd636b3b1eb..b28cb2dacfca 100644
--- a/src/pages/workspace/withPolicy.tsx
+++ b/src/pages/workspace/withPolicy.tsx
@@ -103,7 +103,6 @@ export default function <TProps extends WithPolicyProps>(WrappedComponent: Compo
 
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(props as TProps)}
                 policy={policy}
                 policyDraft={policyDraft}
diff --git a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
index 83e6399910cc..83c73d6645ad 100644
--- a/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
+++ b/src/pages/workspace/withPolicyAndFullscreenLoading.tsx
@@ -47,7 +47,6 @@ export default function withPolicyAndFullscreenLoading<TProps extends WithPolicy
 
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(rest as TProps)}
                 isLoadingReportData={isLoadingReportData}
                 personalDetails={personalDetails}
diff --git a/src/pages/workspace/withPolicyConnections.tsx b/src/pages/workspace/withPolicyConnections.tsx
index 8538f5c6f504..c4260975c2b8 100644
--- a/src/pages/workspace/withPolicyConnections.tsx
+++ b/src/pages/workspace/withPolicyConnections.tsx
@@ -54,7 +54,6 @@ function withPolicyConnections<TProps extends WithPolicyConnectionsProps>(Wrappe
 
         return (
             <WrappedComponent
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 isConnectionDataFetchNeeded={isConnectionDataFetchNeeded}
             />
diff --git a/src/stories/AddressSearch.stories.tsx b/src/stories/AddressSearch.stories.tsx
index 3b6406af94c5..af9fa41f2db0 100644
--- a/src/stories/AddressSearch.stories.tsx
+++ b/src/stories/AddressSearch.stories.tsx
@@ -27,7 +27,6 @@ function Template(props: AddressSearchProps) {
         <AddressSearch
             value={value as string}
             onInputChange={(inputValue) => setValue(inputValue)}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/stories/Avatar.stories.tsx b/src/stories/Avatar.stories.tsx
index e313195158ff..dd04c647b792 100644
--- a/src/stories/Avatar.stories.tsx
+++ b/src/stories/Avatar.stories.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import type {Meta, StoryFn} from '@storybook/react-webpack5';
 import React from 'react';
 import {View} from 'react-native';
diff --git a/src/stories/AvatarSelector.stories.tsx b/src/stories/AvatarSelector.stories.tsx
index c93294ce6c03..ade20e90dad9 100644
--- a/src/stories/AvatarSelector.stories.tsx
+++ b/src/stories/AvatarSelector.stories.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import type {Meta, StoryFn} from '@storybook/react-webpack5';
 import React, {useState} from 'react';
 import type {AvatarSelectorProps} from '@components/AvatarSelector';
diff --git a/src/stories/Banner.stories.tsx b/src/stories/Banner.stories.tsx
index 2ca2489dd8e0..6a7693411814 100644
--- a/src/stories/Banner.stories.tsx
+++ b/src/stories/Banner.stories.tsx
@@ -16,7 +16,6 @@ const story = {
 };
 
 function Template(props: BannerProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <Banner {...props} />;
 }
 
diff --git a/src/stories/Breadcrumbs.stories.tsx b/src/stories/Breadcrumbs.stories.tsx
index 38cb5192b105..4fe62f514211 100644
--- a/src/stories/Breadcrumbs.stories.tsx
+++ b/src/stories/Breadcrumbs.stories.tsx
@@ -16,7 +16,6 @@ const story = {
 type StoryType = typeof Template & {args?: Partial<BreadcrumbsProps>};
 
 function Template(args: BreadcrumbsProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <Breadcrumbs {...args} />;
 }
 
diff --git a/src/stories/Button.stories.tsx b/src/stories/Button.stories.tsx
index ed1ec8c48406..68bff3c85d98 100644
--- a/src/stories/Button.stories.tsx
+++ b/src/stories/Button.stories.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import type {Meta, StoryFn} from '@storybook/react-webpack5';
 import React, {useCallback, useState} from 'react';
 import {View} from 'react-native';
diff --git a/src/stories/ButtonWithDropdownMenu.stories.tsx b/src/stories/ButtonWithDropdownMenu.stories.tsx
index 60f1212c29e7..ddf359406f0b 100644
--- a/src/stories/ButtonWithDropdownMenu.stories.tsx
+++ b/src/stories/ButtonWithDropdownMenu.stories.tsx
@@ -29,7 +29,6 @@ function Template(props: ButtonWithDropdownMenuProps<unknown>) {
 
     return (
         <ButtonWithDropdownMenu
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             options={options}
         />
diff --git a/src/stories/Checkbox.stories.tsx b/src/stories/Checkbox.stories.tsx
index cb3ee8ba473d..c8f1a46bc0b9 100644
--- a/src/stories/Checkbox.stories.tsx
+++ b/src/stories/Checkbox.stories.tsx
@@ -16,7 +16,6 @@ const story: Meta<typeof Checkbox> = {
 };
 
 function Template(props: CheckboxProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <Checkbox {...props} />;
 }
 
diff --git a/src/stories/CheckboxWithLabel.stories.tsx b/src/stories/CheckboxWithLabel.stories.tsx
index 9fa2c3d30f77..37c864701678 100644
--- a/src/stories/CheckboxWithLabel.stories.tsx
+++ b/src/stories/CheckboxWithLabel.stories.tsx
@@ -21,7 +21,6 @@ const story: Meta<typeof CheckboxWithLabel> = {
 };
 
 function Template(props: CheckboxWithLabelProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <CheckboxWithLabel {...props} />;
 }
 
diff --git a/src/stories/Composer.stories.tsx b/src/stories/Composer.stories.tsx
index dc6a2546a243..495a649c555a 100644
--- a/src/stories/Composer.stories.tsx
+++ b/src/stories/Composer.stories.tsx
@@ -45,7 +45,6 @@ function Default(props: ComposerProps) {
         <View>
             <View style={[defaultStyles.border, defaultStyles.p4]}>
                 <ComposerWithNavigation
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                     multiline
                     value={comment}
diff --git a/src/stories/EReceipt.stories.tsx b/src/stories/EReceipt.stories.tsx
index 10bf8bc83014..fbe7272ac4a9 100644
--- a/src/stories/EReceipt.stories.tsx
+++ b/src/stories/EReceipt.stories.tsx
@@ -170,7 +170,6 @@ const story: Meta<typeof EReceipt> = {
 };
 
 function Template(props: EReceiptProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <EReceipt {...props} />;
 }
 
diff --git a/src/stories/EReceiptThumbail.stories.tsx b/src/stories/EReceiptThumbail.stories.tsx
index 54ee90ebd83a..df08a3633e8c 100644
--- a/src/stories/EReceiptThumbail.stories.tsx
+++ b/src/stories/EReceiptThumbail.stories.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import type {Meta, StoryFn} from '@storybook/react-webpack5';
 import React from 'react';
 import {View} from 'react-native';
diff --git a/src/stories/Form.stories.tsx b/src/stories/Form.stories.tsx
index 462774fd64eb..a008a87761aa 100644
--- a/src/stories/Form.stories.tsx
+++ b/src/stories/Form.stories.tsx
@@ -74,7 +74,6 @@ function Template(props: FormProviderProps & FormProviderOnyxProps) {
     }
 
     return (
-        // eslint-disable-next-line react/jsx-props-no-spreading
         <FormProvider {...props}>
             <View>
                 <InputWrapper
@@ -187,7 +186,6 @@ function WithNativeEventHandler(props: FormProviderProps & FormProviderOnyxProps
     }
 
     return (
-        // eslint-disable-next-line react/jsx-props-no-spreading
         <FormProvider {...props}>
             <InputWrapper
                 InputComponent={TextInput}
diff --git a/src/stories/FormAlertWithSubmitButton.stories.tsx b/src/stories/FormAlertWithSubmitButton.stories.tsx
index 37a65c4e9d3f..9dad568ec6e8 100644
--- a/src/stories/FormAlertWithSubmitButton.stories.tsx
+++ b/src/stories/FormAlertWithSubmitButton.stories.tsx
@@ -16,7 +16,6 @@ const story: Meta<typeof FormAlertWithSubmitButton> = {
 };
 
 function Template(props: FormAlertWithSubmitButtonProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <FormAlertWithSubmitButton {...props} />;
 }
 
diff --git a/src/stories/Header.stories.tsx b/src/stories/Header.stories.tsx
index fb38cf94d11f..271f81697009 100644
--- a/src/stories/Header.stories.tsx
+++ b/src/stories/Header.stories.tsx
@@ -16,7 +16,6 @@ const story: Meta<typeof Header> = {
 };
 
 function Template(props: HeaderProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <Header {...props} />;
 }
 
diff --git a/src/stories/HeaderWithBackButton.stories.tsx b/src/stories/HeaderWithBackButton.stories.tsx
index a293b99c0d9f..7e03a93456f6 100644
--- a/src/stories/HeaderWithBackButton.stories.tsx
+++ b/src/stories/HeaderWithBackButton.stories.tsx
@@ -16,7 +16,6 @@ const story: Meta<typeof HeaderWithBackButton> = {
 };
 
 function Template(props: HeaderWithBackButtonProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <HeaderWithBackButton {...props} />;
 }
 
diff --git a/src/stories/InlineSystemMessage.stories.tsx b/src/stories/InlineSystemMessage.stories.tsx
index 40479cda2199..fb0a6e6642e3 100644
--- a/src/stories/InlineSystemMessage.stories.tsx
+++ b/src/stories/InlineSystemMessage.stories.tsx
@@ -16,7 +16,6 @@ const story: Meta<typeof InlineSystemMessage> = {
 };
 
 function Template(props: InlineSystemMessageProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <InlineSystemMessage {...props} />;
 }
 
diff --git a/src/stories/InteractiveStepSubHeader.stories.tsx b/src/stories/InteractiveStepSubHeader.stories.tsx
index 916fa4bb7e26..e3a4e9b77da4 100644
--- a/src/stories/InteractiveStepSubHeader.stories.tsx
+++ b/src/stories/InteractiveStepSubHeader.stories.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import React, {useRef} from 'react';
 import type {ForwardedRef} from 'react';
 import {Button, View} from 'react-native';
diff --git a/src/stories/MagicCodeInput.stories.tsx b/src/stories/MagicCodeInput.stories.tsx
index 8bffe67a9ed4..fdf264164e56 100644
--- a/src/stories/MagicCodeInput.stories.tsx
+++ b/src/stories/MagicCodeInput.stories.tsx
@@ -22,7 +22,6 @@ function Template(props: MagicCodeInputProps) {
         <MagicCodeInput
             value={value}
             onChangeText={setValue}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/stories/MenuItem.stories.tsx b/src/stories/MenuItem.stories.tsx
index 21fe8cc369da..cf7c373627e9 100644
--- a/src/stories/MenuItem.stories.tsx
+++ b/src/stories/MenuItem.stories.tsx
@@ -21,7 +21,6 @@ const story: Meta<typeof MenuItem> = {
 };
 
 function Template(props: MenuItemProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <MenuItem {...props} />;
 }
 
diff --git a/src/stories/MoneyRequestReportPreview.stories.tsx b/src/stories/MoneyRequestReportPreview.stories.tsx
index 8771761e2bd2..4536122d9bb7 100644
--- a/src/stories/MoneyRequestReportPreview.stories.tsx
+++ b/src/stories/MoneyRequestReportPreview.stories.tsx
@@ -140,7 +140,6 @@ function Template(props: MoneyRequestReportPreviewContentProps, {parameters}: {p
             <ThemeStylesProvider>
                 <View style={{maxWidth: '100%'}}>
                     <MoneyRequestReportPreviewContent
-                        // eslint-disable-next-line react/jsx-props-no-spreading
                         {...props}
                         reportPreviewStyles={reportPreviewStyle}
                         containerStyles={[reportPreviewStyle.componentStyle, props.containerStyles]}
diff --git a/src/stories/NumberWithSymbolForm.stories.tsx b/src/stories/NumberWithSymbolForm.stories.tsx
index 9246f9946d67..f28608c1f640 100644
--- a/src/stories/NumberWithSymbolForm.stories.tsx
+++ b/src/stories/NumberWithSymbolForm.stories.tsx
@@ -23,7 +23,6 @@ const story: Meta<typeof NumberWithSymbolForm> = {
 function Template(props: NumberWithSymbolFormProps) {
     return (
         <ScrollView contentContainerStyle={defaultStyles.flexGrow1}>
-            {/* eslint-disable-next-line react/jsx-props-no-spreading */}
             <NumberWithSymbolFormWithNavigation {...props} />
         </ScrollView>
     );
diff --git a/src/stories/OptionRow.stories.tsx b/src/stories/OptionRow.stories.tsx
index d4abcd747ddd..dc03ae03364f 100644
--- a/src/stories/OptionRow.stories.tsx
+++ b/src/stories/OptionRow.stories.tsx
@@ -4,8 +4,6 @@ import OnyxListItemProvider from '@components/OnyxListItemProvider';
 import OptionRow from '@components/OptionRow';
 import type {OptionRowProps} from '@components/OptionRow';
 
-/* eslint-disable react/jsx-props-no-spreading */
-
 /**
  * We use the Component Story Format for writing stories. Follow the docs here:
  *
diff --git a/src/stories/Picker.stories.tsx b/src/stories/Picker.stories.tsx
index bee63ddb8c1d..6bf454a9f473 100644
--- a/src/stories/Picker.stories.tsx
+++ b/src/stories/Picker.stories.tsx
@@ -23,7 +23,6 @@ function Template(props: TemplateProps) {
         <Picker
             value={value}
             onInputChange={(e) => setValue(e)}
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
         />
     );
diff --git a/src/stories/PopoverMenu.stories.tsx b/src/stories/PopoverMenu.stories.tsx
index 898c54ef201f..47f9effe6fb3 100644
--- a/src/stories/PopoverMenu.stories.tsx
+++ b/src/stories/PopoverMenu.stories.tsx
@@ -34,7 +34,6 @@ function Template(props: PopoverMenuProps) {
             />
             <SafeAreaProvider>
                 <PopoverMenu
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                     isVisible={isVisible}
                     onClose={toggleVisibility}
diff --git a/src/stories/PromotedActionBar.stories.tsx b/src/stories/PromotedActionBar.stories.tsx
index 98619b43dc72..f666d0f30f90 100644
--- a/src/stories/PromotedActionBar.stories.tsx
+++ b/src/stories/PromotedActionBar.stories.tsx
@@ -21,10 +21,7 @@ type StoryType = typeof Template & {args?: Partial<PromotedActionsBarPropsWithTe
 function Template(args: PromotedActionsBarProps) {
     return (
         <View style={{maxWidth: variables.sideBarWidth}}>
-            <PromotedActionsBar
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...args}
-            />
+            <PromotedActionsBar {...args} />
         </View>
     );
 }
diff --git a/src/stories/RadioButtonWithLabel.stories.tsx b/src/stories/RadioButtonWithLabel.stories.tsx
index 134a256f08cb..68300baeaec3 100644
--- a/src/stories/RadioButtonWithLabel.stories.tsx
+++ b/src/stories/RadioButtonWithLabel.stories.tsx
@@ -16,7 +16,6 @@ const story: Meta<typeof RadioButtonWithLabel> = {
 };
 
 function Template(props: RadioButtonWithLabelProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <RadioButtonWithLabel {...props} />;
 }
 
diff --git a/src/stories/ReportActionItemImages.stories.tsx b/src/stories/ReportActionItemImages.stories.tsx
index bceea78d32af..929f5b9c0083 100644
--- a/src/stories/ReportActionItemImages.stories.tsx
+++ b/src/stories/ReportActionItemImages.stories.tsx
@@ -24,7 +24,6 @@ function Template(props: ReportActionItemImagesProps) {
         >
             {({hovered}) => (
                 <ReportActionItemImages
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                     isHovered={hovered}
                 />
diff --git a/src/stories/SelectionListWithSections.stories.tsx b/src/stories/SelectionListWithSections.stories.tsx
index 94d8b5f1def5..25e6cb4b4b77 100644
--- a/src/stories/SelectionListWithSections.stories.tsx
+++ b/src/stories/SelectionListWithSections.stories.tsx
@@ -90,7 +90,6 @@ function Default(props: SelectionListWithSectionsProps<ListItem>) {
 
     return (
         <SelectionListWithNavigation
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             sections={sections}
             ListItem={SingleSelectListItem}
@@ -130,7 +129,6 @@ function WithTextInput(props: SelectionListWithSectionsProps<ListItem>) {
 
     return (
         <SelectionListWithNavigation
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             sections={sections}
             ListItem={SingleSelectListItem}
@@ -174,7 +172,6 @@ function WithAlternateText(props: SelectionListWithSectionsProps<ListItem>) {
 
     return (
         <SelectionListWithNavigation
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             sections={sections}
             onSelectRow={onSelectRow}
@@ -225,7 +222,6 @@ function MultipleSelection(props: SelectionListWithSectionsProps<ListItem>) {
 
     return (
         <SelectionListWithNavigation
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             sections={sections}
             ListItem={MultiSelectListItem}
@@ -277,7 +273,6 @@ function WithSectionHeader(props: SelectionListWithSectionsProps<ListItem>) {
 
     return (
         <SelectionListWithNavigation
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             sections={sections}
             ListItem={MultiSelectListItem}
@@ -337,7 +332,6 @@ function WithConfirmButton(props: SelectionListWithSectionsProps<ListItem>) {
 
     return (
         <SelectionListWithNavigation
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             sections={memo.sections}
             ListItem={MultiSelectListItem}
diff --git a/src/stories/TextInput.stories.tsx b/src/stories/TextInput.stories.tsx
index 1982eb449ef9..1aa774445307 100644
--- a/src/stories/TextInput.stories.tsx
+++ b/src/stories/TextInput.stories.tsx
@@ -17,7 +17,6 @@ const story: Meta<typeof TextInput> = {
 };
 
 function Template(props: BaseTextInputProps) {
-    // eslint-disable-next-line react/jsx-props-no-spreading
     return <TextInput {...props} />;
 }
 
@@ -85,7 +84,6 @@ function HintAndErrorInput(props: BaseTextInputProps) {
     const [error, setError] = useState('');
     return (
         <TextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             onChangeText={(value) => {
                 if (value?.toLowerCase() === 'oops!') {
@@ -114,7 +112,6 @@ function AutoGrowSupportInput(props: BaseTextInputProps) {
 
     return (
         <TextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
             {...props}
             onChangeText={setValue}
             value={value}
diff --git a/src/stories/Tooltip.stories.tsx b/src/stories/Tooltip.stories.tsx
index 4b241d88cfbc..86ac23af57bd 100644
--- a/src/stories/Tooltip.stories.tsx
+++ b/src/stories/Tooltip.stories.tsx
@@ -19,7 +19,6 @@ function Template(props: TooltipExtendedProps) {
     return (
         <div style={{width: 100}}>
             <Tooltip
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 // Disable nullish coalescing to handle cases when maxWidth is 0
                 // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
diff --git a/src/stories/TransactionPreviewContent.stories.tsx b/src/stories/TransactionPreviewContent.stories.tsx
index e26bccb3a751..d9cf2d1c6ace 100644
--- a/src/stories/TransactionPreviewContent.stories.tsx
+++ b/src/stories/TransactionPreviewContent.stories.tsx
@@ -131,7 +131,6 @@ function Template(props: TransactionPreviewContentProps) {
         <ThemeProvider theme={CONST.THEME.LIGHT}>
             <ThemeStylesProvider>
                 <View style={{flexDirection: 'row'}}>
-                    {/* eslint-disable-next-line react/jsx-props-no-spreading */}
                     <TransactionPreviewContent {...props} />
                 </View>
             </ThemeStylesProvider>
diff --git a/tests/perf-test/ReportActionsList.perf-test.tsx b/tests/perf-test/ReportActionsList.perf-test.tsx
index 4e9118e1c201..6589d408e1cc 100644
--- a/tests/perf-test/ReportActionsList.perf-test.tsx
+++ b/tests/perf-test/ReportActionsList.perf-test.tsx
@@ -41,7 +41,6 @@ jest.mock('@components/withCurrentUserPersonalDetails', () => {
 
             return (
                 <Component
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...(props as TProps)}
                     currentUserPersonalDetails={LHNTestUtils.fakePersonalDetails[currentUserAccountID]}
                 />
diff --git a/tests/perf-test/SelectionList.perf-test.tsx b/tests/perf-test/SelectionList.perf-test.tsx
index abbb9565cd8d..c523436645a3 100644
--- a/tests/perf-test/SelectionList.perf-test.tsx
+++ b/tests/perf-test/SelectionList.perf-test.tsx
@@ -23,7 +23,6 @@ jest.mock('@shopify/flash-list', () => {
         FlashList: ({data, ...props}: React.ComponentProps<typeof RN.FlatList>) => (
             <RN.FlatList
                 data={data}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
                 initialNumToRender={data?.length}
             />
@@ -48,7 +47,6 @@ jest.mock('@components/withKeyboardState', () => <TProps extends KeyboardStateCo
     function WrappedComponent(props: Omit<TProps, keyof KeyboardStateContextValue>) {
         return (
             <Component
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...(props as TProps)}
                 isKeyboardShown={false}
             />
diff --git a/tests/ui/AvatarSelector.test.tsx b/tests/ui/AvatarSelector.test.tsx
index cb0091ec99f0..62a2ae66155b 100644
--- a/tests/ui/AvatarSelector.test.tsx
+++ b/tests/ui/AvatarSelector.test.tsx
@@ -52,7 +52,6 @@ describe('AvatarSelector', () => {
             <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
                 <AvatarSelector
                     onSelect={onSelectMock}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                 />
             </ComposeProviders>,
diff --git a/tests/ui/LHNItemsPresence.tsx b/tests/ui/LHNItemsPresence.tsx
index 8393a8757618..c7c9eef7ce3b 100644
--- a/tests/ui/LHNItemsPresence.tsx
+++ b/tests/ui/LHNItemsPresence.tsx
@@ -72,7 +72,6 @@ jest.mock('@components/withCurrentUserPersonalDetails', () => {
 
             return (
                 <Component
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...(props as TProps)}
                     currentUserPersonalDetails={LHNTestUtilsMock.fakePersonalDetails[currentUserAccountID]}
                 />
diff --git a/tests/ui/MoneyReportContentCreatedTest.tsx b/tests/ui/MoneyReportContentCreatedTest.tsx
index 073d29f456c4..553b096379e9 100644
--- a/tests/ui/MoneyReportContentCreatedTest.tsx
+++ b/tests/ui/MoneyReportContentCreatedTest.tsx
@@ -68,7 +68,6 @@ const renderWithProps = (props: Partial<React.ComponentProps<typeof MoneyReportC
 
     return render(
         <OnyxListItemProvider>
-            {/* eslint-disable-next-line react/jsx-props-no-spreading */}
             <MoneyReportContentCreated {...merged} />
         </OnyxListItemProvider>,
     );
diff --git a/tests/ui/MoneyRequestReportFooter.tsx b/tests/ui/MoneyRequestReportFooter.tsx
index 79e42d7f9f83..68b1314ccf8e 100644
--- a/tests/ui/MoneyRequestReportFooter.tsx
+++ b/tests/ui/MoneyRequestReportFooter.tsx
@@ -133,7 +133,6 @@ const renderMoneyRequestConfirmationListFooter = (transaction: Transaction) => {
     return render(
         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
             <ScreenWrapper testID="MoneyRequestConfirmationListFooter">
-                {/* eslint-disable-next-line react/jsx-props-no-spreading */}
                 <MoneyRequestConfirmationListFooter {...defaultProps} />
             </ScreenWrapper>
         </ComposeProviders>,
diff --git a/tests/ui/ReportActionAvatarsTest.tsx b/tests/ui/ReportActionAvatarsTest.tsx
index b4cbd2ec44c8..cf7f1c9bef50 100644
--- a/tests/ui/ReportActionAvatarsTest.tsx
+++ b/tests/ui/ReportActionAvatarsTest.tsx
@@ -276,7 +276,6 @@ const onyxState = {
 function renderAvatar(props: Parameters<typeof ReportActionAvatars>[0]) {
     return render(
         <OnyxListItemProvider>
-            {/* eslint-disable-next-line react/jsx-props-no-spreading */}
             <ReportActionAvatars {...props} />
         </OnyxListItemProvider>,
     );
diff --git a/tests/ui/ReportActionComposeTest.tsx b/tests/ui/ReportActionComposeTest.tsx
index bba2658a7a4c..bff7a59086b8 100644
--- a/tests/ui/ReportActionComposeTest.tsx
+++ b/tests/ui/ReportActionComposeTest.tsx
@@ -60,9 +60,7 @@ const renderReportActionCompose = (props?: Partial<ReportActionComposeProps>) =>
     return render(
         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
             <ReportActionCompose
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...defaultProps}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </ComposeProviders>,
diff --git a/tests/ui/ReportActionItemMessageEditTest.tsx b/tests/ui/ReportActionItemMessageEditTest.tsx
index 5587f9027f79..c505be3cf7ff 100644
--- a/tests/ui/ReportActionItemMessageEditTest.tsx
+++ b/tests/ui/ReportActionItemMessageEditTest.tsx
@@ -62,9 +62,7 @@ const renderReportActionItemMessageEdit = (props?: Partial<ReportActionItemMessa
     return render(
         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
             <ReportActionItemMessageEdit
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...defaultProps}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </ComposeProviders>,
diff --git a/tests/ui/ToggleDistanceUnitButtonTests.tsx b/tests/ui/ToggleDistanceUnitButtonTests.tsx
index be2adf9b2b73..f47bd98c8a80 100644
--- a/tests/ui/ToggleDistanceUnitButtonTests.tsx
+++ b/tests/ui/ToggleDistanceUnitButtonTests.tsx
@@ -13,7 +13,6 @@ describe('ToggleDistanceUnitButton', () => {
                 testID="pressable"
                 accessibilityLabel="fake-button"
                 accessibilityRole={CONST.ROLE.BUTTON}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             >
                 <Text>Click me</Text>
diff --git a/tests/ui/TransactionItemRowRBRTest.tsx b/tests/ui/TransactionItemRowRBRTest.tsx
index 296b3d0826e7..0451a8638ca1 100644
--- a/tests/ui/TransactionItemRowRBRTest.tsx
+++ b/tests/ui/TransactionItemRowRBRTest.tsx
@@ -47,7 +47,6 @@ const renderTransactionItemRow = (transactionItem: TransactionWithOptionalSearch
                 report={transactionItem.report}
                 policy={transactionItem.policy}
                 reportActions={reportActions}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...defaultProps}
             />
         </ComposeProviders>,
@@ -135,7 +134,6 @@ describe('TransactionItemRowRBR', () => {
                 <TransactionItemRow
                     transactionItem={mockTransaction}
                     violations={undefined}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...defaultProps}
                     columns={[CONST.SEARCH.TABLE_COLUMNS.REIMBURSABLE]}
                 />
@@ -298,7 +296,6 @@ describe('TransactionItemRowRBR', () => {
                 <TransactionItemRow
                     transactionItem={mockTimeTransaction}
                     violations={undefined}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...defaultProps}
                     columns={[CONST.SEARCH.TABLE_COLUMNS.TAX_RATE, CONST.SEARCH.TABLE_COLUMNS.TAX_AMOUNT]}
                 />
diff --git a/tests/ui/WorkspacePageWithSectionsTest.tsx b/tests/ui/WorkspacePageWithSectionsTest.tsx
index 80cc7cb6a04b..47121933bd42 100644
--- a/tests/ui/WorkspacePageWithSectionsTest.tsx
+++ b/tests/ui/WorkspacePageWithSectionsTest.tsx
@@ -60,10 +60,7 @@ const renderWorkspacePageWithSections = (props = {}) => {
 
     return render(
         <ComposeProviders components={[OnyxListItemProvider, LocaleContextProvider]}>
-            <WorkspacePageWithSections
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...defaultProps}
-            >
+            <WorkspacePageWithSections {...defaultProps}>
                 <View />
             </WorkspacePageWithSections>
         </ComposeProviders>,
diff --git a/tests/ui/components/Button.tsx b/tests/ui/components/Button.tsx
index 0c0a1b5e2813..bfc2006cb20d 100644
--- a/tests/ui/components/Button.tsx
+++ b/tests/ui/components/Button.tsx
@@ -13,7 +13,6 @@ describe('Button Component', () => {
         render(
             <Button
                 text={buttonText}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />,
         );
diff --git a/tests/ui/components/ButtonKeyboardShortcut.tsx b/tests/ui/components/ButtonKeyboardShortcut.tsx
index fa32614f6b18..15191f79ff55 100644
--- a/tests/ui/components/ButtonKeyboardShortcut.tsx
+++ b/tests/ui/components/ButtonKeyboardShortcut.tsx
@@ -39,7 +39,6 @@ const renderShortcut = (props: Partial<ButtonKeyboardShortcutProps> = {}) =>
             <ButtonKeyboardShortcut
                 pressOnEnter
                 isPressOnEnterActive
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />
         </NavigationContainer>,
diff --git a/tests/ui/components/CheckboxWithLabel.tsx b/tests/ui/components/CheckboxWithLabel.tsx
index dab351b8c41d..0c193adf2ded 100644
--- a/tests/ui/components/CheckboxWithLabel.tsx
+++ b/tests/ui/components/CheckboxWithLabel.tsx
@@ -12,7 +12,6 @@ describe('CheckboxWithLabel Component', () => {
             <CheckboxWithLabel
                 label={LABEL}
                 onInputChange={mockOnInputChange}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             />,
         );
diff --git a/tests/ui/components/ComposedButton.tsx b/tests/ui/components/ComposedButton.tsx
index 7cc8c47e9ae6..9b89503a521c 100644
--- a/tests/ui/components/ComposedButton.tsx
+++ b/tests/ui/components/ComposedButton.tsx
@@ -45,7 +45,6 @@ describe('ButtonComposed — Button', () => {
         render(
             <Button
                 accessibilityLabel={LABEL}
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...props}
             >
                 {children}
diff --git a/tests/ui/components/FeatureTrainingModalTest.tsx b/tests/ui/components/FeatureTrainingModalTest.tsx
index 3fc3e08f2150..7641e2afdbcf 100644
--- a/tests/ui/components/FeatureTrainingModalTest.tsx
+++ b/tests/ui/components/FeatureTrainingModalTest.tsx
@@ -25,7 +25,7 @@ jest.mock('@libs/Navigation/Navigation', () => ({
 
 jest.mock('@components/ImageSVG', () => {
     const {View} = require<typeof ReactNative>('react-native');
-    // eslint-disable-next-line react/jsx-props-no-spreading
+
     return (props: ViewProps) => <View {...props} />;
 });
 
diff --git a/tests/ui/components/SettlementButtonTest.tsx b/tests/ui/components/SettlementButtonTest.tsx
index 20be009b94c8..09e4cae3706e 100644
--- a/tests/ui/components/SettlementButtonTest.tsx
+++ b/tests/ui/components/SettlementButtonTest.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading -- Using spread for defaultProps in tests for cleaner test code */
 import {act, fireEvent, render, screen} from '@testing-library/react-native';
 import React from 'react';
 import Onyx from 'react-native-onyx';
diff --git a/tests/ui/components/TextInputLabel.tsx b/tests/ui/components/TextInputLabel.tsx
index 05fae399cd43..f126782bc75e 100644
--- a/tests/ui/components/TextInputLabel.tsx
+++ b/tests/ui/components/TextInputLabel.tsx
@@ -5,12 +5,7 @@ import type TextInputLabelProps from '@components/TextInput/TextInputLabel/types
 
 describe('TextInputLabel', () => {
     const renderLabel = (props: TextInputLabelProps) => {
-        return render(
-            <TextInputLabel
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...props}
-            />,
-        );
+        return render(<TextInputLabel {...props} />);
     };
 
     const labelTranslateY = useSharedValue(0);
diff --git a/tests/ui/components/TimePickerTest.tsx b/tests/ui/components/TimePickerTest.tsx
index e6078be79bf1..cda32169fdb8 100644
--- a/tests/ui/components/TimePickerTest.tsx
+++ b/tests/ui/components/TimePickerTest.tsx
@@ -63,7 +63,6 @@ describe('TimePicker Component', () => {
             <NavigationContainer>
                 <TimePicker
                     onSubmit={() => {}}
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...props}
                 />
             </NavigationContainer>,
diff --git a/tests/unit/AvatarButtonWithIconTest.tsx b/tests/unit/AvatarButtonWithIconTest.tsx
index 54ec1964de53..7c8c197d1d54 100644
--- a/tests/unit/AvatarButtonWithIconTest.tsx
+++ b/tests/unit/AvatarButtonWithIconTest.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/jsx-props-no-spreading */
 import {fireEvent, render, renderHook, screen} from '@testing-library/react-native';
 import React, {createRef} from 'react';
 import {View} from 'react-native';
diff --git a/tests/unit/MentionUserRendererTest.tsx b/tests/unit/MentionUserRendererTest.tsx
index a550700a149f..6618945eb49e 100644
--- a/tests/unit/MentionUserRendererTest.tsx
+++ b/tests/unit/MentionUserRendererTest.tsx
@@ -43,7 +43,6 @@ jest.mock('@components/withCurrentUserPersonalDetails', () => {
         function WrappedComponent(props: Omit<TProps, keyof WithCurrentUserPersonalDetailsProps>) {
             return (
                 <Component
-                    // eslint-disable-next-line react/jsx-props-no-spreading
                     {...(props as TProps)}
                     currentUserPersonalDetails={{
                         accountID: 1,
diff --git a/tests/unit/TransactionGroupListItemTest.tsx b/tests/unit/TransactionGroupListItemTest.tsx
index 0d3293c3d77f..448fdcae82b9 100644
--- a/tests/unit/TransactionGroupListItemTest.tsx
+++ b/tests/unit/TransactionGroupListItemTest.tsx
@@ -312,13 +312,7 @@ describe('TransactionGroupListItem', () => {
     }
 
     const renderTransactionGroupListItem = () => {
-        return render(
-            <TransactionGroupListItem
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...defaultProps}
-            />,
-            {wrapper: TestWrapper},
-        );
+        return render(<TransactionGroupListItem {...defaultProps} />, {wrapper: TestWrapper});
     };
 
     const expand = async () => {
@@ -442,13 +436,7 @@ describe('Empty Report Selection', () => {
     }
 
     const renderTransactionGroupListItem = () => {
-        return render(
-            <TransactionGroupListItem
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...defaultProps}
-            />,
-            {wrapper: TestWrapper},
-        );
+        return render(<TransactionGroupListItem {...defaultProps} />, {wrapper: TestWrapper});
     };
 
     it('should render an empty report with checkbox', async () => {
@@ -533,13 +521,7 @@ describe('Empty Report Selection', () => {
             item: mockNonEmptyReport,
         };
 
-        const {unmount: unmountNonEmpty} = render(
-            <TransactionGroupListItem
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...nonEmptyProps}
-            />,
-            {wrapper: TestWrapper},
-        );
+        const {unmount: unmountNonEmpty} = render(<TransactionGroupListItem {...nonEmptyProps} />, {wrapper: TestWrapper});
         await waitForBatchedUpdatesWithAct();
 
         const nonEmptyCheckbox = screen.getByRole(CONST.ROLE.CHECKBOX);
@@ -577,13 +559,7 @@ describe('Empty Report Selection', () => {
             item: mockNonEmptyReport,
         };
 
-        render(
-            <TransactionGroupListItem
-                // eslint-disable-next-line react/jsx-props-no-spreading
-                {...nonEmptyProps}
-            />,
-            {wrapper: TestWrapper},
-        );
+        render(<TransactionGroupListItem {...nonEmptyProps} />, {wrapper: TestWrapper});
         await waitForBatchedUpdatesWithAct();
 
         // Non-empty reports should have an expand button
