From 657c10299997ac8b4a2e50a49dca5a3bac59cf17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Wed, 18 Oct 2023 19:27:17 -0600
Subject: [PATCH 001/113] check if principal's email is public

---
 src/pages/TeachersUnite/IntroSchoolPrincipalPage.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
index 207ff0664053..91f24721f6d2 100644
--- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
+++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
@@ -19,6 +19,7 @@ import Navigation from '../../libs/Navigation/Navigation';
 import TeachersUnite from '../../libs/actions/TeachersUnite';
 import useLocalize from '../../hooks/useLocalize';
 import * as ValidationUtils from '../../libs/ValidationUtils';
+import * as LoginUtils from '../../libs/LoginUtils';
 
 const propTypes = {
     /** Login list for the user that is signed in */
@@ -74,6 +75,9 @@ function IntroSchoolPrincipalPage(props) {
             if (!_.isEmpty(values.partnerUserID) && !Str.isValidEmail(values.partnerUserID)) {
                 ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('teachersUnitePage.error.enterValidEmail'));
             }
+            if (!_.isEmpty(values.partnerUserID) && LoginUtils.isEmailPublicDomain(values.partnerUserID)) {
+                ErrorUtils.addErrorMessage(errors, 'partnerUserID', translate('teachersUnitePage.error.tryDifferentEmail'));
+            }
 
             return errors;
         },

From eab7290bbee8c7626fe0e087f51f23964f2d1569 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Fri, 20 Oct 2023 11:36:58 +0700
Subject: [PATCH 002/113] add new blocking view for new room page

---
 src/languages/en.ts                         |   2 +
 src/languages/es.ts                         |   2 +
 src/libs/Permissions.ts                     |   1 +
 src/pages/workspace/WorkspaceNewRoomPage.js | 156 +++++++++++---------
 4 files changed, 95 insertions(+), 66 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 11637846130a..f352e4aa3d08 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1422,6 +1422,8 @@ export default {
                 companyCards: 'Company credit cards',
                 reimbursements: 'Easy reimbursements',
             },
