Merge branch 'main' into fix/29886-distance-stop-button

src/components/SafeArea/index.ios.js → src/components/SafeArea/index.ios.tsx

@@ -1,23 +1,19 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import {SafeAreaView} from 'react-native-safe-area-context';
 import styles from '@styles/styles';
+import SafeAreaProps from './types';
 
-function SafeArea(props) {
+function SafeArea({children}: SafeAreaProps) {
     return (
         <SafeAreaView
             style={[styles.iPhoneXSafeArea]}
             edges={['left', 'right']}
         >
-            {props.children}
+            {children}
         </SafeAreaView>
     );
 }
 
-SafeArea.propTypes = {
-    /** App content */
-    children: PropTypes.node.isRequired,
-};
 SafeArea.displayName = 'SafeArea';
 
 export default SafeArea;

src/components/SafeArea/index.tsx

@@ -0,0 +1,3 @@
+import SafeAreaProps from './types';
+
+export default ({children}: SafeAreaProps) => children;

src/components/SafeArea/types.ts

@@ -0,0 +1,5 @@
+import ChildrenProps from '@src/types/utils/ChildrenProps';
+
+type SafeAreaProps = ChildrenProps;
+
+export default SafeAreaProps;