Merge branch 'main' into marcaaron-fixVersions

Author: marcaaron

.eslintrc.js

@@ -14,6 +14,7 @@ const restrictedImportPaths = [
             'Text',
             'ScrollView',
             'Animated',
+            'findNodeHandle',
         ],
         message: [
             '',
@@ -105,6 +106,10 @@ const restrictedImportPaths = [
         importNames: ['useOnyx'],
         message: "Please use '@hooks/useOnyx' instead.",
     },
+    {
+        name: '@src/utils/findNodeHandle',
+        message: "Do not use 'findNodeHandle' as it is no longer supported on web.",
+    },
 ];
 
 const restrictedImportPatterns = [

Mobile-Expensify

@@ -1,24 +1,27 @@
-type FSPageInterface = {
-    start: jest.Mock<void, []>;
-};
+import type {Fullstory, FSPageLike as mockFSPageLike} from '@libs/Fullstory/types';
 
 export default function mockFSLibrary() {
     jest.mock('@fullstory/react-native', () => {
-        class Fullstory {
-            consent = jest.fn();
-
-            anonymize = jest.fn();
+        return {
+            FSPage: jest.fn(),
+            default: jest.fn(),
+        };
+    });
 
-            identify = jest.fn();
+    jest.mock<Fullstory>('@libs/Fullstory', () => {
+        class FSPage implements mockFSPageLike {
+            start() {}
         }
 
         return {
-            FSPage(): FSPageInterface {
-                return {
-                    start: jest.fn(() => {}),
-                };
-            },
-            default: Fullstory,
+            Page: FSPage,
+            getChatFSClass: jest.fn(),
+            init: jest.fn(),
+            onReady: jest.fn(),
+            consent: jest.fn(),
+            identify: jest.fn(),
+            consentAndIdentify: jest.fn(),
+            anonymize: jest.fn(),
         };
     });
 }

jest/setupMockFullstoryLib.ts

@@ -108,19 +108,7 @@
 - E/App issue: 🛑
 - PR introducing patch: https://github.com/Expensify/App/pull/60340
 
-### [react-native-web+0.20.0+010+restore-findNodeHandle.patch](react-native-web+0.20.0+010+restore-findNodeHandle.patch)
-
-- Reason:
-  
-    ```
-    Changes `findNodeHandle()` to log a Console warning instead of throwing an Error when being called.
-    ```
-  
-- Upstream PR/issue: 🛑
-- E/App issue: 🛑
-- PR introducing patch: https://github.com/Expensify/App/pull/60421
-
-### [react-native-web+0.20.0+011+fullstory-support.patch](react-native-web+0.20.0+011+fullstory-support.patch)
+### [react-native-web+0.20.0+010+fullstory-support.patch](react-native-web+0.20.0+010+fullstory-support.patch)
 
 - Reason:
   

patches/react-native-web/details.md

@@ -1861,7 +1861,6 @@ const CONST = {
         MSWORD: 'application/msword',
         ZIP: 'application/zip',
         RFC822: 'message/rfc822',
-        HEIC: 'image/heic',
     },
 
     SHARE_FILE_MIMETYPE: {
@@ -1872,7 +1871,6 @@ const CONST = {
         WEBP: 'image/webp',
         TIF: 'image/tif',
         TIFF: 'image/tiff',
-        HEIC: 'image/heic',
         IMG: 'image/*',
         PDF: 'application/pdf',
         MSWORD: 'application/msword',

…e-web+0.20.0+011+fullstory-support.patch …e-web+0.20.0+010+fullstory-support.patchpatches/react-native-web/react-native-web+0.20.0+011+fullstory-support.patch renamed to patches/react-native-web/react-native-web+0.20.0+010+fullstory-support.patch patches/react-native-web/react-native-web+0.20.0+011+fullstory-support.patch renamed to patches/react-native-web/react-native-web+0.20.0+010+fullstory-support.patch

@@ -618,12 +618,12 @@ const ROUTES = {
             ),
     },
     MONEY_REQUEST_STEP_AMOUNT: {
-        route: ':action/:iouType/amount/:transactionID/:reportID/:pageIndex?/:backToReport?',
-        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, pageIndex: string, backTo = '') => {
+        route: ':action/:iouType/amount/:transactionID/:reportID/:reportActionID?/:pageIndex?/:backToReport?',
+        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, reportActionID?: string, pageIndex?: string, backTo = '') => {
             if (!transactionID || !reportID) {
                 Log.warn('Invalid transactionID or reportID is used to build the MONEY_REQUEST_STEP_AMOUNT route');
             }
-            return getUrlWithBackToParam(`${action as string}/${iouType as string}/amount/${transactionID}/${reportID}/${pageIndex}`, backTo);
+            return getUrlWithBackToParam(`${action as string}/${iouType as string}/amount/${transactionID}/${reportID}/${reportActionID ? `${reportActionID}/` : ''}${pageIndex}`, backTo);
         },
     },
     MONEY_REQUEST_STEP_TAX_RATE: {
@@ -707,9 +707,9 @@ const ROUTES = {
             getUrlWithBackToParam(`${action as string}/${iouType as string}/subrate/${transactionID}/${reportID}/edit/${pageIndex}`, backTo),
     },
     MONEY_REQUEST_STEP_REPORT: {
-        route: ':action/:iouType/report/:transactionID/:reportID',
-        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '') =>
-            getUrlWithBackToParam(`${action as string}/${iouType as string}/report/${transactionID}/${reportID}`, backTo),
+        route: ':action/:iouType/report/:transactionID/:reportID/:reportActionID?',
+        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string, reportID: string, backTo = '', reportActionID?: string) =>
+            getUrlWithBackToParam(`${action as string}/${iouType as string}/report/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo),
     },
     MONEY_REQUEST_EDIT_REPORT: {
         route: ':action/:iouType/report/:reportID/edit',
@@ -835,30 +835,30 @@ const ROUTES = {
         },
     },
     MONEY_REQUEST_STEP_DISTANCE: {
-        route: ':action/:iouType/distance/:transactionID/:reportID',
-        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '') => {
+        route: ':action/:iouType/distance/:transactionID/:reportID/:reportActionID?',
+        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '', reportActionID?: string) => {
             if (!transactionID || !reportID) {
                 Log.warn('Invalid transactionID or reportID is used to build the MONEY_REQUEST_STEP_DISTANCE route');
             }
-            return getUrlWithBackToParam(`${action as string}/${iouType as string}/distance/${transactionID}/${reportID}`, backTo);
+            return getUrlWithBackToParam(`${action as string}/${iouType as string}/distance/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo);
         },
     },
     MONEY_REQUEST_STEP_DISTANCE_RATE: {
-        route: ':action/:iouType/distanceRate/:transactionID/:reportID',
-        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '') => {
+        route: ':action/:iouType/distanceRate/:transactionID/:reportID/:reportActionID?',
+        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '', reportActionID?: string) => {
             if (!transactionID || !reportID) {
                 Log.warn('Invalid transactionID or reportID is used to build the MONEY_REQUEST_STEP_DISTANCE_RATE route');
             }
-            return getUrlWithBackToParam(`${action as string}/${iouType as string}/distanceRate/${transactionID}/${reportID}`, backTo);
+            return getUrlWithBackToParam(`${action as string}/${iouType as string}/distanceRate/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo);
         },
     },
     MONEY_REQUEST_STEP_MERCHANT: {
-        route: ':action/:iouType/merchant/:transactionID/:reportID',
-        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '') => {
+        route: ':action/:iouType/merchant/:transactionID/:reportID/:reportActionID?',
+        getRoute: (action: IOUAction, iouType: IOUType, transactionID: string | undefined, reportID: string | undefined, backTo = '', reportActionID?: string) => {
             if (!transactionID || !reportID) {
                 Log.warn('Invalid transactionID or reportID is used to build the MONEY_REQUEST_STEP_MERCHANT route');
             }
-            return getUrlWithBackToParam(`${action as string}/${iouType as string}/merchant/${transactionID}/${reportID}`, backTo);
+            return getUrlWithBackToParam(`${action as string}/${iouType as string}/merchant/${transactionID}/${reportID}${reportActionID ? `/${reportActionID}` : ''}`, backTo);
         },
     },
     MONEY_REQUEST_STEP_PARTICIPANTS: {

patches/react-native-web/react-native-web+0.20.0+010+restore-findNodeHandle.patch

@@ -1,4 +1,3 @@
-import type {ForwardedRef} from 'react';
 import React from 'react';
 import type {PressableStateCallbackType} from 'react-native';
 import {View} from 'react-native';
@@ -9,6 +8,7 @@ import getButtonState from '@libs/getButtonState';
 import ReportActionComposeFocusManager from '@libs/ReportActionComposeFocusManager';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
+import type {PressableRef} from './Pressable/GenericPressable/types';
 import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
 import Tooltip from './Tooltip/PopoverAnchorTooltip';
 
@@ -36,16 +36,18 @@ type BaseMiniContextMenuItemProps = {
      * Can be used to control the click event, and for example whether or not to lose focus from the composer when pressing the item
      */
     shouldPreventDefaultFocusOnPress?: boolean;
+
+    /**
+     * Reference to the outer element
+     */
+    ref?: PressableRef;
 };
 
 /**
  * Component that renders a mini context menu item with a
  * pressable. Also renders a tooltip when hovering the item.
  */
-function BaseMiniContextMenuItem(
-    {tooltipText, onPress, children, isDelayButtonStateComplete = true, shouldPreventDefaultFocusOnPress = true}: BaseMiniContextMenuItemProps,
-    ref: ForwardedRef<View>,
-) {
+function BaseMiniContextMenuItem({tooltipText, onPress, children, isDelayButtonStateComplete = true, shouldPreventDefaultFocusOnPress = true, ref}: BaseMiniContextMenuItemProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
     return (
@@ -95,4 +97,4 @@ function BaseMiniContextMenuItem(
 
 BaseMiniContextMenuItem.displayName = 'BaseMiniContextMenuItem';
 
-export default React.forwardRef(BaseMiniContextMenuItem);
+export default BaseMiniContextMenuItem;