+            notFound: 'No workspace found',
+            description: 'Rooms are a great place to discuss and work with multiple people. To message a room, create or join a workspace'
         },
         new: {
             newWorkspace: 'New workspace',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index e4a5c37241f2..14b99ce92b76 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1443,6 +1443,8 @@ export default {
                 companyCards: 'Tarjetas de crédito corporativas',
                 reimbursements: 'Reembolsos fáciles',
             },
+            notFound: 'No se encontró ningún espacio de trabajo',
+            description: 'Las salas son un gran lugar para discutir y trabajar con varias personas. Para enviar mensajes a una sala, crear o unirse a un espacio de trabajo'
         },
         new: {
             newWorkspace: 'Nuevo espacio de trabajo',
diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 13489c396c3c..fe06ebb77e0c 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -2,6 +2,7 @@ import CONST from '../CONST';
 import Beta from '../types/onyx/Beta';
 
 function canUseAllBetas(betas: Beta[]): boolean {
+    return true;
     return betas?.includes(CONST.BETAS.ALL);
 }
 
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index da0bf845cc81..54ad2babb187 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -27,6 +27,11 @@ import compose from '../../libs/compose';
 import variables from '../../styles/variables';
 import useDelayedInputFocus from '../../hooks/useDelayedInputFocus';
 import ValuePicker from '../../components/ValuePicker';
+import BlockingView from '../../components/BlockingViews/BlockingView';
+import * as Illustrations from '../../components/Icon/Illustrations';
+import Button from '../../components/Button';
+import Navigation from '../../libs/Navigation/Navigation';
+import ROUTES from '../../ROUTES';
 
 const propTypes = {
     /** All reports shared with the user */
@@ -162,7 +167,7 @@ function WorkspaceNewRoomPage(props) {
 
     return (
         <FullPageNotFoundView
-            shouldShow={!Permissions.canUsePolicyRooms(props.betas) || !workspaceOptions.length}
+            shouldShow={!Permissions.canUsePolicyRooms(props.betas)}
             shouldShowBackButton={false}
             linkKey="workspace.emptyWorkspace.title"
             onLinkPress={() => App.createWorkspaceAndNavigateToIt('', false, '', false, false)}
@@ -175,75 +180,94 @@ function WorkspaceNewRoomPage(props) {
                 testID={WorkspaceNewRoomPage.displayName}
             >
                 {({insets}) => (
-                    <KeyboardAvoidingView
-                        style={styles.h100}
-                        behavior="padding"
-                        // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
-                        // This is because when wrapping whole screen the screen was freezing when changing Tabs.
-                        keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
-                    >
-                        <Form
-                            formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
-                            submitButtonText={translate('newRoomPage.createRoom')}
-                            style={[styles.mh5, styles.flexGrow1]}
-                            validate={validate}
-                            onSubmit={submit}
-                            enabledWhenOffline
+                    workspaceOptions.length ? (
+                        <KeyboardAvoidingView
+                            style={styles.h100}
+                            behavior="padding"
+                            // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
+                            // This is because when wrapping whole screen the screen was freezing when changing Tabs.
+                            keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
                         >
-                            <View style={styles.mb5}>
-                                <RoomNameInput
-                                    ref={(el) => (roomNameInputRef.current = el)}
-                                    inputID="roomName"
-                                    isFocused={props.isFocused}
-                                    shouldDelayFocus
-                                    autoFocus
-                                />
-                            </View>
-                            <View style={styles.mb5}>
-                                <TextInput
-                                    inputID="welcomeMessage"
-                                    label={translate('welcomeMessagePage.welcomeMessageOptional')}
-                                    accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
-                                    accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
-                                    autoGrowHeight
-                                    maxLength={CONST.MAX_COMMENT_LENGTH}
-                                    autoCapitalize="none"
-                                    textAlignVertical="top"
-                                    containerStyles={[styles.autoGrowHeightMultilineInput]}
-                                />
-                            </View>
-                            <View style={[styles.mhn5]}>
-                                <ValuePicker
-                                    inputID="policyID"
-                                    label={translate('workspace.common.workspace')}
-                                    placeholder={translate('newRoomPage.selectAWorkspace')}
-                                    items={workspaceOptions}
-                                    onValueChange={setPolicyID}
-                                />
-                            </View>
-                            {isPolicyAdmin && (
-                                <View style={styles.mhn5}>
+                            <Form
+                                formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
+                                submitButtonText={translate('newRoomPage.createRoom')}
+                                style={[styles.mh5, styles.flexGrow1]}
+                                validate={validate}
+                                onSubmit={submit}
+                                enabledWhenOffline
+                            >
+                                <View style={styles.mb5}>
+                                    <RoomNameInput
+                                        ref={(el) => (roomNameInputRef.current = el)}
+                                        inputID="roomName"
+                                        isFocused={props.isFocused}
+                                        shouldDelayFocus
+                                        autoFocus
+                                    />
+                                </View>
+                                <View style={styles.mb5}>
+                                    <TextInput
+                                        inputID="welcomeMessage"
+                                        label={translate('welcomeMessagePage.welcomeMessageOptional')}
+                                        accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
+                                        accessibilityRole={CONST.ACCESSIBILITY_ROLE.TEXT}
+                                        autoGrowHeight
+                                        maxLength={CONST.MAX_COMMENT_LENGTH}
+                                        autoCapitalize="none"
+                                        textAlignVertical="top"
+                                        containerStyles={[styles.autoGrowHeightMultilineInput]}
+                                    />
+                                </View>
+                                <View style={[styles.mhn5]}>
+                                    <ValuePicker
+                                        inputID="policyID"
+                                        label={translate('workspace.common.workspace')}
+                                        placeholder={translate('newRoomPage.selectAWorkspace')}
+                                        items={workspaceOptions}
+                                        onValueChange={setPolicyID}
+                                    />
+                                </View>
+                                {isPolicyAdmin && (
+                                    <View style={styles.mhn5}>
+                                        <ValuePicker
+                                            inputID="writeCapability"
+                                            label={translate('writeCapabilityPage.label')}
+                                            items={writeCapabilityOptions}
+                                            value={writeCapability}
+                                            onValueChange={setWriteCapability}
+                                        />
+                                    </View>
+                                )}
+                                <View style={[styles.mb1, styles.mhn5]}>
                                     <ValuePicker
-                                        inputID="writeCapability"
-                                        label={translate('writeCapabilityPage.label')}
-                                        items={writeCapabilityOptions}
-                                        value={writeCapability}
-                                        onValueChange={setWriteCapability}
+                                        inputID="visibility"
+                                        label={translate('newRoomPage.visibility')}
+                                        items={visibilityOptions}
+                                        onValueChange={setVisibility}
+                                        value={visibility}
                                     />
                                 </View>
-                            )}
-                            <View style={[styles.mb1, styles.mhn5]}>
-                                <ValuePicker
-                                    inputID="visibility"
-                                    label={translate('newRoomPage.visibility')}
-                                    items={visibilityOptions}
-                                    onValueChange={setVisibility}
-                                    value={visibility}
-                                />
-                            </View>
-                            <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
-                        </Form>
-                    </KeyboardAvoidingView>
+                                <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
+                            </Form>
+                        </KeyboardAvoidingView>
+                    ) : (
+                        <>
+                            <BlockingView
+                                icon={Illustrations.ToddBehindCloud}
+                                iconWidth={variables.modalTopIconWidth}
+                                iconHeight={variables.modalTopIconHeight}
+                                title={translate("workspace.emptyWorkspace.notFound")}
+                                subtitle={translate("workspace.emptyWorkspace.description")}
+                                shouldShowLink={false}
+                            />
+                            <Button 
+                                success
+                                text={translate("footer.learnMore")}
+                                onPress={() =>  Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}
+                                style={[styles.mh5, styles.mb5]}
+                            />
+                        </>
+                    )
                 )}
             </ScreenWrapper>
         </FullPageNotFoundView>

From 299a60c2706fd1563b2e06cdf344e3f0a5dac6fa Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Fri, 20 Oct 2023 13:56:26 +0700
Subject: [PATCH 003/113] fix lint

---
 src/languages/en.ts                         |  2 +-
 src/languages/es.ts                         |  2 +-
 src/pages/workspace/WorkspaceNewRoomPage.js | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/languages/en.ts b/src/languages/en.ts
index f352e4aa3d08..cb8e11660308 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1423,7 +1423,7 @@ export default {
                 reimbursements: 'Easy reimbursements',
             },
             notFound: 'No workspace found',
-            description: 'Rooms are a great place to discuss and work with multiple people. To message a room, create or join a workspace'
+            description: 'Rooms are a great place to discuss and work with multiple people. To message a room, create or join a workspace',
         },
         new: {
             newWorkspace: 'New workspace',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 14b99ce92b76..d91148e9ac5d 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1444,7 +1444,7 @@ export default {
                 reimbursements: 'Reembolsos fáciles',
             },
             notFound: 'No se encontró ningún espacio de trabajo',
-            description: 'Las salas son un gran lugar para discutir y trabajar con varias personas. Para enviar mensajes a una sala, crear o unirse a un espacio de trabajo'
+            description: 'Las salas son un gran lugar para discutir y trabajar con varias personas. Para enviar mensajes a una sala, crear o unirse a un espacio de trabajo',
         },
         new: {
             newWorkspace: 'Nuevo espacio de trabajo',
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 54ad2babb187..38b93bf9badf 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -179,7 +179,7 @@ function WorkspaceNewRoomPage(props) {
                 shouldEnablePickerAvoiding={false}
                 testID={WorkspaceNewRoomPage.displayName}
             >
-                {({insets}) => (
+                {({insets}) =>
                     workspaceOptions.length ? (
                         <KeyboardAvoidingView
                             style={styles.h100}
@@ -256,19 +256,19 @@ function WorkspaceNewRoomPage(props) {
                                 icon={Illustrations.ToddBehindCloud}
                                 iconWidth={variables.modalTopIconWidth}
                                 iconHeight={variables.modalTopIconHeight}
-                                title={translate("workspace.emptyWorkspace.notFound")}
-                                subtitle={translate("workspace.emptyWorkspace.description")}
+                                title={translate('workspace.emptyWorkspace.notFound')}
+                                subtitle={translate('workspace.emptyWorkspace.description')}
                                 shouldShowLink={false}
                             />
-                            <Button 
+                            <Button
                                 success
-                                text={translate("footer.learnMore")}
-                                onPress={() =>  Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}
+                                text={translate('footer.learnMore')}
+                                onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}
                                 style={[styles.mh5, styles.mb5]}
                             />
                         </>
                     )
-                )}
+                }
             </ScreenWrapper>
         </FullPageNotFoundView>
     );

From dda39ec73dfe131c6c312cac162ccfd21161ffc8 Mon Sep 17 00:00:00 2001
From: Bartosz Grajdek <bartosz.grajdek@swmansion.com>
Date: Fri, 20 Oct 2023 14:16:55 +0200
Subject: [PATCH 004/113] Rename AutoUpdateTime

---
 src/components/{AutoUpdateTime.js => AutoUpdateTime.tsx} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/components/{AutoUpdateTime.js => AutoUpdateTime.tsx} (100%)

diff --git a/src/components/AutoUpdateTime.js b/src/components/AutoUpdateTime.tsx
similarity index 100%
rename from src/components/AutoUpdateTime.js
rename to src/components/AutoUpdateTime.tsx

From 5e4f72e2cff715a8de9e08ac529a0abb346f2343 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 24 Oct 2023 13:00:36 +0700
Subject: [PATCH 005/113] revert hard code

---
 src/libs/Permissions.ts                     | 1 -
 src/pages/NewChatPage.js                    | 1 +
 src/pages/workspace/WorkspaceNewRoomPage.js | 8 ++------
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index fe06ebb77e0c..13489c396c3c 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -2,7 +2,6 @@ import CONST from '../CONST';
 import Beta from '../types/onyx/Beta';
 
 function canUseAllBetas(betas: Beta[]): boolean {
-    return true;
     return betas?.includes(CONST.BETAS.ALL);
 }
 
diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
index 9ee5f838aafd..6a33c8251334 100755
--- a/src/pages/NewChatPage.js
+++ b/src/pages/NewChatPage.js
@@ -216,6 +216,7 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, translate, i
             includeSafeAreaPaddingBottom={false}
             includePaddingTop={false}
             shouldEnableMaxHeight
+            shouldShowOfflineIndicator={false}
             testID={NewChatPage.displayName}
         >
             {({safeAreaPaddingBottomStyle, insets}) => (
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 38b93bf9badf..24b4a007ef2a 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -166,17 +166,13 @@ function WorkspaceNewRoomPage(props) {
     useDelayedInputFocus(roomNameInputRef, 600);
 
     return (
-        <FullPageNotFoundView
-            shouldShow={!Permissions.canUsePolicyRooms(props.betas)}
-            shouldShowBackButton={false}
-            linkKey="workspace.emptyWorkspace.title"
-            onLinkPress={() => App.createWorkspaceAndNavigateToIt('', false, '', false, false)}
-        >
+        <FullPageNotFoundView shouldShow={!Permissions.canUsePolicyRooms(props.betas)}>
             <ScreenWrapper
                 shouldEnableKeyboardAvoidingView={false}
                 includeSafeAreaPaddingBottom={false}
                 includePaddingTop={false}
                 shouldEnablePickerAvoiding={false}
+                shouldShowOfflineIndicator={false}
                 testID={WorkspaceNewRoomPage.displayName}
             >
                 {({insets}) =>

From d1e23ef73879f8aa17f957277d8bc6200cb89dd6 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 24 Oct 2023 13:05:51 +0700
Subject: [PATCH 006/113] fix lint

---
 src/pages/workspace/WorkspaceNewRoomPage.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index bf45b5d3b8fa..4d327fc68088 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -5,7 +5,6 @@ import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
 import withNavigationFocus from '../../components/withNavigationFocus';
 import * as Report from '../../libs/actions/Report';
-import * as App from '../../libs/actions/App';
 import useLocalize from '../../hooks/useLocalize';
 import styles from '../../styles/styles';
 import RoomNameInput from '../../components/RoomNameInput';

From eda60a37d8b7c1989e1068db59caf2febb1569e5 Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Fri, 27 Oct 2023 14:35:12 +0200
Subject: [PATCH 007/113] create chat opening test

---
 src/libs/E2E/reactNativeLaunchingTest.js  |  3 +-
 src/libs/E2E/tests/chatOpeningTest.e2e.js | 50 +++++++++++++++++++++++
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 src/libs/E2E/tests/chatOpeningTest.e2e.js

diff --git a/src/libs/E2E/reactNativeLaunchingTest.js b/src/libs/E2E/reactNativeLaunchingTest.js
index 13183c1044db..1e923e75aea2 100644
--- a/src/libs/E2E/reactNativeLaunchingTest.js
+++ b/src/libs/E2E/reactNativeLaunchingTest.js
@@ -24,6 +24,7 @@ if (!Metrics.canCapturePerformanceMetrics()) {
 const tests = {
     [E2EConfig.TEST_NAMES.AppStartTime]: require('./tests/appStartTimeTest.e2e').default,
     [E2EConfig.TEST_NAMES.OpenSearchPage]: require('./tests/openSearchPageTest.e2e').default,
+    [E2EConfig.TEST_NAMES.ChatOpening]: require('./tests/chatOpeningTest.e2e').default,
 };
 
 // Once we receive the TII measurement we know that the app is initialized and ready to be used:
@@ -65,5 +66,5 @@ E2EClient.getTestConfig()
 
 // start the usual app
 Performance.markStart('regularAppStart');
-import '../../../index';
+import '../../../appIndex';
 Performance.markEnd('regularAppStart');
diff --git a/src/libs/E2E/tests/chatOpeningTest.e2e.js b/src/libs/E2E/tests/chatOpeningTest.e2e.js
new file mode 100644
index 000000000000..f5c25add4812
--- /dev/null
+++ b/src/libs/E2E/tests/chatOpeningTest.e2e.js
@@ -0,0 +1,50 @@
+import E2ELogin from '../actions/e2eLogin';
+import Performance from '../../Performance';
+import E2EClient from '../client';
+import Navigation from '../../Navigation/Navigation';
+import ROUTES from '../../../ROUTES';
+import CONST from '../../../CONST';
+import getReport from '../apiMocks/openReport';
+
+const test = () => {
+    // check for login (if already logged in the action will simply resolve)
+    console.debug('[E2E] Logging in for chat opening');
+    const report = getReport();
+    const reportID = report.onyxData[0].value.reportID;
+
+    E2ELogin().then((neededLogin) => {
+        if (neededLogin) {
+            // we don't want to submit the first login to the results
+            return E2EClient.submitTestDone();
+        }
+
+        console.debug('[E2E] Logged in, getting chat opening metrics and submitting them…');
+
+        Performance.subscribeToMeasurements((entry) => {
+            if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
+                console.debug(`[E2E] Sidebar loaded, navigating to search route…`);
+                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+                return;
+            }
+            console.debug(`[E2E] Entry: ${JSON.stringify(entry)}`);
+            if (entry.name !== CONST.TIMING.CHAT_RENDER) {
+                return;
+            }
+
+            console.debug(`[E2E] Submitting!`);
+            E2EClient.submitTestResults({
+                name: 'Chat opening',
+                duration: entry.duration,
+            })
+                .then(() => {
+                    console.debug('[E2E] Done with search, exiting…');
+                    E2EClient.submitTestDone();
+                })
+                .catch((err) => {
+                    console.debug('[E2E] Error while submitting test results:', err);
+                });
+        });
+    });
+};
+
+export default test;

From 79e06210f191f0452c1345b0018fdb8b6100b268 Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Fri, 27 Oct 2023 14:35:54 +0200
Subject: [PATCH 008/113] add timers

---
 src/CONST.ts                               |  1 +
 src/pages/home/ReportScreen.js             | 11 ++++++++++-
 src/pages/home/report/ReportActionsList.js |  4 ++++
 tests/e2e/config.js                        |  4 ++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index a6106b88a532..1388b95162d9 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -678,6 +678,7 @@ const CONST = {
     TIMING: {
         CALCULATE_MOST_RECENT_LAST_MODIFIED_ACTION: 'calc_most_recent_last_modified_action',
         SEARCH_RENDER: 'search_render',
+        CHAT_RENDER: 'chat_render',
         HOMEPAGE_INITIAL_RENDER: 'homepage_initial_render',
         REPORT_INITIAL_RENDER: 'report_initial_render',
         SWITCH_REPORT: 'switch_report',
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 32a14303e9a7..3ec76c6c30a4 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -10,8 +10,11 @@ import ScreenWrapper from '../../components/ScreenWrapper';
 import HeaderView from './HeaderView';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
-import * as Report from '../../libs/actions/Report';
 import ONYXKEYS from '../../ONYXKEYS';
+import PAGES_CONST from '../PAGES_CONST';
+import Timing from '../../libs/actions/Timing';
+import Performance from '../../libs/Performance';
+import * as Report from '../../libs/actions/Report';
 import * as ReportUtils from '../../libs/ReportUtils';
 import ReportActionsView from './report/ReportActionsView';
 import ReportActionsSkeletonView from '../../components/ReportActionsSkeletonView';
@@ -160,6 +163,11 @@ function ReportScreen({
     const [isBannerVisible, setIsBannerVisible] = useState(true);
     const [listHeight, setListHeight] = useState(0);
 
+    if (firstRenderRef.current) {
+        Timing.start(CONST.TIMING.CHAT_RENDER);
+        Performance.markStart(CONST.TIMING.CHAT_RENDER);
+    }
+
     const reportID = getReportID(route);
     const {addWorkspaceRoomOrChatPendingAction, addWorkspaceRoomOrChatErrors} = ReportUtils.getReportOfflinePendingActionAndErrors(report);
     const screenWrapperStyle = [styles.appContent, styles.flex1, {marginTop: viewportOffsetTop}];
@@ -468,6 +476,7 @@ ReportScreen.defaultProps = defaultProps;
 ReportScreen.displayName = 'ReportScreen';
 
 export default compose(
+    Performance.withRenderTrace({id: PAGES_CONST.REPORT_ACTIONS_VIEW}),
     withViewportOffsetTop,
     withCurrentReportID,
     withOnyx(
diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index 3cdd8ece876f..469a175b978d 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -16,6 +16,8 @@ import useReportScrollManager from '../../../hooks/useReportScrollManager';
 import DateUtils from '../../../libs/DateUtils';
 import * as ReportUtils from '../../../libs/ReportUtils';
 import * as Report from '../../../libs/actions/Report';
+import Performance from '../../../libs/Performance';
+import Timing from '../../../libs/actions/Timing';
 import compose from '../../../libs/compose';
 import styles from '../../../styles/styles';
 import variables from '../../../styles/variables';
@@ -368,6 +370,8 @@ function ReportActionsList({
     const onLayoutInner = useCallback(
         (event) => {
             onLayout(event);
+            Timing.end(CONST.TIMING.CHAT_RENDER);
+            Performance.markEnd(CONST.TIMING.CHAT_RENDER);
         },
         [onLayout],
     );
diff --git a/tests/e2e/config.js b/tests/e2e/config.js
index 6095927d0174..5b93bfbd38ec 100644
--- a/tests/e2e/config.js
+++ b/tests/e2e/config.js
@@ -10,6 +10,7 @@ const TEST_NAMES = {
     AppStartTime: 'App start time',
     OpenSearchPage: 'Open search page TTI',
     ReportTyping: 'Report typing',
+    ChatOpening: 'Chat opening',
 };
 
 /**
@@ -70,5 +71,8 @@ module.exports = {
                 autoFocus: true,
             },
         },
+        [TEST_NAMES.ChatOpening]: {
+            name: TEST_NAMES.ChatOpening,
+        },
     },
 };

From 8b5a3e3b3ebbc6a89336df20b99a12a851c24b8a Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Fri, 27 Oct 2023 15:11:48 +0200
Subject: [PATCH 009/113] remove PAGES_CONST

---
 src/pages/home/ReportScreen.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 3ec76c6c30a4..3b4bf3d3e761 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -11,7 +11,6 @@ import HeaderView from './HeaderView';
 import Navigation from '../../libs/Navigation/Navigation';
 import ROUTES from '../../ROUTES';
 import ONYXKEYS from '../../ONYXKEYS';
-import PAGES_CONST from '../PAGES_CONST';
 import Timing from '../../libs/actions/Timing';
 import Performance from '../../libs/Performance';
 import * as Report from '../../libs/actions/Report';
@@ -476,7 +475,6 @@ ReportScreen.defaultProps = defaultProps;
 ReportScreen.displayName = 'ReportScreen';
 
 export default compose(
-    Performance.withRenderTrace({id: PAGES_CONST.REPORT_ACTIONS_VIEW}),
     withViewportOffsetTop,
     withCurrentReportID,
     withOnyx(

From b37fbd1486ca6d4441b334b2cd2e52985a34784d Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Sat, 28 Oct 2023 16:17:51 +0700
Subject: [PATCH 010/113] fix: 30448

---
 src/libs/ReportUtils.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 2dccc68b74e0..0f32468a8c3c 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1568,6 +1568,10 @@ function canEditMoneyRequest(reportAction) {
         return true;
     }
 
+    if (reportAction.originalMessage.type !== CONST.IOU.REPORT_ACTION_TYPE.CREATE) {
+        return false;
+    }
+
     const moneyRequestReportID = lodashGet(reportAction, 'originalMessage.IOUReportID', 0);
 
     if (!moneyRequestReportID) {

From 70fec0f74b2646b497cc623d541fb1eeeddb7d15 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 30 Oct 2023 14:54:01 +0700
Subject: [PATCH 011/113] fix lint

---
 src/pages/workspace/WorkspaceNewRoomPage.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index ee57edf3fa07..d6b429bc2bed 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -3,8 +3,11 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
+import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
+import Button from '@components/Button';
 import Form from '@components/Form';
+import * as Illustrations from '@components/Icon/Illustrations';
 import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
 import RoomNameInput from '@components/RoomNameInput';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -16,6 +19,7 @@ import useDelayedInputFocus from '@hooks/useDelayedInputFocus';
 import useLocalize from '@hooks/useLocalize';
 import compose from '@libs/compose';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import Navigation from '@libs/Navigation/Navigation';
 import Permissions from '@libs/Permissions';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
@@ -26,10 +30,6 @@ import variables from '@styles/variables';
 import * as Report from '@userActions/Report';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import * as Illustrations from '@components/Icon/Illustrations';
-import BlockingView from '@components/BlockingViews/BlockingView';
-import Button from '@components/Button';
-import Navigation from '@libs/Navigation/Navigation';
 import ROUTES from '@src/ROUTES';
 
 const propTypes = {

From c10bfff26c0f34889d329ba6628c5d42f37ede49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 30 Oct 2023 14:02:44 -0600
Subject: [PATCH 012/113] fix lint

---
 src/pages/TeachersUnite/IntroSchoolPrincipalPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
index 6a4a08867bad..a9dc8a2f4642 100644
--- a/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
+++ b/src/pages/TeachersUnite/IntroSchoolPrincipalPage.js
@@ -12,9 +12,9 @@ import Text from '@components/Text';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import * as LoginUtils from '@libs/LoginUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ValidationUtils from '@libs/ValidationUtils';
-import * as LoginUtils from '@libs/LoginUtils';
 import styles from '@styles/styles';
 import TeachersUnite from '@userActions/TeachersUnite';
 import CONST from '@src/CONST';

From d2c6d8e9a37e381db74aff4e3cba04111349212b Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Tue, 31 Oct 2023 13:36:01 +0100
Subject: [PATCH 013/113] end timing in ReportScreen

---
 src/libs/E2E/tests/chatOpeningTest.e2e.js  | 63 +++++++++++-----------
 src/pages/home/ReportScreen.js             |  7 ++-
 src/pages/home/report/ReportActionsList.js |  4 --
 3 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/src/libs/E2E/tests/chatOpeningTest.e2e.js b/src/libs/E2E/tests/chatOpeningTest.e2e.js
index f5c25add4812..3fadbe333c9b 100644
--- a/src/libs/E2E/tests/chatOpeningTest.e2e.js
+++ b/src/libs/E2E/tests/chatOpeningTest.e2e.js
@@ -1,10 +1,11 @@
-import E2ELogin from '../actions/e2eLogin';
-import Performance from '../../Performance';
-import E2EClient from '../client';
-import Navigation from '../../Navigation/Navigation';
-import ROUTES from '../../../ROUTES';
-import CONST from '../../../CONST';
-import getReport from '../apiMocks/openReport';
+import E2ECleanReportActions from '@libs/E2E/actions/cleanReportActions';
+import E2ELogin from '@libs/E2E/actions/e2eLogin';
+import getReport from '@libs/E2E/apiMocks/openReport';
+import E2EClient from '@libs/E2E/client';
+import Navigation from '@libs/Navigation/Navigation';
+import Performance from '@libs/Performance';
+import CONST from '@src/CONST';
+import ROUTES from '@src/ROUTES';
 
 const test = () => {
     // check for login (if already logged in the action will simply resolve)
@@ -18,31 +19,33 @@ const test = () => {
             return E2EClient.submitTestDone();
         }
 
-        console.debug('[E2E] Logged in, getting chat opening metrics and submitting them…');
+        console.debug('[E2E] Logged in, cleaning report actions from onyx…');
+        E2ECleanReportActions().then(() => {
+            console.debug('[E2E] Logged in, getting chat opening metrics and submitting them…');
+            Performance.subscribeToMeasurements((entry) => {
+                if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
+                    console.debug(`[E2E] Sidebar loaded, navigating to search route…`);
+                    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+                    return;
+                }
+                console.debug(`[E2E] Entry: ${JSON.stringify(entry)}`);
+                if (entry.name !== CONST.TIMING.CHAT_RENDER) {
+                    return;
+                }
 
-        Performance.subscribeToMeasurements((entry) => {
-            if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
-                console.debug(`[E2E] Sidebar loaded, navigating to search route…`);
-                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
-                return;
-            }
-            console.debug(`[E2E] Entry: ${JSON.stringify(entry)}`);
-            if (entry.name !== CONST.TIMING.CHAT_RENDER) {
-                return;
-            }
-
-            console.debug(`[E2E] Submitting!`);
-            E2EClient.submitTestResults({
-                name: 'Chat opening',
-                duration: entry.duration,
-            })
-                .then(() => {
-                    console.debug('[E2E] Done with search, exiting…');
-                    E2EClient.submitTestDone();
+                console.debug(`[E2E] Submitting!`);
+                E2EClient.submitTestResults({
+                    name: 'Chat opening',
+                    duration: entry.duration,
                 })
-                .catch((err) => {
-                    console.debug('[E2E] Error while submitting test results:', err);
-                });
+                    .then(() => {
+                        console.debug('[E2E] Done with search, exiting…');
+                        E2EClient.submitTestDone();
+                    })
+                    .catch((err) => {
+                        console.debug('[E2E] Error while submitting test results:', err);
+                    });
+            });
         });
     });
 };
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index f4082f134ee3..2f89b89de553 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -19,10 +19,12 @@ import withViewportOffsetTop from '@components/withViewportOffsetTop';
 import useLocalize from '@hooks/useLocalize';
 import usePrevious from '@hooks/usePrevious';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import Timing from '@libs/actions/Timing';
 import compose from '@libs/compose';
 import getIsReportFullyVisible from '@libs/getIsReportFullyVisible';
 import Navigation from '@libs/Navigation/Navigation';
 import reportWithoutHasDraftSelector from '@libs/OnyxSelectors/reportWithoutHasDraftSelector';
+import Performance from '@libs/Performance';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import Visibility from '@libs/Visibility';
@@ -36,8 +38,6 @@ import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import HeaderView from './HeaderView';
-import Timing from '@libs/actions/Timing';
-import Performance from '@libs/Performance';
 import reportActionPropTypes from './report/reportActionPropTypes';
 import ReportActionsView from './report/ReportActionsView';
 import ReportFooter from './report/ReportFooter';
@@ -303,6 +303,9 @@ function ReportScreen({
     );
 
     useEffect(() => {
+        Timing.end(CONST.TIMING.CHAT_RENDER);
+        Performance.markEnd(CONST.TIMING.CHAT_RENDER);
+
         fetchReportIfNeeded();
         ComposerActions.setShouldShowComposeInput(true);
         return () => {
diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index 7da0c70d0a11..8fa40a96bd6b 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -4,8 +4,6 @@ import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import Animated, {useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
 import _ from 'underscore';
-import Performance from '@libs/Performance';
-import Timing from '@libs/actions/Timing';
 import InvertedFlatList from '@components/InvertedFlatList';
 import {withPersonalDetails} from '@components/OnyxProvider';
 import withCurrentUserPersonalDetails, {withCurrentUserPersonalDetailsDefaultProps, withCurrentUserPersonalDetailsPropTypes} from '@components/withCurrentUserPersonalDetails';
@@ -387,8 +385,6 @@ function ReportActionsList({
     const onLayoutInner = useCallback(
         (event) => {
             onLayout(event);
-            Timing.end(CONST.TIMING.CHAT_RENDER);
-            Performance.markEnd(CONST.TIMING.CHAT_RENDER);
         },
         [onLayout],
     );

From f919ede550fde5c2db36505ab40aad7514515347 Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Tue, 31 Oct 2023 16:28:02 +0100
Subject: [PATCH 014/113] get rid of E2ECleanReportActions

---
 src/libs/E2E/tests/chatOpeningTest.e2e.js | 48 +++++++++++------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/libs/E2E/tests/chatOpeningTest.e2e.js b/src/libs/E2E/tests/chatOpeningTest.e2e.js
index 3fadbe333c9b..47c554e584f2 100644
--- a/src/libs/E2E/tests/chatOpeningTest.e2e.js
+++ b/src/libs/E2E/tests/chatOpeningTest.e2e.js
@@ -1,4 +1,3 @@
-import E2ECleanReportActions from '@libs/E2E/actions/cleanReportActions';
 import E2ELogin from '@libs/E2E/actions/e2eLogin';
 import getReport from '@libs/E2E/apiMocks/openReport';
 import E2EClient from '@libs/E2E/client';
@@ -19,33 +18,30 @@ const test = () => {
             return E2EClient.submitTestDone();
         }
 
-        console.debug('[E2E] Logged in, cleaning report actions from onyx…');
-        E2ECleanReportActions().then(() => {
-            console.debug('[E2E] Logged in, getting chat opening metrics and submitting them…');
-            Performance.subscribeToMeasurements((entry) => {
-                if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
-                    console.debug(`[E2E] Sidebar loaded, navigating to search route…`);
-                    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
-                    return;
-                }
-                console.debug(`[E2E] Entry: ${JSON.stringify(entry)}`);
-                if (entry.name !== CONST.TIMING.CHAT_RENDER) {
-                    return;
-                }
+        console.debug('[E2E] Logged in, getting chat opening metrics and submitting them…');
+        Performance.subscribeToMeasurements((entry) => {
+            if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
+                console.debug(`[E2E] Sidebar loaded, navigating to search route…`);
+                Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
+                return;
+            }
+            console.debug(`[E2E] Entry: ${JSON.stringify(entry)}`);
+            if (entry.name !== CONST.TIMING.CHAT_RENDER) {
+                return;
+            }
 
-                console.debug(`[E2E] Submitting!`);
-                E2EClient.submitTestResults({
-                    name: 'Chat opening',
-                    duration: entry.duration,
+            console.debug(`[E2E] Submitting!`);
+            E2EClient.submitTestResults({
+                name: 'Chat opening',
+                duration: entry.duration,
+            })
+                .then(() => {
+                    console.debug('[E2E] Done with search, exiting…');
+                    E2EClient.submitTestDone();
                 })
-                    .then(() => {
-                        console.debug('[E2E] Done with search, exiting…');
-                        E2EClient.submitTestDone();
-                    })
-                    .catch((err) => {
-                        console.debug('[E2E] Error while submitting test results:', err);
-                    });
-            });
+                .catch((err) => {
+                    console.debug('[E2E] Error while submitting test results:', err);
+                });
         });
     });
 };

From a8093546b69d3c43f0acec5753a092afd896680a Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Fri, 3 Nov 2023 18:35:18 -0700
Subject: [PATCH 015/113] Copy cloudflare cache busting from platformDeploy

---
 .github/workflows/deployExpensifyHelp.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/deployExpensifyHelp.yml b/.github/workflows/deployExpensifyHelp.yml
index 4a53e75354c6..2b5a4bf59d9a 100644
--- a/.github/workflows/deployExpensifyHelp.yml
+++ b/.github/workflows/deployExpensifyHelp.yml
@@ -52,6 +52,14 @@ jobs:
           projectName: helpdot
           directory: ./docs/_site
 
+      - name: Setup Cloudflare CLI
+        run: pip3 install cloudflare
+
+      - name: Purge Cloudflare cache
+        run: /home/runner/.local/bin/cli4 --delete hosts=["new.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
+        env:
+          CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
+
       - name: Leave a comment on the PR
         uses: actions-cool/maintain-one-comment@de04bd2a3750d86b324829a3ff34d47e48e16f4b
         if: ${{ github.event_name == 'pull_request' }}

From 2c20fab8c229f6f361827964b230a2fff35402a8 Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Thu, 9 Nov 2023 10:26:28 +0100
Subject: [PATCH 016/113] clean after merge

---
 src/libs/E2E/reactNativeLaunchingTest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/E2E/reactNativeLaunchingTest.js b/src/libs/E2E/reactNativeLaunchingTest.js
index f8eeea2a633d..3b12e324a6c2 100644
--- a/src/libs/E2E/reactNativeLaunchingTest.js
+++ b/src/libs/E2E/reactNativeLaunchingTest.js
@@ -66,5 +66,5 @@ E2EClient.getTestConfig()
 
 // start the usual app
 Performance.markStart('regularAppStart');
-import '../../../appIndex';
+import '../../../index';
 Performance.markEnd('regularAppStart');

From e7267d9b7ffb7f303bcd279f292853a3b93150af Mon Sep 17 00:00:00 2001
From: rory <rory@expensify.com>
Date: Mon, 13 Nov 2023 13:12:01 -0800
Subject: [PATCH 017/113] Update host to help.expensify.com

---
 .github/workflows/deployExpensifyHelp.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deployExpensifyHelp.yml b/.github/workflows/deployExpensifyHelp.yml
index 2b5a4bf59d9a..1c489904bfd7 100644
--- a/.github/workflows/deployExpensifyHelp.yml
+++ b/.github/workflows/deployExpensifyHelp.yml
@@ -56,7 +56,7 @@ jobs:
         run: pip3 install cloudflare
 
       - name: Purge Cloudflare cache
-        run: /home/runner/.local/bin/cli4 --delete hosts=["new.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
+        run: /home/runner/.local/bin/cli4 --delete hosts=["help.expensify.com"] /zones/:9ee042e6cfc7fd45e74aa7d2f78d617b/purge_cache
         env:
           CF_API_KEY: ${{ secrets.CLOUDFLARE_TOKEN }}
 

From 6af325ab7e93050fcead4ff2d36dea974ce5662d Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Wed, 15 Nov 2023 12:07:20 +0700
Subject: [PATCH 018/113] fix lint

---
 src/pages/NewChatPage.js                    | 1 -
 src/pages/workspace/WorkspaceNewRoomPage.js | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
index 2c9858a15f50..22af82041f7b 100755
--- a/src/pages/NewChatPage.js
+++ b/src/pages/NewChatPage.js
@@ -224,7 +224,6 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, translate, i
             shouldShowOfflineIndicator={false}
             includePaddingTop={false}
             shouldEnableMaxHeight
-            shouldShowOfflineIndicator={false}
             testID={NewChatPage.displayName}
         >
             {({safeAreaPaddingBottomStyle, insets}) => (
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 9cc085534c97..7fd70b704fee 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -175,7 +175,6 @@ function WorkspaceNewRoomPage(props) {
                 shouldShowOfflineIndicator={false}
                 includePaddingTop={false}
                 shouldEnablePickerAvoiding={false}
-                shouldShowOfflineIndicator={false}
                 testID={WorkspaceNewRoomPage.displayName}
             >
                 {({insets}) =>

From 037efabb4a050b04244000906138a9a00f441199 Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Fri, 17 Nov 2023 11:50:47 +0100
Subject: [PATCH 019/113] migrate to ts

---
 ...ningTest.e2e.js => chatOpeningTest.e2e.ts} | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)
 rename src/libs/E2E/tests/{chatOpeningTest.e2e.js => chatOpeningTest.e2e.ts} (80%)

diff --git a/src/libs/E2E/tests/chatOpeningTest.e2e.js b/src/libs/E2E/tests/chatOpeningTest.e2e.ts
similarity index 80%
rename from src/libs/E2E/tests/chatOpeningTest.e2e.js
rename to src/libs/E2E/tests/chatOpeningTest.e2e.ts
index 47c554e584f2..e695acea0f72 100644
--- a/src/libs/E2E/tests/chatOpeningTest.e2e.js
+++ b/src/libs/E2E/tests/chatOpeningTest.e2e.ts
@@ -1,16 +1,29 @@
 import E2ELogin from '@libs/E2E/actions/e2eLogin';
-import getReport from '@libs/E2E/apiMocks/openReport';
+import mockReport from '@libs/E2E/apiMocks/openReport';
 import E2EClient from '@libs/E2E/client';
 import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
 
+type ReportValue = {
+    reportID: string;
+};
+
+type OnyxData = {
+    value: ReportValue;
+};
+
+type MockReportResponse = {
+    onyxData: OnyxData[];
+};
+
 const test = () => {
     // check for login (if already logged in the action will simply resolve)
     console.debug('[E2E] Logging in for chat opening');
-    const report = getReport();
-    const reportID = report.onyxData[0].value.reportID;
+    const report = mockReport() as MockReportResponse;
+
+    const {reportID} = report.onyxData[0].value;
 
     E2ELogin().then((neededLogin) => {
         if (neededLogin) {
@@ -21,7 +34,7 @@ const test = () => {
         console.debug('[E2E] Logged in, getting chat opening metrics and submitting them…');
         Performance.subscribeToMeasurements((entry) => {
             if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
-                console.debug(`[E2E] Sidebar loaded, navigating to search route…`);
+                console.debug(`[E2E] Sidebar loaded, navigating report…`);
                 Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
                 return;
             }
@@ -36,7 +49,7 @@ const test = () => {
                 duration: entry.duration,
             })
                 .then(() => {
-                    console.debug('[E2E] Done with search, exiting…');
+                    console.debug('[E2E] Done with chat opening, exiting…');
                     E2EClient.submitTestDone();
                 })
                 .catch((err) => {

From 01e00ec10a21e77b3c7fe0ed4470ea2521cdd31f Mon Sep 17 00:00:00 2001
From: Bartosz Grajdek <bartosz.grajdek@swmansion.com>
Date: Sun, 19 Nov 2023 15:21:01 +0100
Subject: [PATCH 020/113] [TS migration] Migrate 'AutoUpdateTime.js' component
 to TypeScript

---
 src/components/AutoUpdateTime.tsx | 22 +++++++---------------
 src/libs/DateUtils.ts             |  6 +++---
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/components/AutoUpdateTime.tsx b/src/components/AutoUpdateTime.tsx
index 1970839ec320..ac30628207b8 100644
--- a/src/components/AutoUpdateTime.tsx
+++ b/src/components/AutoUpdateTime.tsx
@@ -2,33 +2,26 @@
  * Displays the user's local time and updates it every minute.
  * The time auto-update logic is extracted to this component to avoid re-rendering a more complex component, e.g. DetailsPage.
  */
-import PropTypes from 'prop-types';
 import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import DateUtils from '@libs/DateUtils';
 import useThemeStyles from '@styles/useThemeStyles';
+import {Timezone} from "@src/types/onyx/PersonalDetails";
 import Text from './Text';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import withLocalize, {WithLocalizeProps} from './withLocalize';
 
-const propTypes = {
+type AutoUpdateTimeProps = {
     /** Timezone of the user from their personal details */
-    timezone: PropTypes.shape({
-        /** Value of selected timezone */
-        selected: PropTypes.string,
+    timezone: Required<Timezone>
+} & WithLocalizeProps;
 
-        /** Whether timezone is automatically set */
-        automatic: PropTypes.bool,
-    }).isRequired,
-    ...withLocalizePropTypes,
-};
-
-function AutoUpdateTime(props) {
+function AutoUpdateTime(props: AutoUpdateTimeProps) {
     const styles = useThemeStyles();
     /**
      * @returns {Date} Returns the locale Date object
      */
     const getCurrentUserLocalTime = useCallback(
-        () => DateUtils.getLocalDateFromDatetime(props.preferredLocale, null, props.timezone.selected),
+        () => DateUtils.getLocalDateFromDatetime(props.preferredLocale, undefined, props.timezone.selected),
         [props.preferredLocale, props.timezone.selected],
     );
 
@@ -67,6 +60,5 @@ function AutoUpdateTime(props) {
     );
 }
 
-AutoUpdateTime.propTypes = propTypes;
 AutoUpdateTime.displayName = 'AutoUpdateTime';
 export default withLocalize(AutoUpdateTime);
diff --git a/src/libs/DateUtils.ts b/src/libs/DateUtils.ts
index 80eae24d9367..153f05f4fd22 100644
--- a/src/libs/DateUtils.ts
+++ b/src/libs/DateUtils.ts
@@ -80,7 +80,7 @@ function setLocale(localeString: Locale) {
  * Gets the user's stored time zone NVP and returns a localized
  * Date object for the given ISO-formatted datetime string
  */
-function getLocalDateFromDatetime(locale: Locale, datetime: string, currentSelectedTimezone: SelectedTimezone = timezone.selected): Date {
+function getLocalDateFromDatetime(locale: Locale, datetime?: string, currentSelectedTimezone: SelectedTimezone = timezone.selected): Date {
     setLocale(locale);
     if (!datetime) {
         return utcToZonedTime(new Date(), currentSelectedTimezone);
@@ -201,7 +201,7 @@ function datetimeToRelative(locale: Locale, datetime: string): string {
  * @param selectedTimezone
  * @returns
  */
-function getZoneAbbreviation(datetime: string, selectedTimezone: SelectedTimezone): string {
+function getZoneAbbreviation(datetime: string | Date, selectedTimezone: SelectedTimezone): string {
     return formatInTimeZone(datetime, selectedTimezone, 'zzz');
 }
 
@@ -228,7 +228,7 @@ function formatToDayOfWeek(datetime: string): string {
  *
  * @returns 2:30 PM
  */
-function formatToLocalTime(datetime: string): string {
+function formatToLocalTime(datetime: string | Date): string {
     return format(new Date(datetime), CONST.DATE.LOCAL_TIME_FORMAT);
 }
 

From f1b3339006aef65ce9b024525967caadcfcec71b Mon Sep 17 00:00:00 2001
From: Bartosz Grajdek <bartosz.grajdek@swmansion.com>
Date: Mon, 20 Nov 2023 12:22:36 +0100
Subject: [PATCH 021/113] fix: prettier

---
 src/components/AutoUpdateTime.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AutoUpdateTime.tsx b/src/components/AutoUpdateTime.tsx
index ac30628207b8..1b9fb0052224 100644
--- a/src/components/AutoUpdateTime.tsx
+++ b/src/components/AutoUpdateTime.tsx
@@ -6,13 +6,13 @@ import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
 import {View} from 'react-native';
 import DateUtils from '@libs/DateUtils';
 import useThemeStyles from '@styles/useThemeStyles';
-import {Timezone} from "@src/types/onyx/PersonalDetails";
+import {Timezone} from '@src/types/onyx/PersonalDetails';
 import Text from './Text';
 import withLocalize, {WithLocalizeProps} from './withLocalize';
 
 type AutoUpdateTimeProps = {
     /** Timezone of the user from their personal details */
-    timezone: Required<Timezone>
+    timezone: Required<Timezone>;
 } & WithLocalizeProps;
 
 function AutoUpdateTime(props: AutoUpdateTimeProps) {

From 7b71b8ee817493496a02007cd9d3e6e894a21059 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Wed, 22 Nov 2023 14:44:16 +0700
Subject: [PATCH 022/113] disable thread functions for whisper message

---
 .../home/report/ContextMenu/ContextMenuActions.js      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
index 4f35926c5957..649475021ef8 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.js
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -130,7 +130,12 @@ export default [
             const isIOUAction = reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && !ReportActionsUtils.isSplitBillAction(reportAction);
             const isModifiedExpenseAction = ReportActionsUtils.isModifiedExpenseAction(reportAction);
             const isTaskAction = ReportActionsUtils.isTaskAction(reportAction);
-            return (isCommentAction || isReportPreviewAction || isIOUAction || isModifiedExpenseAction || isTaskAction) && !ReportUtils.isThreadFirstChat(reportAction, reportID);
+            const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction);
+            return (
+                !isWhisperAction &&
+                (isCommentAction || isReportPreviewAction || isIOUAction || isModifiedExpenseAction || isTaskAction) &&
+                !ReportUtils.isThreadFirstChat(reportAction, reportID)
+            );
         },
         onPress: (closePopover, {reportAction, reportID}) => {
             if (closePopover) {
@@ -161,7 +166,8 @@ export default [
             const isCommentAction = reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.ADDCOMMENT && !ReportUtils.isThreadFirstChat(reportAction, reportID);
             const isReportPreviewAction = reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.REPORTPREVIEW;
             const isIOUAction = reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.IOU && !ReportActionsUtils.isSplitBillAction(reportAction);
-            return !subscribed && (isCommentAction || isReportPreviewAction || isIOUAction);
+            const isWhisperAction = ReportActionsUtils.isWhisperAction(reportAction);
+            return !subscribed && !isWhisperAction && (isCommentAction || isReportPreviewAction || isIOUAction);
         },
         onPress: (closePopover, {reportAction, reportID}) => {
             let childReportNotificationPreference = lodashGet(reportAction, 'childReportNotificationPreference', '');

From 7770c89a6720df91ffd2be9e7c0a3b9d10a75e07 Mon Sep 17 00:00:00 2001
From: Bartosz Grajdek <bartosz.grajdek@swmansion.com>
Date: Thu, 23 Nov 2023 12:32:16 +0100
Subject: [PATCH 023/113] fix: remove required<> from types

---
 src/components/AutoUpdateTime.tsx | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/components/AutoUpdateTime.tsx b/src/components/AutoUpdateTime.tsx
index 1b9fb0052224..8aa276b87923 100644
--- a/src/components/AutoUpdateTime.tsx
+++ b/src/components/AutoUpdateTime.tsx
@@ -10,10 +10,10 @@ import {Timezone} from '@src/types/onyx/PersonalDetails';
 import Text from './Text';
 import withLocalize, {WithLocalizeProps} from './withLocalize';
 
-type AutoUpdateTimeProps = {
+type AutoUpdateTimeProps = WithLocalizeProps & {
     /** Timezone of the user from their personal details */
-    timezone: Required<Timezone>;
-} & WithLocalizeProps;
+    timezone: Timezone;
+};
 
 function AutoUpdateTime(props: AutoUpdateTimeProps) {
     const styles = useThemeStyles();
@@ -27,7 +27,12 @@ function AutoUpdateTime(props: AutoUpdateTimeProps) {
 
     const [currentUserLocalTime, setCurrentUserLocalTime] = useState(getCurrentUserLocalTime);
     const minuteRef = useRef(new Date().getMinutes());
-    const timezoneName = useMemo(() => DateUtils.getZoneAbbreviation(currentUserLocalTime, props.timezone.selected), [currentUserLocalTime, props.timezone.selected]);
+    const timezoneName = useMemo(() => {
+        if (props.timezone.selected) {
+            return DateUtils.getZoneAbbreviation(currentUserLocalTime, props.timezone.selected);
+        }
+        return '';
+    }, [currentUserLocalTime, props.timezone.selected]);
 
     useEffect(() => {
         // If the any of the props that getCurrentUserLocalTime depends on change, we want to update the displayed time immediately

From bb6a916ab689b151e75e0be65a63a775bd205bce Mon Sep 17 00:00:00 2001
From: Bartosz Grajdek <bartosz.grajdek@swmansion.com>
Date: Thu, 23 Nov 2023 12:59:12 +0100
Subject: [PATCH 024/113] Destructure props

---
 src/components/AutoUpdateTime.tsx | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/AutoUpdateTime.tsx b/src/components/AutoUpdateTime.tsx
index 8aa276b87923..6346232b9637 100644
--- a/src/components/AutoUpdateTime.tsx
+++ b/src/components/AutoUpdateTime.tsx
@@ -15,24 +15,21 @@ type AutoUpdateTimeProps = WithLocalizeProps & {
     timezone: Timezone;
 };
 
-function AutoUpdateTime(props: AutoUpdateTimeProps) {
+function AutoUpdateTime({timezone, preferredLocale, translate}: AutoUpdateTimeProps) {
     const styles = useThemeStyles();
     /**
      * @returns {Date} Returns the locale Date object
      */
-    const getCurrentUserLocalTime = useCallback(
-        () => DateUtils.getLocalDateFromDatetime(props.preferredLocale, undefined, props.timezone.selected),
-        [props.preferredLocale, props.timezone.selected],
-    );
+    const getCurrentUserLocalTime = useCallback(() => DateUtils.getLocalDateFromDatetime(preferredLocale, undefined, timezone.selected), [preferredLocale, timezone.selected]);
 
     const [currentUserLocalTime, setCurrentUserLocalTime] = useState(getCurrentUserLocalTime);
     const minuteRef = useRef(new Date().getMinutes());
     const timezoneName = useMemo(() => {
-        if (props.timezone.selected) {
-            return DateUtils.getZoneAbbreviation(currentUserLocalTime, props.timezone.selected);
+        if (timezone.selected) {
+            return DateUtils.getZoneAbbreviation(currentUserLocalTime, timezone.selected);
         }
         return '';
-    }, [currentUserLocalTime, props.timezone.selected]);
+    }, [currentUserLocalTime, timezone.selected]);
 
     useEffect(() => {
         // If the any of the props that getCurrentUserLocalTime depends on change, we want to update the displayed time immediately
@@ -56,7 +53,7 @@ function AutoUpdateTime(props: AutoUpdateTimeProps) {
                 style={[styles.textLabelSupporting, styles.mb1]}
                 numberOfLines={1}
             >
-                {props.translate('detailsPage.localTime')}
+                {translate('detailsPage.localTime')}
             </Text>
             <Text numberOfLines={1}>
                 {DateUtils.formatToLocalTime(currentUserLocalTime)} {timezoneName}

From 2ba4c7d3308661d33031b479d7b19b186fc52a42 Mon Sep 17 00:00:00 2001
From: Bartosz Grajdek <bartosz.grajdek@swmansion.com>
Date: Thu, 23 Nov 2023 13:00:18 +0100
Subject: [PATCH 025/113] fix: remove type from JSDoc

---
 src/components/AutoUpdateTime.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AutoUpdateTime.tsx b/src/components/AutoUpdateTime.tsx
index 6346232b9637..c8bd594977b2 100644
--- a/src/components/AutoUpdateTime.tsx
+++ b/src/components/AutoUpdateTime.tsx
@@ -18,7 +18,7 @@ type AutoUpdateTimeProps = WithLocalizeProps & {
 function AutoUpdateTime({timezone, preferredLocale, translate}: AutoUpdateTimeProps) {
     const styles = useThemeStyles();
     /**
-     * @returns {Date} Returns the locale Date object
+     * @returns Returns the locale Date object
      */
     const getCurrentUserLocalTime = useCallback(() => DateUtils.getLocalDateFromDatetime(preferredLocale, undefined, timezone.selected), [preferredLocale, timezone.selected]);
 

From 9254f76fc2b7fe9676e022b848f0bd2366affb84 Mon Sep 17 00:00:00 2001
From: Bartosz Grajdek <bartosz.grajdek@swmansion.com>
Date: Thu, 23 Nov 2023 13:02:06 +0100
Subject: [PATCH 026/113] fix: spelling mistake

---
 src/components/AutoUpdateTime.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/AutoUpdateTime.tsx b/src/components/AutoUpdateTime.tsx
index c8bd594977b2..7b584e236b37 100644
--- a/src/components/AutoUpdateTime.tsx
+++ b/src/components/AutoUpdateTime.tsx
@@ -17,9 +17,7 @@ type AutoUpdateTimeProps = WithLocalizeProps & {
 
 function AutoUpdateTime({timezone, preferredLocale, translate}: AutoUpdateTimeProps) {
     const styles = useThemeStyles();
-    /**
-     * @returns Returns the locale Date object
-     */
+    /** @returns Returns the locale Date object */
     const getCurrentUserLocalTime = useCallback(() => DateUtils.getLocalDateFromDatetime(preferredLocale, undefined, timezone.selected), [preferredLocale, timezone.selected]);
 
     const [currentUserLocalTime, setCurrentUserLocalTime] = useState(getCurrentUserLocalTime);
@@ -32,7 +30,7 @@ function AutoUpdateTime({timezone, preferredLocale, translate}: AutoUpdateTimePr
     }, [currentUserLocalTime, timezone.selected]);
 
     useEffect(() => {
-        // If the any of the props that getCurrentUserLocalTime depends on change, we want to update the displayed time immediately
+        // If any of the props that getCurrentUserLocalTime depends on change, we want to update the displayed time immediately
         setCurrentUserLocalTime(getCurrentUserLocalTime());
 
         // Also, if the user leaves this page open, we want to make sure the displayed time is updated every minute when the clock changes

From f93f34b708b51d0188fb1b8ba99c21e02aa330c2 Mon Sep 17 00:00:00 2001
From: AmjedNazzal <amjednazzal@outlook.com>
Date: Thu, 30 Nov 2023 10:54:05 +0300
Subject: [PATCH 027/113] Fix for issue #31789

---
 src/libs/SessionUtils.ts          |  5 +++--
 src/libs/actions/Session/index.ts | 16 ++++++++++++++++
 src/types/onyx/Session.ts         |  3 +++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/libs/SessionUtils.ts b/src/libs/SessionUtils.ts
index 6cd20e0b56b2..53de614f0f8d 100644
--- a/src/libs/SessionUtils.ts
+++ b/src/libs/SessionUtils.ts
@@ -35,8 +35,9 @@ Onyx.connect({
         if (loggedInDuringSession) {
             return;
         }
-
-        if (session?.authToken) {
+        // We are incorporating a check for 'signedInWithShortLivedAuthToken' to handle cases where login is performed using a ShortLivedAuthToken
+        // This check is necessary because, with ShortLivedAuthToken, 'authToken' gets populated, leading to 'loggedInDuringSession' being assigned a false value
+        if (session?.authToken && !session?.signedInWithShortLivedAuthToken) {
             loggedInDuringSession = false;
         } else {
             loggedInDuringSession = true;
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 559f60a21c98..5d86bcb74bb2 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -331,6 +331,15 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
                 isLoading: true,
             },
         },
+        // We are making a temporary modification to 'signedInWithShortLivedAuthToken' to ensure that 'App.openApp' will be called at least once
+        // Subsequently, we revert it back to the default value (undefined) in 'successData' to ensure the user is logged out on refresh
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.SESSION,
+            value: {
+                signedInWithShortLivedAuthToken: true,
+            },
+        },
     ];
 
     const successData: OnyxUpdate[] = [
@@ -341,6 +350,13 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
                 isLoading: false,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.SESSION,
+            value: {
+                signedInWithShortLivedAuthToken: undefined,
+            },
+        },
     ];
 
     const failureData: OnyxUpdate[] = [
diff --git a/src/types/onyx/Session.ts b/src/types/onyx/Session.ts
index faaa493b1286..aa4d52075d34 100644
--- a/src/types/onyx/Session.ts
+++ b/src/types/onyx/Session.ts
@@ -27,6 +27,9 @@ type Session = {
 
     /** Server side errors keyed by microtime */
     errors?: OnyxCommon.Errors;
+
+    /** User signed in with short lived token */
+    signedInWithShortLivedAuthToken?: boolean;
 };
 
 export default Session;

From cb6b0170ac51f36f3cb75d615111fcfc2ce8c2e2 Mon Sep 17 00:00:00 2001
From: Amjed Nazzal <74202751+AmjedNazzal@users.noreply.github.com>
Date: Thu, 30 Nov 2023 16:33:02 +0300
Subject: [PATCH 028/113] Update index.ts

---
 src/libs/actions/Session/index.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 5d86bcb74bb2..62ad5020f3c3 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -332,7 +332,6 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
             },
         },
         // We are making a temporary modification to 'signedInWithShortLivedAuthToken' to ensure that 'App.openApp' will be called at least once
-        // Subsequently, we revert it back to the default value (undefined) in 'successData' to ensure the user is logged out on refresh
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SESSION,
@@ -342,6 +341,7 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
         },
     ];
 
+    // Subsequently, we revert it back to the default value of signedInWithShortLivedAuthToken (undefined) in 'successData' to ensure the user is logged out on refresh
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -367,6 +367,13 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
                 isLoading: false,
             },
         },
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: ONYXKEYS.SESSION,
+            value: {
+                signedInWithShortLivedAuthToken: undefined,
+            },
+        },
     ];
 
     // If the user is signing in with a different account from the current app, should not pass the auto-generated login as it may be tied to the old account.

From 771e292bf1e7fa0769fad7b26b4b6b0ca29b75af Mon Sep 17 00:00:00 2001
From: Amjed Nazzal <74202751+AmjedNazzal@users.noreply.github.com>
Date: Thu, 30 Nov 2023 17:24:42 +0300
Subject: [PATCH 029/113] Fix - issue #31789 adjusting comments

---
 src/libs/actions/Session/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 62ad5020f3c3..ccdb5216420e 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -341,7 +341,6 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
         },
     ];
 
-    // Subsequently, we revert it back to the default value of signedInWithShortLivedAuthToken (undefined) in 'successData' to ensure the user is logged out on refresh
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -350,6 +349,7 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
                 isLoading: false,
             },
         },
+        // Subsequently, we revert it back to the default value of signedInWithShortLivedAuthToken (undefined) in 'successData' to ensure the user is logged out on refresh
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SESSION,

From 9b6dca761ee11b90384b8b475b88400b9af282ab Mon Sep 17 00:00:00 2001
From: Amjed Nazzal <74202751+AmjedNazzal@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:01:52 +0300
Subject: [PATCH 030/113] Fix - issue #31789 merging success and failure data

---
 src/libs/actions/Session/index.ts | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index ccdb5216420e..0e6fb9099de3 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -341,25 +341,9 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
         },
     ];
 
-    const successData: OnyxUpdate[] = [
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.ACCOUNT,
-            value: {
-                isLoading: false,
-            },
-        },
-        // Subsequently, we revert it back to the default value of signedInWithShortLivedAuthToken (undefined) in 'successData' to ensure the user is logged out on refresh
-        {
-            onyxMethod: Onyx.METHOD.MERGE,
-            key: ONYXKEYS.SESSION,
-            value: {
-                signedInWithShortLivedAuthToken: undefined,
-            },
-        },
-    ];
-
-    const failureData: OnyxUpdate[] = [
+    // Subsequently, we revert it back to the default value of 'signedInWithShortLivedAuthToken' (undefined) in 'successData' or 'failureData' to ensure the user is logged out on refresh
+    // We are combining both success and failure data params into one const as they are identical
+    const resolutionData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.ACCOUNT,
@@ -375,6 +359,9 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
             },
         },
     ];
+    
+    const successData = resolutionData;
+    const failureData = resolutionData;
 
     // If the user is signing in with a different account from the current app, should not pass the auto-generated login as it may be tied to the old account.
     // scene 1: the user is transitioning to newDot from a different account on oldDot.

From 4ecc326b2d700c0a7128f4d824541fa48a3d14c9 Mon Sep 17 00:00:00 2001
From: AmjedNazzal <amjednazzal@outlook.com>
Date: Fri, 1 Dec 2023 17:11:00 +0300
Subject: [PATCH 031/113] Fix - Issue #31789 - Lint fix

---
 src/libs/actions/Session/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 0e6fb9099de3..5b7b460580fc 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -359,7 +359,7 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
             },
         },
     ];
-    
+
     const successData = resolutionData;
     const failureData = resolutionData;
 

From b75b4776d057ad7e8fdfd5c963bd6f1ce87e3960 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 4 Dec 2023 16:24:10 +0700
Subject: [PATCH 032/113] Bank account option is not present in Pay with
 Expensify menu

---
 src/components/AddPaymentMethodMenu.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/AddPaymentMethodMenu.js b/src/components/AddPaymentMethodMenu.js
index 4d01fa108e2a..8f93ef2009ff 100644
--- a/src/components/AddPaymentMethodMenu.js
+++ b/src/components/AddPaymentMethodMenu.js
@@ -7,6 +7,7 @@ import useLocalize from '@hooks/useLocalize';
 import compose from '@libs/compose';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import {iouDefaultProps, iouPropTypes} from '@pages/iou/propTypes';
 import iouReportPropTypes from '@pages/iouReportPropTypes';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -48,6 +49,9 @@ const propTypes = {
         /** Currently logged in user accountID */
         accountID: PropTypes.number,
     }),
+
+    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
+    iou: iouPropTypes,
 };
 
 const defaultProps = {
@@ -59,9 +63,10 @@ const defaultProps = {
     },
     anchorRef: () => {},
     session: {},
+    iou: iouDefaultProps,
 };
 
-function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignment, anchorRef, iouReport, onItemSelected, session}) {
+function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignment, anchorRef, iouReport, onItemSelected, session, iou}) {
     const {translate} = useLocalize();
 
     // Users can choose to pay with business bank account in case of Expense reports or in case of P2P IOU report
@@ -70,6 +75,8 @@ function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignme
         ReportUtils.isExpenseReport(iouReport) ||
         (ReportUtils.isIOUReport(iouReport) && !ReportActionsUtils.hasRequestFromCurrentAccount(lodashGet(iouReport, 'reportID', 0), lodashGet(session, 'accountID', 0)));
 
+    const canUsePersonalBankAccount = iou.id === CONST.IOU.TYPE.SEND;
+
     return (
         <PopoverMenu
             isVisible={isVisible}
@@ -79,7 +86,7 @@ function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignme
             anchorRef={anchorRef}
             onItemSelected={onClose}
             menuItems={[
-                ...(ReportUtils.isIOUReport(iouReport)
+                ...(canUsePersonalBankAccount
                     ? [
                           {
                               text: translate('common.personalBankAccount'),
@@ -122,5 +129,8 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        iou: {
+            key: ONYXKEYS.IOU,
+        },
     }),
 )(AddPaymentMethodMenu);

From 28d0ba98697be7d6d7b7a651b75290e8dfab3c9e Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Mon, 4 Dec 2023 16:07:45 +0100
Subject: [PATCH 033/113] Fix error shows up when saving existing and valid
 room name with any changes

---
 src/components/Form/FormProvider.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
index af2511fc9f74..5a3970cb8ce1 100644
--- a/src/components/Form/FormProvider.js
+++ b/src/components/Form/FormProvider.js
@@ -224,7 +224,12 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                 inputValues[inputID] = propsToParse.defaultValue;
             } else if (_.isUndefined(inputValues[inputID])) {
                 // We want to initialize the input value if it's undefined
-                inputValues[inputID] = _.isUndefined(propsToParse.defaultValue) ? getInitialValueByType(propsToParse.valueType) : propsToParse.defaultValue;
+                const initialValue = _.isUndefined(propsToParse.defaultValue) ? getInitialValueByType(propsToParse.valueType) : propsToParse.defaultValue;
+
+                inputValues[inputID] = _.isFunction(propsToParse.valueParser) ? propsToParse.valueParser(initialValue) : initialValue;
+                if (_.isFunction(propsToParse.displayParser)) {
+                    inputValues[`${inputID}ToDisplay`] = propsToParse.displayParser(initialValue);
+                }
             }
 
             const errorFields = lodashGet(formState, 'errorFields', {});

From 9fa1591ccddc5d24754b0af98137d496c042dc69 Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Mon, 4 Dec 2023 19:37:23 +0100
Subject: [PATCH 034/113] Revert "Revert "[Form Provider Refactor]
 RoomNameInput fixes""

This reverts commit a60110bf0dd0a925c05f8026b729c4cfb0320852.
---
 src/components/Form/FormProvider.js           | 22 +++++--
 src/components/Form/InputWrapper.js           |  4 ++
 src/components/RoomNameInput/index.js         | 53 ++++-----------
 src/components/RoomNameInput/index.native.js  | 66 -------------------
 .../RoomNameInput/roomNameInputPropTypes.js   |  9 ++-
 src/libs/RoomNameInputUtils.ts                |  4 +-
 src/pages/settings/Report/RoomNamePage.js     | 16 ++---
 src/pages/workspace/WorkspaceNewRoomPage.js   | 19 ++++--
 8 files changed, 59 insertions(+), 134 deletions(-)
 delete mode 100644 src/components/RoomNameInput/index.native.js

diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
index 5a3970cb8ce1..42d0d2bf9d81 100644
--- a/src/components/Form/FormProvider.js
+++ b/src/components/Form/FormProvider.js
@@ -242,6 +242,8 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                     .first()
                     .value() || '';
 
+            const value = !_.isUndefined(inputValues[`${inputID}ToDisplay`]) ? inputValues[`${inputID}ToDisplay`] : inputValues[inputID];
+
             return {
                 ...propsToParse,
                 ref:
@@ -254,7 +256,7 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                 inputID,
                 key: propsToParse.key || inputID,
                 errorText: errors[inputID] || fieldErrorMessage,
-                value: inputValues[inputID],
+                value,
                 // As the text input is controlled, we never set the defaultValue prop
                 // as this is already happening by the value prop.
                 defaultValue: undefined,
@@ -314,13 +316,19 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                         propsToParse.onBlur(event);
                     }
                 },
-                onInputChange: (value, key) => {
+                onInputChange: (inputValue, key) => {
                     const inputKey = key || inputID;
                     setInputValues((prevState) => {
-                        const newState = {
-                            ...prevState,
-                            [inputKey]: value,
-                        };
+                        const newState = _.isFunction(propsToParse.valueParser)
+                            ? {
+                                  ...prevState,
+                                  [inputKey]: propsToParse.valueParser(inputValue),
+                                  [`${inputKey}ToDisplay`]: _.isFunction(propsToParse.displayParser) ? propsToParse.displayParser(inputValue) : inputValue,
+                              }
+                            : {
+                                  ...prevState,
+                                  [inputKey]: inputValue,
+                              };
 
                         if (shouldValidateOnChange) {
                             onValidate(newState);
@@ -333,7 +341,7 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                     }
 
                     if (_.isFunction(propsToParse.onValueChange)) {
-                        propsToParse.onValueChange(value, inputKey);
+                        propsToParse.onValueChange(inputValue, inputKey);
                     }
                 },
             };
diff --git a/src/components/Form/InputWrapper.js b/src/components/Form/InputWrapper.js
index 9a31210195c4..11e74d2759b1 100644
--- a/src/components/Form/InputWrapper.js
+++ b/src/components/Form/InputWrapper.js
@@ -9,11 +9,15 @@ const propTypes = {
     inputID: PropTypes.string.isRequired,
     valueType: PropTypes.string,
     forwardedRef: refPropTypes,
+    valueParser: PropTypes.func,
+    displayParser: PropTypes.func,
 };
 
 const defaultProps = {
     forwardedRef: undefined,
     valueType: 'string',
+    valueParser: undefined,
+    displayParser: undefined,
 };
 
 function InputWrapper(props) {
diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
index 14529d7b594a..e32c264a57cc 100644
--- a/src/components/RoomNameInput/index.js
+++ b/src/components/RoomNameInput/index.js
@@ -1,49 +1,24 @@
-import React, {useState} from 'react';
-import _ from 'underscore';
+import React from 'react';
+import InputWrapper from '@components/Form/InputWrapper';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
+import getOperatingSystem from '@libs/getOperatingSystem';
 import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import CONST from '@src/CONST';
 import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 
-function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, onBlur, shouldDelayFocus, inputID, roomName}) {
     const {translate} = useLocalize();
 
-    const [selection, setSelection] = useState();
+    const keyboardType = getOperatingSystem() === CONST.OS.IOS ? CONST.KEYBOARD_TYPE.ASCII_CAPABLE : CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD;
 
-    /**
-     * Calls the onChangeText callback with a modified room name
-     * @param {Event} event
-     */
-    const setModifiedRoomName = (event) => {
-        const roomName = event.nativeEvent.text;
-        const modifiedRoomName = RoomNameInputUtils.modifyRoomName(roomName);
-        onChangeText(modifiedRoomName);
-
-        // if custom component has onInputChange, use it to trigger changes (Form input)
-        if (_.isFunction(onInputChange)) {
-            onInputChange(modifiedRoomName);
-        }
-
-        // Prevent cursor jump behaviour:
-        // Check if newRoomNameWithHash is the same as modifiedRoomName
-        // If it is then the room name is valid (does not contain unallowed characters); no action required
-        // If not then the room name contains unvalid characters and we must adjust the cursor position manually
-        // Read more: https://github.com/Expensify/App/issues/12741
-        const oldRoomNameWithHash = value || '';
-        const newRoomNameWithHash = `${CONST.POLICY.ROOM_PREFIX}${roomName}`;
-        if (modifiedRoomName !== newRoomNameWithHash) {
-            const offset = modifiedRoomName.length - oldRoomNameWithHash.length;
-            const newSelection = {
-                start: selection.start + offset,
-                end: selection.end + offset,
-            };
-            setSelection(newSelection);
-        }
-    };
+    const valueParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName);
+    const displayParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName, true);
 
     return (
-        <TextInput
+        <InputWrapper
+            InputComponent={TextInput}
+            inputID={inputID}
             ref={forwardedRef}
             disabled={disabled}
             label={translate('newRoomPage.roomName')}
@@ -51,18 +26,18 @@ function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef,
             role={CONST.ACCESSIBILITY_ROLE.TEXT}
             prefixCharacter={CONST.POLICY.ROOM_PREFIX}
             placeholder={translate('newRoomPage.social')}
-            onChange={setModifiedRoomName}
-            value={value.substring(1)} // Since the room name always starts with a prefix, we omit the first character to avoid displaying it twice.
-            selection={selection}
-            onSelectionChange={(event) => setSelection(event.nativeEvent.selection)}
             errorText={errorText}
+            valueParser={valueParser}
+            displayParser={displayParser}
             autoCapitalize="none"
             onBlur={(event) => isFocused && onBlur(event)}
             shouldDelayFocus={shouldDelayFocus}
             autoFocus={isFocused && autoFocus}
             maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
+            defaultValue={roomName}
             spellCheck={false}
             shouldInterceptSwipe
+            keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
         />
     );
 }
diff --git a/src/components/RoomNameInput/index.native.js b/src/components/RoomNameInput/index.native.js
deleted file mode 100644
index a2c09996ad34..000000000000
--- a/src/components/RoomNameInput/index.native.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import _ from 'underscore';
-import TextInput from '@components/TextInput';
-import useLocalize from '@hooks/useLocalize';
-import getOperatingSystem from '@libs/getOperatingSystem';
-import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
-import CONST from '@src/CONST';
-import * as roomNameInputPropTypes from './roomNameInputPropTypes';
-
-function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
-    const {translate} = useLocalize();
-
-    /**
-     * Calls the onChangeText callback with a modified room name
-     * @param {Event} event
-     */
-    const setModifiedRoomName = (event) => {
-        const roomName = event.nativeEvent.text;
-        const modifiedRoomName = RoomNameInputUtils.modifyRoomName(roomName);
-        onChangeText(modifiedRoomName);
-
-        // if custom component has onInputChange, use it to trigger changes (Form input)
-        if (_.isFunction(onInputChange)) {
-            onInputChange(modifiedRoomName);
-        }
-    };
-
-    const keyboardType = getOperatingSystem() === CONST.OS.IOS ? CONST.KEYBOARD_TYPE.ASCII_CAPABLE : CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD;
-
-    return (
-        <TextInput
-            ref={forwardedRef}
-            disabled={disabled}
-            label={translate('newRoomPage.roomName')}
-            accessibilityLabel={translate('newRoomPage.roomName')}
-            role={CONST.ACCESSIBILITY_ROLE.TEXT}
-            prefixCharacter={CONST.POLICY.ROOM_PREFIX}
-            placeholder={translate('newRoomPage.social')}
-            onChange={setModifiedRoomName}
-            value={value.substring(1)} // Since the room name always starts with a prefix, we omit the first character to avoid displaying it twice.
-            errorText={errorText}
-            maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
-            keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
-            onBlur={(event) => isFocused && onBlur(event)}
-            autoFocus={isFocused && autoFocus}
-            autoCapitalize="none"
-            shouldDelayFocus={shouldDelayFocus}
-        />
-    );
-}
-
-RoomNameInput.propTypes = roomNameInputPropTypes.propTypes;
-RoomNameInput.defaultProps = roomNameInputPropTypes.defaultProps;
-RoomNameInput.displayName = 'RoomNameInput';
-
-const RoomNameInputWithRef = React.forwardRef((props, ref) => (
-    <RoomNameInput
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        forwardedRef={ref}
-    />
-));
-
-RoomNameInputWithRef.displayName = 'RoomNameInputWithRef';
-
-export default RoomNameInputWithRef;
diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
index 7f8292f0123e..f457e4e2a494 100644
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -1,4 +1,5 @@
 import PropTypes from 'prop-types';
+import refPropTypes from '@components/refPropTypes';
 
 const propTypes = {
     /** Callback to execute when the text input is modified correctly */
@@ -14,10 +15,10 @@ const propTypes = {
     errorText: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object]))]),
 
     /** A ref forwarded to the TextInput */
-    forwardedRef: PropTypes.func,
+    forwardedRef: refPropTypes,
 
     /** The ID used to uniquely identify the input in a Form */
-    inputID: PropTypes.string,
+    inputID: PropTypes.string.isRequired,
 
     /** Callback that is called when the text input is blurred */
     onBlur: PropTypes.func,
@@ -30,6 +31,8 @@ const propTypes = {
 
     /** Whether navigation is focused */
     isFocused: PropTypes.bool.isRequired,
+
+    roomName: PropTypes.string,
 };
 
 const defaultProps = {
@@ -39,10 +42,10 @@ const defaultProps = {
     errorText: '',
     forwardedRef: () => {},
 
-    inputID: undefined,
     onBlur: () => {},
     autoFocus: false,
     shouldDelayFocus: false,
+    roomName: '',
 };
 
 export {propTypes, defaultProps};
diff --git a/src/libs/RoomNameInputUtils.ts b/src/libs/RoomNameInputUtils.ts
index cff0bbc30274..e6f7d420bf59 100644
--- a/src/libs/RoomNameInputUtils.ts
+++ b/src/libs/RoomNameInputUtils.ts
@@ -3,14 +3,14 @@ import CONST from '@src/CONST';
 /**
  * Replaces spaces with dashes
  */
-function modifyRoomName(roomName: string): string {
+function modifyRoomName(roomName: string, skipPolicyPrefix?: boolean): string {
     const modifiedRoomNameWithoutHash = roomName
         .replace(/ /g, '-')
 
         // Replaces the smart dash on iOS devices with two hyphens
         .replace(/—/g, '--');
 
-    return `${CONST.POLICY.ROOM_PREFIX}${modifiedRoomNameWithoutHash}`;
+    return skipPolicyPrefix ? modifiedRoomNameWithoutHash : `${CONST.POLICY.ROOM_PREFIX}${modifiedRoomNameWithoutHash}`;
 }
 
 export {
diff --git a/src/pages/settings/Report/RoomNamePage.js b/src/pages/settings/Report/RoomNamePage.js
index 7916043c7e20..f8b6568733c7 100644
--- a/src/pages/settings/Report/RoomNamePage.js
+++ b/src/pages/settings/Report/RoomNamePage.js
@@ -4,7 +4,7 @@ import React, {useCallback, useRef} from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import Form from '@components/Form';
+import FormProvider from '@components/Form/FormProvider';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import RoomNameInput from '@components/RoomNameInput';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -42,13 +42,8 @@ const defaultProps = {
     policy: {},
 };
 
-function RoomNamePage(props) {
+function RoomNamePage({policy, report, reports, translate}) {
     const styles = useThemeStyles();
-    const policy = props.policy;
-    const report = props.report;
-    const reports = props.reports;
-    const translate = props.translate;
-
     const roomNameInputRef = useRef(null);
     const isFocused = useIsFocused();
 
@@ -91,7 +86,7 @@ function RoomNamePage(props) {
                     title={translate('newRoomPage.roomName')}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.REPORT_SETTINGS.getRoute(report.reportID))}
                 />
-                <Form
+                <FormProvider
                     style={[styles.flexGrow1, styles.ph5]}
                     formID={ONYXKEYS.FORMS.ROOM_NAME_FORM}
                     onSubmit={(values) => Report.updatePolicyRoomNameAndNavigate(report, values.roomName)}
@@ -101,13 +96,14 @@ function RoomNamePage(props) {
                 >
                     <View style={styles.mb4}>
                         <RoomNameInput
-                            ref={(ref) => (roomNameInputRef.current = ref)}
+                            ref={roomNameInputRef}
                             inputID="roomName"
                             defaultValue={report.reportName}
                             isFocused={isFocused}
+                            roomName={report.reportName.slice(1)}
                         />
                     </View>
-                </Form>
+                </FormProvider>
             </FullPageNotFoundView>
         </ScreenWrapper>
     );
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 7ddd78621d2d..92f2ab3dd5a6 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -4,7 +4,8 @@ import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
-import Form from '@components/Form';
+import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
 import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
 import OfflineIndicator from '@components/OfflineIndicator';
 import RoomNameInput from '@components/RoomNameInput';
@@ -239,7 +240,7 @@ function WorkspaceNewRoomPage(props) {
                         // This is because when wrapping whole screen the screen was freezing when changing Tabs.
                         keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
                     >
-                        <Form
+                        <FormProvider
                             formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
                             submitButtonText={translate('newRoomPage.createRoom')}
                             style={[styles.mh5, styles.flexGrow1]}
@@ -257,7 +258,8 @@ function WorkspaceNewRoomPage(props) {
                                 />
                             </View>
                             <View style={styles.mb5}>
-                                <TextInput
+                                <InputWrapper
+                                    InputComponent={TextInput}
                                     inputID="welcomeMessage"
                                     label={translate('welcomeMessagePage.welcomeMessageOptional')}
                                     accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
@@ -269,7 +271,8 @@ function WorkspaceNewRoomPage(props) {
                                 />
                             </View>
                             <View style={[styles.mhn5]}>
-                                <ValuePicker
+                                <InputWrapper
+                                    InputComponent={ValuePicker}
                                     inputID="policyID"
                                     label={translate('workspace.common.workspace')}
                                     items={workspaceOptions}
@@ -278,7 +281,8 @@ function WorkspaceNewRoomPage(props) {
                             </View>
                             {isPolicyAdmin && (
                                 <View style={styles.mhn5}>
-                                    <ValuePicker
+                                    <InputWrapper
+                                        InputComponent={ValuePicker}
                                         inputID="writeCapability"
                                         label={translate('writeCapabilityPage.label')}
                                         items={writeCapabilityOptions}
@@ -288,7 +292,8 @@ function WorkspaceNewRoomPage(props) {
                                 </View>
                             )}
                             <View style={[styles.mb1, styles.mhn5]}>
-                                <ValuePicker
+                                <InputWrapper
+                                    InputComponent={ValuePicker}
                                     inputID="visibility"
                                     label={translate('newRoomPage.visibility')}
                                     items={visibilityOptions}
@@ -297,7 +302,7 @@ function WorkspaceNewRoomPage(props) {
                                 />
                             </View>
                             <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
-                        </Form>
+                        </FormProvider>
                         {isSmallScreenWidth && <OfflineIndicator />}
                     </KeyboardAvoidingView>
                 )}

From b9fc2f4b464f81c286f2e8ab9905625a8b8797fd Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Mon, 4 Dec 2023 20:08:58 +0100
Subject: [PATCH 035/113] Fix inconsistent error message

---
 src/components/Form/FormProvider.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
index 42d0d2bf9d81..847750f78bf5 100644
--- a/src/components/Form/FormProvider.js
+++ b/src/components/Form/FormProvider.js
@@ -125,7 +125,7 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
             }
             FormActions.setErrorFields(formID, null);
 
-            const validateErrors = validate(values) || {};
+            const validateErrors = validate(trimmedStringValues) || {};
 
             // Validate the input for html tags. It should supercede any other error
             _.each(trimmedStringValues, (inputValue, inputID) => {
@@ -154,6 +154,11 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                         }
                     }
                 }
+
+                if (isMatch && leadingSpaceIndex === -1) {
+                    return;
+                }
+
                 // Add a validation error here because it is a string value that contains HTML characters
                 validateErrors[inputID] = 'common.error.invalidCharacter';
             });

From cc75622457c9c26a12ce60943e27c5bf224f1dc6 Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Tue, 5 Dec 2023 10:22:22 +0100
Subject: [PATCH 036/113] Fix last character of input fields is removed after
 coming back to form

---
 src/components/Form/FormProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
index 847750f78bf5..5576c861d96d 100644
--- a/src/components/Form/FormProvider.js
+++ b/src/components/Form/FormProvider.js
@@ -342,7 +342,7 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                     });
 
                     if (propsToParse.shouldSaveDraft) {
-                        FormActions.setDraftValues(formID, {[inputKey]: value});
+                        FormActions.setDraftValues(formID, {[inputKey]: _.isFunction(propsToParse.valueParser) ? propsToParse.valueParser(inputValue) : inputValue});
                     }
 
                     if (_.isFunction(propsToParse.onValueChange)) {

From 7c438ac1254e663afc5e63bf0dc469d18b6bb976 Mon Sep 17 00:00:00 2001
From: Taras Perun <terry.perun@gmail.com>
Date: Tue, 5 Dec 2023 14:39:09 +0100
Subject: [PATCH 037/113] typo

---
 src/libs/E2E/tests/chatOpeningTest.e2e.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/E2E/tests/chatOpeningTest.e2e.ts b/src/libs/E2E/tests/chatOpeningTest.e2e.ts
index e695acea0f72..ff948c298b4a 100644
--- a/src/libs/E2E/tests/chatOpeningTest.e2e.ts
+++ b/src/libs/E2E/tests/chatOpeningTest.e2e.ts
@@ -34,7 +34,7 @@ const test = () => {
         console.debug('[E2E] Logged in, getting chat opening metrics and submitting them…');
         Performance.subscribeToMeasurements((entry) => {
             if (entry.name === CONST.TIMING.SIDEBAR_LOADED) {
-                console.debug(`[E2E] Sidebar loaded, navigating report…`);
+                console.debug(`[E2E] Sidebar loaded, navigating to report…`);
                 Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
                 return;
             }

From 380f56358b7bdb6c52991bc319c59da62f8c0da5 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Wed, 6 Dec 2023 18:25:03 +0700
Subject: [PATCH 038/113] add Personal bank account option to the IOU report

---
 src/components/AddPaymentMethodMenu.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AddPaymentMethodMenu.js b/src/components/AddPaymentMethodMenu.js
index 8f93ef2009ff..6b6794c46b38 100644
--- a/src/components/AddPaymentMethodMenu.js
+++ b/src/components/AddPaymentMethodMenu.js
@@ -75,7 +75,7 @@ function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignme
         ReportUtils.isExpenseReport(iouReport) ||
         (ReportUtils.isIOUReport(iouReport) && !ReportActionsUtils.hasRequestFromCurrentAccount(lodashGet(iouReport, 'reportID', 0), lodashGet(session, 'accountID', 0)));
 
-    const canUsePersonalBankAccount = iou.id === CONST.IOU.TYPE.SEND;
+    const canUsePersonalBankAccount = iou.id === CONST.IOU.TYPE.SEND || ReportUtils.isIOUReport(iouReport);
 
     return (
         <PopoverMenu

From f89cc5b311b9ef78b464f6bd0a69636457bb4d50 Mon Sep 17 00:00:00 2001
From: Viktoryia Kliushun <vikstash@gmail.com>
Date: Wed, 6 Dec 2023 13:01:38 +0100
Subject: [PATCH 039/113] [TS migration] Migrate
 'ReportActionItemTaskAction.js' component

---
 src/components/ReportActionItem/TaskAction.js | 34 -------------------
 .../ReportActionItem/TaskAction.tsx           | 27 +++++++++++++++
 2 files changed, 27 insertions(+), 34 deletions(-)
 delete mode 100644 src/components/ReportActionItem/TaskAction.js
 create mode 100644 src/components/ReportActionItem/TaskAction.tsx

diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js
deleted file mode 100644
index f30d8c3908de..000000000000
--- a/src/components/ReportActionItem/TaskAction.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import {View} from 'react-native';
-import Text from '@components/Text';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
-import useThemeStyles from '@styles/useThemeStyles';
-import * as Task from '@userActions/Task';
-
-const propTypes = {
-    /** Name of the reportAction action */
-    actionName: PropTypes.string.isRequired,
-
-    /** The ID of the associated taskReport */
-    // eslint-disable-next-line react/no-unused-prop-types -- This is used in the withOnyx HOC
-    taskReportID: PropTypes.string.isRequired,
-
-    ...withLocalizePropTypes,
-};
-
-function TaskAction(props) {
-    const styles = useThemeStyles();
-    return (
-        <>
-            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Task.getTaskReportActionMessage(props.actionName, props.taskReportID, false)}</Text>
-            </View>
-        </>
-    );
-}
-
-TaskAction.propTypes = propTypes;
-TaskAction.displayName = 'TaskAction';
-
-export default withLocalize(TaskAction);
diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
new file mode 100644
index 000000000000..7ce31547d33b
--- /dev/null
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import {View} from 'react-native';
+import Text from '@components/Text';
+import useThemeStyles from '@styles/useThemeStyles';
+import * as Task from '@userActions/Task';
+
+type TaskActionProps = {
+    /** Name of the reportAction action */
+    actionName: string;
+
+    /** The ID of the associated taskReport */
+    taskReportID: string;
+};
+
+function TaskAction({actionName, taskReportID}: TaskActionProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+            <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Task.getTaskReportActionMessage(actionName, taskReportID, false)}</Text>
+        </View>
+    );
+}
+
+TaskAction.displayName = 'TaskAction';
+
+export default TaskAction;

From 3b2dbf4d8363198045df1b73b279c95bc00547e4 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Thu, 7 Dec 2023 15:37:16 +0100
Subject: [PATCH 040/113] fix: scrollbar color on windows

---
 .../BaseAutoCompleteSuggestions.tsx           | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
index efde2b24992f..e08f04ff2eec 100644
--- a/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
+++ b/src/components/AutoCompleteSuggestions/BaseAutoCompleteSuggestions.tsx
@@ -4,6 +4,7 @@ import {View} from 'react-native';
 // We take ScrollView from this package to properly handle the scrolling of AutoCompleteSuggestions in chats since one scroll is nested inside another
 import {ScrollView} from 'react-native-gesture-handler';
 import Animated, {Easing, FadeOutDown, useAnimatedStyle, useSharedValue, withTiming} from 'react-native-reanimated';
+import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
 import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
 import * as StyleUtils from '@styles/StyleUtils';
 import useTheme from '@styles/themes/useTheme';
@@ -85,18 +86,20 @@ function BaseAutoCompleteSuggestions<TSuggestion>(
             style={[styles.autoCompleteSuggestionsContainer, animatedStyles]}
             exiting={FadeOutDown.duration(100).easing(Easing.inOut(Easing.ease))}
         >
-            <FlashList
-                estimatedItemSize={CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT}
-                ref={scrollRef}
-                keyboardShouldPersistTaps="handled"
-                data={suggestions}
-                renderItem={renderItem}
-                renderScrollComponent={ScrollView}
-                keyExtractor={keyExtractor}
-                removeClippedSubviews={false}
-                showsVerticalScrollIndicator={innerHeight > rowHeight.value}
-                extraData={highlightedSuggestionIndex}
-            />
+            <ColorSchemeWrapper>
+                <FlashList
+                    estimatedItemSize={CONST.AUTO_COMPLETE_SUGGESTER.SUGGESTION_ROW_HEIGHT}
+                    ref={scrollRef}
+                    keyboardShouldPersistTaps="handled"
+                    data={suggestions}
+                    renderItem={renderItem}
+                    renderScrollComponent={ScrollView}
+                    keyExtractor={keyExtractor}
+                    removeClippedSubviews={false}
+                    showsVerticalScrollIndicator={innerHeight > rowHeight.value}
+                    extraData={highlightedSuggestionIndex}
+                />
+            </ColorSchemeWrapper>
         </Animated.View>
     );
 }

From 4512edcaca776299f7c90c6a55aaa373243fea14 Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Fri, 8 Dec 2023 03:41:38 +0700
Subject: [PATCH 041/113] hide Join menu with whisper thread

---
 src/pages/home/HeaderView.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index 5b57419c8530..51593bd49b50 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -102,6 +102,7 @@ function HeaderView(props) {
     const parentReportAction = ReportActionsUtils.getParentReportAction(props.report);
     const isCanceledTaskReport = ReportUtils.isCanceledTaskReport(props.report, parentReportAction);
     const lastVisibleMessage = ReportActionsUtils.getLastVisibleMessage(props.report.reportID);
+    const isWhisperAction = ReportActionsUtils.isWhisperAction(parentReportAction);
     const isEmptyChat = !props.report.lastMessageText && !props.report.lastMessageTranslationKey && !lastVisibleMessage.lastMessageText && !lastVisibleMessage.lastMessageTranslationKey;
     const isUserCreatedPolicyRoom = ReportUtils.isUserCreatedPolicyRoom(props.report);
     const isPolicyMember = useMemo(() => !_.isEmpty(props.policy), [props.policy]);
@@ -134,7 +135,7 @@ function HeaderView(props) {
     }
 
     if ((isChatThread && !isEmptyChat) || isUserCreatedPolicyRoom || canLeaveRoom) {
-        if (props.report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
+        if (!isWhisperAction && props.report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN) {
             threeDotMenuItems.push({
                 icon: Expensicons.ChatBubbles,
                 text: translate('common.join'),

From 02756ba5dcb00e05ac1553149034e5be989989ef Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Fri, 8 Dec 2023 16:03:16 +0100
Subject: [PATCH 042/113] Code review changes

---
 src/components/RoomNameInput.js               | 97 +++++++++++++++++++
 src/components/RoomNameInput/index.js         | 59 -----------
 .../RoomNameInput/roomNameInputPropTypes.js   | 51 ----------
 src/pages/settings/Report/RoomNamePage.js     | 14 ++-
 src/pages/workspace/WorkspaceNewRoomPage.js   | 19 +++-
 5 files changed, 125 insertions(+), 115 deletions(-)
 create mode 100644 src/components/RoomNameInput.js
 delete mode 100644 src/components/RoomNameInput/index.js
 delete mode 100644 src/components/RoomNameInput/roomNameInputPropTypes.js

diff --git a/src/components/RoomNameInput.js b/src/components/RoomNameInput.js
new file mode 100644
index 000000000000..fbc10b306a6e
--- /dev/null
+++ b/src/components/RoomNameInput.js
@@ -0,0 +1,97 @@
+import PropTypes from 'prop-types';
+import React from 'react';
+import useLocalize from '@hooks/useLocalize';
+import getOperatingSystem from '@libs/getOperatingSystem';
+import CONST from '@src/CONST';
+import refPropTypes from './refPropTypes';
+import TextInput from './TextInput';
+
+const propTypes = {
+    /** Callback to execute when the text input is modified correctly */
+    onChangeText: PropTypes.func,
+
+    /** Room name to show in input field. This should include the '#' already prefixed to the name */
+    value: PropTypes.string,
+
+    /** Whether we should show the input as disabled */
+    disabled: PropTypes.bool,
+
+    /** Error text to show */
+    errorText: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object]))]),
+
+    /** A ref forwarded to the TextInput */
+    forwardedRef: refPropTypes,
+
+    /** The ID used to uniquely identify the input in a Form */
+    inputID: PropTypes.string.isRequired,
+
+    /** Callback that is called when the text input is blurred */
+    onBlur: PropTypes.func,
+
+    /** AutoFocus */
+    autoFocus: PropTypes.bool,
+
+    /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
+    shouldDelayFocus: PropTypes.bool,
+
+    /** Whether navigation is focused */
+    isFocused: PropTypes.bool.isRequired,
+
+    roomName: PropTypes.string,
+};
+
+const defaultProps = {
+    onChangeText: () => {},
+    value: '',
+    disabled: false,
+    errorText: '',
+    forwardedRef: () => {},
+
+    onBlur: () => {},
+    autoFocus: false,
+    shouldDelayFocus: false,
+    roomName: '',
+};
+
+function RoomNameInput({isFocused, autoFocus, disabled, forwardedRef, onBlur, shouldDelayFocus, ...restProps}) {
+    const {translate} = useLocalize();
+
+    const keyboardType = getOperatingSystem() === CONST.OS.IOS ? CONST.KEYBOARD_TYPE.ASCII_CAPABLE : CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD;
+
+    return (
+        <TextInput
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...restProps}
+            ref={forwardedRef}
+            disabled={disabled}
+            label={translate('newRoomPage.roomName')}
+            accessibilityLabel={translate('newRoomPage.roomName')}
+            role={CONST.ACCESSIBILITY_ROLE.TEXT}
+            placeholder={translate('newRoomPage.social')}
+            autoCapitalize="none"
+            onBlur={(event) => isFocused && onBlur(event)}
+            shouldDelayFocus={shouldDelayFocus}
+            autoFocus={isFocused && autoFocus}
+            maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
+            spellCheck={false}
+            shouldInterceptSwipe
+            keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
+        />
+    );
+}
+
+RoomNameInput.propTypes = propTypes;
+RoomNameInput.defaultProps = defaultProps;
+RoomNameInput.displayName = 'RoomNameInput';
+
+const RoomNameInputWithRef = React.forwardRef((props, ref) => (
+    <RoomNameInput
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));
+
+RoomNameInputWithRef.displayName = 'RoomNameInputWithRef';
+
+export default RoomNameInputWithRef;
diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
deleted file mode 100644
index e32c264a57cc..000000000000
--- a/src/components/RoomNameInput/index.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-import InputWrapper from '@components/Form/InputWrapper';
-import TextInput from '@components/TextInput';
-import useLocalize from '@hooks/useLocalize';
-import getOperatingSystem from '@libs/getOperatingSystem';
-import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
-import CONST from '@src/CONST';
-import * as roomNameInputPropTypes from './roomNameInputPropTypes';
-
-function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, onBlur, shouldDelayFocus, inputID, roomName}) {
-    const {translate} = useLocalize();
-
-    const keyboardType = getOperatingSystem() === CONST.OS.IOS ? CONST.KEYBOARD_TYPE.ASCII_CAPABLE : CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD;
-
-    const valueParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName);
-    const displayParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName, true);
-
-    return (
-        <InputWrapper
-            InputComponent={TextInput}
-            inputID={inputID}
-            ref={forwardedRef}
-            disabled={disabled}
-            label={translate('newRoomPage.roomName')}
-            accessibilityLabel={translate('newRoomPage.roomName')}
-            role={CONST.ACCESSIBILITY_ROLE.TEXT}
-            prefixCharacter={CONST.POLICY.ROOM_PREFIX}
-            placeholder={translate('newRoomPage.social')}
-            errorText={errorText}
-            valueParser={valueParser}
-            displayParser={displayParser}
-            autoCapitalize="none"
-            onBlur={(event) => isFocused && onBlur(event)}
-            shouldDelayFocus={shouldDelayFocus}
-            autoFocus={isFocused && autoFocus}
-            maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
-            defaultValue={roomName}
-            spellCheck={false}
-            shouldInterceptSwipe
-            keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
-        />
-    );
-}
-
-RoomNameInput.propTypes = roomNameInputPropTypes.propTypes;
-RoomNameInput.defaultProps = roomNameInputPropTypes.defaultProps;
-RoomNameInput.displayName = 'RoomNameInput';
-
-const RoomNameInputWithRef = React.forwardRef((props, ref) => (
-    <RoomNameInput
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        forwardedRef={ref}
-    />
-));
-
-RoomNameInputWithRef.displayName = 'RoomNameInputWithRef';
-
-export default RoomNameInputWithRef;
diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
deleted file mode 100644
index f457e4e2a494..000000000000
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import PropTypes from 'prop-types';
-import refPropTypes from '@components/refPropTypes';
-
-const propTypes = {
-    /** Callback to execute when the text input is modified correctly */
-    onChangeText: PropTypes.func,
-
-    /** Room name to show in input field. This should include the '#' already prefixed to the name */
-    value: PropTypes.string,
-
-    /** Whether we should show the input as disabled */
-    disabled: PropTypes.bool,
-
-    /** Error text to show */
-    errorText: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object]))]),
-
-    /** A ref forwarded to the TextInput */
-    forwardedRef: refPropTypes,
-
-    /** The ID used to uniquely identify the input in a Form */
-    inputID: PropTypes.string.isRequired,
-
-    /** Callback that is called when the text input is blurred */
-    onBlur: PropTypes.func,
-
-    /** AutoFocus */
-    autoFocus: PropTypes.bool,
-
-    /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
-    shouldDelayFocus: PropTypes.bool,
-
-    /** Whether navigation is focused */
-    isFocused: PropTypes.bool.isRequired,
-
-    roomName: PropTypes.string,
-};
-
-const defaultProps = {
-    onChangeText: () => {},
-    value: '',
-    disabled: false,
-    errorText: '',
-    forwardedRef: () => {},
-
-    onBlur: () => {},
-    autoFocus: false,
-    shouldDelayFocus: false,
-    roomName: '',
-};
-
-export {propTypes, defaultProps};
diff --git a/src/pages/settings/Report/RoomNamePage.js b/src/pages/settings/Report/RoomNamePage.js
index f8b6568733c7..7d41d55bf415 100644
--- a/src/pages/settings/Report/RoomNamePage.js
+++ b/src/pages/settings/Report/RoomNamePage.js
@@ -5,6 +5,7 @@ import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import FormProvider from '@components/Form/FormProvider';
+import InputWrapper from '@components/Form/InputWrapper';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import RoomNameInput from '@components/RoomNameInput';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -13,6 +14,7 @@ import compose from '@libs/compose';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import withReportOrNotFound from '@pages/home/report/withReportOrNotFound';
 import reportPropTypes from '@pages/reportPropTypes';
@@ -47,6 +49,9 @@ function RoomNamePage({policy, report, reports, translate}) {
     const roomNameInputRef = useRef(null);
     const isFocused = useIsFocused();
 
+    const valueParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName);
+    const displayParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName, true);
+
     const validate = useCallback(
         (values) => {
             const errors = {};
@@ -95,12 +100,15 @@ function RoomNamePage({policy, report, reports, translate}) {
                     enabledWhenOffline
                 >
                     <View style={styles.mb4}>
-                        <RoomNameInput
+                        <InputWrapper
+                            InputComponent={RoomNameInput}
                             ref={roomNameInputRef}
                             inputID="roomName"
-                            defaultValue={report.reportName}
+                            defaultValue={report.reportName.slice(1)}
                             isFocused={isFocused}
-                            roomName={report.reportName.slice(1)}
+                            valueParser={valueParser}
+                            displayParser={displayParser}
+                            prefixCharacter={CONST.POLICY.ROOM_PREFIX}
                         />
                     </View>
                 </FormProvider>
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 92f2ab3dd5a6..4c65ac86c775 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -25,6 +25,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import Permissions from '@libs/Permissions';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import useThemeStyles from '@styles/useThemeStyles';
 import variables from '@styles/variables';
@@ -160,6 +161,8 @@ function WorkspaceNewRoomPage(props) {
         setWriteCapability(CONST.REPORT.WRITE_CAPABILITIES.ALL);
     }, [isPolicyAdmin]);
 
+    const valueParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName);
+    const displayParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName, true);
     /**
      * @param {Object} values - form input values passed by the Form component
      * @returns {Boolean}
@@ -191,7 +194,15 @@ function WorkspaceNewRoomPage(props) {
         [props.reports],
     );
 
-    const workspaceOptions = useMemo(() => _.map(PolicyUtils.getActivePolicies(props.policies), (policy) => ({label: policy.name, key: policy.id, value: policy.id})), [props.policies]);
+    const workspaceOptions = useMemo(
+        () =>
+            _.map(PolicyUtils.getActivePolicies(props.policies), (policy) => ({
+                label: policy.name,
+                key: policy.id,
+                value: policy.id,
+            })),
+        [props.policies],
+    );
 
     const writeCapabilityOptions = useMemo(
         () =>
@@ -249,12 +260,16 @@ function WorkspaceNewRoomPage(props) {
                             enabledWhenOffline
                         >
                             <View style={styles.mb5}>
-                                <RoomNameInput
+                                <InputWrapper
+                                    InputComponent={RoomNameInput}
                                     ref={inputCallbackRef}
                                     inputID="roomName"
                                     isFocused={props.isFocused}
                                     shouldDelayFocus
                                     autoFocus
+                                    valueParser={valueParser}
+                                    displayParser={displayParser}
+                                    prefixCharacter={CONST.POLICY.ROOM_PREFIX}
                                 />
                             </View>
                             <View style={styles.mb5}>

From 3c7e77a52ef3672d36d0e0ec89265b3dae0427ff Mon Sep 17 00:00:00 2001
From: Viktoryia Kliushun <vikstash@gmail.com>
Date: Mon, 11 Dec 2023 09:34:45 +0100
Subject: [PATCH 043/113] Updates to follow main branch

---
 src/components/ReportActionItem/TaskAction.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
index 7ce31547d33b..efe7656e38d0 100644
--- a/src/components/ReportActionItem/TaskAction.tsx
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -1,23 +1,20 @@
 import React from 'react';
 import {View} from 'react-native';
 import Text from '@components/Text';
+import * as TaskUtils from '@libs/TaskUtils';
 import useThemeStyles from '@styles/useThemeStyles';
-import * as Task from '@userActions/Task';
 
 type TaskActionProps = {
     /** Name of the reportAction action */
     actionName: string;
-
-    /** The ID of the associated taskReport */
-    taskReportID: string;
 };
 
-function TaskAction({actionName, taskReportID}: TaskActionProps) {
+function TaskAction({actionName}: TaskActionProps) {
     const styles = useThemeStyles();
 
     return (
         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-            <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Task.getTaskReportActionMessage(actionName, taskReportID, false)}</Text>
+            <Text style={[styles.chatItemMessage, styles.colorMuted]}>{TaskUtils.getTaskReportActionMessage(actionName)}</Text>
         </View>
     );
 }

From ca929fb3b06e3eb70d6da1abec92c249e5599360 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 11 Dec 2023 15:53:33 +0700
Subject: [PATCH 044/113] pass iouType to SettlementButton

---
 src/components/AddPaymentMethodMenu.js         | 14 +++++---------
 src/components/KYCWall/BaseKYCWall.js          |  2 ++
 src/components/KYCWall/kycWallPropTypes.js     |  4 ++++
 src/components/MoneyRequestConfirmationList.js |  1 +
 src/components/SettlementButton.js             |  6 ++++++
 5 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/components/AddPaymentMethodMenu.js b/src/components/AddPaymentMethodMenu.js
index 6b6794c46b38..4abe5655e307 100644
--- a/src/components/AddPaymentMethodMenu.js
+++ b/src/components/AddPaymentMethodMenu.js
@@ -7,7 +7,6 @@ import useLocalize from '@hooks/useLocalize';
 import compose from '@libs/compose';
 import * as ReportActionsUtils from '@libs/ReportActionsUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import {iouDefaultProps, iouPropTypes} from '@pages/iou/propTypes';
 import iouReportPropTypes from '@pages/iouReportPropTypes';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -50,8 +49,8 @@ const propTypes = {
         accountID: PropTypes.number,
     }),
 
-    /** Holds data related to Money Request view state, rather than the underlying Money Request data. */
-    iou: iouPropTypes,
+    /** Whether the personal bank account option should be shown */
+    shouldShowPersonalBankAccountOption: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -63,10 +62,10 @@ const defaultProps = {
     },
     anchorRef: () => {},
     session: {},
-    iou: iouDefaultProps,
+    shouldShowPersonalBankAccountOption: false,
 };
 
-function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignment, anchorRef, iouReport, onItemSelected, session, iou}) {
+function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignment, anchorRef, iouReport, onItemSelected, session, shouldShowPersonalBankAccountOption}) {
     const {translate} = useLocalize();
 
     // Users can choose to pay with business bank account in case of Expense reports or in case of P2P IOU report
@@ -75,7 +74,7 @@ function AddPaymentMethodMenu({isVisible, onClose, anchorPosition, anchorAlignme
         ReportUtils.isExpenseReport(iouReport) ||
         (ReportUtils.isIOUReport(iouReport) && !ReportActionsUtils.hasRequestFromCurrentAccount(lodashGet(iouReport, 'reportID', 0), lodashGet(session, 'accountID', 0)));
 
-    const canUsePersonalBankAccount = iou.id === CONST.IOU.TYPE.SEND || ReportUtils.isIOUReport(iouReport);
+    const canUsePersonalBankAccount = shouldShowPersonalBankAccountOption || ReportUtils.isIOUReport(iouReport);
 
     return (
         <PopoverMenu
@@ -129,8 +128,5 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
-        iou: {
-            key: ONYXKEYS.IOU,
-        },
     }),
 )(AddPaymentMethodMenu);
diff --git a/src/components/KYCWall/BaseKYCWall.js b/src/components/KYCWall/BaseKYCWall.js
index e229a860dd9f..fb2acb78d938 100644
--- a/src/components/KYCWall/BaseKYCWall.js
+++ b/src/components/KYCWall/BaseKYCWall.js
@@ -41,6 +41,7 @@ function KYCWall({
     source,
     userWallet,
     walletTerms,
+    shouldShowPersonalBankAccountOption,
 }) {
     const anchorRef = useRef(null);
     const transferBalanceButtonRef = useRef(null);
@@ -212,6 +213,7 @@ function KYCWall({
                     setShouldShowAddPaymentMenu(false);
                     selectPaymentMethod(item);
                 }}
+                shouldShowPersonalBankAccountOption={shouldShowPersonalBankAccountOption}
             />
             {children(continueAction, anchorRef)}
         </>
diff --git a/src/components/KYCWall/kycWallPropTypes.js b/src/components/KYCWall/kycWallPropTypes.js
index 58db2c1c1940..2f14f1e12e11 100644
--- a/src/components/KYCWall/kycWallPropTypes.js
+++ b/src/components/KYCWall/kycWallPropTypes.js
@@ -62,6 +62,9 @@ const propTypes = {
 
     /** Callback for when a payment method has been selected */
     onSelectPaymentMethod: PropTypes.func,
+
+    /** Whether the personal bank account option should be shown */
+    shouldShowPersonalBankAccountOption: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -82,6 +85,7 @@ const defaultProps = {
     },
     shouldIncludeDebitCard: true,
     onSelectPaymentMethod: () => {},
+    shouldShowPersonalBankAccountOption: false,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index 258a15c4c813..16cfaf84d96a 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -517,6 +517,7 @@ function MoneyRequestConfirmationList(props) {
                     horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                     vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
                 }}
+                shouldShowPersonalBankAccountOption={shouldShowSettlementButton}
             />
         ) : (
             <ButtonWithDropdownMenu
diff --git a/src/components/SettlementButton.js b/src/components/SettlementButton.js
index c7342b0d36ac..fd782d949bdd 100644
--- a/src/components/SettlementButton.js
+++ b/src/components/SettlementButton.js
@@ -74,6 +74,9 @@ const propTypes = {
         horizontal: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL)),
         vertical: PropTypes.oneOf(_.values(CONST.MODAL.ANCHOR_ORIGIN_VERTICAL)),
     }),
+
+    /** Whether the personal bank account option should be shown */
+    shouldShowPersonalBankAccountOption: PropTypes.bool,
 };
 
 const defaultProps = {
@@ -101,6 +104,7 @@ const defaultProps = {
         horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT, // caret for dropdown is at right, so horizontal anchor is at RIGHT
         vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP, // we assume that popover menu opens below the button, anchor is at TOP
     },
+    shouldShowPersonalBankAccountOption: false,
 };
 
 function SettlementButton({
@@ -121,6 +125,7 @@ function SettlementButton({
     pressOnEnter,
     policyID,
     style,
+    shouldShowPersonalBankAccountOption,
 }) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
@@ -190,6 +195,7 @@ function SettlementButton({
             chatReportID={chatReportID}
             iouReport={iouReport}
             anchorAlignment={kycWallAnchorAlignment}
+            shouldShowPersonalBankAccountOption={shouldShowPersonalBankAccountOption}
         >
             {(triggerKYCFlow, buttonRef) => (
                 <ButtonWithDropdownMenu

From 452a6e880c1e822e44aed76c275ddee10efbd7d8 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Mon, 11 Dec 2023 16:13:09 +0700
Subject: [PATCH 045/113] refactor component

---
 src/pages/workspace/WorkspaceNewRoomPage.js | 122 ++++++++++----------
 1 file changed, 63 insertions(+), 59 deletions(-)

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index be4d3093fba2..842dfd3e2f03 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -219,6 +219,68 @@ function WorkspaceNewRoomPage(props) {
 
     const {inputCallbackRef} = useAutoFocusInput();
 
+    const newRoomForm = (
+        <Form
+            formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
+            submitButtonText={translate('newRoomPage.createRoom')}
+            style={[styles.mh5, styles.flexGrow1]}
+            validate={validate}
+            onSubmit={submit}
+            enabledWhenOffline
+        >
+            <View style={styles.mb5}>
+                <RoomNameInput
+                    ref={inputCallbackRef}
+                    inputID="roomName"
+                    isFocused={props.isFocused}
+                    shouldDelayFocus
+                    autoFocus
+                />
+            </View>
+            <View style={styles.mb5}>
+                <TextInput
+                    inputID="welcomeMessage"
+                    label={translate('welcomeMessagePage.welcomeMessageOptional')}
+                    accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
+                    role={CONST.ACCESSIBILITY_ROLE.TEXT}
+                    autoGrowHeight
+                    maxLength={CONST.MAX_COMMENT_LENGTH}
+                    autoCapitalize="none"
+                    containerStyles={[styles.autoGrowHeightMultilineInput]}
+                />
+            </View>
+            <View style={[styles.mhn5]}>
+                <ValuePicker
+                    inputID="policyID"
+                    label={translate('workspace.common.workspace')}
+                    items={workspaceOptions}
+                    onValueChange={setPolicyID}
+                />
+            </View>
+            {isPolicyAdmin && (
+                <View style={styles.mhn5}>
+                    <ValuePicker
+                        inputID="writeCapability"
+                        label={translate('writeCapabilityPage.label')}
+                        items={writeCapabilityOptions}
+                        value={writeCapability}
+                        onValueChange={setWriteCapability}
+                    />
+                </View>
+            )}
+            <View style={[styles.mb1, styles.mhn5]}>
+                <ValuePicker
+                    inputID="visibility"
+                    label={translate('newRoomPage.visibility')}
+                    items={visibilityOptions}
+                    onValueChange={setVisibility}
+                    value={visibility}
+                />
+            </View>
+            <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
+        </Form>
+    );
+
     return (
         <FullPageNotFoundView shouldShow={!Permissions.canUsePolicyRooms(props.betas)}>
             <ScreenWrapper
@@ -238,65 +300,7 @@ function WorkspaceNewRoomPage(props) {
                             // This is because when wrapping whole screen the screen was freezing when changing Tabs.
                             keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
                         >
-                            <Form
-                                formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
-                                submitButtonText={translate('newRoomPage.createRoom')}
-                                style={[styles.mh5, styles.flexGrow1]}
-                                validate={validate}
-                                onSubmit={submit}
-                                enabledWhenOffline
-                            >
-                                <View style={styles.mb5}>
-                                    <RoomNameInput
-                                        ref={inputCallbackRef}
-                                        inputID="roomName"
-                                        isFocused={props.isFocused}
-                                        shouldDelayFocus
-                                        autoFocus
-                                    />
-                                </View>
-                                <View style={styles.mb5}>
-                                    <TextInput
-                                        inputID="welcomeMessage"
-                                        label={translate('welcomeMessagePage.welcomeMessageOptional')}
-                                        accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
-                                        role={CONST.ACCESSIBILITY_ROLE.TEXT}
-                                        autoGrowHeight
-                                        maxLength={CONST.MAX_COMMENT_LENGTH}
-                                        autoCapitalize="none"
-                                        containerStyles={[styles.autoGrowHeightMultilineInput]}
-                                    />
-                                </View>
-                                <View style={[styles.mhn5]}>
-                                    <ValuePicker
-                                        inputID="policyID"
-                                        label={translate('workspace.common.workspace')}
-                                        items={workspaceOptions}
-                                        onValueChange={setPolicyID}
-                                    />
-                                </View>
-                                {isPolicyAdmin && (
-                                    <View style={styles.mhn5}>
-                                        <ValuePicker
-                                            inputID="writeCapability"
-                                            label={translate('writeCapabilityPage.label')}
-                                            items={writeCapabilityOptions}
-                                            value={writeCapability}
-                                            onValueChange={setWriteCapability}
-                                        />
-                                    </View>
-                                )}
-                                <View style={[styles.mb1, styles.mhn5]}>
-                                    <ValuePicker
-                                        inputID="visibility"
-                                        label={translate('newRoomPage.visibility')}
-                                        items={visibilityOptions}
-                                        onValueChange={setVisibility}
-                                        value={visibility}
-                                    />
-                                </View>
-                                <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
-                            </Form>
+                            {newRoomForm}
                             {isSmallScreenWidth && <OfflineIndicator />}
                         </KeyboardAvoidingView>
                     ) : (

From b4b6715be777f6be3f8f2615837e0c518f31324d Mon Sep 17 00:00:00 2001
From: Rachael Hopkins <32854888+RachCHopkins@users.noreply.github.com>
Date: Tue, 12 Dec 2023 15:30:44 +1300
Subject: [PATCH 046/113] Update FinancalForce.md

---
 .../accounting-integrations/FinancalForce.md  | 97 +++++++++++++------
 1 file changed, 68 insertions(+), 29 deletions(-)

diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md b/docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md
index 18c78ac7fc10..65361ba1af9a 100644
--- a/docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md
+++ b/docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md
@@ -1,21 +1,21 @@
 ---
-title: Financial Force
-description: Guide to connecting Expensify and FinancialForce FFA and PSA/SRP
+title: Certinia
+description: Guide to connecting Expensify and Certinia FFA and PSA/SRP (formerly known as FinancialForce)
 ---
 # Overview
-[FinancialForce](https://use.expensify.com/financialforce) is a cloud-based software solution that provides a range of financial management and accounting applications built on the Salesforce platform. There are two versions: PSA/SRP and FFA and we support both. 
+[Cetinia](https://use.expensify.com/financialforce) (Formerly known as FinancialForce)is a cloud-based software solution that provides a range of financial management and accounting applications built on the Salesforce platform. There are two versions: PSA/SRP and FFA and we support both. 
 
-# Before connecting to FinancialForce
-Install the Expensify bundle in SalesForce using the relevant installer:
+# Before connecting to Certinia
+Install the Expensify bundle in Certinia using the relevant installer:
 * [PSA/SRP](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t2M000002J0BHD%252Fpackaging%252FinstallPackage.apexp%253Fp0%253D04t2M000002J0BH)
 * [FFA](https://login.salesforce.com/packaging/installPackage.apexp?p0=04t4p000001UQVj)
 
-## Check contact details in FF 
-First, make sure you have a user and contact in FinancialForce that match your main email in Expensify. Then, create contacts for all employees who will be sending expense reports. Ensure that each contact's email matches the one they use in their Expensify account.
+## Check contact details in Certinia 
+First, make sure you have a user and contact in Certinia that match your main email in Expensify. Then, create contacts for all employees who will be sending expense reports. Ensure that each contact's email matches the one they use in their Expensify account.
 
 ## If you use PSA/SRP
 Each report approver needs both a User and a Contact. The user does not need to have a SalesForce license. These can be free chatter users.
-Set permission controls in FinancialForce for your user for each contact/resource. 
+Set permission controls in Certinia for your user for each contact/resource. 
 * Go to Permission Controls
   - Create a new permission control
   - Set yourself (exporter) as the user 
@@ -29,13 +29,13 @@ Set permission controls in FinancialForce for your user for each contact/resourc
   - Go to **Main Menu** > _+ symbol_ > **Expense Type GLA Mappings**
   - Click **New** to add new mappings
 
-# How to connect to FinancialForce
-1. Go to **Settings** > **Policies** > **Groups** > _[Policy Name]_ > **Connections in Expensify**
-2. Click **Create a New FinancialForce Connection**
-3. Log into your FinancialForce account
-4. Expensify and FinancialForce will begin to sync (in Expensify)
+# How to connect to Certinia
+1. Go to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** in Expensify
+2. Click **Create a New Certinia (FinancialForce) Connection**
+3. Log into your Certinia account
+4. Expensify and Certinia will begin to sync (in Expensify)
 
-# How to configure export settings for FinancialForce
+# How to configure export settings for Certinia
 ## Preferred Exporter
 The preferred exporter is the user who will be the main exporter of reports. This person will receive the notifications for errors.
 
@@ -46,9 +46,9 @@ Reports can be exported as Complete or In Progress, using date of last expense,
 Both reimbursable and non-reimbursable reports are exported as payable invoices (FFA) or expense reports (PSA/SRP). If you have both Reimbursable and Non-Reimbursable expenses on a single report, we will create a separate payable invoice/expense report for each type. 
 
 ## Default Vendor (FFA)
-Choose from the full list of vendors from your FinancialForce FFA account, this will be applied to the non-reimbursable payable invoices.
+Choose from the full list of vendors from your Certinia FFA account, this will be applied to the non-reimbursable payable invoices.
 
-# How to Configure coding for Financial Force
+# How to Configure coding for Certinia
 ## Company
 Select which FinancialForce company to import from/export to.
 
@@ -62,8 +62,8 @@ Your Expense Type GLA Mappings are enabled in Expensify to use as categories on
 We import four dimension levels and each has three options to select from:
 
 * Do not map: FinancialForce defaults will apply to the payable invoice, without importing into Expensify
-* Tags: These are shown in the Tag section of your policy, and employees can select them on each expense created
-* Report fields: These will show in the Reports section of your policy. Employees can select one to be applied at the header level i.e. the entire report. 
+* Tags: These are shown in the Tag section of your workspace, and employees can select them on each expense created
+* Report fields: These will show in the Reports section of your workspace. Employees can select one to be applied at the header level i.e. the entire report. 
 
 ## Projects, Assignments, or Projects & Assignments (PSA/SRP)
 These can be imported as tags with **Milestones** being optional. When selecting to import only projects, we will derive the account from the project. If an assignment is selected, we will derive both the account and project from the assignment. 
@@ -71,41 +71,80 @@ These can be imported as tags with **Milestones** being optional. When selecting
 Note: If you are using a project that does not have an assignment, the box **Allow Expenses Without Assignment** must be checked on the project in FinancialForce.
 
 ## Tax
-Import tax rates from FinancialForce to apply to expenses.
+Import tax rates from Certinia to apply to expenses.
 
-# How to configure advanced settings for Financial Force
+# How to configure advanced settings for Certinia
 ## Auto Sync
-Auto Sync in FinancialForce performs daily updates to your coding. Additionally, it automatically exports reports after they receive final approval. For Non-Reimbursable expenses, syncing happens immediately upon final approval of the report. In the case of Reimbursable expenses, syncing occurs as soon as the report is reimbursed or marked as reimbursed.
+Auto Sync in Certinia performs daily updates to your coding. Additionally, it automatically exports reports after they receive final approval. For Non-Reimbursable expenses, syncing happens immediately upon final approval of the report. In the case of Reimbursable expenses, syncing occurs as soon as the report is reimbursed or marked as reimbursed.
 
 ## Export tax as non-billable
 When exporting Billable expenses, this dictates whether you will also bill the tax component to your clients/customers.
 
 # Deep Dive
-## Multi-Currency in FinancialForce PSA/SRP
-When exporting to FinancialForce PSA/SRP you may see up to three different currencies on the expense report in FinancialForce, if employees are submitting expenses in more than one original currency.
+## Multi-Currency in Certinia PSA/SRP
+When exporting to Certinia PSA/SRP you may see up to three different currencies on the expense report in Certinia, if employees are submitting expenses in more than one original currency.
 * Summary Total Reimbursement Amount: this currency is derived from the currency of the project selected on the expense.
-* Amount field on the Expense line: this currency is derived from the Expensify policy default report currency.
+* Amount field on the Expense line: this currency is derived from the Expensify workspace default report currency.
 * Reimbursable Amount on the Expense line: this currency is derived from the currency of the resource with an email matching the report submitter.
 
 # FAQ
-## What happens if the report can’t be exported to FinancialForce?
+## What happens if the report can’t be exported to Certinia?
 * The preferred exporter will receive an email outlining the issue and any specific error messages
 * Any error messages preventing the export from taking place will be recorded in the report’s history
 * The report will be listed in the exporter’s Expensify Inbox as awaiting export.
 
 ## If I enable Auto Sync, what happens to existing approved and reimbursed reports?
-You can activate Auto Sync without worry because it relies on Final Approval to trigger auto-export. Existing Approved reports won't be affected. However, for Approved reports that haven't been exported to FinancialForce, you'll need to either manually export them or mark them as manually entered.
+You can activate Auto Sync without worry because it relies on Final Approval to trigger auto-export. Existing Approved reports won't be affected. However, for Approved reports that haven't been exported to Certinia, you'll need to either manually export them or mark them as manually entered.
 
 ## How do I export tax?
-Tax rates are created in Expensify through the tax tracking feature under **Settings** > **Policies** > **Group** > _[Policy Name]_ > **Tax**. We export the tax amount calculated on the expenses. 
+Tax rates are created in Expensify through the tax tracking feature under **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Tax**. We export the tax amount calculated on the expenses. 
 
-## How do reports map to Payable Invoices in FinancialForce FFA?
+## How do reports map to Payable Invoices in Certinia FFA?
 * Account Name - Account associated with Expensify submitter’s email address
 * Reference 1 - Report URL
 * Invoice Description - Report title
 
-## How do reports map to Expense Reports in FinancialForce PSA/SRP?
+## How do reports map to Expense Reports in Certinia PSA/SRP?
 * Expense report name - Report title
 * Resource - User associated with Expensify submitter’s email address
 * Description - Report URL
 * Approver - Expensify report approver
+
+# Sync and Export Errors
+
+## ExpensiError FF0047: You must have an Ops Edit permission to edit approved records.
+This error indicates that the permission control setup between the connected user and the report submitter or region is missing Ops Edit permission.
+
+In Certinia go to Permission Controls and click the one you need to edit. Make sure that Expense Ops Edit is selected under Permissions.
+
+## ExpensiError FF0076: Could not find employee in Certinia
+Go to Contacts in Certinia and add the report creator/submitter's Expensify email address to their employee record, or create a record with that email listed.
+
+If a record already exists then search for their email address to confirm it is not associated with multiple records.
+
+## ExpensiError FF0089: Expense Reports for this Project require an Assignment
+This error indicates that the project needs to have the permissions adjusted in Certinia
+
+Go to Projects > [project name] > Project Attributes and check Allow Expense Without Assignment. 
+
+## ExpensiError FF0091: Bad Field Name — [field] is invalid for [object]
+This means the field in question is not accessible to the user profile in Certinia for the user whose credentials were used to make the connection within Expensify. 
+
+To correct this:
+* Go to Setup > Build > expand Create > Object within Certinia
+* Then go to Payable Invoice > Custom Fields and Relationships
+* Click View Field Accessibility 
+* Find the employee profile in the list and select Hidden
+* Make sure both checkboxes for Visible are selected
+
+Once this step has been completed, sync the connection within Expensify by going to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** > **Sync Now** and then attempt to export the report again. 
+
+## ExpensiError FF0132: Insufficient access. Make sure you are connecting to Certinia with a user that has the 'Modify All Data' permission
+
+Log into Certinia and go to Setup > Manage Users > Users and find the user whose credentials made the connection. 
+
+* Click on their profile on the far right side of the page
+* Go to System > System Permissions
+* Enable Modify All Data and save
+
+Sync the connection within Expensify by going to **Settings** > **Workspaces** > **Groups** > _[Workspace Name]_ > **Connections** > **Sync Now** and then attempt to export the report again

From d528f408515c89876efd9b0ae561fd06434134c9 Mon Sep 17 00:00:00 2001
From: Rachael Hopkins <32854888+RachCHopkins@users.noreply.github.com>
Date: Tue, 12 Dec 2023 15:35:23 +1300
Subject: [PATCH 047/113] Rename FinancalForce.md to Certinia.md

---
 .../accounting-integrations/{FinancalForce.md => Certinia.md}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename docs/articles/expensify-classic/integrations/accounting-integrations/{FinancalForce.md => Certinia.md} (100%)

diff --git a/docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md b/docs/articles/expensify-classic/integrations/accounting-integrations/Certinia.md
similarity index 100%
rename from docs/articles/expensify-classic/integrations/accounting-integrations/FinancalForce.md
rename to docs/articles/expensify-classic/integrations/accounting-integrations/Certinia.md

From 9f761ea9c5752032090fa015325d7cabe5652e44 Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Tue, 12 Dec 2023 11:06:40 +0700
Subject: [PATCH 048/113] fix user is signed out

---
 .../Profile/Contacts/ContactMethodDetailsPage.js      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index b468607ed8f3..63db06dd2b26 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -21,6 +21,7 @@ import withThemeStyles, {withThemeStylesPropTypes} from '@components/withThemeSt
 import compose from '@libs/compose';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
+import * as Session from '@userActions/Session';
 import * as User from '@userActions/User';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -121,7 +122,15 @@ class ContactMethodDetailsPage extends Component {
     componentDidUpdate(prevProps) {
         const validatedDate = lodashGet(this.props.loginList, [this.getContactMethod(), 'validatedDate']);
         const prevValidatedDate = lodashGet(prevProps.loginList, [this.getContactMethod(), 'validatedDate']);
-
+        const contactMethod = this.getContactMethod();
+        const loginData = lodashGet(this.props.loginList, contactMethod, {});
+        const isDefaultContactMethod = this.props.session.email === loginData.partnerUserID;
+        const isFailedAddContactMethod = Boolean(lodashGet(loginData, 'errorFields.addedLogin'));
+        const shouldSignOut = isDefaultContactMethod && !loginData.validatedDate && !isFailedAddContactMethod;
+        if (shouldSignOut) {    
+            Session.signOutAndRedirectToSignIn();
+            return;
+        }
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
         if (!prevValidatedDate && validatedDate) {

From 615a2d691ed16b23301a0edae286b91d2ea3126b Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Tue, 12 Dec 2023 11:16:01 +0700
Subject: [PATCH 049/113] fix update logic

---
 .../Profile/Contacts/ContactMethodDetailsPage.js    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index 63db06dd2b26..4ff6e712eb73 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -120,20 +120,21 @@ class ContactMethodDetailsPage extends Component {
     }
 
     componentDidUpdate(prevProps) {
-        const validatedDate = lodashGet(this.props.loginList, [this.getContactMethod(), 'validatedDate']);
-        const prevValidatedDate = lodashGet(prevProps.loginList, [this.getContactMethod(), 'validatedDate']);
         const contactMethod = this.getContactMethod();
+        const validatedDate = lodashGet(this.props.loginList, [contactMethod, 'validatedDate']);
+        const prevValidatedDate = lodashGet(prevProps.loginList, [contactMethod, 'validatedDate']);
+
         const loginData = lodashGet(this.props.loginList, contactMethod, {});
         const isDefaultContactMethod = this.props.session.email === loginData.partnerUserID;
         const isFailedAddContactMethod = Boolean(lodashGet(loginData, 'errorFields.addedLogin'));
         const shouldSignOut = isDefaultContactMethod && !loginData.validatedDate && !isFailedAddContactMethod;
-        if (shouldSignOut) {    
-            Session.signOutAndRedirectToSignIn();
-            return;
-        }
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
         if (!prevValidatedDate && validatedDate) {
+            if (shouldSignOut) {
+                Session.signOutAndRedirectToSignIn();
+                return;
+            }
             Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);
         }
     }

From 133f9d2dbd818d1e7c8d73c548ed231211dd7287 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Tue, 12 Dec 2023 16:39:06 +0700
Subject: [PATCH 050/113] reverse view

---
 src/pages/workspace/WorkspaceNewRoomPage.js | 160 ++++++++++----------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 842dfd3e2f03..7983fd663255 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -219,66 +219,24 @@ function WorkspaceNewRoomPage(props) {
 
     const {inputCallbackRef} = useAutoFocusInput();
 
-    const newRoomForm = (
-        <Form
-            formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
-            submitButtonText={translate('newRoomPage.createRoom')}
-            style={[styles.mh5, styles.flexGrow1]}
-            validate={validate}
-            onSubmit={submit}
-            enabledWhenOffline
-        >
-            <View style={styles.mb5}>
-                <RoomNameInput
-                    ref={inputCallbackRef}
-                    inputID="roomName"
-                    isFocused={props.isFocused}
-                    shouldDelayFocus
-                    autoFocus
-                />
-            </View>
-            <View style={styles.mb5}>
-                <TextInput
-                    inputID="welcomeMessage"
-                    label={translate('welcomeMessagePage.welcomeMessageOptional')}
-                    accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
-                    role={CONST.ACCESSIBILITY_ROLE.TEXT}
-                    autoGrowHeight
-                    maxLength={CONST.MAX_COMMENT_LENGTH}
-                    autoCapitalize="none"
-                    containerStyles={[styles.autoGrowHeightMultilineInput]}
-                />
-            </View>
-            <View style={[styles.mhn5]}>
-                <ValuePicker
-                    inputID="policyID"
-                    label={translate('workspace.common.workspace')}
-                    items={workspaceOptions}
-                    onValueChange={setPolicyID}
-                />
-            </View>
-            {isPolicyAdmin && (
-                <View style={styles.mhn5}>
-                    <ValuePicker
-                        inputID="writeCapability"
-                        label={translate('writeCapabilityPage.label')}
-                        items={writeCapabilityOptions}
-                        value={writeCapability}
-                        onValueChange={setWriteCapability}
-                    />
-                </View>
-            )}
-            <View style={[styles.mb1, styles.mhn5]}>
-                <ValuePicker
-                    inputID="visibility"
-                    label={translate('newRoomPage.visibility')}
-                    items={visibilityOptions}
-                    onValueChange={setVisibility}
-                    value={visibility}
-                />
-            </View>
-            <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
-        </Form>
+    const emptyWorkspaceView = (
+        <>
+            <BlockingView
+                icon={Illustrations.ToddBehindCloud}
+                iconWidth={variables.modalTopIconWidth}
+                iconHeight={variables.modalTopIconHeight}
+                title={translate('workspace.emptyWorkspace.notFound')}
+                subtitle={translate('workspace.emptyWorkspace.description')}
+                shouldShowLink={false}
+            />
+            <Button
+                success
+                text={translate('footer.learnMore')}
+                onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}
+                style={[styles.mh5, styles.mb5]}
+            />
+            {isSmallScreenWidth && <OfflineIndicator />}
+        </>
     );
 
     return (
@@ -292,7 +250,9 @@ function WorkspaceNewRoomPage(props) {
                 testID={WorkspaceNewRoomPage.displayName}
             >
                 {({insets}) =>
-                    workspaceOptions.length ? (
+                    workspaceOptions.length === 0 ? (
+                        {emptyWorkspaceView}
+                    ) : (
                         <KeyboardAvoidingView
                             style={styles.h100}
                             behavior="padding"
@@ -300,27 +260,67 @@ function WorkspaceNewRoomPage(props) {
                             // This is because when wrapping whole screen the screen was freezing when changing Tabs.
                             keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
                         >
-                            {newRoomForm}
+                            <Form
+                                formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
+                                submitButtonText={translate('newRoomPage.createRoom')}
+                                style={[styles.mh5, styles.flexGrow1]}
+                                validate={validate}
+                                onSubmit={submit}
+                                enabledWhenOffline
+                            >
+                                <View style={styles.mb5}>
+                                    <RoomNameInput
+                                        ref={inputCallbackRef}
+                                        inputID="roomName"
+                                        isFocused={props.isFocused}
+                                        shouldDelayFocus
+                                        autoFocus
+                                    />
+                                </View>
+                                <View style={styles.mb5}>
+                                    <TextInput
+                                        inputID="welcomeMessage"
+                                        label={translate('welcomeMessagePage.welcomeMessageOptional')}
+                                        accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
+                                        role={CONST.ACCESSIBILITY_ROLE.TEXT}
+                                        autoGrowHeight
+                                        maxLength={CONST.MAX_COMMENT_LENGTH}
+                                        autoCapitalize="none"
+                                        containerStyles={[styles.autoGrowHeightMultilineInput]}
+                                    />
+                                </View>
+                                <View style={[styles.mhn5]}>
+                                    <ValuePicker
+                                        inputID="policyID"
+                                        label={translate('workspace.common.workspace')}
+                                        items={workspaceOptions}
+                                        onValueChange={setPolicyID}
+                                    />
+                                </View>
+                                {isPolicyAdmin && (
+                                    <View style={styles.mhn5}>
+                                        <ValuePicker
+                                            inputID="writeCapability"
+                                            label={translate('writeCapabilityPage.label')}
+                                            items={writeCapabilityOptions}
+                                            value={writeCapability}
+                                            onValueChange={setWriteCapability}
+                                        />
+                                    </View>
+                                )}
+                                <View style={[styles.mb1, styles.mhn5]}>
+                                    <ValuePicker
+                                        inputID="visibility"
+                                        label={translate('newRoomPage.visibility')}
+                                        items={visibilityOptions}
+                                        onValueChange={setVisibility}
+                                        value={visibility}
+                                    />
+                                </View>
+                                <Text style={[styles.textLabel, styles.colorMuted]}>{visibilityDescription}</Text>
+                            </Form>
                             {isSmallScreenWidth && <OfflineIndicator />}
                         </KeyboardAvoidingView>
-                    ) : (
-                        <>
-                            <BlockingView
-                                icon={Illustrations.ToddBehindCloud}
-                                iconWidth={variables.modalTopIconWidth}
-                                iconHeight={variables.modalTopIconHeight}
-                                title={translate('workspace.emptyWorkspace.notFound')}
-                                subtitle={translate('workspace.emptyWorkspace.description')}
-                                shouldShowLink={false}
-                            />
-                            <Button
-                                success
-                                text={translate('footer.learnMore')}
-                                onPress={() => Navigation.navigate(ROUTES.SETTINGS_WORKSPACES)}
-                                style={[styles.mh5, styles.mb5]}
-                            />
-                            {isSmallScreenWidth && <OfflineIndicator />}
-                        </>
                     )
                 }
             </ScreenWrapper>

From c56d3af7e7da4728f40c95d0eaaa21bf96912e37 Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Tue, 12 Dec 2023 16:27:17 +0100
Subject: [PATCH 051/113] Revert RoomNameInput changes

---
 src/components/Form/FormProvider.js           | 32 ++----
 src/components/Form/InputWrapper.js           |  4 -
 src/components/RoomNameInput.js               | 97 -------------------
 src/components/RoomNameInput/index.js         | 86 ++++++++++++++++
 src/components/RoomNameInput/index.native.js  | 68 +++++++++++++
 .../RoomNameInput/roomNameInputPropTypes.js   | 48 +++++++++
 src/pages/settings/Report/RoomNamePage.js     |  7 +-
 src/pages/workspace/WorkspaceNewRoomPage.js   |  5 -
 8 files changed, 212 insertions(+), 135 deletions(-)
 delete mode 100644 src/components/RoomNameInput.js
 create mode 100644 src/components/RoomNameInput/index.js
 create mode 100644 src/components/RoomNameInput/index.native.js
 create mode 100644 src/components/RoomNameInput/roomNameInputPropTypes.js

diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
index 5576c861d96d..ece9390ce443 100644
--- a/src/components/Form/FormProvider.js
+++ b/src/components/Form/FormProvider.js
@@ -229,12 +229,7 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                 inputValues[inputID] = propsToParse.defaultValue;
             } else if (_.isUndefined(inputValues[inputID])) {
                 // We want to initialize the input value if it's undefined
-                const initialValue = _.isUndefined(propsToParse.defaultValue) ? getInitialValueByType(propsToParse.valueType) : propsToParse.defaultValue;
-
-                inputValues[inputID] = _.isFunction(propsToParse.valueParser) ? propsToParse.valueParser(initialValue) : initialValue;
-                if (_.isFunction(propsToParse.displayParser)) {
-                    inputValues[`${inputID}ToDisplay`] = propsToParse.displayParser(initialValue);
-                }
+                inputValues[inputID] = _.isUndefined(propsToParse.defaultValue) ? getInitialValueByType(propsToParse.valueType) : propsToParse.defaultValue;
             }
 
             const errorFields = lodashGet(formState, 'errorFields', {});
@@ -247,8 +242,6 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                     .first()
                     .value() || '';
 
-            const value = !_.isUndefined(inputValues[`${inputID}ToDisplay`]) ? inputValues[`${inputID}ToDisplay`] : inputValues[inputID];
-
             return {
                 ...propsToParse,
                 ref:
@@ -261,8 +254,7 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                 inputID,
                 key: propsToParse.key || inputID,
                 errorText: errors[inputID] || fieldErrorMessage,
-                value,
-                // As the text input is controlled, we never set the defaultValue prop
+                value: inputValues[inputID], // As the text input is controlled, we never set the defaultValue prop
                 // as this is already happening by the value prop.
                 defaultValue: undefined,
                 onTouched: (event) => {
@@ -321,19 +313,13 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                         propsToParse.onBlur(event);
                     }
                 },
-                onInputChange: (inputValue, key) => {
+                onInputChange: (value, key) => {
                     const inputKey = key || inputID;
                     setInputValues((prevState) => {
-                        const newState = _.isFunction(propsToParse.valueParser)
-                            ? {
-                                  ...prevState,
-                                  [inputKey]: propsToParse.valueParser(inputValue),
-                                  [`${inputKey}ToDisplay`]: _.isFunction(propsToParse.displayParser) ? propsToParse.displayParser(inputValue) : inputValue,
-                              }
-                            : {
-                                  ...prevState,
-                                  [inputKey]: inputValue,
-                              };
+                        const newState = {
+                            ...prevState,
+                            [inputKey]: value,
+                        };
 
                         if (shouldValidateOnChange) {
                             onValidate(newState);
@@ -342,11 +328,11 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                     });
 
                     if (propsToParse.shouldSaveDraft) {
-                        FormActions.setDraftValues(formID, {[inputKey]: _.isFunction(propsToParse.valueParser) ? propsToParse.valueParser(inputValue) : inputValue});
+                        FormActions.setDraftValues(formID, {[inputKey]: value});
                     }
 
                     if (_.isFunction(propsToParse.onValueChange)) {
-                        propsToParse.onValueChange(inputValue, inputKey);
+                        propsToParse.onValueChange(value, inputKey);
                     }
                 },
             };
diff --git a/src/components/Form/InputWrapper.js b/src/components/Form/InputWrapper.js
index 11e74d2759b1..9a31210195c4 100644
--- a/src/components/Form/InputWrapper.js
+++ b/src/components/Form/InputWrapper.js
@@ -9,15 +9,11 @@ const propTypes = {
     inputID: PropTypes.string.isRequired,
     valueType: PropTypes.string,
     forwardedRef: refPropTypes,
-    valueParser: PropTypes.func,
-    displayParser: PropTypes.func,
 };
 
 const defaultProps = {
     forwardedRef: undefined,
     valueType: 'string',
-    valueParser: undefined,
-    displayParser: undefined,
 };
 
 function InputWrapper(props) {
diff --git a/src/components/RoomNameInput.js b/src/components/RoomNameInput.js
deleted file mode 100644
index fbc10b306a6e..000000000000
--- a/src/components/RoomNameInput.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import useLocalize from '@hooks/useLocalize';
-import getOperatingSystem from '@libs/getOperatingSystem';
-import CONST from '@src/CONST';
-import refPropTypes from './refPropTypes';
-import TextInput from './TextInput';
-
-const propTypes = {
-    /** Callback to execute when the text input is modified correctly */
-    onChangeText: PropTypes.func,
-
-    /** Room name to show in input field. This should include the '#' already prefixed to the name */
-    value: PropTypes.string,
-
-    /** Whether we should show the input as disabled */
-    disabled: PropTypes.bool,
-
-    /** Error text to show */
-    errorText: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object]))]),
-
-    /** A ref forwarded to the TextInput */
-    forwardedRef: refPropTypes,
-
-    /** The ID used to uniquely identify the input in a Form */
-    inputID: PropTypes.string.isRequired,
-
-    /** Callback that is called when the text input is blurred */
-    onBlur: PropTypes.func,
-
-    /** AutoFocus */
-    autoFocus: PropTypes.bool,
-
-    /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
-    shouldDelayFocus: PropTypes.bool,
-
-    /** Whether navigation is focused */
-    isFocused: PropTypes.bool.isRequired,
-
-    roomName: PropTypes.string,
-};
-
-const defaultProps = {
-    onChangeText: () => {},
-    value: '',
-    disabled: false,
-    errorText: '',
-    forwardedRef: () => {},
-
-    onBlur: () => {},
-    autoFocus: false,
-    shouldDelayFocus: false,
-    roomName: '',
-};
-
-function RoomNameInput({isFocused, autoFocus, disabled, forwardedRef, onBlur, shouldDelayFocus, ...restProps}) {
-    const {translate} = useLocalize();
-
-    const keyboardType = getOperatingSystem() === CONST.OS.IOS ? CONST.KEYBOARD_TYPE.ASCII_CAPABLE : CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD;
-
-    return (
-        <TextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...restProps}
-            ref={forwardedRef}
-            disabled={disabled}
-            label={translate('newRoomPage.roomName')}
-            accessibilityLabel={translate('newRoomPage.roomName')}
-            role={CONST.ACCESSIBILITY_ROLE.TEXT}
-            placeholder={translate('newRoomPage.social')}
-            autoCapitalize="none"
-            onBlur={(event) => isFocused && onBlur(event)}
-            shouldDelayFocus={shouldDelayFocus}
-            autoFocus={isFocused && autoFocus}
-            maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
-            spellCheck={false}
-            shouldInterceptSwipe
-            keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
-        />
-    );
-}
-
-RoomNameInput.propTypes = propTypes;
-RoomNameInput.defaultProps = defaultProps;
-RoomNameInput.displayName = 'RoomNameInput';
-
-const RoomNameInputWithRef = React.forwardRef((props, ref) => (
-    <RoomNameInput
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        forwardedRef={ref}
-    />
-));
-
-RoomNameInputWithRef.displayName = 'RoomNameInputWithRef';
-
-export default RoomNameInputWithRef;
diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
new file mode 100644
index 000000000000..f94637be1e5c
--- /dev/null
+++ b/src/components/RoomNameInput/index.js
@@ -0,0 +1,86 @@
+import React, {useState} from 'react';
+import _ from 'underscore';
+import TextInput from '@components/TextInput';
+import useLocalize from '@hooks/useLocalize';
+import getOperatingSystem from '@libs/getOperatingSystem';
+import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
+import CONST from '@src/CONST';
+import * as roomNameInputPropTypes from './roomNameInputPropTypes';
+
+function RoomNameInput({value, isFocused, autoFocus, disabled, forwardedRef, onBlur, shouldDelayFocus, onChangeText, onInputChange, ...restProps}) {
+    const {translate} = useLocalize();
+
+    const keyboardType = getOperatingSystem() === CONST.OS.IOS ? CONST.KEYBOARD_TYPE.ASCII_CAPABLE : CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD;
+    const [selection, setSelection] = useState();
+
+    /**
+     * Calls the onChangeText callback with a modified room name
+     * @param {Event} event
+     */
+    const setModifiedRoomName = (event) => {
+        const roomName = event.nativeEvent.text;
+        const modifiedRoomName = RoomNameInputUtils.modifyRoomName(roomName);
+        onChangeText(modifiedRoomName);
+
+        // if custom component has onInputChange, use it to trigger changes (Form input)
+        if (_.isFunction(onInputChange)) {
+            onInputChange(modifiedRoomName);
+        }
+
+        // Prevent cursor jump behaviour:
+        // Check if newRoomNameWithHash is the same as modifiedRoomName
+        // If it is then the room name is valid (does not contain unallowed characters); no action required
+        // If not then the room name contains unvalid characters and we must adjust the cursor position manually
+        // Read more: https://github.com/Expensify/App/issues/12741
+        const oldRoomNameWithHash = value || '';
+        const newRoomNameWithHash = `${CONST.POLICY.ROOM_PREFIX}${roomName}`;
+        if (modifiedRoomName !== newRoomNameWithHash) {
+            const offset = modifiedRoomName.length - oldRoomNameWithHash.length;
+            const newSelection = {
+                start: selection.start + offset,
+                end: selection.end + offset,
+            };
+            setSelection(newSelection);
+        }
+    };
+    return (
+        <TextInput
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...restProps}
+            ref={forwardedRef}
+            disabled={disabled}
+            label={translate('newRoomPage.roomName')}
+            accessibilityLabel={translate('newRoomPage.roomName')}
+            role={CONST.ACCESSIBILITY_ROLE.TEXT}
+            placeholder={translate('newRoomPage.social')}
+            autoCapitalize="none"
+            value={value.substring(1)}
+            onChange={setModifiedRoomName}
+            selection={selection}
+            onBlur={(event) => isFocused && onBlur(event)}
+            shouldDelayFocus={shouldDelayFocus}
+            autoFocus={isFocused && autoFocus}
+            maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
+            onSelectionChange={(event) => setSelection(event.nativeEvent.selection)}
+            spellCheck={false}
+            shouldInterceptSwipe
+            keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
+        />
+    );
+}
+
+RoomNameInput.propTypes = roomNameInputPropTypes.propTypes;
+RoomNameInput.defaultProps = roomNameInputPropTypes.defaultProps;
+RoomNameInput.displayName = 'RoomNameInput';
+
+const RoomNameInputWithRef = React.forwardRef((props, ref) => (
+    <RoomNameInput
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));
+
+RoomNameInputWithRef.displayName = 'RoomNameInputWithRef';
+
+export default RoomNameInputWithRef;
diff --git a/src/components/RoomNameInput/index.native.js b/src/components/RoomNameInput/index.native.js
new file mode 100644
index 000000000000..dec176db0a9c
--- /dev/null
+++ b/src/components/RoomNameInput/index.native.js
@@ -0,0 +1,68 @@
+import React from 'react';
+import _ from 'underscore';
+import TextInput from '@components/TextInput';
+import useLocalize from '@hooks/useLocalize';
+import getOperatingSystem from '@libs/getOperatingSystem';
+import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
+import CONST from '@src/CONST';
+import * as roomNameInputPropTypes from './roomNameInputPropTypes';
+
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus, ...restProps}) {
+    const {translate} = useLocalize();
+
+    /**
+     * Calls the onChangeText callback with a modified room name
+     * @param {Event} event
+     */
+    const setModifiedRoomName = (event) => {
+        const roomName = event.nativeEvent.text;
+        const modifiedRoomName = RoomNameInputUtils.modifyRoomName(roomName);
+        onChangeText(modifiedRoomName);
+
+        // if custom component has onInputChange, use it to trigger changes (Form input)
+        if (_.isFunction(onInputChange)) {
+            onInputChange(modifiedRoomName);
+        }
+    };
+
+    const keyboardType = getOperatingSystem() === CONST.OS.IOS ? CONST.KEYBOARD_TYPE.ASCII_CAPABLE : CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD;
+
+    return (
+        <TextInput
+            // eslint-disable-next-line react/jsx-props-no-spreading
+            {...restProps}
+            ref={forwardedRef}
+            disabled={disabled}
+            label={translate('newRoomPage.roomName')}
+            accessibilityLabel={translate('newRoomPage.roomName')}
+            role={CONST.ACCESSIBILITY_ROLE.TEXT}
+            prefixCharacter={CONST.POLICY.ROOM_PREFIX}
+            placeholder={translate('newRoomPage.social')}
+            onChange={setModifiedRoomName}
+            value={value.substring(1)} // Since the room name always starts with a prefix, we omit the first character to avoid displaying it twice.
+            errorText={errorText}
+            maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
+            keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
+            onBlur={(event) => isFocused && onBlur(event)}
+            autoFocus={isFocused && autoFocus}
+            autoCapitalize="none"
+            shouldDelayFocus={shouldDelayFocus}
+        />
+    );
+}
+
+RoomNameInput.propTypes = roomNameInputPropTypes.propTypes;
+RoomNameInput.defaultProps = roomNameInputPropTypes.defaultProps;
+RoomNameInput.displayName = 'RoomNameInput';
+
+const RoomNameInputWithRef = React.forwardRef((props, ref) => (
+    <RoomNameInput
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        forwardedRef={ref}
+    />
+));
+
+RoomNameInputWithRef.displayName = 'RoomNameInputWithRef';
+
+export default RoomNameInputWithRef;
diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
new file mode 100644
index 000000000000..7f8292f0123e
--- /dev/null
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -0,0 +1,48 @@
+import PropTypes from 'prop-types';
+
+const propTypes = {
+    /** Callback to execute when the text input is modified correctly */
+    onChangeText: PropTypes.func,
+
+    /** Room name to show in input field. This should include the '#' already prefixed to the name */
+    value: PropTypes.string,
+
+    /** Whether we should show the input as disabled */
+    disabled: PropTypes.bool,
+
+    /** Error text to show */
+    errorText: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object]))]),
+
+    /** A ref forwarded to the TextInput */
+    forwardedRef: PropTypes.func,
+
+    /** The ID used to uniquely identify the input in a Form */
+    inputID: PropTypes.string,
+
+    /** Callback that is called when the text input is blurred */
+    onBlur: PropTypes.func,
+
+    /** AutoFocus */
+    autoFocus: PropTypes.bool,
+
+    /** Whether we should wait before focusing the TextInput, useful when using transitions on Android */
+    shouldDelayFocus: PropTypes.bool,
+
+    /** Whether navigation is focused */
+    isFocused: PropTypes.bool.isRequired,
+};
+
+const defaultProps = {
+    onChangeText: () => {},
+    value: '',
+    disabled: false,
+    errorText: '',
+    forwardedRef: () => {},
+
+    inputID: undefined,
+    onBlur: () => {},
+    autoFocus: false,
+    shouldDelayFocus: false,
+};
+
+export {propTypes, defaultProps};
diff --git a/src/pages/settings/Report/RoomNamePage.js b/src/pages/settings/Report/RoomNamePage.js
index 7d41d55bf415..f4df6f89cfe7 100644
--- a/src/pages/settings/Report/RoomNamePage.js
+++ b/src/pages/settings/Report/RoomNamePage.js
@@ -49,9 +49,6 @@ function RoomNamePage({policy, report, reports, translate}) {
     const roomNameInputRef = useRef(null);
     const isFocused = useIsFocused();
 
-    const valueParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName);
-    const displayParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName, true);
-
     const validate = useCallback(
         (values) => {
             const errors = {};
@@ -104,10 +101,8 @@ function RoomNamePage({policy, report, reports, translate}) {
                             InputComponent={RoomNameInput}
                             ref={roomNameInputRef}
                             inputID="roomName"
-                            defaultValue={report.reportName.slice(1)}
+                            defaultValue={report.reportName}
                             isFocused={isFocused}
-                            valueParser={valueParser}
-                            displayParser={displayParser}
                             prefixCharacter={CONST.POLICY.ROOM_PREFIX}
                         />
                     </View>
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 4c65ac86c775..b0d4c0b1b53f 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -25,7 +25,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import Permissions from '@libs/Permissions';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import useThemeStyles from '@styles/useThemeStyles';
 import variables from '@styles/variables';
@@ -161,8 +160,6 @@ function WorkspaceNewRoomPage(props) {
         setWriteCapability(CONST.REPORT.WRITE_CAPABILITIES.ALL);
     }, [isPolicyAdmin]);
 
-    const valueParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName);
-    const displayParser = (innerRoomName) => RoomNameInputUtils.modifyRoomName(innerRoomName, true);
     /**
      * @param {Object} values - form input values passed by the Form component
      * @returns {Boolean}
@@ -267,8 +264,6 @@ function WorkspaceNewRoomPage(props) {
                                     isFocused={props.isFocused}
                                     shouldDelayFocus
                                     autoFocus
-                                    valueParser={valueParser}
-                                    displayParser={displayParser}
                                     prefixCharacter={CONST.POLICY.ROOM_PREFIX}
                                 />
                             </View>

From f54b32647f6de50fdfccbd2ac7f93284664826a8 Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Tue, 12 Dec 2023 16:32:29 +0100
Subject: [PATCH 052/113] Cleanup

---
 src/components/Form/FormProvider.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
index ece9390ce443..520d1c65b367 100644
--- a/src/components/Form/FormProvider.js
+++ b/src/components/Form/FormProvider.js
@@ -254,7 +254,8 @@ function FormProvider({validate, formID, shouldValidateOnBlur, shouldValidateOnC
                 inputID,
                 key: propsToParse.key || inputID,
                 errorText: errors[inputID] || fieldErrorMessage,
-                value: inputValues[inputID], // As the text input is controlled, we never set the defaultValue prop
+                value: inputValues[inputID],
+                // As the text input is controlled, we never set the defaultValue prop
                 // as this is already happening by the value prop.
                 defaultValue: undefined,
                 onTouched: (event) => {

From abbca9008b1c8f104d2c0451da3365e94b630b2e Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Tue, 12 Dec 2023 16:39:18 +0100
Subject: [PATCH 053/113] Cleanup

---
 src/components/RoomNameInput/index.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
index f94637be1e5c..0ee74c6b6780 100644
--- a/src/components/RoomNameInput/index.js
+++ b/src/components/RoomNameInput/index.js
@@ -7,10 +7,9 @@ import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import CONST from '@src/CONST';
 import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 
-function RoomNameInput({value, isFocused, autoFocus, disabled, forwardedRef, onBlur, shouldDelayFocus, onChangeText, onInputChange, ...restProps}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus, ...restProps}) {
     const {translate} = useLocalize();
 
-    const keyboardType = getOperatingSystem() === CONST.OS.IOS ? CONST.KEYBOARD_TYPE.ASCII_CAPABLE : CONST.KEYBOARD_TYPE.VISIBLE_PASSWORD;
     const [selection, setSelection] = useState();
 
     /**
@@ -53,18 +52,17 @@ function RoomNameInput({value, isFocused, autoFocus, disabled, forwardedRef, onB
             accessibilityLabel={translate('newRoomPage.roomName')}
             role={CONST.ACCESSIBILITY_ROLE.TEXT}
             placeholder={translate('newRoomPage.social')}
-            autoCapitalize="none"
-            value={value.substring(1)}
             onChange={setModifiedRoomName}
+            value={value.substring(1)} // Since the room name always starts with a prefix, we omit the first character to avoid displaying it twice.
             selection={selection}
+            onSelectionChange={(event) => setSelection(event.nativeEvent.selection)}
+            autoCapitalize="none"
             onBlur={(event) => isFocused && onBlur(event)}
             shouldDelayFocus={shouldDelayFocus}
             autoFocus={isFocused && autoFocus}
             maxLength={CONST.REPORT.MAX_ROOM_NAME_LENGTH}
-            onSelectionChange={(event) => setSelection(event.nativeEvent.selection)}
             spellCheck={false}
             shouldInterceptSwipe
-            keyboardType={keyboardType} // this is a bit hacky solution to a RN issue https://github.com/facebook/react-native/issues/27449
         />
     );
 }

From f0ac1bddc70bd87da7b6d3ac7f2b738003924067 Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Tue, 12 Dec 2023 16:46:54 +0100
Subject: [PATCH 054/113] RoomNameInput cleanup

---
 src/components/RoomNameInput/index.js                  | 5 +++--
 src/components/RoomNameInput/roomNameInputPropTypes.js | 5 +++++
 src/pages/settings/Report/RoomNamePage.js              | 2 --
 src/pages/workspace/WorkspaceNewRoomPage.js            | 1 -
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
index 0ee74c6b6780..1597acab7cd5 100644
--- a/src/components/RoomNameInput/index.js
+++ b/src/components/RoomNameInput/index.js
@@ -2,12 +2,11 @@ import React, {useState} from 'react';
 import _ from 'underscore';
 import TextInput from '@components/TextInput';
 import useLocalize from '@hooks/useLocalize';
-import getOperatingSystem from '@libs/getOperatingSystem';
 import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import CONST from '@src/CONST';
 import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 
-function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus, ...restProps}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus, prefixCharacter, ...restProps}) {
     const {translate} = useLocalize();
 
     const [selection, setSelection] = useState();
@@ -42,6 +41,7 @@ function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef,
             setSelection(newSelection);
         }
     };
+
     return (
         <TextInput
             // eslint-disable-next-line react/jsx-props-no-spreading
@@ -51,6 +51,7 @@ function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef,
             label={translate('newRoomPage.roomName')}
             accessibilityLabel={translate('newRoomPage.roomName')}
             role={CONST.ACCESSIBILITY_ROLE.TEXT}
+            prefixCharacter={prefixCharacter}
             placeholder={translate('newRoomPage.social')}
             onChange={setModifiedRoomName}
             value={value.substring(1)} // Since the room name always starts with a prefix, we omit the first character to avoid displaying it twice.
diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
index 7f8292f0123e..e5c326624563 100644
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -1,4 +1,5 @@
 import PropTypes from 'prop-types';
+import CONST from '@src/CONST';
 
 const propTypes = {
     /** Callback to execute when the text input is modified correctly */
@@ -30,6 +31,9 @@ const propTypes = {
 
     /** Whether navigation is focused */
     isFocused: PropTypes.bool.isRequired,
+
+    /** Prefix character */
+    prefixCharacter: PropTypes.string,
 };
 
 const defaultProps = {
@@ -43,6 +47,7 @@ const defaultProps = {
     onBlur: () => {},
     autoFocus: false,
     shouldDelayFocus: false,
+    prefixCharacter: CONST.POLICY.ROOM_PREFIX,
 };
 
 export {propTypes, defaultProps};
diff --git a/src/pages/settings/Report/RoomNamePage.js b/src/pages/settings/Report/RoomNamePage.js
index f4df6f89cfe7..9ae98cc067cc 100644
--- a/src/pages/settings/Report/RoomNamePage.js
+++ b/src/pages/settings/Report/RoomNamePage.js
@@ -14,7 +14,6 @@ import compose from '@libs/compose';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import * as ReportUtils from '@libs/ReportUtils';
-import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
 import withReportOrNotFound from '@pages/home/report/withReportOrNotFound';
 import reportPropTypes from '@pages/reportPropTypes';
@@ -103,7 +102,6 @@ function RoomNamePage({policy, report, reports, translate}) {
                             inputID="roomName"
                             defaultValue={report.reportName}
                             isFocused={isFocused}
-                            prefixCharacter={CONST.POLICY.ROOM_PREFIX}
                         />
                     </View>
                 </FormProvider>
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index b0d4c0b1b53f..49880cce8048 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -264,7 +264,6 @@ function WorkspaceNewRoomPage(props) {
                                     isFocused={props.isFocused}
                                     shouldDelayFocus
                                     autoFocus
-                                    prefixCharacter={CONST.POLICY.ROOM_PREFIX}
                                 />
                             </View>
                             <View style={styles.mb5}>

From 1ee26db273c181646561de0c2ad528f5d299211a Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 13 Dec 2023 00:44:25 +0800
Subject: [PATCH 055/113] move clean up to Session cleanupSession

---
 src/libs/actions/Session/index.ts  | 33 +++++++++++++++++++++++++++++
 src/libs/actions/SignInRedirect.ts | 34 ------------------------------
 2 files changed, 33 insertions(+), 34 deletions(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 82b51651cacc..82d371e16bed 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -4,14 +4,20 @@ import {ChannelAuthorizationCallback} from 'pusher-js/with-encryption';
 import {Linking} from 'react-native';
 import Onyx, {OnyxUpdate} from 'react-native-onyx';
 import {ValueOf} from 'type-fest';
+import * as PersistedRequests from '@libs/actions/PersistedRequests';
 import * as API from '@libs/API';
 import * as Authentication from '@libs/Authentication';
 import * as ErrorUtils from '@libs/ErrorUtils';
+import HttpUtils from '@libs/HttpUtils';
 import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
+import navigationRef from '@libs/Navigation/navigationRef';
+import * as MainQueue from '@libs/Network/MainQueue';
 import * as NetworkStore from '@libs/Network/NetworkStore';
+import NetworkConnection from '@libs/NetworkConnection';
 import * as Pusher from '@libs/Pusher/pusher';
 import * as ReportUtils from '@libs/ReportUtils';
+import * as SessionUtils from '@libs/SessionUtils';
 import Timers from '@libs/Timers';
 import {hideContextMenu} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import * as Device from '@userActions/Device';
@@ -23,6 +29,7 @@ import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
 import Credentials from '@src/types/onyx/Credentials';
 import {AutoAuthState} from '@src/types/onyx/Session';
 import clearCache from './clearCache';
@@ -583,14 +590,40 @@ function clearSignInData() {
     });
 }
 
+/**
+ * Reset all current params of the Home route
+ */
+function resetHomeRouteParams() {
+    Navigation.isNavigationReady().then(() => {
+        const routes = navigationRef.current?.getState().routes;
+        const homeRoute = routes?.find((route) => route.name === SCREENS.HOME);
+
+        const emptyParams: Record<string, undefined> = {};
+        Object.keys(homeRoute?.params ?? {}).forEach((paramKey) => {
+            emptyParams[paramKey] = undefined;
+        });
+
+        Navigation.setParams(emptyParams, homeRoute?.key ?? '');
+        Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
+    });
+}
+
 /**
  * Put any logic that needs to run when we are signed out here. This can be triggered when the current tab or another tab signs out.
+ * - Cancels pending network calls - any lingering requests are discarded to prevent unwanted storage writes
+ * - Clears all current params of the Home route - the login page URL should not contain any parameter
  */
 function cleanupSession() {
     Pusher.disconnect();
     Timers.clearAll();
     Welcome.resetReadyCheck();
     PriorityMode.resetHasReadRequiredDataFromStorage();
+    MainQueue.clear();
+    HttpUtils.cancelPendingRequests();
+    PersistedRequests.clear();
+    NetworkConnection.clearReconnectionCallbacks();
+    SessionUtils.resetDidUserLogInDuringSession();
+    resetHomeRouteParams();
 }
 
 function clearAccountMessages() {
diff --git a/src/libs/actions/SignInRedirect.ts b/src/libs/actions/SignInRedirect.ts
index 9ca4e6813567..6c9e7f55d887 100644
--- a/src/libs/actions/SignInRedirect.ts
+++ b/src/libs/actions/SignInRedirect.ts
@@ -1,14 +1,6 @@
 import Onyx from 'react-native-onyx';
 import * as ErrorUtils from '@libs/ErrorUtils';
-import HttpUtils from '@libs/HttpUtils';
-import Navigation from '@libs/Navigation/Navigation';
-import navigationRef from '@libs/Navigation/navigationRef';
-import * as MainQueue from '@libs/Network/MainQueue';
-import NetworkConnection from '@libs/NetworkConnection';
-import * as SessionUtils from '@libs/SessionUtils';
 import ONYXKEYS, {OnyxKey} from '@src/ONYXKEYS';
-import SCREENS from '@src/SCREENS';
-import * as PersistedRequests from './PersistedRequests';
 
 let currentIsOffline: boolean | undefined;
 let currentShouldForceOffline: boolean | undefined;
@@ -45,42 +37,16 @@ function clearStorageAndRedirect(errorMessage?: string) {
     });
 }
 
-/**
- * Reset all current params of the Home route
- */
-function resetHomeRouteParams() {
-    Navigation.isNavigationReady().then(() => {
-        const routes = navigationRef.current?.getState().routes;
-        const homeRoute = routes?.find((route) => route.name === SCREENS.HOME);
-
-        const emptyParams: Record<string, undefined> = {};
-        Object.keys(homeRoute?.params ?? {}).forEach((paramKey) => {
-            emptyParams[paramKey] = undefined;
-        });
-
-        Navigation.setParams(emptyParams, homeRoute?.key ?? '');
-        Onyx.set(ONYXKEYS.IS_CHECKING_PUBLIC_ROOM, false);
-    });
-}
-
 /**
  * Cleanup actions resulting in the user being redirected to the Sign-in page
  * - Clears the Onyx store - removing the authToken redirects the user to the Sign-in page
- * - Cancels pending network calls - any lingering requests are discarded to prevent unwanted storage writes
- * - Clears all current params of the Home route - the login page URL should not contain any parameter
  *
  * Normally this method would live in Session.js, but that would cause a circular dependency with Network.js.
  *
  * @param [errorMessage] error message to be displayed on the sign in page
  */
 function redirectToSignIn(errorMessage?: string) {
-    MainQueue.clear();
-    HttpUtils.cancelPendingRequests();
-    PersistedRequests.clear();
-    NetworkConnection.clearReconnectionCallbacks();
     clearStorageAndRedirect(errorMessage);
-    resetHomeRouteParams();
-    SessionUtils.resetDidUserLogInDuringSession();
 }
 
 export default redirectToSignIn;

From 25cce87e0b7ab5bb271ecfd33e534cc6fb1852ae Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 13 Dec 2023 00:44:47 +0800
Subject: [PATCH 056/113] remove immediate clean sign out after close account

---
 src/libs/actions/User.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index 3aa0e9642cdb..9fd2d19f4520 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -69,8 +69,6 @@ function closeAccount(message) {
             ],
         },
     );
-    // Run cleanup actions to prevent reconnection callbacks from blocking logging in again
-    redirectToSignIn();
 }
 
 /**

From 86497f36314e215789c8dd999df32326b6ac056d Mon Sep 17 00:00:00 2001
From: Bernhard Owen Josephus <bernhard.josephus@gmail.com>
Date: Wed, 13 Dec 2023 00:55:01 +0800
Subject: [PATCH 057/113] fix lint

---
 src/libs/actions/User.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
index 9fd2d19f4520..544164d6e36d 100644
--- a/src/libs/actions/User.js
+++ b/src/libs/actions/User.js
@@ -17,7 +17,6 @@ import * as OnyxUpdates from './OnyxUpdates';
 import * as PersonalDetails from './PersonalDetails';
 import * as Report from './Report';
 import * as Session from './Session';
-import redirectToSignIn from './SignInRedirect';
 
 let currentUserAccountID = '';
 let currentEmail = '';

From e486816a2ccde4e425696747ddc5f89b6b8cadf8 Mon Sep 17 00:00:00 2001
From: Viktoryia Kliushun <vikstash@gmail.com>
Date: Wed, 13 Dec 2023 08:56:26 +0100
Subject: [PATCH 058/113] Remove unnecessary taskReportID prop

---
 src/pages/home/report/ReportActionItem.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index e172627d04ef..42d77d565fb0 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -363,12 +363,7 @@ function ReportActionItem(props) {
             props.action.actionName === CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED ||
             props.action.actionName === CONST.REPORT.ACTIONS.TYPE.TASKREOPENED
         ) {
-            children = (
-                <TaskAction
-                    taskReportID={props.action.originalMessage.taskReportID.toString()}
-                    actionName={props.action.actionName}
-                />
-            );
+            children = <TaskAction actionName={props.action.actionName} />;
         } else if (ReportActionsUtils.isCreatedTaskReportAction(props.action)) {
             children = (
                 <ShowContextMenuContext.Provider value={contextValue}>

From 1c63ef7c2dfcaeee1221749725a0bcd3cadaae88 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Wed, 13 Dec 2023 15:25:48 +0700
Subject: [PATCH 059/113] fix crashes app

---
 src/pages/workspace/WorkspaceNewRoomPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 7983fd663255..edd76b2ae5c5 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -251,7 +251,7 @@ function WorkspaceNewRoomPage(props) {
             >
                 {({insets}) =>
                     workspaceOptions.length === 0 ? (
-                        {emptyWorkspaceView}
+                        <>{emptyWorkspaceView}</>
                     ) : (
                         <KeyboardAvoidingView
                             style={styles.h100}

From 885ba8d5ce3f48de18df5ec13103c0b04be880da Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Wed, 13 Dec 2023 11:44:41 +0100
Subject: [PATCH 060/113] Remove unnecessary change

---
 src/components/RoomNameInput/index.js                  | 4 ++--
 src/components/RoomNameInput/roomNameInputPropTypes.js | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
index 1597acab7cd5..5a868714720a 100644
--- a/src/components/RoomNameInput/index.js
+++ b/src/components/RoomNameInput/index.js
@@ -6,7 +6,7 @@ import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import CONST from '@src/CONST';
 import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 
-function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus, prefixCharacter, ...restProps}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus, ...restProps}) {
     const {translate} = useLocalize();
 
     const [selection, setSelection] = useState();
@@ -51,7 +51,7 @@ function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef,
             label={translate('newRoomPage.roomName')}
             accessibilityLabel={translate('newRoomPage.roomName')}
             role={CONST.ACCESSIBILITY_ROLE.TEXT}
-            prefixCharacter={prefixCharacter}
+            prefixCharacter={CONST.POLICY.ROOM_PREFIX}
             placeholder={translate('newRoomPage.social')}
             onChange={setModifiedRoomName}
             value={value.substring(1)} // Since the room name always starts with a prefix, we omit the first character to avoid displaying it twice.
diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
index e5c326624563..732ad358ad16 100644
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -31,9 +31,6 @@ const propTypes = {
 
     /** Whether navigation is focused */
     isFocused: PropTypes.bool.isRequired,
-
-    /** Prefix character */
-    prefixCharacter: PropTypes.string,
 };
 
 const defaultProps = {
@@ -47,7 +44,6 @@ const defaultProps = {
     onBlur: () => {},
     autoFocus: false,
     shouldDelayFocus: false,
-    prefixCharacter: CONST.POLICY.ROOM_PREFIX,
 };
 
 export {propTypes, defaultProps};

From b750a6b43bc0c07096d599e12c2bbbfe9128dc9c Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Wed, 13 Dec 2023 11:46:05 +0100
Subject: [PATCH 061/113] Revert changes in RoomNameInputUtils

---
 src/libs/RoomNameInputUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/RoomNameInputUtils.ts b/src/libs/RoomNameInputUtils.ts
index e6f7d420bf59..cff0bbc30274 100644
--- a/src/libs/RoomNameInputUtils.ts
+++ b/src/libs/RoomNameInputUtils.ts
@@ -3,14 +3,14 @@ import CONST from '@src/CONST';
 /**
  * Replaces spaces with dashes
  */
-function modifyRoomName(roomName: string, skipPolicyPrefix?: boolean): string {
+function modifyRoomName(roomName: string): string {
     const modifiedRoomNameWithoutHash = roomName
         .replace(/ /g, '-')
 
         // Replaces the smart dash on iOS devices with two hyphens
         .replace(/—/g, '--');
 
-    return skipPolicyPrefix ? modifiedRoomNameWithoutHash : `${CONST.POLICY.ROOM_PREFIX}${modifiedRoomNameWithoutHash}`;
+    return `${CONST.POLICY.ROOM_PREFIX}${modifiedRoomNameWithoutHash}`;
 }
 
 export {

From 6e66e3f96bc84b85bfcf9cb365616e00caf50984 Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Wed, 13 Dec 2023 11:46:24 +0100
Subject: [PATCH 062/113] Cleanup

---
 src/components/RoomNameInput/roomNameInputPropTypes.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
index 732ad358ad16..7f8292f0123e 100644
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -1,5 +1,4 @@
 import PropTypes from 'prop-types';
-import CONST from '@src/CONST';
 
 const propTypes = {
     /** Callback to execute when the text input is modified correctly */

From eb1207f34d1d429a10882a049a121e34a0bb9234 Mon Sep 17 00:00:00 2001
From: Amjed Nazzal <74202751+AmjedNazzal@users.noreply.github.com>
Date: Wed, 13 Dec 2023 14:16:32 +0300
Subject: [PATCH 063/113] Fix issue #31789 changed undefined to null

---
 src/libs/actions/Session/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 5bca9fee89c7..160746b90554 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -342,7 +342,7 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
         },
     ];
 
-    // Subsequently, we revert it back to the default value of 'signedInWithShortLivedAuthToken' (undefined) in 'successData' or 'failureData' to ensure the user is logged out on refresh
+    // Subsequently, we revert it back to the default value of 'signedInWithShortLivedAuthToken' in 'successData' or 'failureData' to ensure the user is logged out on refresh
     // We are combining both success and failure data params into one const as they are identical
     const resolutionData: OnyxUpdate[] = [
         {
@@ -356,7 +356,7 @@ function signInWithShortLivedAuthToken(email: string, authToken: string) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: ONYXKEYS.SESSION,
             value: {
-                signedInWithShortLivedAuthToken: undefined,
+                signedInWithShortLivedAuthToken: null,
             },
         },
     ];

From 1f0e812a1fa26bfe8a35a81dea688dc24fb4b118 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Wed, 13 Dec 2023 21:44:34 +0700
Subject: [PATCH 064/113] refactor empty view variable

---
 src/pages/workspace/WorkspaceNewRoomPage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index edd76b2ae5c5..e7efe33b1e69 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -219,7 +219,7 @@ function WorkspaceNewRoomPage(props) {
 
     const {inputCallbackRef} = useAutoFocusInput();
 
-    const emptyWorkspaceView = (
+    const renderEmptyWorkspaceView = () => (
         <>
             <BlockingView
                 icon={Illustrations.ToddBehindCloud}
@@ -251,7 +251,7 @@ function WorkspaceNewRoomPage(props) {
             >
                 {({insets}) =>
                     workspaceOptions.length === 0 ? (
-                        <>{emptyWorkspaceView}</>
+                        renderEmptyWorkspaceView()
                     ) : (
                         <KeyboardAvoidingView
                             style={styles.h100}

From 0ed740301bbfa9464d5958c07fc9ab7b8a36ccb2 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Wed, 13 Dec 2023 15:04:48 +0000
Subject: [PATCH 065/113] fix: upgrade electron-log from 4.4.7 to 4.4.8

Snyk has created this PR to upgrade electron-log from 4.4.7 to 4.4.8.

See this package in npm:
https://www.npmjs.com/package/electron-log

See this project in Snyk:
https://app.snyk.io/org/expensify/project/9535b87d-14b8-434b-873d-3a25a2cba0bc?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 desktop/package-lock.json | 14 +++++++-------
 desktop/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index bfeb58ceec05..dbd9fc8eb017 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -8,7 +8,7 @@
       "license": "MIT",
       "dependencies": {
         "electron-context-menu": "^2.3.0",
-        "electron-log": "^4.4.7",
+        "electron-log": "^4.4.8",
         "electron-serve": "^1.0.0",
         "electron-updater": "^6.1.6",
         "node-machine-id": "^1.1.12"
@@ -140,9 +140,9 @@
       "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
     },
     "node_modules/electron-log": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.7.tgz",
-      "integrity": "sha512-uFZQdgevOp9Fn5lDOrJMU/bmmYxDLZitbIHJM7VXN+cpB59ZnPt1FQL4bOf/Dl2gaIMPYJEfXx38GvJma5iV6A=="
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
+      "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
     },
     "node_modules/electron-serve": {
       "version": "1.1.0",
@@ -525,9 +525,9 @@
       "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
     },
     "electron-log": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.7.tgz",
-      "integrity": "sha512-uFZQdgevOp9Fn5lDOrJMU/bmmYxDLZitbIHJM7VXN+cpB59ZnPt1FQL4bOf/Dl2gaIMPYJEfXx38GvJma5iV6A=="
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
+      "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
     },
     "electron-serve": {
       "version": "1.1.0",
diff --git a/desktop/package.json b/desktop/package.json
index a6b92bde81c4..cde88130184a 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -5,7 +5,7 @@
   "scripts": {},
   "dependencies": {
     "electron-context-menu": "^2.3.0",
-    "electron-log": "^4.4.7",
+    "electron-log": "^4.4.8",
     "electron-serve": "^1.0.0",
     "electron-updater": "^6.1.6",
     "node-machine-id": "^1.1.12"

From 4616660af027bed009c8cb9da790ea0110d93635 Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Wed, 13 Dec 2023 22:37:52 +0700
Subject: [PATCH 066/113] fix shouldSignOut condition

---
 src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index 4ff6e712eb73..ed22f49be54e 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -127,7 +127,7 @@ class ContactMethodDetailsPage extends Component {
         const loginData = lodashGet(this.props.loginList, contactMethod, {});
         const isDefaultContactMethod = this.props.session.email === loginData.partnerUserID;
         const isFailedAddContactMethod = Boolean(lodashGet(loginData, 'errorFields.addedLogin'));
-        const shouldSignOut = isDefaultContactMethod && !loginData.validatedDate && !isFailedAddContactMethod;
+        const shouldSignOut = isDefaultContactMethod && !isFailedAddContactMethod;
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
         if (!prevValidatedDate && validatedDate) {

From e3b72525ee59e217d722696ab88f3bb65b1df10b Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 20:07:14 +0100
Subject: [PATCH 067/113] fix: set global background style

---
 src/Expensify.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Expensify.js b/src/Expensify.js
index 756df5b79b88..37c046640080 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -37,6 +37,8 @@ import Visibility from './libs/Visibility';
 import ONYXKEYS from './ONYXKEYS';
 import PopoverReportActionContextMenu from './pages/home/report/ContextMenu/PopoverReportActionContextMenu';
 import * as ReportActionContextMenu from './pages/home/report/ContextMenu/ReportActionContextMenu';
+import useTheme from './styles/themes/useTheme';
+import useThemePreference from './styles/themes/useThemePreference';
 
 Onyx.registerLogger(({level, message}) => {
     if (level === 'alert') {
@@ -98,6 +100,8 @@ const defaultProps = {
 const SplashScreenHiddenContext = React.createContext({});
 
 function Expensify(props) {
+    const themePreference = useThemePreference();
+    const theme = useTheme();
     const appStateChangeListener = useRef(null);
     const [isNavigationReady, setIsNavigationReady] = useState(false);
     const [isOnyxMigrated, setIsOnyxMigrated] = useState(false);
@@ -202,6 +206,11 @@ function Expensify(props) {
         // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want this effect to run again
     }, []);
 
+    useEffect(() => {
+        const htmlElement = document.getElementsByTagName('html')[0];
+        htmlElement.style.setProperty('background-color', theme.appBG);
+    }, [theme.appBG]);
+
     // Display a blank page until the onyx migration completes
     if (!isOnyxMigrated) {
         return null;

From 119fff0e66e4da40039aecd8de4b4f1f3eacda7e Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 20:34:30 +0100
Subject: [PATCH 068/113] fix: status bar not chaning when changing theme from
 another device

---
 src/components/CustomStatusBar/index.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/CustomStatusBar/index.tsx b/src/components/CustomStatusBar/index.tsx
index 3b5022c60898..0f1c4c1cbfbc 100644
--- a/src/components/CustomStatusBar/index.tsx
+++ b/src/components/CustomStatusBar/index.tsx
@@ -1,4 +1,3 @@
-import {EventListenerCallback, NavigationContainerEventMap} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import React, {useCallback, useContext, useEffect} from 'react';
 import {navigationRef} from '@libs/Navigation/Navigation';
@@ -43,7 +42,7 @@ const CustomStatusBar: CustomStatusBarType = ({isNested = false}) => {
         };
     }, [disableRootStatusBar, isNested]);
 
-    const updateStatusBarStyle = useCallback<EventListenerCallback<NavigationContainerEventMap, 'state'>>(() => {
+    const updateStatusBarStyle = useCallback(() => {
         if (isDisabled) {
             return;
         }
@@ -51,7 +50,10 @@ const CustomStatusBar: CustomStatusBarType = ({isNested = false}) => {
         // Set the status bar colour depending on the current route.
         // If we don't have any colour defined for a route, fall back to
         // appBG color.
-        const currentRoute = navigationRef.getCurrentRoute();
+        let currentRoute: ReturnType<typeof navigationRef.getCurrentRoute> | undefined;
+        if (navigationRef.isReady()) {
+            currentRoute = navigationRef.getCurrentRoute();
+        }
 
         let currentScreenBackgroundColor = theme.appBG;
         let statusBarStyle = theme.statusBarStyle;
@@ -75,8 +77,8 @@ const CustomStatusBar: CustomStatusBarType = ({isNested = false}) => {
             return;
         }
 
-        updateStatusBarAppearance({statusBarStyle: theme.statusBarStyle});
-    }, [isDisabled, theme.statusBarStyle]);
+        updateStatusBarStyle();
+    }, [isDisabled, theme.statusBarStyle, updateStatusBarStyle]);
 
     if (isDisabled) {
         return null;

From b688242e888c17451fd56b8f303b1bbab5baf9f0 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 20:39:48 +0100
Subject: [PATCH 069/113] remove unused import

---
 src/Expensify.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index 37c046640080..1a79e7706e57 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -38,7 +38,6 @@ import ONYXKEYS from './ONYXKEYS';
 import PopoverReportActionContextMenu from './pages/home/report/ContextMenu/PopoverReportActionContextMenu';
 import * as ReportActionContextMenu from './pages/home/report/ContextMenu/ReportActionContextMenu';
 import useTheme from './styles/themes/useTheme';
-import useThemePreference from './styles/themes/useThemePreference';
 
 Onyx.registerLogger(({level, message}) => {
     if (level === 'alert') {
@@ -100,7 +99,6 @@ const defaultProps = {
 const SplashScreenHiddenContext = React.createContext({});
 
 function Expensify(props) {
-    const themePreference = useThemePreference();
     const theme = useTheme();
     const appStateChangeListener = useRef(null);
     const [isNavigationReady, setIsNavigationReady] = useState(false);

From a66319ca3eb3f065c41b1d2748bc2bfc8a169bf4 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Wed, 13 Dec 2023 11:46:21 -0800
Subject: [PATCH 070/113] use || instead of ?? to prevent greyed out icon

---
 src/libs/ReportUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 63037416c923..a29d5b93f4e8 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1211,7 +1211,7 @@ function getDefaultWorkspaceAvatar(workspaceName?: string): React.FC<SvgProps> {
 
 function getWorkspaceAvatar(report: OnyxEntry<Report>): UserUtils.AvatarSource {
     const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]);
-    return allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar ?? getDefaultWorkspaceAvatar(workspaceName);
+    return allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar || getDefaultWorkspaceAvatar(workspaceName);
 }
 
 /**

From 802095e3f2026a9d15dbf587f2e0ae109e64663b Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 21:01:02 +0100
Subject: [PATCH 071/113] fix: global background

---
 src/App.js                                    |  6 ++--
 src/Expensify.js                              |  7 -----
 .../CustomStatusBarContext.tsx                |  0
 .../CustomStatusBarContextProvider.tsx        |  0
 .../index.tsx                                 | 30 +++++++------------
 .../updateGlobalBackgroundColor/index.ts      |  5 ++++
 .../updateGlobalBackgroundColor/index.web.ts  |  8 +++++
 .../updateGlobalBackgroundColor/types.ts      |  5 ++++
 .../index.android.ts                          |  0
 .../updateStatusBarAppearance/index.ios.ts    |  0
 .../updateStatusBarAppearance/index.ts        |  0
 .../updateStatusBarAppearance/types.ts        |  0
 src/pages/signin/SignInPage.js                |  4 +--
 13 files changed, 33 insertions(+), 32 deletions(-)
 rename src/components/{CustomStatusBar => CustomStatusBarAndBackground}/CustomStatusBarContext.tsx (100%)
 rename src/components/{CustomStatusBar => CustomStatusBarAndBackground}/CustomStatusBarContextProvider.tsx (100%)
 rename src/components/{CustomStatusBar => CustomStatusBarAndBackground}/index.tsx (77%)
 create mode 100644 src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.ts
 create mode 100644 src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.web.ts
 create mode 100644 src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/types.ts
 rename src/components/{CustomStatusBar => CustomStatusBarAndBackground}/updateStatusBarAppearance/index.android.ts (100%)
 rename src/components/{CustomStatusBar => CustomStatusBarAndBackground}/updateStatusBarAppearance/index.ios.ts (100%)
 rename src/components/{CustomStatusBar => CustomStatusBarAndBackground}/updateStatusBarAppearance/index.ts (100%)
 rename src/components/{CustomStatusBar => CustomStatusBarAndBackground}/updateStatusBarAppearance/types.ts (100%)

diff --git a/src/App.js b/src/App.js
index e273dcce1e47..b1ed164189f0 100644
--- a/src/App.js
+++ b/src/App.js
@@ -8,8 +8,8 @@ import {SafeAreaProvider} from 'react-native-safe-area-context';
 import '../wdyr';
 import ColorSchemeWrapper from './components/ColorSchemeWrapper';
 import ComposeProviders from './components/ComposeProviders';
-import CustomStatusBar from './components/CustomStatusBar';
-import CustomStatusBarContextProvider from './components/CustomStatusBar/CustomStatusBarContextProvider';
+import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackground';
+import CustomStatusBarContextProvider from './components/CustomStatusBarAndBackground/CustomStatusBarContextProvider';
 import ErrorBoundary from './components/ErrorBoundary';
 import HTMLEngineProvider from './components/HTMLEngineProvider';
 import {LocaleContextProvider} from './components/LocaleContextProvider';
@@ -71,7 +71,7 @@ function App() {
                     CustomStatusBarContextProvider,
                 ]}
             >
-                <CustomStatusBar />
+                <CustomStatusBarAndBackground />
                 <ErrorBoundary errorMessage="NewExpensify crash caught by error boundary">
                     <ColorSchemeWrapper>
                         <Expensify />
diff --git a/src/Expensify.js b/src/Expensify.js
index 1a79e7706e57..756df5b79b88 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -37,7 +37,6 @@ import Visibility from './libs/Visibility';
 import ONYXKEYS from './ONYXKEYS';
 import PopoverReportActionContextMenu from './pages/home/report/ContextMenu/PopoverReportActionContextMenu';
 import * as ReportActionContextMenu from './pages/home/report/ContextMenu/ReportActionContextMenu';
-import useTheme from './styles/themes/useTheme';
 
 Onyx.registerLogger(({level, message}) => {
     if (level === 'alert') {
@@ -99,7 +98,6 @@ const defaultProps = {
 const SplashScreenHiddenContext = React.createContext({});
 
 function Expensify(props) {
-    const theme = useTheme();
     const appStateChangeListener = useRef(null);
     const [isNavigationReady, setIsNavigationReady] = useState(false);
     const [isOnyxMigrated, setIsOnyxMigrated] = useState(false);
@@ -204,11 +202,6 @@ function Expensify(props) {
         // eslint-disable-next-line react-hooks/exhaustive-deps -- we don't want this effect to run again
     }, []);
 
-    useEffect(() => {
-        const htmlElement = document.getElementsByTagName('html')[0];
-        htmlElement.style.setProperty('background-color', theme.appBG);
-    }, [theme.appBG]);
-
     // Display a blank page until the onyx migration completes
     if (!isOnyxMigrated) {
         return null;
diff --git a/src/components/CustomStatusBar/CustomStatusBarContext.tsx b/src/components/CustomStatusBarAndBackground/CustomStatusBarContext.tsx
similarity index 100%
rename from src/components/CustomStatusBar/CustomStatusBarContext.tsx
rename to src/components/CustomStatusBarAndBackground/CustomStatusBarContext.tsx
diff --git a/src/components/CustomStatusBar/CustomStatusBarContextProvider.tsx b/src/components/CustomStatusBarAndBackground/CustomStatusBarContextProvider.tsx
similarity index 100%
rename from src/components/CustomStatusBar/CustomStatusBarContextProvider.tsx
rename to src/components/CustomStatusBarAndBackground/CustomStatusBarContextProvider.tsx
diff --git a/src/components/CustomStatusBar/index.tsx b/src/components/CustomStatusBarAndBackground/index.tsx
similarity index 77%
rename from src/components/CustomStatusBar/index.tsx
rename to src/components/CustomStatusBarAndBackground/index.tsx
index 0f1c4c1cbfbc..81aea2c588e1 100644
--- a/src/components/CustomStatusBar/index.tsx
+++ b/src/components/CustomStatusBarAndBackground/index.tsx
@@ -1,34 +1,25 @@
-import PropTypes from 'prop-types';
 import React, {useCallback, useContext, useEffect} from 'react';
 import {navigationRef} from '@libs/Navigation/Navigation';
 import StatusBar from '@libs/StatusBar';
 import useTheme from '@styles/themes/useTheme';
 import CustomStatusBarContext from './CustomStatusBarContext';
+import updateGlobalBackgroundColor from './updateGlobalBackgroundColor';
 import updateStatusBarAppearance from './updateStatusBarAppearance';
 
-type CustomStatusBarProps = {
+type CustomStatusBarAndBackgroundProps = {
     isNested: boolean;
 };
 
-const propTypes = {
-    /** Whether the CustomStatusBar is nested within another CustomStatusBar.
-     *  A nested CustomStatusBar will disable the "root" CustomStatusBar. */
-    isNested: PropTypes.bool,
-};
-
-type CustomStatusBarType = {
-    (props: CustomStatusBarProps): React.ReactNode;
-    displayName: string;
-    propTypes: typeof propTypes;
-};
-
-// eslint-disable-next-line react/function-component-definition
-const CustomStatusBar: CustomStatusBarType = ({isNested = false}) => {
+function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBackgroundProps) {
     const {isRootStatusBarDisabled, disableRootStatusBar} = useContext(CustomStatusBarContext);
     const theme = useTheme();
 
     const isDisabled = !isNested && isRootStatusBarDisabled;
 
+    useEffect(() => {
+        updateGlobalBackgroundColor(theme);
+    }, [theme]);
+
     useEffect(() => {
         if (isNested) {
             disableRootStatusBar(true);
@@ -85,9 +76,8 @@ const CustomStatusBar: CustomStatusBarType = ({isNested = false}) => {
     }
 
     return <StatusBar />;
-};
+}
 
-CustomStatusBar.displayName = 'CustomStatusBar';
-CustomStatusBar.propTypes = propTypes;
+CustomStatusBarAndBackground.displayName = 'CustomStatusBar';
 
-export default CustomStatusBar;
+export default CustomStatusBarAndBackground;
diff --git a/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.ts b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.ts
new file mode 100644
index 000000000000..dac994ba8597
--- /dev/null
+++ b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.ts
@@ -0,0 +1,5 @@
+import type UpdateGlobalBackgroundColor from './types';
+
+const updateGlobalBackgroundColor: UpdateGlobalBackgroundColor = () => undefined;
+
+export default updateGlobalBackgroundColor;
diff --git a/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.web.ts b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.web.ts
new file mode 100644
index 000000000000..481d866dbe4f
--- /dev/null
+++ b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.web.ts
@@ -0,0 +1,8 @@
+import UpdateGlobalBackgroundColor from './types';
+
+const updateGlobalBackgroundColor: UpdateGlobalBackgroundColor = (theme) => {
+    const htmlElement = document.getElementsByTagName('html')[0];
+    htmlElement.style.setProperty('background-color', theme.appBG);
+};
+
+export default updateGlobalBackgroundColor;
diff --git a/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/types.ts b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/types.ts
new file mode 100644
index 000000000000..5555589c5b75
--- /dev/null
+++ b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/types.ts
@@ -0,0 +1,5 @@
+import {ThemeColors} from '@styles/themes/types';
+
+type UpdateGlobalBackgroundColor = (theme: ThemeColors) => void;
+
+export default UpdateGlobalBackgroundColor;
diff --git a/src/components/CustomStatusBar/updateStatusBarAppearance/index.android.ts b/src/components/CustomStatusBarAndBackground/updateStatusBarAppearance/index.android.ts
similarity index 100%
rename from src/components/CustomStatusBar/updateStatusBarAppearance/index.android.ts
rename to src/components/CustomStatusBarAndBackground/updateStatusBarAppearance/index.android.ts
diff --git a/src/components/CustomStatusBar/updateStatusBarAppearance/index.ios.ts b/src/components/CustomStatusBarAndBackground/updateStatusBarAppearance/index.ios.ts
similarity index 100%
rename from src/components/CustomStatusBar/updateStatusBarAppearance/index.ios.ts
rename to src/components/CustomStatusBarAndBackground/updateStatusBarAppearance/index.ios.ts
diff --git a/src/components/CustomStatusBar/updateStatusBarAppearance/index.ts b/src/components/CustomStatusBarAndBackground/updateStatusBarAppearance/index.ts
similarity index 100%
rename from src/components/CustomStatusBar/updateStatusBarAppearance/index.ts
rename to src/components/CustomStatusBarAndBackground/updateStatusBarAppearance/index.ts
diff --git a/src/components/CustomStatusBar/updateStatusBarAppearance/types.ts b/src/components/CustomStatusBarAndBackground/updateStatusBarAppearance/types.ts
similarity index 100%
rename from src/components/CustomStatusBar/updateStatusBarAppearance/types.ts
rename to src/components/CustomStatusBarAndBackground/updateStatusBarAppearance/types.ts
diff --git a/src/pages/signin/SignInPage.js b/src/pages/signin/SignInPage.js
index dbad6324c922..e6f4367f1af4 100644
--- a/src/pages/signin/SignInPage.js
+++ b/src/pages/signin/SignInPage.js
@@ -5,7 +5,7 @@ import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import ColorSchemeWrapper from '@components/ColorSchemeWrapper';
-import CustomStatusBar from '@components/CustomStatusBar';
+import CustomStatusBarAndBackground from '@components/CustomStatusBarAndBackground';
 import useLocalize from '@hooks/useLocalize';
 import useSafeAreaInsets from '@hooks/useSafeAreaInsets';
 import useWindowDimensions from '@hooks/useWindowDimensions';
@@ -288,7 +288,7 @@ function SignInPage(props) {
         <ThemeProvider theme={CONST.THEME.DARK}>
             <ThemeStylesProvider>
                 <ColorSchemeWrapper>
-                    <CustomStatusBar isNested />
+                    <CustomStatusBarAndBackground isNested />
                     <SignInPageInner
                         // eslint-disable-next-line react/jsx-props-no-spreading
                         {...props}

From 3d8caed4fd485c7e34e9e10a91802f0af4d44588 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 21:03:18 +0100
Subject: [PATCH 072/113] update

---
 src/components/CustomStatusBarAndBackground/index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/CustomStatusBarAndBackground/index.tsx b/src/components/CustomStatusBarAndBackground/index.tsx
index 81aea2c588e1..988d68f519fd 100644
--- a/src/components/CustomStatusBarAndBackground/index.tsx
+++ b/src/components/CustomStatusBarAndBackground/index.tsx
@@ -17,8 +17,12 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
     const isDisabled = !isNested && isRootStatusBarDisabled;
 
     useEffect(() => {
+        if (isDisabled) {
+            return;
+        }
+
         updateGlobalBackgroundColor(theme);
-    }, [theme]);
+    }, [isDisabled, theme]);
 
     useEffect(() => {
         if (isNested) {

From d176479510264249047dda8f3d9e278dd456ca44 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 21:05:12 +0100
Subject: [PATCH 073/113] add comments

---
 .../CustomStatusBarAndBackground/index.tsx    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/components/CustomStatusBarAndBackground/index.tsx b/src/components/CustomStatusBarAndBackground/index.tsx
index 988d68f519fd..cf235fedb53f 100644
--- a/src/components/CustomStatusBarAndBackground/index.tsx
+++ b/src/components/CustomStatusBarAndBackground/index.tsx
@@ -16,14 +16,7 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
 
     const isDisabled = !isNested && isRootStatusBarDisabled;
 
-    useEffect(() => {
-        if (isDisabled) {
-            return;
-        }
-
-        updateGlobalBackgroundColor(theme);
-    }, [isDisabled, theme]);
-
+    // Disable the root status bar when a nested status bar is rendered
     useEffect(() => {
         if (isNested) {
             disableRootStatusBar(true);
@@ -61,12 +54,14 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
         updateStatusBarAppearance({backgroundColor: currentScreenBackgroundColor, statusBarStyle});
     }, [isDisabled, theme.PAGE_THEMES, theme.appBG, theme.statusBarStyle]);
 
+    // Update the status bar style everytime the navigation state changes
     useEffect(() => {
         navigationRef.addListener('state', updateStatusBarStyle);
 
         return () => navigationRef.removeListener('state', updateStatusBarStyle);
     }, [updateStatusBarStyle]);
 
+    // Update the status bar style everytime the theme changes
     useEffect(() => {
         if (isDisabled) {
             return;
@@ -75,6 +70,16 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
         updateStatusBarStyle();
     }, [isDisabled, theme.statusBarStyle, updateStatusBarStyle]);
 
+    // Update the global background (on web) everytime the theme changes.
+    // The background of the html element needs to be updated, otherwise you will see a big contrast when resizing the window or when the keyboard is open on iOS web.
+    useEffect(() => {
+        if (isDisabled) {
+            return;
+        }
+
+        updateGlobalBackgroundColor(theme);
+    }, [isDisabled, theme]);
+
     if (isDisabled) {
         return null;
     }

From 99fb4abc46a3460ba543e2db8e47c4d8504fb678 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Wed, 13 Dec 2023 12:15:48 -0800
Subject: [PATCH 074/113] use linter friendly code

---
 src/libs/ReportUtils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a29d5b93f4e8..cc3392c2c105 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1211,7 +1211,8 @@ function getDefaultWorkspaceAvatar(workspaceName?: string): React.FC<SvgProps> {
 
 function getWorkspaceAvatar(report: OnyxEntry<Report>): UserUtils.AvatarSource {
     const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]);
-    return allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar || getDefaultWorkspaceAvatar(workspaceName);
+    const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar;
+    return avatar ? avatar : getDefaultWorkspaceAvatar(workspaceName);
 }
 
 /**

From c2c707d771c6e57e9fd3bb15be0b88cea7ec42e1 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 21:52:18 +0100
Subject: [PATCH 075/113] fix: import

---
 .../updateGlobalBackgroundColor/types.ts                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/types.ts b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/types.ts
index 5555589c5b75..83bd36a9428a 100644
--- a/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/types.ts
+++ b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/types.ts
@@ -1,4 +1,4 @@
-import {ThemeColors} from '@styles/themes/types';
+import {ThemeColors} from '@styles/theme/types';
 
 type UpdateGlobalBackgroundColor = (theme: ThemeColors) => void;
 

From 6abe0353c5aa2514f6fea9302589a7a12933db99 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 22:27:17 +0100
Subject: [PATCH 076/113] fix: wrong file name

---
 .../{index.web.ts => index.website.ts}                            | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/{index.web.ts => index.website.ts} (100%)

diff --git a/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.web.ts b/src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.website.ts
similarity index 100%
rename from src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.web.ts
rename to src/components/CustomStatusBarAndBackground/updateGlobalBackgroundColor/index.website.ts

From 813d0520077fe6a94ac71c36caa0f27248e36b30 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 22:27:50 +0100
Subject: [PATCH 077/113] fix: status bar flashing

---
 .../CustomStatusBarAndBackground/index.tsx    | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/CustomStatusBarAndBackground/index.tsx b/src/components/CustomStatusBarAndBackground/index.tsx
index 5e1b7faa15c9..2aabd67a79c3 100644
--- a/src/components/CustomStatusBarAndBackground/index.tsx
+++ b/src/components/CustomStatusBarAndBackground/index.tsx
@@ -2,7 +2,7 @@ import React, {useCallback, useContext, useEffect} from 'react';
 import useTheme from '@hooks/useTheme';
 import {navigationRef} from '@libs/Navigation/Navigation';
 import StatusBar from '@libs/StatusBar';
-import CustomStatusBarContext from './CustomStatusBarContext';
+import CustomStatusBarAndBackgroundContext from './CustomStatusBarAndBackgroundContext';
 import updateGlobalBackgroundColor from './updateGlobalBackgroundColor';
 import updateStatusBarAppearance from './updateStatusBarAppearance';
 
@@ -13,8 +13,9 @@ type CustomStatusBarAndBackgroundProps = {
 };
 
 function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBackgroundProps) {
-    const {isRootStatusBarDisabled, disableRootStatusBar} = useContext(CustomStatusBarContext);
+    const {isRootStatusBarDisabled, disableRootStatusBar} = useContext(CustomStatusBarAndBackgroundContext);
     const theme = useTheme();
+    const [statusBarStyle, setStatusBarStyle] = React.useState(theme.statusBarStyle);
 
     const isDisabled = !isNested && isRootStatusBarDisabled;
 
@@ -46,20 +47,25 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
         }
 
         let currentScreenBackgroundColor = theme.appBG;
-        let statusBarStyle = theme.statusBarStyle;
+        let newStatusBarStyle = theme.statusBarStyle;
         if (currentRoute && 'name' in currentRoute && currentRoute.name in theme.PAGE_THEMES) {
             const screenTheme = theme.PAGE_THEMES[currentRoute.name];
             currentScreenBackgroundColor = screenTheme.backgroundColor;
-            statusBarStyle = screenTheme.statusBarStyle;
+            newStatusBarStyle = screenTheme.statusBarStyle;
         }
 
-        updateStatusBarAppearance({backgroundColor: currentScreenBackgroundColor, statusBarStyle});
-    }, [isDisabled, theme.PAGE_THEMES, theme.appBG, theme.statusBarStyle]);
+        // Don't update the status bar style if it's the same as the current one, to prevent flashing.
+        if (newStatusBarStyle === statusBarStyle) {
+            updateStatusBarAppearance({backgroundColor: currentScreenBackgroundColor});
+        } else {
+            updateStatusBarAppearance({backgroundColor: currentScreenBackgroundColor, statusBarStyle: newStatusBarStyle});
+            setStatusBarStyle(newStatusBarStyle);
+        }
+    }, [isDisabled, statusBarStyle, theme.PAGE_THEMES, theme.appBG, theme.statusBarStyle]);
 
     // Update the status bar style everytime the navigation state changes
     useEffect(() => {
         navigationRef.addListener('state', updateStatusBarStyle);
-
         return () => navigationRef.removeListener('state', updateStatusBarStyle);
     }, [updateStatusBarStyle]);
 

From 7c21b91ed733c4b4cc29c5534664e8626678e552 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 22:27:56 +0100
Subject: [PATCH 078/113] rename context

---
 .../CustomStatusBarAndBackgroundContext.tsx     | 11 +++++++++++
 ...tomStatusBarAndBackgroundContextProvider.tsx | 17 +++++++++++++++++
 .../CustomStatusBarContext.tsx                  | 11 -----------
 .../CustomStatusBarContextProvider.tsx          | 17 -----------------
 4 files changed, 28 insertions(+), 28 deletions(-)
 create mode 100644 src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext.tsx
 create mode 100644 src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider.tsx
 delete mode 100644 src/components/CustomStatusBarAndBackground/CustomStatusBarContext.tsx
 delete mode 100644 src/components/CustomStatusBarAndBackground/CustomStatusBarContextProvider.tsx

diff --git a/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext.tsx b/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext.tsx
new file mode 100644
index 000000000000..4a1a1cd2f964
--- /dev/null
+++ b/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext.tsx
@@ -0,0 +1,11 @@
+import {createContext} from 'react';
+
+type CustomStatusBarAndBackgroundContextType = {
+    isRootStatusBarDisabled: boolean;
+    disableRootStatusBar: (isDisabled: boolean) => void;
+};
+
+const CustomStatusBarAndBackgroundContext = createContext<CustomStatusBarAndBackgroundContextType>({isRootStatusBarDisabled: false, disableRootStatusBar: () => undefined});
+
+export default CustomStatusBarAndBackgroundContext;
+export {type CustomStatusBarAndBackgroundContextType};
diff --git a/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider.tsx b/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider.tsx
new file mode 100644
index 000000000000..b4d553b60d0f
--- /dev/null
+++ b/src/components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider.tsx
@@ -0,0 +1,17 @@
+import React, {useMemo, useState} from 'react';
+import CustomStatusBarAndBackgroundContext from './CustomStatusBarAndBackgroundContext';
+
+function CustomStatusBarAndBackgroundContextProvider({children}: React.PropsWithChildren) {
+    const [isRootStatusBarDisabled, disableRootStatusBar] = useState(false);
+    const value = useMemo(
+        () => ({
+            isRootStatusBarDisabled,
+            disableRootStatusBar,
+        }),
+        [isRootStatusBarDisabled],
+    );
+
+    return <CustomStatusBarAndBackgroundContext.Provider value={value}>{children}</CustomStatusBarAndBackgroundContext.Provider>;
+}
+
+export default CustomStatusBarAndBackgroundContextProvider;
diff --git a/src/components/CustomStatusBarAndBackground/CustomStatusBarContext.tsx b/src/components/CustomStatusBarAndBackground/CustomStatusBarContext.tsx
deleted file mode 100644
index b2c317b05c25..000000000000
--- a/src/components/CustomStatusBarAndBackground/CustomStatusBarContext.tsx
+++ /dev/null
@@ -1,11 +0,0 @@
-import {createContext} from 'react';
-
-type CustomStatusBarContextType = {
-    isRootStatusBarDisabled: boolean;
-    disableRootStatusBar: (isDisabled: boolean) => void;
-};
-
-const CustomStatusBarContext = createContext<CustomStatusBarContextType>({isRootStatusBarDisabled: false, disableRootStatusBar: () => undefined});
-
-export default CustomStatusBarContext;
-export {type CustomStatusBarContextType};
diff --git a/src/components/CustomStatusBarAndBackground/CustomStatusBarContextProvider.tsx b/src/components/CustomStatusBarAndBackground/CustomStatusBarContextProvider.tsx
deleted file mode 100644
index 27a5cac5d8cc..000000000000
--- a/src/components/CustomStatusBarAndBackground/CustomStatusBarContextProvider.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, {useMemo, useState} from 'react';
-import CustomStatusBarContext from './CustomStatusBarContext';
-
-function CustomStatusBarContextProvider({children}: React.PropsWithChildren) {
-    const [isRootStatusBarDisabled, disableRootStatusBar] = useState(false);
-    const value = useMemo(
-        () => ({
-            isRootStatusBarDisabled,
-            disableRootStatusBar,
-        }),
-        [isRootStatusBarDisabled],
-    );
-
-    return <CustomStatusBarContext.Provider value={value}>{children}</CustomStatusBarContext.Provider>;
-}
-
-export default CustomStatusBarContextProvider;

From 04234959bf453cb70be65628ecbc6933d08d0028 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Wed, 13 Dec 2023 22:28:02 +0100
Subject: [PATCH 079/113] rename provider

---
 src/App.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App.js b/src/App.js
index b3e7a5bb5fd9..3553900bbc7f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -9,7 +9,7 @@ import '../wdyr';
 import ColorSchemeWrapper from './components/ColorSchemeWrapper';
 import ComposeProviders from './components/ComposeProviders';
 import CustomStatusBarAndBackground from './components/CustomStatusBarAndBackground';
-import CustomStatusBarContextProvider from './components/CustomStatusBarAndBackground/CustomStatusBarContextProvider';
+import CustomStatusBarAndBackgroundContextProvider from './components/CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContextProvider';
 import ErrorBoundary from './components/ErrorBoundary';
 import HTMLEngineProvider from './components/HTMLEngineProvider';
 import {LocaleContextProvider} from './components/LocaleContextProvider';
@@ -68,7 +68,7 @@ function App() {
                     ReportAttachmentsProvider,
                     PickerStateProvider,
                     EnvironmentProvider,
-                    CustomStatusBarContextProvider,
+                    CustomStatusBarAndBackgroundContextProvider,
                 ]}
             >
                 <CustomStatusBarAndBackground />

From 73768c45f98ef039789d8378fe14635181b73dd7 Mon Sep 17 00:00:00 2001
From: Nikki Wines <nikkiwines@expensify.com>
Date: Wed, 13 Dec 2023 13:42:11 -0800
Subject: [PATCH 080/113] more linter

---
 src/libs/ReportUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index cc3392c2c105..8729bb1bf957 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -1211,8 +1211,8 @@ function getDefaultWorkspaceAvatar(workspaceName?: string): React.FC<SvgProps> {
 
 function getWorkspaceAvatar(report: OnyxEntry<Report>): UserUtils.AvatarSource {
     const workspaceName = getPolicyName(report, false, allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]);
-    const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar;
-    return avatar ? avatar : getDefaultWorkspaceAvatar(workspaceName);
+    const avatar = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`]?.avatar ?? '';
+    return !isEmpty(avatar) ? avatar : getDefaultWorkspaceAvatar(workspaceName);
 }
 
 /**

From f73d652784e42b53e7fb634d34e9fba5230c2756 Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Thu, 14 Dec 2023 00:41:28 +0100
Subject: [PATCH 081/113] fix: listeners not removed

---
 .../CustomStatusBarAndBackground/index.tsx    | 79 +++++++++++--------
 1 file changed, 46 insertions(+), 33 deletions(-)

diff --git a/src/components/CustomStatusBarAndBackground/index.tsx b/src/components/CustomStatusBarAndBackground/index.tsx
index 2aabd67a79c3..b84f9c6a6630 100644
--- a/src/components/CustomStatusBarAndBackground/index.tsx
+++ b/src/components/CustomStatusBarAndBackground/index.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useContext, useEffect} from 'react';
+import React, {useCallback, useContext, useEffect, useRef, useState} from 'react';
 import useTheme from '@hooks/useTheme';
 import {navigationRef} from '@libs/Navigation/Navigation';
 import StatusBar from '@libs/StatusBar';
@@ -15,7 +15,7 @@ type CustomStatusBarAndBackgroundProps = {
 function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBackgroundProps) {
     const {isRootStatusBarDisabled, disableRootStatusBar} = useContext(CustomStatusBarAndBackgroundContext);
     const theme = useTheme();
-    const [statusBarStyle, setStatusBarStyle] = React.useState(theme.statusBarStyle);
+    const [statusBarStyle, setStatusBarStyle] = useState(theme.statusBarStyle);
 
     const isDisabled = !isNested && isRootStatusBarDisabled;
 
@@ -33,41 +33,54 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
         };
     }, [disableRootStatusBar, isNested]);
 
-    const updateStatusBarStyle = useCallback(() => {
-        if (isDisabled) {
-            return;
-        }
+    const listenerCount = useRef(0);
+    const updateStatusBarStyle = useCallback(
+        (listenerId?: number) => {
+            // Check if this function is either called through the current navigation listener or the general useEffect which listens for theme changes.
+            if (listenerId !== undefined && listenerId !== listenerCount.current) {
+                return;
+            }
 
-        // Set the status bar colour depending on the current route.
-        // If we don't have any colour defined for a route, fall back to
-        // appBG color.
-        let currentRoute: ReturnType<typeof navigationRef.getCurrentRoute> | undefined;
-        if (navigationRef.isReady()) {
-            currentRoute = navigationRef.getCurrentRoute();
-        }
+            // Set the status bar colour depending on the current route.
+            // If we don't have any colour defined for a route, fall back to
+            // appBG color.
+            let currentRoute: ReturnType<typeof navigationRef.getCurrentRoute> | undefined;
+            if (navigationRef.isReady()) {
+                currentRoute = navigationRef.getCurrentRoute();
+            }
 
-        let currentScreenBackgroundColor = theme.appBG;
-        let newStatusBarStyle = theme.statusBarStyle;
-        if (currentRoute && 'name' in currentRoute && currentRoute.name in theme.PAGE_THEMES) {
-            const screenTheme = theme.PAGE_THEMES[currentRoute.name];
-            currentScreenBackgroundColor = screenTheme.backgroundColor;
-            newStatusBarStyle = screenTheme.statusBarStyle;
-        }
+            let currentScreenBackgroundColor = theme.appBG;
+            let newStatusBarStyle = theme.statusBarStyle;
+            if (currentRoute && 'name' in currentRoute && currentRoute.name in theme.PAGE_THEMES) {
+                const screenTheme = theme.PAGE_THEMES[currentRoute.name];
+                currentScreenBackgroundColor = screenTheme.backgroundColor;
+                newStatusBarStyle = screenTheme.statusBarStyle;
+            }
 
-        // Don't update the status bar style if it's the same as the current one, to prevent flashing.
-        if (newStatusBarStyle === statusBarStyle) {
-            updateStatusBarAppearance({backgroundColor: currentScreenBackgroundColor});
-        } else {
-            updateStatusBarAppearance({backgroundColor: currentScreenBackgroundColor, statusBarStyle: newStatusBarStyle});
-            setStatusBarStyle(newStatusBarStyle);
-        }
-    }, [isDisabled, statusBarStyle, theme.PAGE_THEMES, theme.appBG, theme.statusBarStyle]);
+            // Don't update the status bar style if it's the same as the current one, to prevent flashing.
+            if (newStatusBarStyle === statusBarStyle) {
+                updateStatusBarAppearance({backgroundColor: currentScreenBackgroundColor});
+            } else {
+                updateStatusBarAppearance({backgroundColor: currentScreenBackgroundColor, statusBarStyle: newStatusBarStyle});
+                setStatusBarStyle(newStatusBarStyle);
+            }
+        },
+        [statusBarStyle, theme.PAGE_THEMES, theme.appBG, theme.statusBarStyle],
+    );
 
-    // Update the status bar style everytime the navigation state changes
+    // Add navigation state listeners to update the status bar every time the route changes
+    // We have to pass a count as the listener id, because "react-navigation" somehow doesn't remove listeners properyl
     useEffect(() => {
-        navigationRef.addListener('state', updateStatusBarStyle);
-        return () => navigationRef.removeListener('state', updateStatusBarStyle);
-    }, [updateStatusBarStyle]);
+        if (isDisabled) {
+            return;
+        }
+
+        const listenerId = ++listenerCount.current;
+        const listener = () => updateStatusBarStyle(listenerId);
+
+        navigationRef.addListener('state', listener);
+        return () => navigationRef.removeListener('state', listener);
+    }, [isDisabled, theme.appBG, updateStatusBarStyle]);
 
     // Update the status bar style everytime the theme changes
     useEffect(() => {
@@ -76,7 +89,7 @@ function CustomStatusBarAndBackground({isNested = false}: CustomStatusBarAndBack
         }
 
         updateStatusBarStyle();
-    }, [isDisabled, theme.statusBarStyle, updateStatusBarStyle]);
+    }, [isDisabled, theme, updateStatusBarStyle]);
 
     // Update the global background (on web) everytime the theme changes.
     // The background of the html element needs to be updated, otherwise you will see a big contrast when resizing the window or when the keyboard is open on iOS web.

From 3d2e50fe32c2224414a1e846cf6f1a632d3d91f0 Mon Sep 17 00:00:00 2001
From: Viktoryia Kliushun <vikstash@gmail.com>
Date: Thu, 14 Dec 2023 08:42:25 +0100
Subject: [PATCH 082/113] Update useThemeStyles hook import to follow main
 branch updates

---
 src/components/ReportActionItem/TaskAction.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
index efe7656e38d0..b10be4e86fe8 100644
--- a/src/components/ReportActionItem/TaskAction.tsx
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import {View} from 'react-native';
 import Text from '@components/Text';
+import useThemeStyles from '@hooks/useThemeStyles';
 import * as TaskUtils from '@libs/TaskUtils';
-import useThemeStyles from '@styles/useThemeStyles';
 
 type TaskActionProps = {
     /** Name of the reportAction action */

From eaf6d53e946aef0853fe541aabb41e820b43d9e3 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Thu, 14 Dec 2023 17:13:05 +0700
Subject: [PATCH 083/113] clean code

---
 src/components/MoneyRequestConfirmationList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
index fc0e4e8854b7..fc3e4b095873 100755
--- a/src/components/MoneyRequestConfirmationList.js
+++ b/src/components/MoneyRequestConfirmationList.js
@@ -521,7 +521,7 @@ function MoneyRequestConfirmationList(props) {
                     horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
                     vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
                 }}
-                shouldShowPersonalBankAccountOption={shouldShowSettlementButton}
+                shouldShowPersonalBankAccountOption
             />
         ) : (
             <ButtonWithDropdownMenu

From 6c11d1fa58ce853f13d2487e559c5c3f87f597da Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Thu, 14 Dec 2023 11:27:59 +0100
Subject: [PATCH 084/113] Fix for - Unable to leave public room

---
 src/libs/Permissions.ts    |  2 +-
 src/libs/actions/Report.ts | 44 +++++++++++---------------------------
 2 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 9cde613ebb5a..239d790581ba 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -3,7 +3,7 @@ import CONST from '@src/CONST';
 import Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.ALL);
+    return true;
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index bea4ab8aed77..65c03874bd7b 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2054,29 +2054,21 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
     // If a workspace member is leaving a workspace room, they don't actually lose the room from Onyx.
     // Instead, their notification preference just gets set to "hidden".
     const optimisticData: OnyxUpdate[] = [
-        isWorkspaceMemberLeavingWorkspaceRoom
-            ? {
-                  onyxMethod: Onyx.METHOD.MERGE,
-                  key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-                  value: {
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
+            value: isWorkspaceMemberLeavingWorkspaceRoom
+                ? {
                       notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
-                  },
-              }
-            : {
-                  onyxMethod: Onyx.METHOD.SET,
-                  key: `${ONYXKEYS.COLLECTION.REPORT}${reportID}`,
-                  value: {
-                      reportID,
+                  }
+                : {
+                      reportID: null,
                       stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
                       statusNum: CONST.REPORT.STATUS.CLOSED,
-                      chatType: report.chatType,
-                      parentReportID: report.parentReportID,
-                      parentReportActionID: report.parentReportActionID,
-                      policyID: report.policyID,
-                      type: report.type,
                   },
-              },
+        },
     ];
+
     const successData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -2127,19 +2119,11 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
 
     const inviteeEmails = Object.keys(inviteeEmailsToAccountIDs);
     const inviteeAccountIDs = Object.values(inviteeEmailsToAccountIDs);
+
     const participantAccountIDsAfterInvitation = [...new Set([...(report?.participantAccountIDs ?? []), ...inviteeAccountIDs])].filter(
         (accountID): accountID is number => typeof accountID === 'number',
     );
 
-    type PersonalDetailsOnyxData = {
-        optimisticData: OnyxUpdate[];
-        successData: OnyxUpdate[];
-        failureData: OnyxUpdate[];
-    };
-
-    const logins = inviteeEmails.map((memberLogin) => OptionsListUtils.addSMSDomainIfPhoneNumber(memberLogin));
-    const newPersonalDetailsOnyxData = PersonalDetailsUtils.getNewPersonalDetailsOnyxData(logins, inviteeAccountIDs) as PersonalDetailsOnyxData;
-
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -2148,11 +2132,8 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
                 participantAccountIDs: participantAccountIDsAfterInvitation,
             },
         },
-        ...newPersonalDetailsOnyxData.optimisticData,
     ];
 
-    const successData: OnyxUpdate[] = newPersonalDetailsOnyxData.successData;
-
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -2161,7 +2142,6 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
                 participantAccountIDs: report.participantAccountIDs,
             },
         },
-        ...newPersonalDetailsOnyxData.failureData,
     ];
 
     type InviteToRoomParameters = {
@@ -2174,7 +2154,7 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
         inviteeEmails,
     };
 
-    API.write('InviteToRoom', parameters, {optimisticData, successData, failureData});
+    API.write('InviteToRoom', parameters, {optimisticData, failureData});
 }
 
 /** Removes people from a room */

From 2273930ad23b773a1a555447404e7aa1c95f4ee5 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Thu, 14 Dec 2023 11:33:40 +0100
Subject: [PATCH 085/113] Revert some unrelated changes

---
 src/libs/Permissions.ts    |  2 +-
 src/libs/actions/Report.ts | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 239d790581ba..9cde613ebb5a 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -3,7 +3,7 @@ import CONST from '@src/CONST';
 import Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return true;
+    return !!betas?.includes(CONST.BETAS.ALL);
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 65c03874bd7b..0c5d2fd0d746 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2119,11 +2119,19 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
 
     const inviteeEmails = Object.keys(inviteeEmailsToAccountIDs);
     const inviteeAccountIDs = Object.values(inviteeEmailsToAccountIDs);
-
     const participantAccountIDsAfterInvitation = [...new Set([...(report?.participantAccountIDs ?? []), ...inviteeAccountIDs])].filter(
         (accountID): accountID is number => typeof accountID === 'number',
     );
 
+    type PersonalDetailsOnyxData = {
+        optimisticData: OnyxUpdate[];
+        successData: OnyxUpdate[];
+        failureData: OnyxUpdate[];
+    };
+
+    const logins = inviteeEmails.map((memberLogin) => OptionsListUtils.addSMSDomainIfPhoneNumber(memberLogin));
+    const newPersonalDetailsOnyxData = PersonalDetailsUtils.getNewPersonalDetailsOnyxData(logins, inviteeAccountIDs) as PersonalDetailsOnyxData;
+
     const optimisticData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -2132,8 +2140,11 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
                 participantAccountIDs: participantAccountIDsAfterInvitation,
             },
         },
+        ...newPersonalDetailsOnyxData.optimisticData,
     ];
 
+    const successData: OnyxUpdate[] = newPersonalDetailsOnyxData.successData;
+
     const failureData: OnyxUpdate[] = [
         {
             onyxMethod: Onyx.METHOD.MERGE,
@@ -2142,6 +2153,7 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
                 participantAccountIDs: report.participantAccountIDs,
             },
         },
+        ...newPersonalDetailsOnyxData.failureData,
     ];
 
     type InviteToRoomParameters = {
@@ -2154,7 +2166,7 @@ function inviteToRoom(reportID: string, inviteeEmailsToAccountIDs: Record<string
         inviteeEmails,
     };
 
-    API.write('InviteToRoom', parameters, {optimisticData, failureData});
+    API.write('InviteToRoom', parameters, {optimisticData, successData, failureData});
 }
 
 /** Removes people from a room */

From ac358ef08f71c6d77c3464c0ab756047793d0202 Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Thu, 14 Dec 2023 12:06:47 +0100
Subject: [PATCH 086/113] Update notification preference when leaving
 public/private rooms

---
 src/libs/Permissions.ts    | 2 +-
 src/libs/actions/Report.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 9cde613ebb5a..239d790581ba 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -3,7 +3,7 @@ import CONST from '@src/CONST';
 import Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.ALL);
+    return true;
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {
diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts
index 0c5d2fd0d746..9977693896ee 100644
--- a/src/libs/actions/Report.ts
+++ b/src/libs/actions/Report.ts
@@ -2065,6 +2065,7 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
                       reportID: null,
                       stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
                       statusNum: CONST.REPORT.STATUS.CLOSED,
+                      notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
                   },
         },
     ];

From 592c1b2d6ff97c7536905a33da6e018701fa613f Mon Sep 17 00:00:00 2001
From: Blazej Kustra <blazej.kustra@swmansion.com>
Date: Thu, 14 Dec 2023 12:08:18 +0100
Subject: [PATCH 087/113] Remove test code

---
 src/libs/Permissions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 239d790581ba..9cde613ebb5a 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -3,7 +3,7 @@ import CONST from '@src/CONST';
 import Beta from '@src/types/onyx/Beta';
 
 function canUseAllBetas(betas: OnyxEntry<Beta[]>): boolean {
-    return true;
+    return !!betas?.includes(CONST.BETAS.ALL);
 }
 
 function canUseChronos(betas: OnyxEntry<Beta[]>): boolean {

From 06c17359824a3b23f959682e4b98297d9bdb3fb4 Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Thu, 14 Dec 2023 12:26:21 +0100
Subject: [PATCH 088/113] Fix prop types error

---
 src/components/RoomNameInput/roomNameInputPropTypes.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
index 7f8292f0123e..0d7cbb4ab8be 100644
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -1,4 +1,5 @@
 import PropTypes from 'prop-types';
+import refPropTypes from "@components/refPropTypes";
 
 const propTypes = {
     /** Callback to execute when the text input is modified correctly */
@@ -14,7 +15,7 @@ const propTypes = {
     errorText: PropTypes.oneOfType([PropTypes.string, PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.object]))]),
 
     /** A ref forwarded to the TextInput */
-    forwardedRef: PropTypes.func,
+    forwardedRef: refPropTypes,
 
     /** The ID used to uniquely identify the input in a Form */
     inputID: PropTypes.string,

From 8c701f251c2de45c17a3d72867fb284722374eda Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Thu, 14 Dec 2023 12:50:31 +0100
Subject: [PATCH 089/113] Revert changes in RoomNameInputUtils

---
 src/components/RoomNameInput/index.js        | 5 ++---
 src/components/RoomNameInput/index.native.js | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/RoomNameInput/index.js b/src/components/RoomNameInput/index.js
index 5a868714720a..14529d7b594a 100644
--- a/src/components/RoomNameInput/index.js
+++ b/src/components/RoomNameInput/index.js
@@ -6,7 +6,7 @@ import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import CONST from '@src/CONST';
 import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 
-function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus, ...restProps}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
     const {translate} = useLocalize();
 
     const [selection, setSelection] = useState();
@@ -44,8 +44,6 @@ function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef,
 
     return (
         <TextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...restProps}
             ref={forwardedRef}
             disabled={disabled}
             label={translate('newRoomPage.roomName')}
@@ -57,6 +55,7 @@ function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef,
             value={value.substring(1)} // Since the room name always starts with a prefix, we omit the first character to avoid displaying it twice.
             selection={selection}
             onSelectionChange={(event) => setSelection(event.nativeEvent.selection)}
+            errorText={errorText}
             autoCapitalize="none"
             onBlur={(event) => isFocused && onBlur(event)}
             shouldDelayFocus={shouldDelayFocus}
diff --git a/src/components/RoomNameInput/index.native.js b/src/components/RoomNameInput/index.native.js
index dec176db0a9c..a2c09996ad34 100644
--- a/src/components/RoomNameInput/index.native.js
+++ b/src/components/RoomNameInput/index.native.js
@@ -7,7 +7,7 @@ import * as RoomNameInputUtils from '@libs/RoomNameInputUtils';
 import CONST from '@src/CONST';
 import * as roomNameInputPropTypes from './roomNameInputPropTypes';
 
-function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus, ...restProps}) {
+function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef, value, onBlur, onChangeText, onInputChange, shouldDelayFocus}) {
     const {translate} = useLocalize();
 
     /**
@@ -29,8 +29,6 @@ function RoomNameInput({isFocused, autoFocus, disabled, errorText, forwardedRef,
 
     return (
         <TextInput
-            // eslint-disable-next-line react/jsx-props-no-spreading
-            {...restProps}
             ref={forwardedRef}
             disabled={disabled}
             label={translate('newRoomPage.roomName')}

From 5e785e9da1ca23fcfa63fe228f658ecfac68a755 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 14 Dec 2023 12:07:54 +0000
Subject: [PATCH 090/113] Update version to 1.4.12-1

---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 685e9f206eb4..8af6b0bfec8f 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041200
-        versionName "1.4.12-0"
+        versionCode 1001041201
+        versionName "1.4.12-1"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f4ef6d22bea6..5dff6696c82e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.12.0</string>
+	<string>1.4.12.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index c7fb13979540..b771531acb8b 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.12.0</string>
+	<string>1.4.12.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index c03809caece0..be3f042a826b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.12-0",
+  "version": "1.4.12-1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.12-0",
+      "version": "1.4.12-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index c6a9d9fde386..a37e494b3294 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.12-0",
+  "version": "1.4.12-1",
   "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.",

From 207d4ac23598dd10dad0275344d750b62b67a4a3 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 14 Dec 2023 12:09:22 +0000
Subject: [PATCH 091/113] Update version to 1.4.12-2

---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 8af6b0bfec8f..0849b1cf59f9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041201
-        versionName "1.4.12-1"
+        versionCode 1001041202
+        versionName "1.4.12-2"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 5dff6696c82e..1e827cab6935 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.12.1</string>
+	<string>1.4.12.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b771531acb8b..9e489e59474f 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.12.1</string>
+	<string>1.4.12.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index be3f042a826b..c6c12e491cde 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.12-1",
+  "version": "1.4.12-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.12-1",
+      "version": "1.4.12-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index a37e494b3294..dba9988e34e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.12-1",
+  "version": "1.4.12-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.",

From 86d5e8ae62040bbe9901a7e39e0845072a8fa7da Mon Sep 17 00:00:00 2001
From: Christoph Pader <christoph.pader@outlook.com>
Date: Thu, 14 Dec 2023 14:29:38 +0100
Subject: [PATCH 092/113] set keyboard appearance

---
 src/components/RNTextInput.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/RNTextInput.tsx b/src/components/RNTextInput.tsx
index 28555abe3266..ff812e7c799b 100644
--- a/src/components/RNTextInput.tsx
+++ b/src/components/RNTextInput.tsx
@@ -2,16 +2,20 @@ import React, {ForwardedRef} from 'react';
 // eslint-disable-next-line no-restricted-imports
 import {TextInput, TextInputProps} from 'react-native';
 import Animated, {AnimatedProps} from 'react-native-reanimated';
+import useTheme from '@hooks/useTheme';
 
 // Convert the underlying TextInput into an Animated component so that we can take an animated ref and pass it to a worklet
 const AnimatedTextInput = Animated.createAnimatedComponent(TextInput);
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function RNTextInputWithRef(props: TextInputProps, ref: ForwardedRef<React.Component<AnimatedProps<TextInputProps>>>) {
+    const theme = useTheme();
+
     return (
         <AnimatedTextInput
             allowFontScaling={false}
             textBreakStrategy="simple"
+            keyboardAppearance={theme.colorScheme}
             ref={(refHandle) => {
                 if (typeof ref !== 'function') {
                     return;

From 31f79a6d28067acbbb4104bae379eef37f09332e Mon Sep 17 00:00:00 2001
From: Kamil Owczarz <kamil.owczarz@swmansion.com>
Date: Thu, 14 Dec 2023 14:29:18 +0100
Subject: [PATCH 093/113] Lint fix

---
 src/components/Form/FormProvider.js           | 36 +++++++++----------
 .../RoomNameInput/roomNameInputPropTypes.js   |  2 +-
 src/pages/workspace/WorkspaceNewRoomPage.js   |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/components/Form/FormProvider.js b/src/components/Form/FormProvider.js
index 3cff9fe2a3a5..50b24e368fc6 100644
--- a/src/components/Form/FormProvider.js
+++ b/src/components/Form/FormProvider.js
@@ -126,7 +126,7 @@ const FormProvider = forwardRef(
                 }
                 FormActions.setErrorFields(formID, null);
 
-            const validateErrors = validate(trimmedStringValues) || {};
+                const validateErrors = validate(trimmedStringValues) || {};
 
                 // Validate the input for html tags. It should supercede any other error
                 _.each(trimmedStringValues, (inputValue, inputID) => {
@@ -142,27 +142,27 @@ const FormProvider = forwardRef(
                         return;
                     }
 
-                const matchedHtmlTags = inputValue.match(CONST.VALIDATE_FOR_HTML_TAG_REGEX);
-                let isMatch = _.some(CONST.WHITELISTED_TAGS, (r) => r.test(inputValue));
-                // Check for any matches that the original regex (foundHtmlTagIndex) matched
-                if (matchedHtmlTags) {
-                    // Check if any matched inputs does not match in WHITELISTED_TAGS list and return early if needed.
-                    for (let i = 0; i < matchedHtmlTags.length; i++) {
-                        const htmlTag = matchedHtmlTags[i];
-                        isMatch = _.some(CONST.WHITELISTED_TAGS, (r) => r.test(htmlTag));
-                        if (!isMatch) {
-                            break;
+                    const matchedHtmlTags = inputValue.match(CONST.VALIDATE_FOR_HTML_TAG_REGEX);
+                    let isMatch = _.some(CONST.WHITELISTED_TAGS, (r) => r.test(inputValue));
+                    // Check for any matches that the original regex (foundHtmlTagIndex) matched
+                    if (matchedHtmlTags) {
+                        // Check if any matched inputs does not match in WHITELISTED_TAGS list and return early if needed.
+                        for (let i = 0; i < matchedHtmlTags.length; i++) {
+                            const htmlTag = matchedHtmlTags[i];
+                            isMatch = _.some(CONST.WHITELISTED_TAGS, (r) => r.test(htmlTag));
+                            if (!isMatch) {
+                                break;
+                            }
                         }
                     }
-                }
 
-                if (isMatch && leadingSpaceIndex === -1) {
-                    return;
-                }
+                    if (isMatch && leadingSpaceIndex === -1) {
+                        return;
+                    }
 
-                // Add a validation error here because it is a string value that contains HTML characters
-                validateErrors[inputID] = 'common.error.invalidCharacter';
-            });
+                    // Add a validation error here because it is a string value that contains HTML characters
+                    validateErrors[inputID] = 'common.error.invalidCharacter';
+                });
 
                 if (!_.isObject(validateErrors)) {
                     throw new Error('Validate callback must return an empty object or an object with shape {inputID: error}');
diff --git a/src/components/RoomNameInput/roomNameInputPropTypes.js b/src/components/RoomNameInput/roomNameInputPropTypes.js
index 0d7cbb4ab8be..60be8430b056 100644
--- a/src/components/RoomNameInput/roomNameInputPropTypes.js
+++ b/src/components/RoomNameInput/roomNameInputPropTypes.js
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import refPropTypes from "@components/refPropTypes";
+import refPropTypes from '@components/refPropTypes';
 
 const propTypes = {
     /** Callback to execute when the text input is modified correctly */
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index be20bdc4f89e..6f86e871e8ae 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -6,9 +6,9 @@ import _ from 'underscore';
 import BlockingView from '@components/BlockingViews/BlockingView';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import Button from '@components/Button';
-import * as Illustrations from '@components/Icon/Illustrations';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
+import * as Illustrations from '@components/Icon/Illustrations';
 import KeyboardAvoidingView from '@components/KeyboardAvoidingView';
 import OfflineIndicator from '@components/OfflineIndicator';
 import RoomNameInput from '@components/RoomNameInput';

From 3ff0ef4739c986adb0bff5915d0d3aa57614e13f Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Thu, 14 Dec 2023 20:39:52 +0700
Subject: [PATCH 094/113] fix add comment

---
 .../settings/Profile/Contacts/ContactMethodDetailsPage.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index ed22f49be54e..58f8c57360db 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -126,11 +126,12 @@ class ContactMethodDetailsPage extends Component {
 
         const loginData = lodashGet(this.props.loginList, contactMethod, {});
         const isDefaultContactMethod = this.props.session.email === loginData.partnerUserID;
-        const isFailedAddContactMethod = Boolean(lodashGet(loginData, 'errorFields.addedLogin'));
-        const shouldSignOut = isDefaultContactMethod && !isFailedAddContactMethod;
+        const shouldSignOut = isDefaultContactMethod;
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
         if (!prevValidatedDate && validatedDate) {
+            // If the selected contactMethod is the current session.login, the current authToken invalid after the successful magic code verification
+            // So we need to sign out the user and redirect to the sign in page
             if (shouldSignOut) {
                 Session.signOutAndRedirectToSignIn();
                 return;

From 4223aac8541cca8663e6f216f0bdec8717353afb Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Thu, 14 Dec 2023 20:41:34 +0700
Subject: [PATCH 095/113] fix comment

---
 src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index 58f8c57360db..2229e0f4634a 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -130,7 +130,7 @@ class ContactMethodDetailsPage extends Component {
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
         if (!prevValidatedDate && validatedDate) {
-            // If the selected contactMethod is the current session.login, the current authToken invalid after the successful magic code verification
+            // If the selected contactMethod is the current session.login, the current authToken is invalid after the successful magic code verification
             // So we need to sign out the user and redirect to the sign in page
             if (shouldSignOut) {
                 Session.signOutAndRedirectToSignIn();

From 8fb343cdff12e1855f92ae2786d0a083ec527115 Mon Sep 17 00:00:00 2001
From: DylanDylann <141406735+DylanDylann@users.noreply.github.com>
Date: Thu, 14 Dec 2023 20:46:40 +0700
Subject: [PATCH 096/113] fix update comment

Co-authored-by: Olly <ollywilks@googlemail.com>
---
 src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index 2229e0f4634a..403a9ea14a43 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -130,7 +130,7 @@ class ContactMethodDetailsPage extends Component {
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
         if (!prevValidatedDate && validatedDate) {
-            // If the selected contactMethod is the current session.login, the current authToken is invalid after the successful magic code verification
+            // If the selected contactMethod is the current session.login and the account is unvalidated, the current authToken is invalid after the successful magic code verification
             // So we need to sign out the user and redirect to the sign in page
             if (shouldSignOut) {
                 Session.signOutAndRedirectToSignIn();

From a85a5c0792decc1522df37a8919373d49b4f250c Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Thu, 14 Dec 2023 20:52:06 +0700
Subject: [PATCH 097/113] fix refactor comment

---
 .../settings/Profile/Contacts/ContactMethodDetailsPage.js    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index 403a9ea14a43..e1cbf5989a35 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -130,8 +130,9 @@ class ContactMethodDetailsPage extends Component {
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
         if (!prevValidatedDate && validatedDate) {
-            // If the selected contactMethod is the current session.login and the account is unvalidated, the current authToken is invalid after the successful magic code verification
-            // So we need to sign out the user and redirect to the sign in page
+            // If the selected contactMethod is the current session['login'] and the account is unvalidated,
+            // the current authToken is invalid after the successful magic code verification.
+            // So we need to sign out the user and redirect to the sign in page.
             if (shouldSignOut) {
                 Session.signOutAndRedirectToSignIn();
                 return;

From 195376981b1dc806b7c52ce02beb007b7af6905f Mon Sep 17 00:00:00 2001
From: DylanDylann <dylandylan9112@gmail.com>
Date: Thu, 14 Dec 2023 21:10:55 +0700
Subject: [PATCH 098/113] fix remove redundant code

---
 .../settings/Profile/Contacts/ContactMethodDetailsPage.js      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
index e1cbf5989a35..e3aee93a6911 100644
--- a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
+++ b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.js
@@ -126,14 +126,13 @@ class ContactMethodDetailsPage extends Component {
 
         const loginData = lodashGet(this.props.loginList, contactMethod, {});
         const isDefaultContactMethod = this.props.session.email === loginData.partnerUserID;
-        const shouldSignOut = isDefaultContactMethod;
         // Navigate to methods page on successful magic code verification
         // validatedDate property is responsible to decide the status of the magic code verification
         if (!prevValidatedDate && validatedDate) {
             // If the selected contactMethod is the current session['login'] and the account is unvalidated,
             // the current authToken is invalid after the successful magic code verification.
             // So we need to sign out the user and redirect to the sign in page.
-            if (shouldSignOut) {
+            if (isDefaultContactMethod) {
                 Session.signOutAndRedirectToSignIn();
                 return;
             }

From 072efdd0185e1d912844de89127f274442f2fec3 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 14 Dec 2023 15:15:07 +0000
Subject: [PATCH 099/113] Update version to 1.4.13-0

---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 4 ++--
 ios/NewExpensifyTests/Info.plist | 4 ++--
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 0849b1cf59f9..dbc0935e9b76 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041202
-        versionName "1.4.12-2"
+        versionCode 1001041300
+        versionName "1.4.13-0"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 1e827cab6935..a917b6a4499c 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.12</string>
+	<string>1.4.13</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.12.2</string>
+	<string>1.4.13.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 9e489e59474f..b1e7c2a22e26 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.12</string>
+	<string>1.4.13</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.12.2</string>
+	<string>1.4.13.0</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index c6c12e491cde..86c0950a0b12 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.12-2",
+  "version": "1.4.13-0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.12-2",
+      "version": "1.4.13-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index dba9988e34e8..a3dd3776d125 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.12-2",
+  "version": "1.4.13-0",
   "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.",

From 01fad724d357e9fe9d202d33d0a8b59bd2c9d6ce Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Thu, 14 Dec 2023 17:25:59 +0000
Subject: [PATCH 100/113] fix: upgrade electron-log from 4.4.7 to 4.4.8

Snyk has created this PR to upgrade electron-log from 4.4.7 to 4.4.8.

See this package in npm:
https://www.npmjs.com/package/electron-log

See this project in Snyk:
https://app.snyk.io/org/expensify/project/9535b87d-14b8-434b-873d-3a25a2cba0bc?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 desktop/package-lock.json | 14 +++++++-------
 desktop/package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index 39b186beb022..6f62e6a5ba00 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -8,7 +8,7 @@
       "license": "MIT",
       "dependencies": {
         "electron-context-menu": "^2.3.0",
-        "electron-log": "^4.4.7",
+        "electron-log": "^4.4.8",
         "electron-serve": "^1.2.0",
         "electron-updater": "^6.1.6",
         "node-machine-id": "^1.1.12"
@@ -140,9 +140,9 @@
       "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
     },
     "node_modules/electron-log": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.7.tgz",
-      "integrity": "sha512-uFZQdgevOp9Fn5lDOrJMU/bmmYxDLZitbIHJM7VXN+cpB59ZnPt1FQL4bOf/Dl2gaIMPYJEfXx38GvJma5iV6A=="
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
+      "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
     },
     "node_modules/electron-serve": {
       "version": "1.2.0",
@@ -531,9 +531,9 @@
       "integrity": "sha512-R1oD5gMBPS7PVU8gJwH6CtT0e6VSoD0+SzSnYpNm+dBkcijgA+K7VAMHDfnRq/lkKPZArpzplTW6jfiMYosdzw=="
     },
     "electron-log": {
-      "version": "4.4.7",
-      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.7.tgz",
-      "integrity": "sha512-uFZQdgevOp9Fn5lDOrJMU/bmmYxDLZitbIHJM7VXN+cpB59ZnPt1FQL4bOf/Dl2gaIMPYJEfXx38GvJma5iV6A=="
+      "version": "4.4.8",
+      "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-4.4.8.tgz",
+      "integrity": "sha512-QQ4GvrXO+HkgqqEOYbi+DHL7hj5JM+nHi/j+qrN9zeeXVKy8ZABgbu4CnG+BBqDZ2+tbeq9tUC4DZfIWFU5AZA=="
     },
     "electron-serve": {
       "version": "1.2.0",
diff --git a/desktop/package.json b/desktop/package.json
index 7689c18f0dbd..7545e4b57dba 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -5,7 +5,7 @@
   "scripts": {},
   "dependencies": {
     "electron-context-menu": "^2.3.0",
-    "electron-log": "^4.4.7",
+    "electron-log": "^4.4.8",
     "electron-serve": "^1.2.0",
     "electron-updater": "^6.1.6",
     "node-machine-id": "^1.1.12"

From 5592222e4d5272597cca1ebb28efef4349c0cdfb Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 14 Dec 2023 09:39:17 -0800
Subject: [PATCH 101/113] Remove Dark UIUserInterfaceStyle

---
 ios/NewExpensify/Info.plist | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a917b6a4499c..0d479c6aaf6e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -121,7 +121,7 @@
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 	<key>UIUserInterfaceStyle</key>
-	<string>Dark</string>
+	<string>unspecified</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>

From 6c034ce7c1b63f04095df9b2bc5f92f09eee280b Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 14 Dec 2023 09:48:25 -0800
Subject: [PATCH 102/113] Fix StatusPage colors

---
 src/styles/theme/themes/dark.ts  | 2 +-
 src/styles/theme/themes/light.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/styles/theme/themes/dark.ts b/src/styles/theme/themes/dark.ts
index 714802095810..c2fcac6af13e 100644
--- a/src/styles/theme/themes/dark.ts
+++ b/src/styles/theme/themes/dark.ts
@@ -120,7 +120,7 @@ const darkTheme = {
             statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
         [SCREENS.SETTINGS.PROFILE.STATUS]: {
-            backgroundColor: colors.darkAppBackground,
+            backgroundColor: colors.productDark100,
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
         [SCREENS.SETTINGS.ROOT]: {
diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 8d401f7533d7..3390e0dc0f25 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -120,7 +120,7 @@ const lightTheme = {
             statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
         [SCREENS.SETTINGS.PROFILE.STATUS]: {
-            backgroundColor: colors.green700,
+            backgroundColor: colors.productLight100,
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
         [SCREENS.SETTINGS.ROOT]: {

From b8ffa63513ce75081857d8418c949c27bed96e01 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 14 Dec 2023 11:00:58 -0800
Subject: [PATCH 103/113] revert old PR hardcoding dark theme

---
 .../main/java/com/expensify/chat/MainApplication.java    | 4 ----
 ios/NewExpensify/Info.plist                              | 2 --
 react-native.config.js                                   | 9 +++++++++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/com/expensify/chat/MainApplication.java b/android/app/src/main/java/com/expensify/chat/MainApplication.java
index a4f2bc97416d..bc76be739949 100644
--- a/android/app/src/main/java/com/expensify/chat/MainApplication.java
+++ b/android/app/src/main/java/com/expensify/chat/MainApplication.java
@@ -3,7 +3,6 @@
 import android.content.Context;
 import android.database.CursorWindow;
 
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.multidex.MultiDexApplication;
 
 import com.expensify.chat.bootsplash.BootSplashPackage;
@@ -67,9 +66,6 @@ public ReactNativeHost getReactNativeHost() {
   public void onCreate() {
       super.onCreate();
 
-      // Use night (dark) mode so native UI defaults to dark theme.
-      AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-
       SoLoader.init(this, /* native exopackage */ false);
       if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
         // If you opted-in for the New Architecture, we load the native entry point for this app.
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 0d479c6aaf6e..28912b1133ae 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -120,8 +120,6 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
-	<key>UIUserInterfaceStyle</key>
-	<string>unspecified</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
 </dict>
diff --git a/react-native.config.js b/react-native.config.js
index 6d6dd3f5805f..830b3c9f5a17 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -4,4 +4,13 @@ module.exports = {
         android: {},
     },
     assets: ['./assets/fonts/native'],
+    expo: {
+        userInterfaceStyle: "automatic",
+        ios: {
+          userInterfaceStyle: "automatic",
+        },
+        android: {
+          userInterfaceStyle: "automatic",
+        },
+    },
 };

From 43c71bab1037e07b2d0d7251fa5e90f8cd744655 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 14 Dec 2023 11:06:39 -0800
Subject: [PATCH 104/113] prettier

---
 react-native.config.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/react-native.config.js b/react-native.config.js
index 830b3c9f5a17..f279a6a9b412 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -5,12 +5,12 @@ module.exports = {
     },
     assets: ['./assets/fonts/native'],
     expo: {
-        userInterfaceStyle: "automatic",
+        userInterfaceStyle: 'automatic',
         ios: {
-          userInterfaceStyle: "automatic",
+            userInterfaceStyle: 'automatic',
         },
         android: {
-          userInterfaceStyle: "automatic",
+            userInterfaceStyle: 'automatic',
         },
     },
 };

From d8034b743c11ee7a5f170ffe01a76c12dc24d1cb Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 14 Dec 2023 13:15:08 -0800
Subject: [PATCH 105/113] reset react-native.config.js to main

---
 react-native.config.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/react-native.config.js b/react-native.config.js
index f279a6a9b412..6d6dd3f5805f 100644
--- a/react-native.config.js
+++ b/react-native.config.js
@@ -4,13 +4,4 @@ module.exports = {
         android: {},
     },
     assets: ['./assets/fonts/native'],
-    expo: {
-        userInterfaceStyle: 'automatic',
-        ios: {
-            userInterfaceStyle: 'automatic',
-        },
-        android: {
-            userInterfaceStyle: 'automatic',
-        },
-    },
 };

From 9d2ea87f057f843a822f770aeafc7e10a00c13f9 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Thu, 14 Dec 2023 22:18:47 +0000
Subject: [PATCH 106/113] Update version to 1.4.13-1

---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index dbc0935e9b76..202de35d4a13 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041300
-        versionName "1.4.13-0"
+        versionCode 1001041301
+        versionName "1.4.13-1"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 28912b1133ae..7d5c2419e21c 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.13.0</string>
+	<string>1.4.13.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b1e7c2a22e26..b4de143ac440 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.13.0</string>
+	<string>1.4.13.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 86c0950a0b12..665d82a4850a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.13-0",
+  "version": "1.4.13-1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.13-0",
+      "version": "1.4.13-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index a3dd3776d125..e76e1344832d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.13-0",
+  "version": "1.4.13-1",
   "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.",

From 13c433e1370846a1541007e72bfbb438a094592b Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 14 Dec 2023 15:19:03 -0800
Subject: [PATCH 107/113] Fix light theme page keys

---
 src/styles/theme/themes/light.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/styles/theme/themes/light.ts b/src/styles/theme/themes/light.ts
index 3390e0dc0f25..3cd052046f43 100644
--- a/src/styles/theme/themes/light.ts
+++ b/src/styles/theme/themes/light.ts
@@ -112,8 +112,8 @@ const lightTheme = {
             statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
         },
         [SCREENS.SETTINGS.WALLET.ROOT]: {
-            backgroundColor: colors.productDark100,
-            statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
+            backgroundColor: colors.productLight100,
+            statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
         [SCREENS.SETTINGS.SECURITY]: {
             backgroundColor: colors.ice500,
@@ -121,7 +121,7 @@ const lightTheme = {
         },
         [SCREENS.SETTINGS.PROFILE.STATUS]: {
             backgroundColor: colors.productLight100,
-            statusBarStyle: CONST.STATUS_BAR_STYLE.LIGHT_CONTENT,
+            statusBarStyle: CONST.STATUS_BAR_STYLE.DARK_CONTENT,
         },
         [SCREENS.SETTINGS.ROOT]: {
             backgroundColor: colors.productLight200,

From 50fdecca655fc0d73bca192e6b75965fdcd240a1 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 15 Dec 2023 00:19:45 +0000
Subject: [PATCH 108/113] Update version to 1.4.13-2

---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 202de35d4a13..04715cdd6ccf 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041301
-        versionName "1.4.13-1"
+        versionCode 1001041302
+        versionName "1.4.13-2"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 7d5c2419e21c..44ee5a87588f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.13.1</string>
+	<string>1.4.13.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index b4de143ac440..336e924182f1 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.13.1</string>
+	<string>1.4.13.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 665d82a4850a..135d5b21c18a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.13-1",
+  "version": "1.4.13-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.13-1",
+      "version": "1.4.13-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index e76e1344832d..32dacdb4ea6c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.13-1",
+  "version": "1.4.13-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.",

From 1234afe66bd182dad22f2d8ac1ce27045d6a0463 Mon Sep 17 00:00:00 2001
From: Someshwar Tripathi <someshwartripathi8@gmail.com>
Date: Fri, 15 Dec 2023 09:09:20 +0530
Subject: [PATCH 109/113] Fix header text style

---
 src/pages/ReimbursementAccount/ACHContractStep.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReimbursementAccount/ACHContractStep.js b/src/pages/ReimbursementAccount/ACHContractStep.js
index d10d440a0af5..806e438d0397 100644
--- a/src/pages/ReimbursementAccount/ACHContractStep.js
+++ b/src/pages/ReimbursementAccount/ACHContractStep.js
@@ -219,7 +219,7 @@ function ACHContractStep(props) {
                                         key={index}
                                         style={[styles.p5, styles.border, styles.mb2]}
                                     >
-                                        <Text style={[styles.textStrong, styles.mb2, styles.textWhite]}>{props.translate('beneficialOwnersStep.additionalOwner')}</Text>
+                                        <Text style={[styles.headerText, styles.mb2]}>{props.translate('beneficialOwnersStep.additionalOwner')}</Text>
                                         <IdentityForm
                                             translate={props.translate}
                                             style={[styles.mb2]}

From 67b547b91701dfe80fab1a2891de612dcc9b0fd3 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 15 Dec 2023 09:24:47 +0530
Subject: [PATCH 110/113] whitelisted budget notification action

---
 src/CONST.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/CONST.ts b/src/CONST.ts
index f67e195b73f5..6be443a3f50e 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -533,11 +533,13 @@ const CONST = {
                     DELETE_TAG: 'POLICYCHANGELOG_DELETE_TAG',
                     IMPORT_CUSTOM_UNIT_RATES: 'POLICYCHANGELOG_IMPORT_CUSTOM_UNIT_RATES',
                     IMPORT_TAGS: 'POLICYCHANGELOG_IMPORT_TAGS',
+                    INDIVIDUAL_BUDGET_NOTIFICATION: 'INDIVIDUAL_BUDGET_NOTIFICATION',
                     INVITE_TO_ROOM: 'POLICYCHANGELOG_INVITETOROOM',
                     REMOVE_FROM_ROOM: 'POLICYCHANGELOG_REMOVEFROMROOM',
                     SET_AUTOREIMBURSEMENT: 'POLICYCHANGELOG_SET_AUTOREIMBURSEMENT',
                     SET_AUTO_JOIN: 'POLICYCHANGELOG_SET_AUTO_JOIN',
                     SET_CATEGORY_NAME: 'POLICYCHANGELOG_SET_CATEGORY_NAME',
+                    SHARED_BUDGET_NOTIFICATION: 'SHARED_BUDGET_NOTIFICATION',
                     UPDATE_ACH_ACCOUNT: 'POLICYCHANGELOG_UPDATE_ACH_ACCOUNT',
                     UPDATE_APPROVER_RULE: 'POLICYCHANGELOG_UPDATE_APPROVER_RULE',
                     UPDATE_AUDIT_RATE: 'POLICYCHANGELOG_UPDATE_AUDIT_RATE',

From 993dd1de3749ee82d7d269dc9d36376b3c686d1f Mon Sep 17 00:00:00 2001
From: Vivek Kumar <vivek@expensify.com>
Date: Fri, 15 Dec 2023 09:30:50 +0530
Subject: [PATCH 111/113] fix missing policychange wordings

---
 src/CONST.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 6be443a3f50e..2733da56e597 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -533,13 +533,13 @@ const CONST = {
                     DELETE_TAG: 'POLICYCHANGELOG_DELETE_TAG',
                     IMPORT_CUSTOM_UNIT_RATES: 'POLICYCHANGELOG_IMPORT_CUSTOM_UNIT_RATES',
                     IMPORT_TAGS: 'POLICYCHANGELOG_IMPORT_TAGS',
-                    INDIVIDUAL_BUDGET_NOTIFICATION: 'INDIVIDUAL_BUDGET_NOTIFICATION',
+                    INDIVIDUAL_BUDGET_NOTIFICATION: 'POLICYCHANGELOG_INDIVIDUAL_BUDGET_NOTIFICATION',
                     INVITE_TO_ROOM: 'POLICYCHANGELOG_INVITETOROOM',
                     REMOVE_FROM_ROOM: 'POLICYCHANGELOG_REMOVEFROMROOM',
                     SET_AUTOREIMBURSEMENT: 'POLICYCHANGELOG_SET_AUTOREIMBURSEMENT',
                     SET_AUTO_JOIN: 'POLICYCHANGELOG_SET_AUTO_JOIN',
                     SET_CATEGORY_NAME: 'POLICYCHANGELOG_SET_CATEGORY_NAME',
-                    SHARED_BUDGET_NOTIFICATION: 'SHARED_BUDGET_NOTIFICATION',
+                    SHARED_BUDGET_NOTIFICATION: 'POLICYCHANGELOG_SHARED_BUDGET_NOTIFICATION',
                     UPDATE_ACH_ACCOUNT: 'POLICYCHANGELOG_UPDATE_ACH_ACCOUNT',
                     UPDATE_APPROVER_RULE: 'POLICYCHANGELOG_UPDATE_APPROVER_RULE',
                     UPDATE_AUDIT_RATE: 'POLICYCHANGELOG_UPDATE_AUDIT_RATE',

From dd00587ea44bd7eaf0afaa52ba0904e544e25ac1 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 15 Dec 2023 08:53:32 +0000
Subject: [PATCH 112/113] Update version to 1.4.13-3

---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 04715cdd6ccf..00ba8df0ad97 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041302
-        versionName "1.4.13-2"
+        versionCode 1001041303
+        versionName "1.4.13-3"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 44ee5a87588f..d93eeff2d49d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.13.2</string>
+	<string>1.4.13.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 336e924182f1..fd6edef4c713 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.13.2</string>
+	<string>1.4.13.3</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 135d5b21c18a..03fafb4bda7d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.13-2",
+  "version": "1.4.13-3",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.13-2",
+      "version": "1.4.13-3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 32dacdb4ea6c..9a7d298709d4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.13-2",
+  "version": "1.4.13-3",
   "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.",

From 8bef4bbd123fb6aa8d36e91c3012677208670793 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Fri, 15 Dec 2023 09:13:24 +0000
Subject: [PATCH 113/113] Update version to 1.4.13-4

---
 android/app/build.gradle         | 4 ++--
 ios/NewExpensify/Info.plist      | 2 +-
 ios/NewExpensifyTests/Info.plist | 2 +-
 package-lock.json                | 4 ++--
 package.json                     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 00ba8df0ad97..40961ac9957d 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -91,8 +91,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001041303
-        versionName "1.4.13-3"
+        versionCode 1001041304
+        versionName "1.4.13-4"
     }
 
     flavorDimensions "default"
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index d93eeff2d49d..f372dd6f9cba 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.4.13.3</string>
+	<string>1.4.13.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index fd6edef4c713..b8c64b921e23 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.4.13.3</string>
+	<string>1.4.13.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 03fafb4bda7d..9ad0c00b7bfb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.4.13-3",
+  "version": "1.4.13-4",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.4.13-3",
+      "version": "1.4.13-4",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 9a7d298709d4..33882d533cae 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.4.13-3",
+  "version": "1.4.13-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.",