diff --git a/src/components/FlatList/index.android.js b/src/components/FlatList/index.android.js
deleted file mode 100644
index f7c3da39ed84..000000000000
--- a/src/components/FlatList/index.android.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import {useFocusEffect} from '@react-navigation/native';
-import PropTypes from 'prop-types';
-import React, {forwardRef, useCallback, useContext} from 'react';
-import {FlatList} from 'react-native';
-import {ActionListContext} from '@pages/home/ReportScreenContext';
-
-const propTypes = {
-    /** Same as for FlatList */
-    onScroll: PropTypes.func,
-
-    /** Same as for FlatList */
-    onLayout: PropTypes.func,
-
-    /** Same as for FlatList */
-    // eslint-disable-next-line react/forbid-prop-types
-    maintainVisibleContentPosition: PropTypes.object,
-
-    /** Passed via forwardRef so we can access the FlatList ref */
-    innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.shape({current: PropTypes.instanceOf(FlatList)})]).isRequired,
-};
-
-const defaultProps = {
-    /** Same as for FlatList */
-    onScroll: undefined,
-
-    /** Same as for FlatList */
-    onLayout: undefined,
-
-    /** Same as for FlatList */
-    maintainVisibleContentPosition: undefined,
-};
-
-// FlatList wrapped with the freeze component will lose its scroll state when frozen (only for Android).
-// CustomFlatList saves the offset and use it for scrollToOffset() when unfrozen.
-function CustomFlatList(props) {
-    const {scrollPosition, setScrollPosition} = useContext(ActionListContext);
-
-    const onScreenFocus = useCallback(() => {
-        if (!props.innerRef.current || !scrollPosition.offset) {
-            return;
-        }
-        if (props.innerRef.current && scrollPosition.offset) {
-            props.innerRef.current.scrollToOffset({offset: scrollPosition.offset, animated: false});
-        }
-    }, [scrollPosition.offset, props.innerRef]);
-
-    useFocusEffect(
-        useCallback(() => {
-            onScreenFocus();
-        }, [onScreenFocus]),
-    );
-
-    return (
-        <FlatList
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...props}
-            onScroll={(event) => props.onScroll(event)}
-            onMomentumScrollEnd={(event) => {
-                setScrollPosition({offset: event.nativeEvent.contentOffset.y});
-            }}
-            ref={props.innerRef}
-        />
-    );
-}
-
-CustomFlatList.propTypes = propTypes;
-CustomFlatList.defaultProps = defaultProps;
-
-const CustomFlatListWithRef = forwardRef((props, ref) => (
-    <CustomFlatList
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        innerRef={ref}
-    />
-));
-
-CustomFlatListWithRef.displayName = 'CustomFlatListWithRef';
-
-export default CustomFlatListWithRef;
diff --git a/src/components/FlatList/index.android.tsx b/src/components/FlatList/index.android.tsx
new file mode 100644
index 000000000000..84345f6e0ed4
--- /dev/null
+++ b/src/components/FlatList/index.android.tsx
@@ -0,0 +1,43 @@
+import {useFocusEffect} from '@react-navigation/native';
+import React, {ForwardedRef, forwardRef, useCallback, useContext} from 'react';
+import {FlatList, FlatListProps} from 'react-native';
+import {ActionListContext} from '@pages/home/ReportScreenContext';
+
+// FlatList wrapped with the freeze component will lose its scroll state when frozen (only for Android).
+// CustomFlatList saves the offset and use it for scrollToOffset() when unfrozen.
+function CustomFlatList<T>(props: FlatListProps<T>, ref: ForwardedRef<FlatList>) {
+    const {scrollPosition, setScrollPosition} = useContext(ActionListContext);
+
+    const onScreenFocus = useCallback(() => {
+        if (typeof ref === 'function') {
+            return;
+        }
+        if (!ref?.current || !scrollPosition?.offset) {
+            return;
+        }
+        if (ref.current && scrollPosition.offset) {
+            ref.current.scrollToOffset({offset: scrollPosition.offset, animated: false});
+        }
+    }, [scrollPosition?.offset, ref]);
+
+    useFocusEffect(
+        useCallback(() => {
+            onScreenFocus();
+        }, [onScreenFocus]),
+    );
+
+    return (
+        <FlatList<T>
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...props}
+            onScroll={(event) => props.onScroll?.(event)}
+            onMomentumScrollEnd={(event) => {
+                setScrollPosition({offset: event.nativeEvent.contentOffset.y});
+            }}
+            ref={ref}
+        />
+    );
+}
+
+CustomFlatList.displayName = 'CustomFlatListWithRef';
+export default forwardRef(CustomFlatList);
diff --git a/src/components/FlatList/index.js b/src/components/FlatList/index.ts
similarity index 100%
rename from src/components/FlatList/index.js
rename to src/components/FlatList/index.ts