Merge branch 'main' into fix/44586-pay-system-message-doesnt-show-in-lhn

.github/workflows/reassurePerformanceTests.yml

@@ -48,12 +48,12 @@ jobs:
           git fetch origin "$BASELINE_BRANCH" --no-tags --depth=1
           git switch "$BASELINE_BRANCH"
           npm install --force
-          npx reassure --baseline
+          NODE_OPTIONS=--experimental-vm-modules npx reassure --baseline
           git switch --force --detach -
           git merge --no-commit --allow-unrelated-histories "$BASELINE_BRANCH" -X ours
           git checkout --ours .
           npm install --force
-          npx reassure --branch
+          NODE_OPTIONS=--experimental-vm-modules npx reassure --branch
 
       - name: Validate output.json
         id: validateReassureOutput

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009000407
-        versionName "9.0.4-7"
+        versionCode 1009000502
+        versionName "9.0.5-2"
         // 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

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.4</string>
+	<string>9.0.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>9.0.4.7</string>
+	<string>9.0.5.2</string>
 	<key>FullStory</key>
 	<dict>
 		<key>OrgId</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.4</string>
+	<string>9.0.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.4.7</string>
+	<string>9.0.5.2</string>
 </dict>
 </plist>

ios/NotificationServiceExtension/Info.plist

@@ -11,9 +11,9 @@
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>9.0.4</string>
+	<string>9.0.5</string>
 	<key>CFBundleVersion</key>
-	<string>9.0.4.7</string>
+	<string>9.0.5.2</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "9.0.4-7",
+  "version": "9.0.5-2",
   "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/CONST.ts

