Merge branch 'main' into WorkspaceSwitcherPage_list_refactor

android/app/build.gradle

@@ -98,8 +98,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001046206
-        versionName "1.4.62-6"
+        versionCode 1001046207
+        versionName "1.4.62-7"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

ios/NewExpensify/Info.plist

@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.6</string>
+	<string>1.4.62.7</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.6</string>
+	<string>1.4.62.7</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.4.62</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.62.6</string>
+	<string>1.4.62.7</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.62-6",
+  "version": "1.4.62-7",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/SelectionList/InviteMemberListItem.tsx

@@ -13,9 +13,9 @@ import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import CONST from '@src/CONST';
 import BaseListItem from './BaseListItem';
-import type {InviteMemberListItemProps} from './types';
+import type {InviteMemberListItemProps, ListItem} from './types';
 
-function InviteMemberListItem({
+function InviteMemberListItem<TItem extends ListItem>({
     item,
     isFocused,
     showTooltip,
@@ -26,7 +26,7 @@ function InviteMemberListItem({
     onDismissError,
     shouldPreventDefaultFocusOnSelectRow,
     rightHandSideComponent,
-}: InviteMemberListItemProps) {
+}: InviteMemberListItemProps<TItem>) {
     const styles = useThemeStyles();
     const theme = useTheme();
     const StyleUtils = useStyleUtils();

src/components/SelectionList/types.ts

@@ -162,10 +162,10 @@ type UserListItemProps<TItem extends ListItem> = ListItemProps<TItem> & {
     FooterComponent?: ReactElement;
 };
 
-type RadioListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
-
 type InviteMemberListItemProps<TItem extends ListItem> = UserListItemProps<TItem>;
 
+type RadioListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
+
 type TableListItemProps<TItem extends ListItem> = ListItemProps<TItem>;
 
 type ValidListItem = typeof RadioListItem | typeof UserListItem | typeof TableListItem | typeof InviteMemberListItem;

src/hooks/useStyledSafeAreaInsets.ts

@@ -0,0 +1,37 @@
+// eslint-disable-next-line no-restricted-imports
+import {useSafeAreaInsets} from 'react-native-safe-area-context';
+import useStyleUtils from './useStyleUtils';
+
+/**
+ * Custom hook to get the styled safe area insets.
+ * This hook utilizes the `SafeAreaInsetsContext` to retrieve the current safe area insets
+ * and applies styling adjustments using the `useStyleUtils` hook.
+ *
+ * @returns  An object containing the styled safe area insets and additional styles.
+ * @returns  .paddingTop The top padding adjusted for safe area.
+ * @returns  .paddingBottom The bottom padding adjusted for safe area.
+ * @returns  .insets The safe area insets object or undefined if not available.
+ * @returns  .safeAreaPaddingBottomStyle An object containing the bottom padding style adjusted for safe area.
+ *
+ * @example
+ * // How to use this hook in a component
+ * function MyComponent() {
+ *     const { paddingTop, paddingBottom, safeAreaPaddingBottomStyle } = useStyledSafeAreaInsets();
+ *
+ *     // Use these values to style your component accordingly
+ * }
+ */
+function useStyledSafeAreaInsets() {
+    const StyleUtils = useStyleUtils();
+    const insets = useSafeAreaInsets();
+
+    const {paddingTop, paddingBottom} = StyleUtils.getSafeAreaPadding(insets ?? undefined);
+    return {
+        paddingTop,
+        paddingBottom,
+        insets: insets ?? undefined,
+        safeAreaPaddingBottomStyle: {paddingBottom},
+    };
+}
+
+export default useStyledSafeAreaInsets;

src/languages/en.ts

@@ -593,18 +593,18 @@ export default {
         addReceipt: 'Add receipt',
     },
     quickAction: {
-        scanReceipt: 'Scan Receipt',
-        recordDistance: 'Record Distance',
-        requestMoney: 'Request Money',
-        splitBill: 'Split Bill',
-        splitScan: 'Split Receipt',
-        splitDistance: 'Split Distance',
-        trackManual: 'Track Expense',
-        trackScan: 'Track Receipt',
-        trackDistance: 'Track Distance',
-        sendMoney: 'Send Money',
-        assignTask: 'Assign Task',
-        shortcut: 'Shortcut',
+        scanReceipt: 'Scan receipt',
+        recordDistance: 'Record distance',
+        requestMoney: 'Request money',
+        splitBill: 'Split bill',
+        splitScan: 'Split receipt',
+        splitDistance: 'Split distance',
+        sendMoney: 'Send money',
+        assignTask: 'Assign task',
+        header: 'Quick action',
+        trackManual: 'Track manual',
+        trackScan: 'Track scan',
+        trackDistance: 'Track distance',
     },
     iou: {
         amount: 'Amount',

src/languages/es.ts

@@ -589,18 +589,18 @@ export default {
         addReceipt: 'Añadir recibo',
     },
     quickAction: {
-        scanReceipt: 'Escanear Recibo',
-        recordDistance: 'Grabar Distancia',
-        requestMoney: 'Solicitar Dinero',
-        splitBill: 'Dividir Cuenta',
-        splitScan: 'Dividir Recibo',
-        splitDistance: 'Dividir Distancia',
-        sendMoney: 'Enviar Dinero',
-        assignTask: 'Assignar Tarea',
-        shortcut: 'Acceso Directo',
-        trackManual: 'Crear Gasto',
-        trackScan: 'Crear Recibo',
-        trackDistance: 'Crear Gasto por desplazamiento',
+        scanReceipt: 'Escanear recibo',
+        recordDistance: 'Grabar distancia',
+        requestMoney: 'Solicitar dinero',
+        splitBill: 'Dividir cuenta',
+        splitScan: 'Dividir recibo',
+        splitDistance: 'Dividir distancia',
+        sendMoney: 'Enviar dinero',
+        assignTask: 'Assignar tarea',
+        header: 'Acción rápida',
+        trackManual: 'Crear gasto',
+        trackScan: 'Crear gasto por recibo',
+        trackDistance: 'Crear gasto por desplazamiento',
     },
     iou: {
         amount: 'Importe',

src/libs/OptionsListUtils.ts

@@ -2220,6 +2220,18 @@ function formatSectionsFromSearchTerm(
     };
 }
 
+/**
+ * Helper method to get the `keyForList` for the first option in the OptionsList
+ */
+function getFirstKeyForList(data?: Option[] | null) {
+    if (!data?.length) {
+        return '';
+    }
+
+    const firstNonEmptyDataObj = data[0];
+
+    return firstNonEmptyDataObj.keyForList ? firstNonEmptyDataObj.keyForList : '';
+}
 /**
  * Filters options based on the search input value
  */
@@ -2341,6 +2353,7 @@ export {
     createOptionFromReport,
     getReportOption,
     getTaxRatesSection,
+    getFirstKeyForList,
 };
 
-export type {MemberForList, CategorySection, CategoryTreeSection, Options, OptionList, SearchOption, PayeePersonalDetails, Category, TaxRatesOption};
+export type {MemberForList, CategorySection, CategoryTreeSection, Options, OptionList, SearchOption, PayeePersonalDetails, Category, TaxRatesOption, Option};