Revert "Merge pull request #42592 from software-mansion-labs/kicu/con…

…current-react-lets-go" This reverts commit d047467, reversing changes made to 04f6598.
Expensify · Jul 3, 2024 · 135c6be · 135c6be
1 parent 55546bb
commit 135c6be
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 116 deletions.
diff --git a/patches/@react-navigation+core+6.4.11+001+fix-react-strictmode.patch b/patches/@react-navigation+core+6.4.11+001+fix-react-strictmode.patch
diff --git a/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch b/patches/react-native-reanimated+3.8.1+003+fix-strict-mode.patch
@@ -10,27 +10,4 @@ index 3404e89..b545cb6 100644
 +  // react_native_assert(reanimatedCommitFlag_ != true);
    reanimatedCommitFlag_ = true;
  }
-
-diff --git a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
-index e69c581..78b7034 100644
---- a/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
-+++ b/node_modules/react-native-reanimated/lib/module/reanimated2/UpdateProps.js
-@@ -7,14 +7,11 @@ import { isFabric, isJest, shouldBeUseWeb } from './PlatformChecker';
- import { runOnUIImmediately } from './threads';
- let updateProps;
- if (shouldBeUseWeb()) {
--  updateProps = (_, updates, maybeViewRef, isAnimatedProps) => {
-+  updateProps = (viewDescriptorsSet, updates, maybeViewRef, isAnimatedProps) => {
-     'worklet';
--
--    if (maybeViewRef) {
--      maybeViewRef.items.forEach((item, _index) => {
--        _updatePropsJS(updates, item, isAnimatedProps);
--      });
--    }
-+    viewDescriptorsSet.value.forEach((viewDescriptor) => {
-+      _updatePropsJS(updates, {_component: viewDescriptor.tag}, isAnimatedProps);
-+    })
-   };
- } else {
-   updateProps = (viewDescriptors, updates) => {
+
diff --git a/src/App.tsx b/src/App.tsx
@@ -31,7 +31,6 @@ import {CurrentReportIDContextProvider} from './components/withCurrentReportID';
 import {EnvironmentProvider} from './components/withEnvironment';
 import {KeyboardStateProvider} from './components/withKeyboardState';
 import {WindowDimensionsProvider} from './components/withWindowDimensions';
-import CONFIG from './CONFIG';
 import Expensify from './Expensify';
 import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
 import {ReportIDsContextProvider} from './hooks/useReportIDs';
@@ -53,56 +52,51 @@ LogBox.ignoreLogs([
 
 const fill = {flex: 1};
 
-const StrictModeWrapper = CONFIG.USE_REACT_STRICT_MODE ? React.StrictMode : ({children}: {children: React.ReactElement}) => children;
-
 function App({url}: AppProps) {
     useDefaultDragAndDrop();
     OnyxUpdateManager();
-
     return (
-        <StrictModeWrapper>
-            <InitialURLContextProvider url={url}>
-                <GestureHandlerRootView style={fill}>
-                    <ComposeProviders
-                        components={[
-                            OnyxProvider,
-                            ThemeProvider,
-                            ThemeStylesProvider,
-                            ThemeIllustrationsProvider,
-                            SafeAreaProvider,
-                            PortalProvider,
-                            SafeArea,
-                            LocaleContextProvider,
-                            HTMLEngineProvider,
-                            WindowDimensionsProvider,
-                            KeyboardStateProvider,
-                            PopoverContextProvider,
-                            CurrentReportIDContextProvider,
-                            ScrollOffsetContextProvider,
-                            ReportAttachmentsProvider,
-                            PickerStateProvider,
-                            EnvironmentProvider,
-                            CustomStatusBarAndBackgroundContextProvider,
-                            ActiveElementRoleProvider,
-                            ActiveWorkspaceContextProvider,
-                            ReportIDsContextProvider,
-                            PlaybackContextProvider,
-                            FullScreenContextProvider,
-                            VolumeContextProvider,
-                            VideoPopoverMenuContextProvider,
-                            KeyboardProvider,
-                        ]}
-                    >
-                        <CustomStatusBarAndBackground />
-                        <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
-                            <ColorSchemeWrapper>
-                                <Expensify />
-                            </ColorSchemeWrapper>
-                        </ErrorBoundary>
-                    </ComposeProviders>
-                </GestureHandlerRootView>
-            </InitialURLContextProvider>
-        </StrictModeWrapper>
+        <InitialURLContextProvider url={url}>
+            <GestureHandlerRootView style={fill}>
+                <ComposeProviders
+                    components={[
+                        OnyxProvider,
+                        ThemeProvider,
+                        ThemeStylesProvider,
+                        ThemeIllustrationsProvider,
+                        SafeAreaProvider,
+                        PortalProvider,
+                        SafeArea,
+                        LocaleContextProvider,
+                        HTMLEngineProvider,
+                        WindowDimensionsProvider,
+                        KeyboardStateProvider,
+                        PopoverContextProvider,
+                        CurrentReportIDContextProvider,
+                        ScrollOffsetContextProvider,
+                        ReportAttachmentsProvider,
+                        PickerStateProvider,
+                        EnvironmentProvider,
+                        CustomStatusBarAndBackgroundContextProvider,
+                        ActiveElementRoleProvider,
+                        ActiveWorkspaceContextProvider,
+                        ReportIDsContextProvider,
+                        PlaybackContextProvider,
+                        FullScreenContextProvider,
+                        VolumeContextProvider,
+                        VideoPopoverMenuContextProvider,
+                        KeyboardProvider,
+                    ]}
+                >
+                    <CustomStatusBarAndBackground />
+                    <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
+                        <ColorSchemeWrapper>
+                            <Expensify />
+                        </ColorSchemeWrapper>
+                    </ErrorBoundary>
+                </ComposeProviders>
+            </GestureHandlerRootView>
+        </InitialURLContextProvider>
     );
 }
 

diff --git a/src/CONFIG.ts b/src/CONFIG.ts
@@ -96,5 +96,4 @@ export default {
         IOS_CLIENT_ID: '921154746561-s3uqn2oe4m85tufi6mqflbfbuajrm2i3.apps.googleusercontent.com',
     },
     GCP_GEOLOCATION_API_KEY: googleGeolocationAPIKey,
-    USE_REACT_STRICT_MODE: true,
 } as const;
diff --git a/src/setup/platformSetup/index.website.ts b/src/setup/platformSetup/index.website.ts
@@ -53,6 +53,7 @@ const webUpdater = (): PlatformSpecificUpdater => ({
 export default function () {
     AppRegistry.runApplication(Config.APP_NAME, {
         rootTag: document.getElementById('root'),
+        mode: 'legacy',
     });
 
     // When app loads, get current version (production only)