@@ -719,7 +719,7 @@ const CONST = {
                 TASK_EDITED: 'TASKEDITED',
                 TASK_REOPENED: 'TASKREOPENED',
                 TRIPPREVIEW: 'TRIPPREVIEW',
-                UNAPPROVED: 'UNAPPROVED', // OldDot Action
+                UNAPPROVED: 'UNAPPROVED',
                 UNHOLD: 'UNHOLD',
                 UNSHARE: 'UNSHARE', // OldDot Action
                 UPDATE_GROUP_CHAT_MEMBER_ROLE: 'UPDATEGROUPCHATMEMBERROLE',
@@ -2335,6 +2335,7 @@ const CONST = {
         PRIVATE_NOTES: 'privateNotes',
         DELETE: 'delete',
         MARK_AS_INCOMPLETE: 'markAsIncomplete',
+        UNAPPROVE: 'unapprove',
     },
     EDIT_REQUEST_FIELD: {
         AMOUNT: 'amount',

src/components/FocusTrap/SCREENS_WITH_AUTOFOCUS.ts

@@ -9,6 +9,10 @@ const SCREENS_WITH_AUTOFOCUS: string[] = [
     SCREENS.PRIVATE_NOTES.EDIT,
     SCREENS.SETTINGS.PROFILE.STATUS,
     SCREENS.SETTINGS.PROFILE.PRONOUNS,
+    SCREENS.REPORT_SETTINGS.ROOT,
+    SCREENS.REPORT_SETTINGS.NOTIFICATION_PREFERENCES,
+    SCREENS.REPORT_PARTICIPANTS.ROOT,
+    SCREENS.ROOM_MEMBERS_ROOT,
     SCREENS.NEW_TASK.DETAILS,
     SCREENS.MONEY_REQUEST.CREATE,
     SCREENS.SIGN_IN_ROOT,

src/components/Icon/Expensicons.ts

@@ -42,6 +42,7 @@ import ChatBubbles from '@assets/images/chatbubbles.svg';
 import CheckCircle from '@assets/images/check-circle.svg';
 import CheckmarkCircle from '@assets/images/checkmark-circle.svg';
 import Checkmark from '@assets/images/checkmark.svg';
+import CircularArrowBackwards from '@assets/images/circular-arrow-backwards.svg';
 import Close from '@assets/images/close.svg';
 import ClosedSign from '@assets/images/closed-sign.svg';
 import Coins from '@assets/images/coins.svg';
@@ -201,6 +202,7 @@ export {
     Wrench,
     BackArrow,
     Bank,
+    CircularArrowBackwards,
     Bill,
     Bell,
     BellSlash,

src/components/MoneyRequestConfirmationList.tsx

@@ -531,6 +531,18 @@ function MoneyRequestConfirmationList({
         ],
     );
 
+    const shouldDisableParticipant = (participant: Participant): boolean => {
+        if (ReportUtils.isDraftReport(participant.reportID)) {
+            return true;
+        }
+
+        if (!participant.isInvoiceRoom && !participant.isPolicyExpenseChat && !participant.isSelfDM && ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1)) {
+            return true;
+        }
+
+        return false;
+    };
+
     const sections = useMemo(() => {
         const options: Array<SectionListDataType<MoneyRequestConfirmationListItem>> = [];
         if (isTypeSplit) {
@@ -553,7 +565,7 @@ function MoneyRequestConfirmationList({
             const formattedSelectedParticipants = selectedParticipants.map((participant) => ({
                 ...participant,
                 isSelected: false,
-                isDisabled: !participant.isInvoiceRoom && !participant.isPolicyExpenseChat && !participant.isSelfDM && ReportUtils.isOptimisticPersonalDetail(participant.accountID ?? -1),
+                isInteractive: !shouldDisableParticipant(participant),
             }));
             options.push({
                 title: translate('common.to'),

src/components/PopoverMenu.tsx

@@ -109,16 +109,18 @@ function PopoverMenu({
     const selectedItemIndex = useRef<number | null>(null);
 
     const [currentMenuItems, setCurrentMenuItems] = useState(menuItems);
+    const currentMenuItemsFocusedIndex = currentMenuItems?.findIndex((option) => option.isSelected);
     const [enteredSubMenuIndexes, setEnteredSubMenuIndexes] = useState<number[]>([]);
 
-    const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: -1, maxIndex: currentMenuItems.length - 1, isActive: isVisible});
+    const [focusedIndex, setFocusedIndex] = useArrowKeyFocusManager({initialFocusedIndex: currentMenuItemsFocusedIndex, maxIndex: currentMenuItems.length - 1, isActive: isVisible});
 
     const selectItem = (index: number) => {
         const selectedItem = currentMenuItems[index];
         if (selectedItem?.subMenuItems) {
             setCurrentMenuItems([...selectedItem.subMenuItems]);
             setEnteredSubMenuIndexes([...enteredSubMenuIndexes, index]);
-            setFocusedIndex(-1);
+            const selectedSubMenuItemIndex = selectedItem?.subMenuItems.findIndex((option) => option.isSelected);
+            setFocusedIndex(selectedSubMenuItemIndex);
         } else {
             selectedItemIndex.current = index;
             onItemSelected(selectedItem, index);

src/components/Pressable/GenericPressable/BaseGenericPressable.tsx

@@ -36,6 +36,7 @@ function GenericPressable(
         onPressOut,
         accessible = true,
         fullDisabled = false,
+        interactive = true,
         ...rest
     }: PressableProps,
     ref: PressableRef,
@@ -67,14 +68,17 @@ function GenericPressable(
      * Returns the cursor style based on the state of Pressable
      */
     const cursorStyle = useMemo(() => {
+        if (!interactive) {
+            return styles.cursorDefault;
+        }
         if (shouldUseDisabledCursor) {
             return styles.cursorDisabled;
         }
         if ([rest.accessibilityRole, rest.role].includes(CONST.ROLE.PRESENTATION)) {
             return styles.cursorText;
         }
         return styles.cursorPointer;
-    }, [styles, shouldUseDisabledCursor, rest.accessibilityRole, rest.role]);
+    }, [styles, shouldUseDisabledCursor, rest.accessibilityRole, rest.role, interactive]);
 
     const onLongPressHandler = useCallback(
         (event: GestureResponderEvent) => {
@@ -98,7 +102,7 @@ function GenericPressable(
 
     const onPressHandler = useCallback(
         (event?: GestureResponderEvent | KeyboardEvent) => {
-            if (isDisabled) {
+            if (isDisabled || !interactive) {
                 return;
             }
             if (!onPress) {
@@ -113,7 +117,7 @@ function GenericPressable(
             }
             return onPress(event);
         },
-        [shouldUseHapticsOnPress, onPress, nextFocusRef, ref, isDisabled],
+        [shouldUseHapticsOnPress, onPress, nextFocusRef, ref, isDisabled, interactive],
     );
 
     const voidOnPressHandler = useCallback(

src/components/Pressable/GenericPressable/types.ts

@@ -142,6 +142,12 @@ type PressableProps = RNPressableProps &
          * Specifies if the pressable responder should be disabled
          */
         fullDisabled?: boolean;
+
+        /**
+         * Whether the menu item should be interactive at all
+         * e.g., show disabled cursor when disabled
+         */
+        interactive?: boolean;
     };
 
 type PressableRef = ForwardedRef<HTMLDivElement | View | RNText | undefined>;

src/components/SelectionList/BaseListItem.tsx

@@ -82,6 +82,7 @@ function BaseListItem<TItem extends ListItem>({
                     onSelectRow(item);
                 }}
                 disabled={isDisabled && !item.isSelected}
+                interactive={item.isInteractive}
                 accessibilityLabel={item.text ?? ''}
                 role={CONST.ROLE.BUTTON}
                 hoverDimmingValue={1}

src/components/SelectionList/types.ts

@@ -81,6 +81,9 @@ type ListItem = {
     /** Whether this option is disabled for selection */
     isDisabled?: boolean | null;
 
+    /** Whether this item should be interactive at all */
+    isInteractive?: boolean;
+
     /** List title is bold by default. Use this props to customize it */
     isBold?: boolean;
 

src/components/VideoPlayerContexts/VideoPopoverMenuContext.tsx

@@ -62,6 +62,7 @@ function VideoPopoverMenuContextProvider({children}: ChildrenProps) {
                     updatePlaybackSpeed(speed);
                 },
                 shouldPutLeftPaddingWhenNoIcon: true,
+                isSelected: currentPlaybackSpeed === speed,
             })),
         });
         return items;

src/hooks/useMarkdownStyle.ts

@@ -9,7 +9,8 @@ const defaultEmptyArray: Array<keyof MarkdownStyle> = [];
 
 function useMarkdownStyle(message: string | null = null, excludeStyles: Array<keyof MarkdownStyle> = defaultEmptyArray): MarkdownStyle {
     const theme = useTheme();
-    const emojiFontSize = containsOnlyEmojis(message ?? '') ? variables.fontSizeOnlyEmojis : variables.fontSizeNormal;
+    const hasMessageOnlyEmojis = message != null && message.length > 0 && containsOnlyEmojis(message);
+    const emojiFontSize = hasMessageOnlyEmojis ? variables.fontSizeOnlyEmojis : variables.fontSizeNormal;
 
     // this map is used to reset the styles that are not needed - passing undefined value can break the native side
     const nonStylingDefaultValues: Record<string, string | number> = useMemo(