Merge branch 'main' into garrettmknight-patch-3

Author: twisterdotcom

Mobile-Expensify

@@ -114,8 +114,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009018502
-        versionName "9.1.85-2"
+        versionCode 1009018504
+        versionName "9.1.85-4"
         // 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"

android/app/build.gradle

@@ -44,7 +44,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.1.85.2</string>
+	<string>9.1.85.4</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensify/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.85</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.85.2</string>
+	<string>9.1.85.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

ios/NotificationServiceExtension/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>9.1.85</string>
 	<key>CFBundleVersion</key>
-	<string>9.1.85.2</string>
+	<string>9.1.85.4</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionAttributes</key>

ios/ShareViewController/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.1.85-2",
+  "version": "9.1.85-4",
   "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.",
@@ -129,7 +129,7 @@
     "date-fns-tz": "^3.2.0",
     "dom-serializer": "^0.2.2",
     "domhandler": "^4.3.0",
-    "expensify-common": "^2.0.142",
+    "expensify-common": "2.0.147",
     "expo": "53.0.7",
     "expo-asset": "^11.1.2",
     "expo-av": "^15.1.5",

package-lock.json

@@ -5204,7 +5204,7 @@ const CONST = {
      * The maximum count of items per page for SelectionList.
      * When paginate, it multiplies by page number.
      */
-    MAX_SELECTION_LIST_PAGE_LENGTH: 50,
+    MAX_SELECTION_LIST_PAGE_LENGTH: 500,
 
     /**
      * Bank account names

package.json

@@ -167,34 +167,10 @@ function BaseSelectionList<TItem extends ListItem>(
     const {isKeyboardShown} = useKeyboardState();
     const [itemsToHighlight, setItemsToHighlight] = useState<Set<string> | null>(null);
     const itemFocusTimeoutRef = useRef<NodeJS.Timeout | null>(null);
-    const isItemSelected = useCallback(
-        (item: TItem) => item.isSelected ?? ((isSelected?.(item) ?? selectedItems.includes(item.keyForList ?? '')) && canSelectMultiple),
-        [isSelected, selectedItems, canSelectMultiple],
-    );
-    /** Calculates on which page is selected item so we can scroll to it on first render  */
-    const calculateInitialCurrentPage = useCallback(() => {
-        if (canSelectMultiple || sections.length === 0) {
-            return 1;
-        }
-
-        let currentIndex = 0;
-        for (const section of sections) {
-            if (section.data) {
-                for (const item of section.data) {
-                    if (isItemSelected(item)) {
-                        return Math.floor(currentIndex / CONST.MAX_SELECTION_LIST_PAGE_LENGTH) + 1;
-                    }
-                    currentIndex++;
-                }
-            }
-        }
-        return 1;
-    }, [canSelectMultiple, isItemSelected, sections]);
-    const [currentPage, setCurrentPage] = useState(() => calculateInitialCurrentPage());
+    const [currentPage, setCurrentPage] = useState(1);
     const isTextInputFocusedRef = useRef<boolean>(false);
     const {singleExecution} = useSingleExecution();
     const [itemHeights, setItemHeights] = useState<Record<string, number>>({});
-    const pendingScrollIndexRef = useRef<number | null>(null);
 
     const onItemLayout = (event: LayoutChangeEvent, itemKey: string | null | undefined) => {
         if (!itemKey) {
@@ -211,6 +187,11 @@ function BaseSelectionList<TItem extends ListItem>(
 
     const incrementPage = () => setCurrentPage((prev) => prev + 1);
 
+    const isItemSelected = useCallback(
+        (item: TItem) => item.isSelected ?? ((isSelected?.(item) ?? selectedItems.includes(item.keyForList ?? '')) && canSelectMultiple),
+        [isSelected, selectedItems, canSelectMultiple],
+    );
+
     const canShowProductTrainingTooltipMemo = useMemo(() => {
         return canShowProductTrainingTooltip && isFocused;
     }, [canShowProductTrainingTooltip, isFocused]);
@@ -343,17 +324,6 @@ function BaseSelectionList<TItem extends ListItem>(
                 return;
             }
 
-            // Calculate which page is needed to show this index
-            const requiredPage = Math.ceil((index + 1) / CONST.MAX_SELECTION_LIST_PAGE_LENGTH);
-
-            // If the required page is beyond the current page, load all pages up to it,
-            // then return early and let the scroll happen after the page update
-            if (requiredPage > currentPage) {
-                pendingScrollIndexRef.current = index;
-                setCurrentPage(requiredPage);
-                return;
-            }
-
             const itemIndex = item.index ?? -1;
             const sectionIndex = item.sectionIndex ?? -1;
             let viewOffsetToKeepFocusedItemAtTopOfViewableArea = 0;
@@ -370,11 +340,10 @@ function BaseSelectionList<TItem extends ListItem>(
             }
 
             listRef.current.scrollToLocation({sectionIndex, itemIndex, animated, viewOffset: variables.contentHeaderHeight - viewOffsetToKeepFocusedItemAtTopOfViewableArea});
-            pendingScrollIndexRef.current = null;
         },
 
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
-        [flattenedSections.allOptions, currentPage],
+        [flattenedSections.allOptions],
     );
 
     const [disabledArrowKeyIndexes, setDisabledArrowKeyIndexes] = useState(flattenedSections.disabledArrowKeyOptionsIndexes);
@@ -387,21 +356,6 @@ function BaseSelectionList<TItem extends ListItem>(
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [flattenedSections.disabledArrowKeyOptionsIndexes]);
 
-    /** Check whether there is a need to scroll to an item and if all items are loaded */
-    useEffect(() => {
-        if (pendingScrollIndexRef.current === null) {
-            return;
-        }
-
-        const indexToScroll = pendingScrollIndexRef.current;
-        const targetItem = flattenedSections.allOptions.at(indexToScroll);
-
-        if (targetItem && indexToScroll < CONST.MAX_SELECTION_LIST_PAGE_LENGTH * currentPage) {
-            pendingScrollIndexRef.current = null;
-            scrollToIndex(indexToScroll, true);
-        }
-    }, [currentPage, scrollToIndex, flattenedSections.allOptions]);
-
     const debouncedScrollToIndex = useMemo(() => lodashDebounce(scrollToIndex, CONST.TIMING.LIST_SCROLLING_DEBOUNCE_TIME, {leading: true, trailing: true}), [scrollToIndex]);
 
     const setHasKeyBeenPressed = useCallback(() => {
@@ -816,28 +770,17 @@ function BaseSelectionList<TItem extends ListItem>(
         ) {
             return;
         }
-        // Reset the current page to 1 when the user types something
-        if (prevTextInputValue !== textInputValue) {
-            setCurrentPage(1);
-        }
-
-        // When clearing the search, scroll to the selected item if one exists
-        if (prevTextInputValue !== '' && textInputValue === '') {
-            const foundSelectedItemIndex = flattenedSections.allOptions.findIndex(isItemSelected);
-            if (foundSelectedItemIndex !== -1) {
-                updateAndScrollToFocusedIndex(foundSelectedItemIndex);
-                return;
-            }
-        }
-
         // Remove the focus if the search input is empty and prev search input not empty or selected options length is changed (and allOptions length remains the same)
         // else focus on the first non disabled item
         const newSelectedIndex =
-            (prevTextInputValue !== '' && textInputValue === '') ||
+            (isEmpty(prevTextInputValue) && textInputValue === '') ||
             (flattenedSections.selectedOptions.length !== prevSelectedOptionsLength && prevAllOptionsLength === flattenedSections.allOptions.length)
                 ? -1
                 : 0;
 
+        // Reset the current page to 1 when the user types something
+        setCurrentPage(1);
+
         updateAndScrollToFocusedIndex(newSelectedIndex);
     }, [
         canSelectMultiple,
@@ -849,8 +792,6 @@ function BaseSelectionList<TItem extends ListItem>(
         prevSelectedOptionsLength,
         prevAllOptionsLength,
         shouldUpdateFocusedIndex,
-        flattenedSections.allOptions,
-        isItemSelected,
     ]);
 
     useEffect(

src/CONST/index.ts

@@ -60,6 +60,7 @@ function UserSelectionListItem<TItem extends ListItem>({
     const userDisplayName = useMemo(() => {
         return getDisplayNameForParticipant({
             accountID: item.accountID ?? CONST.DEFAULT_NUMBER_ID,
+            shouldAddCurrentUserPostfix: true,
         });
     }, [item.accountID]);