From 75e4731b191c8d9e59d19bb1888642dfeb97f584 Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Tue, 28 Jun 2022 17:44:27 -0500
Subject: [PATCH 001/178] Use quotation marks

---
 .../settings/Payments/PaymentMethodList.js    | 45 ++++++++++---------
 .../Payments/PaymentsPage/BasePaymentsPage.js | 37 +++++++++++----
 2 files changed, 51 insertions(+), 31 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 9f1ddd25ea33..05d35a172551 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -151,23 +151,6 @@ class PaymentMethodList extends Component {
             });
         }
 
-        if (!this.props.shouldShowAddPaymentMethodButton) {
-            return combinedPaymentMethods;
-        }
-
-        combinedPaymentMethods.push({
-            type: BUTTON,
-            text: this.props.translate('paymentMethodList.addPaymentMethod'),
-            icon: Expensicons.CreditCard,
-            style: [styles.mh4],
-            iconStyles: [styles.mr4],
-            onPress: e => this.props.onPress(e),
-            isDisabled: this.props.isLoadingPayments,
-            shouldShowRightIcon: true,
-            success: true,
-            key: 'addPaymentMethodButton',
-        });
-
         return combinedPaymentMethods;
     }
 
@@ -235,11 +218,29 @@ class PaymentMethodList extends Component {
 
     render() {
         return (
-            <FlatList
-                data={this.createPaymentMethodList()}
-                renderItem={this.renderItem}
-                keyExtractor={item => item.key}
-            />
+            <>
+                <FlatList
+                    bounces={false}
+                    data={this.createPaymentMethodList()}
+                    renderItem={this.renderItem}
+                    keyExtractor={item => item.key}
+                />
+                {
+                    this.props.shouldShowAddPaymentMethodButton
+                    && (
+                        <Button
+                            text={this.props.translate('paymentMethodList.addPaymentMethod')}
+                            icon={Expensicons.CreditCard}
+                            onPress={e => this.props.onPress(e)}
+                            isDisabled={this.props.isLoadingPayments}
+                            style={[styles.mb4, styles.mh4]}
+                            success
+                            shouldShowRightIco
+                            extraLarge
+                        />
+                    )
+                }
+            </>
         );
     }
 }
diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index e0b6b61d4668..d0dfdef59278 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -45,7 +45,8 @@ class BasePaymentsPage extends React.Component {
             selectedPaymentMethod: {},
             formattedSelectedPaymentMethod: {},
             anchorPositionTop: 0,
-            anchorPositionLeft: 0,
+            anchorPositionBottom: 0,
+            anchorPositionRigth: 0,
             addPaymentMethodButton: null,
         };
 
@@ -109,10 +110,24 @@ class BasePaymentsPage extends React.Component {
      */
     setPositionAddPaymentMenu(position) {
         this.setState({
-            anchorPositionTop: position.bottom,
+            anchorPositionTop: position.top + position.height,
 
             // We want the position to be 13px to the right of the left border
-            anchorPositionLeft: position.left + 13,
+            anchorPositionRigth: (window.innerWidth - position.right) + 13,
+        });
+    }
+
+    /**
+     * Set position of the payment method menu
+     *
+     * @param {Object} position
+     */
+    setPositionAddPaymentMethod(position) {
+        this.setState({
+            anchorPositionBottom: window.innerHeight - position.top,
+
+            // We want the position to be 5px to the right of the left border
+            anchorPositionRigth: (window.innerWidth - position.right) + 5,
         });
     }
 
@@ -129,6 +144,8 @@ class BasePaymentsPage extends React.Component {
         this.setState({
             addPaymentMethodButton: nativeEvent,
         });
+
+        // The delete/default menu
         if (accountType) {
             let formattedSelectedPaymentMethod;
             if (accountType === CONST.PAYMENT_METHODS.PAYPAL) {
@@ -166,7 +183,9 @@ class BasePaymentsPage extends React.Component {
         this.setState({
             shouldShowAddPaymentMenu: true,
         });
-        this.setPositionAddPaymentMenu(position);
+
+        // Add payment method menu
+        this.setPositionAddPaymentMethod(position);
     }
 
     /**
@@ -305,8 +324,8 @@ class BasePaymentsPage extends React.Component {
                         isVisible={this.state.shouldShowAddPaymentMenu}
                         onClose={this.hideAddPaymentMenu}
                         anchorPosition={{
-                            top: this.state.anchorPositionTop,
-                            left: this.state.anchorPositionLeft,
+                            bottom: this.state.anchorPositionBottom,
+                            right: this.state.anchorPositionRigth,
                         }}
                         onItemSelected={method => this.addPaymentMethodTypePressed(method)}
                     />
@@ -315,7 +334,7 @@ class BasePaymentsPage extends React.Component {
                         onClose={this.hideDefaultDeleteMenu}
                         anchorPosition={{
                             top: this.state.anchorPositionTop,
-                            left: this.state.anchorPositionLeft,
+                            right: this.state.anchorPositionRigth,
                         }}
                     >
                         <View
@@ -388,7 +407,7 @@ class BasePaymentsPage extends React.Component {
                         onClose={this.hidePasswordPrompt}
                         anchorPosition={{
                             top: this.state.anchorPositionTop,
-                            left: this.state.anchorPositionLeft,
+                            right: this.state.anchorPositionRigth,
                         }}
                         onSubmit={(password) => {
                             this.hidePasswordPrompt();
@@ -406,7 +425,7 @@ class BasePaymentsPage extends React.Component {
                         cancelText={this.props.translate('common.cancel')}
                         anchorPosition={{
                             top: this.state.anchorPositionTop,
-                            left: this.state.anchorPositionLeft,
+                            right: this.state.anchorPositionRigth,
                         }}
                         onConfirm={() => {
                             this.setState({

From db748109edfbf244667b3dea67efb06a6d7422ae Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Sun, 3 Jul 2022 20:28:13 -0500
Subject: [PATCH 002/178] Requested small changes

---
 .../settings/Payments/PaymentMethodList.js     | 18 +-----------------
 .../Payments/PaymentsPage/BasePaymentsPage.js  | 14 +++++++-------
 2 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 05d35a172551..df75af64dc8d 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -17,7 +17,6 @@ import bankAccountPropTypes from '../../../components/bankAccountPropTypes';
 import * as PaymentUtils from '../../../libs/PaymentUtils';
 
 const MENU_ITEM = 'menuItem';
-const BUTTON = 'button';
 
 const propTypes = {
     /** What to do when a menu item is pressed */
@@ -191,21 +190,6 @@ class PaymentMethodList extends Component {
                 />
             );
         }
-        if (item.type === BUTTON) {
-            return (
-                <Button
-                    text={item.text}
-                    icon={item.icon}
-                    onPress={item.onPress}
-                    isDisabled={item.isDisabled}
-                    style={item.style}
-                    iconStyles={item.iconStyles}
-                    success={item.success}
-                    shouldShowRightIcon={item.shouldShowRightIcon}
-                    extraLarge
-                />
-            );
-        }
 
         return (
             <Text
@@ -235,7 +219,7 @@ class PaymentMethodList extends Component {
                             isDisabled={this.props.isLoadingPayments}
                             style={[styles.mb4, styles.mh4]}
                             success
-                            shouldShowRightIco
+                            shouldShowRightIcon
                             extraLarge
                         />
                     )
diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index d0dfdef59278..4163510d3979 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -46,7 +46,7 @@ class BasePaymentsPage extends React.Component {
             formattedSelectedPaymentMethod: {},
             anchorPositionTop: 0,
             anchorPositionBottom: 0,
-            anchorPositionRigth: 0,
+            anchorPositionRight: 0,
             addPaymentMethodButton: null,
         };
 
@@ -113,7 +113,7 @@ class BasePaymentsPage extends React.Component {
             anchorPositionTop: position.top + position.height,
 
             // We want the position to be 13px to the right of the left border
-            anchorPositionRigth: (window.innerWidth - position.right) + 13,
+            anchorPositionRight: (window.innerWidth - position.right) + 13,
         });
     }
 
@@ -127,7 +127,7 @@ class BasePaymentsPage extends React.Component {
             anchorPositionBottom: window.innerHeight - position.top,
 
             // We want the position to be 5px to the right of the left border
-            anchorPositionRigth: (window.innerWidth - position.right) + 5,
+            anchorPositionRight: (window.innerWidth - position.right) + 5,
         });
     }
 
@@ -325,7 +325,7 @@ class BasePaymentsPage extends React.Component {
                         onClose={this.hideAddPaymentMenu}
                         anchorPosition={{
                             bottom: this.state.anchorPositionBottom,
-                            right: this.state.anchorPositionRigth,
+                            right: this.state.anchorPositionRight,
                         }}
                         onItemSelected={method => this.addPaymentMethodTypePressed(method)}
                     />
@@ -334,7 +334,7 @@ class BasePaymentsPage extends React.Component {
                         onClose={this.hideDefaultDeleteMenu}
                         anchorPosition={{
                             top: this.state.anchorPositionTop,
-                            right: this.state.anchorPositionRigth,
+                            right: this.state.anchorPositionRight,
                         }}
                     >
                         <View
@@ -407,7 +407,7 @@ class BasePaymentsPage extends React.Component {
                         onClose={this.hidePasswordPrompt}
                         anchorPosition={{
                             top: this.state.anchorPositionTop,
-                            right: this.state.anchorPositionRigth,
+                            right: this.state.anchorPositionRight,
                         }}
                         onSubmit={(password) => {
                             this.hidePasswordPrompt();
@@ -425,7 +425,7 @@ class BasePaymentsPage extends React.Component {
                         cancelText={this.props.translate('common.cancel')}
                         anchorPosition={{
                             top: this.state.anchorPositionTop,
-                            right: this.state.anchorPositionRigth,
+                            right: this.state.anchorPositionRight,
                         }}
                         onConfirm={() => {
                             this.setState({

From 2285d075119b71a900e6504deb1b01a729cd6740 Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Wed, 6 Jul 2022 21:29:38 -0500
Subject: [PATCH 003/178] dimensionsSubscription Removed

---
 .../Payments/PaymentsPage/BasePaymentsPage.js | 39 +++++--------------
 1 file changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index 4163510d3979..d779d9661a98 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import {
-    View, TouchableOpacity, Dimensions, InteractionManager, LayoutAnimation,
+    View, TouchableOpacity, InteractionManager, LayoutAnimation,
 } from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import PaymentMethodList from '../PaymentMethodList';
@@ -63,24 +63,17 @@ class BasePaymentsPage extends React.Component {
 
     componentDidMount() {
         this.fetchData();
-        if (this.props.shouldListenForResize) {
-            this.dimensionsSubscription = Dimensions.addEventListener('change', this.setMenuPosition);
-        }
     }
 
     componentDidUpdate(prevProps) {
-        if (!prevProps.network.isOffline || this.props.network.isOffline) {
-            return;
+        if (this.shouldListenForResize) {
+            this.setMenuPosition();
         }
 
-        this.fetchData();
-    }
-
-    componentWillUnmount() {
-        if (!this.props.shouldListenForResize || !this.dimensionsSubscription) {
+        if (!prevProps.network.isOffline || this.props.network.isOffline) {
             return;
         }
-        this.dimensionsSubscription.remove();
+        this.fetchData();
     }
 
     setMenuPosition() {
@@ -111,23 +104,10 @@ class BasePaymentsPage extends React.Component {
     setPositionAddPaymentMenu(position) {
         this.setState({
             anchorPositionTop: position.top + position.height,
+            anchorPositionBottom: this.props.windowHeight - position.top,
 
             // We want the position to be 13px to the right of the left border
-            anchorPositionRight: (window.innerWidth - position.right) + 13,
-        });
-    }
-
-    /**
-     * Set position of the payment method menu
-     *
-     * @param {Object} position
-     */
-    setPositionAddPaymentMethod(position) {
-        this.setState({
-            anchorPositionBottom: window.innerHeight - position.top,
-
-            // We want the position to be 5px to the right of the left border
-            anchorPositionRight: (window.innerWidth - position.right) + 5,
+            anchorPositionRight: (this.props.windowWidth - position.right) + 13,
         });
     }
 
@@ -184,8 +164,7 @@ class BasePaymentsPage extends React.Component {
             shouldShowAddPaymentMenu: true,
         });
 
-        // Add payment method menu
-        this.setPositionAddPaymentMethod(position);
+        this.setPositionAddPaymentMenu(position);
     }
 
     /**
@@ -325,7 +304,7 @@ class BasePaymentsPage extends React.Component {
                         onClose={this.hideAddPaymentMenu}
                         anchorPosition={{
                             bottom: this.state.anchorPositionBottom,
-                            right: this.state.anchorPositionRight,
+                            right: this.state.anchorPositionRight - 10,
                         }}
                         onItemSelected={method => this.addPaymentMethodTypePressed(method)}
                     />

From a6bc7c64f67630635e33f9a153bb42b53b5a98c7 Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Wed, 6 Jul 2022 21:31:49 -0500
Subject: [PATCH 004/178] Rollback remove bounce in PaymentMethodList

---
 src/pages/settings/Payments/PaymentMethodList.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index df75af64dc8d..4e3c5f979c2a 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -204,7 +204,6 @@ class PaymentMethodList extends Component {
         return (
             <>
                 <FlatList
-                    bounces={false}
                     data={this.createPaymentMethodList()}
                     renderItem={this.renderItem}
                     keyExtractor={item => item.key}

From 6e72f30335e88977e025cc861d33ce403ac847da Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Mon, 11 Jul 2022 14:54:14 -0500
Subject: [PATCH 005/178] FormAlertWrapper in PaymentMethodList

---
 .../settings/Payments/PaymentMethodList.js    | 27 ++++++++++++-------
 .../Payments/PaymentsPage/BasePaymentsPage.js |  2 +-
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 27ad1518f8d7..04bb0c3d50bd 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -212,16 +212,23 @@ class PaymentMethodList extends Component {
                 {
                     this.props.shouldShowAddPaymentMethodButton
                     && (
-                        <Button
-                            text={this.props.translate('paymentMethodList.addPaymentMethod')}
-                            icon={Expensicons.CreditCard}
-                            onPress={e => this.props.onPress(e)}
-                            isDisabled={this.props.isLoadingPayments}
-                            style={[styles.mb4, styles.mh4]}
-                            success
-                            shouldShowRightIcon
-                            extraLarge
-                        />
+                        <FormAlertWrapper>
+                            {
+                                isOffline => (
+                                    <Button
+                                        text={this.props.translate('paymentMethodList.addPaymentMethod')}
+                                        icon={Expensicons.CreditCard}
+                                        onPress={e => this.props.onPress(e)}
+                                        isDisabled={this.props.isLoadingPayments || isOffline}
+                                        style={[styles.mh4]}
+                                        iconStyles={[styles.mr4]}
+                                        success
+                                        shouldShowRightIcon
+                                        extraLarge
+                                    />
+                                )
+                            }
+                        </FormAlertWrapper>
                     )
                 }
             </>
diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index d779d9661a98..e7a3c9fa0e92 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -304,7 +304,7 @@ class BasePaymentsPage extends React.Component {
                         onClose={this.hideAddPaymentMenu}
                         anchorPosition={{
                             bottom: this.state.anchorPositionBottom,
-                            right: this.state.anchorPositionRight - 10,
+                            right: this.state.anchorPositionRight-30,
                         }}
                         onItemSelected={method => this.addPaymentMethodTypePressed(method)}
                     />

From f58e3f4082465946cd3231d7458b4ffa7714a216 Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Mon, 11 Jul 2022 14:57:12 -0500
Subject: [PATCH 006/178] Lint fix

---
 src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index e7a3c9fa0e92..e82d9b30b1c3 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -304,7 +304,7 @@ class BasePaymentsPage extends React.Component {
                         onClose={this.hideAddPaymentMenu}
                         anchorPosition={{
                             bottom: this.state.anchorPositionBottom,
-                            right: this.state.anchorPositionRight-30,
+                            right: this.state.anchorPositionRight - 30,
                         }}
                         onItemSelected={method => this.addPaymentMethodTypePressed(method)}
                     />

From 59edb3e5a9171ea878ab4bcf736a21906c9e0b17 Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Thu, 21 Jul 2022 23:22:56 -0500
Subject: [PATCH 007/178] Merge improvement

---
 src/pages/settings/Payments/PaymentMethodList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 3725023c7d26..83074a0f4668 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -212,7 +212,7 @@ class PaymentMethodList extends Component {
                                         icon={Expensicons.CreditCard}
                                         onPress={e => this.props.onPress(e)}
                                         isDisabled={this.props.isLoadingPayments || isOffline}
-                                        style={[styles.mh4]}
+                                        style={[styles.mh4, styles.mb4]}
                                         iconStyles={[styles.mr4]}
                                         success
                                         shouldShowRightIcon

From 8d06f00bed6f017d5a05b771388897725456307e Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Thu, 21 Jul 2022 23:23:41 -0500
Subject: [PATCH 008/178] Merge improvement

---
 src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index 73a7d8f1ed31..e19c08cbe2a4 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -318,7 +318,7 @@ class BasePaymentsPage extends React.Component {
                     onClose={this.hideAddPaymentMenu}
                     anchorPosition={{
                         bottom: this.state.anchorPositionBottom,
-                        right: this.state.anchorPositionRight - 30,
+                        right: this.state.anchorPositionRight - 10,
                     }}
                     onItemSelected={method => this.addPaymentMethodTypePressed(method)}
                 />

From 8b74821732b932188cf516d9b3b0d79e25c4d943 Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Mon, 1 Aug 2022 18:10:48 -0500
Subject: [PATCH 009/178] Resolve conflicts

---
 .../Payments/PaymentsPage/BasePaymentsPage.js | 313 +++++++++---------
 1 file changed, 158 insertions(+), 155 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index e19c08cbe2a4..ae5f44606059 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -14,6 +14,7 @@ import Navigation from '../../../../libs/Navigation/Navigation';
 import styles from '../../../../styles/styles';
 import withLocalize from '../../../../components/withLocalize';
 import compose from '../../../../libs/compose';
+import KeyboardAvoidingView from '../../../../components/KeyboardAvoidingView/index';
 import * as BankAccounts from '../../../../libs/actions/BankAccounts';
 import Popover from '../../../../components/Popover';
 import MenuItem from '../../../../components/MenuItem';
@@ -263,176 +264,178 @@ class BasePaymentsPage extends React.Component {
         const isPopoverBottomMount = this.state.anchorPositionTop === 0 || this.props.isSmallScreenWidth;
         return (
             <ScreenWrapper>
-                <HeaderWithCloseButton
-                    title={this.props.translate('common.payments')}
-                    shouldShowBackButton
-                    onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)}
-                    onCloseButtonPress={() => Navigation.dismissModal(true)}
-                />
-                <View style={styles.flex1}>
-                    {Permissions.canUseWallet(this.props.betas) && (
-                        <>
-                            <View style={[styles.mv5]}>
-                                <CurrentWalletBalance />
-                            </View>
-                            {this.props.userWallet.currentBalance > 0 && (
-                                <KYCWall
-                                    onSuccessfulKYC={this.navigateToTransferBalancePage}
-                                    enablePaymentsRoute={ROUTES.SETTINGS_ENABLE_PAYMENTS}
-                                    addBankAccountRoute={ROUTES.SETTINGS_ADD_BANK_ACCOUNT}
-                                    addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD}
-                                    popoverPlacement="bottom"
-                                >
-                                    {triggerKYCFlow => (
-                                        <MenuItem
-                                            title={this.props.translate('common.transferBalance')}
-                                            icon={Expensicons.Transfer}
-                                            onPress={triggerKYCFlow}
-                                            shouldShowRightIcon
-                                            disabled={this.props.network.isOffline}
-                                        />
-                                    )}
-                                </KYCWall>
-                            )}
-                        </>
-                    )}
-                    <Text
-                        style={[styles.ph5, styles.mt6, styles.formLabel]}
-                    >
-                        {this.props.translate('paymentsPage.paymentMethodsTitle')}
-                    </Text>
-                    <PaymentMethodList
-                        onPress={this.paymentMethodPressed}
-                        style={[styles.flex4]}
-                        isAddPaymentMenuActive={this.state.shouldShowAddPaymentMenu}
-                        actionPaymentMethodType={this.state.shouldShowDefaultDeleteMenu || this.state.shouldShowPasswordPrompt || this.state.shouldShowConfirmPopover
-                            ? this.state.selectedPaymentMethodType
-                            : ''}
-                        activePaymentMethodID={this.state.shouldShowDefaultDeleteMenu || this.state.shouldShowPasswordPrompt || this.state.shouldShowConfirmPopover
-                            ? this.getSelectedPaymentMethodID()
-                            : ''}
+                <KeyboardAvoidingView>
+                    <HeaderWithCloseButton
+                        title={this.props.translate('common.payments')}
+                        shouldShowBackButton
+                        onBackButtonPress={() => Navigation.navigate(ROUTES.SETTINGS)}
+                        onCloseButtonPress={() => Navigation.dismissModal(true)}
                     />
-                </View>
-                <AddPaymentMethodMenu
-                    isVisible={this.state.shouldShowAddPaymentMenu}
-                    onClose={this.hideAddPaymentMenu}
-                    anchorPosition={{
-                        bottom: this.state.anchorPositionBottom,
-                        right: this.state.anchorPositionRight - 10,
-                    }}
-                    onItemSelected={method => this.addPaymentMethodTypePressed(method)}
-                />
-                <Popover
-                    isVisible={this.state.shouldShowDefaultDeleteMenu}
-                    onClose={this.hideDefaultDeleteMenu}
-                    anchorPosition={{
-                        top: this.state.anchorPositionTop,
-                        right: this.state.anchorPositionRight,
-                    }}
-                >
-                    <View
-                        style={[
-                            styles.m5,
-                            !this.props.isSmallScreenWidth ? styles.sidebarPopover : '',
-                        ]}
-                    >
-                        {isPopoverBottomMount && (
-                            <MenuItem
-                                title={this.state.formattedSelectedPaymentMethod.title || ''}
-                                icon={this.state.formattedSelectedPaymentMethod.icon}
-                                description={this.state.formattedSelectedPaymentMethod.description}
-                                wrapperStyle={[styles.pv0, styles.ph0, styles.mb4]}
-                                disabled
-                                interactive={false}
-                            />
+                    <View style={styles.flex1}>
+                        {Permissions.canUseWallet(this.props.betas) && (
+                            <>
+                                <View style={[styles.mv5]}>
+                                    <CurrentWalletBalance />
+                                </View>
+                                {this.props.userWallet.currentBalance > 0 && (
+                                    <KYCWall
+                                        onSuccessfulKYC={this.navigateToTransferBalancePage}
+                                        enablePaymentsRoute={ROUTES.SETTINGS_ENABLE_PAYMENTS}
+                                        addBankAccountRoute={ROUTES.SETTINGS_ADD_BANK_ACCOUNT}
+                                        addDebitCardRoute={ROUTES.SETTINGS_ADD_DEBIT_CARD}
+                                        popoverPlacement="bottom"
+                                    >
+                                        {triggerKYCFlow => (
+                                            <MenuItem
+                                                title={this.props.translate('common.transferBalance')}
+                                                icon={Expensicons.Transfer}
+                                                onPress={triggerKYCFlow}
+                                                shouldShowRightIcon
+                                                disabled={this.props.network.isOffline}
+                                            />
+                                        )}
+                                    </KYCWall>
+                                )}
+                            </>
                         )}
-                        {shouldShowMakeDefaultButton && (
+                        <Text
+                            style={[styles.ph5, styles.mt6, styles.formLabel]}
+                        >
+                            {this.props.translate('paymentsPage.paymentMethodsTitle')}
+                        </Text>
+                        <PaymentMethodList
+                            onPress={this.paymentMethodPressed}
+                            style={[styles.flex4]}
+                            isAddPaymentMenuActive={this.state.shouldShowAddPaymentMenu}
+                            actionPaymentMethodType={this.state.shouldShowDefaultDeleteMenu || this.state.shouldShowPasswordPrompt || this.state.shouldShowConfirmPopover
+                                ? this.state.selectedPaymentMethodType
+                                : ''}
+                            activePaymentMethodID={this.state.shouldShowDefaultDeleteMenu || this.state.shouldShowPasswordPrompt || this.state.shouldShowConfirmPopover
+                                ? this.getSelectedPaymentMethodID()
+                                : ''}
+                        />
+                    </View>
+                    <AddPaymentMethodMenu
+                        isVisible={this.state.shouldShowAddPaymentMenu}
+                        onClose={this.hideAddPaymentMenu}
+                        anchorPosition={{
+                            bottom: this.state.anchorPositionBottom,
+                            right: this.state.anchorPositionRight - 10,
+                        }}
+                        onItemSelected={method => this.addPaymentMethodTypePressed(method)}
+                    />
+                    <Popover
+                        isVisible={this.state.shouldShowDefaultDeleteMenu}
+                        onClose={this.hideDefaultDeleteMenu}
+                        anchorPosition={{
+                            top: this.state.anchorPositionTop,
+                            right: this.state.anchorPositionRight,
+                        }}
+                    >
+                        <View
+                            style={[
+                                styles.m5,
+                                !this.props.isSmallScreenWidth ? styles.sidebarPopover : '',
+                            ]}
+                        >
+                            {isPopoverBottomMount && (
+                                <MenuItem
+                                    title={this.state.formattedSelectedPaymentMethod.title || ''}
+                                    icon={this.state.formattedSelectedPaymentMethod.icon}
+                                    description={this.state.formattedSelectedPaymentMethod.description}
+                                    wrapperStyle={[styles.pv0, styles.ph0, styles.mb4]}
+                                    disabled
+                                    interactive={false}
+                                />
+                            )}
+                            {shouldShowMakeDefaultButton && (
+                                <TouchableOpacity
+                                    onPress={() => {
+                                        this.setState({
+                                            shouldShowDefaultDeleteMenu: false,
+                                        });
+
+                                        // Wait for the previous modal to close, before opening a new one. A modal will be considered completely closed when closing animation is finished.
+                                        // InteractionManager fires after the currently running animation is completed.
+                                        // https://github.com/Expensify/App/issues/7768#issuecomment-1044879541
+                                        InteractionManager.runAfterInteractions(() => {
+                                            this.setState({
+                                                shouldShowPasswordPrompt: true,
+                                                passwordButtonText: this.props.translate('paymentsPage.setDefaultConfirmation'),
+                                            });
+                                        });
+                                    }}
+                                    style={[styles.button, styles.alignSelfCenter, styles.w100]}
+                                >
+                                    <Text style={[styles.buttonText]}>
+                                        {this.props.translate('paymentsPage.setDefaultConfirmation')}
+                                    </Text>
+                                </TouchableOpacity>
+                            )}
                             <TouchableOpacity
                                 onPress={() => {
                                     this.setState({
                                         shouldShowDefaultDeleteMenu: false,
                                     });
-
-                                    // Wait for the previous modal to close, before opening a new one. A modal will be considered completely closed when closing animation is finished.
-                                    // InteractionManager fires after the currently running animation is completed.
-                                    // https://github.com/Expensify/App/issues/7768#issuecomment-1044879541
                                     InteractionManager.runAfterInteractions(() => {
                                         this.setState({
-                                            shouldShowPasswordPrompt: true,
-                                            passwordButtonText: this.props.translate('paymentsPage.setDefaultConfirmation'),
+                                            shouldShowConfirmPopover: true,
                                         });
                                     });
                                 }}
-                                style={[styles.button, styles.alignSelfCenter, styles.w100]}
+                                style={[
+                                    styles.button,
+                                    styles.buttonDanger,
+                                    shouldShowMakeDefaultButton && styles.mt4,
+                                    styles.alignSelfCenter,
+                                    styles.w100,
+                                ]}
                             >
-                                <Text style={[styles.buttonText]}>
-                                    {this.props.translate('paymentsPage.setDefaultConfirmation')}
+                                <Text style={[styles.buttonText, styles.textWhite]}>
+                                    {this.props.translate('common.delete')}
                                 </Text>
                             </TouchableOpacity>
-                        )}
-                        <TouchableOpacity
-                            onPress={() => {
-                                this.setState({
-                                    shouldShowDefaultDeleteMenu: false,
-                                });
-                                InteractionManager.runAfterInteractions(() => {
-                                    this.setState({
-                                        shouldShowConfirmPopover: true,
-                                    });
-                                });
-                            }}
-                            style={[
-                                styles.button,
-                                styles.buttonDanger,
-                                shouldShowMakeDefaultButton && styles.mt4,
-                                styles.alignSelfCenter,
-                                styles.w100,
-                            ]}
-                        >
-                            <Text style={[styles.buttonText, styles.textWhite]}>
-                                {this.props.translate('common.delete')}
-                            </Text>
-                        </TouchableOpacity>
-                    </View>
-                </Popover>
-                <PasswordPopover
-                    isVisible={this.state.shouldShowPasswordPrompt}
-                    onClose={this.hidePasswordPrompt}
-                    anchorPosition={{
-                        top: this.state.anchorPositionTop,
-                        right: this.state.anchorPositionRight,
-                    }}
-                    onSubmit={(password) => {
-                        this.hidePasswordPrompt();
-                        this.makeDefaultPaymentMethod(password);
-                    }}
-                    submitButtonText={this.state.passwordButtonText}
-                    isDangerousAction
-                />
-                <ConfirmPopover
-                    contentStyles={!this.props.isSmallScreenWidth ? [styles.sidebarPopover] : undefined}
-                    isVisible={this.state.shouldShowConfirmPopover}
-                    title={this.props.translate('paymentsPage.deleteAccount')}
-                    prompt={this.props.translate('paymentsPage.deleteConfirmation')}
-                    confirmText={this.props.translate('common.delete')}
-                    cancelText={this.props.translate('common.cancel')}
-                    anchorPosition={{
-                        top: this.state.anchorPositionTop,
-                        right: this.state.anchorPositionRight,
-                    }}
-                    onConfirm={() => {
-                        this.setState({
-                            shouldShowConfirmPopover: false,
-                        });
-                        this.deletePaymentMethod();
-                    }}
-                    onCancel={() => {
-                        this.setState({shouldShowConfirmPopover: false});
-                    }}
-                    shouldShowCancelButton
-                    danger
-                />
-                <OfflineIndicator containerStyles={[styles.ml5, styles.mv3]} />
+                        </View>
+                    </Popover>
+                    <PasswordPopover
+                        isVisible={this.state.shouldShowPasswordPrompt}
+                        onClose={this.hidePasswordPrompt}
+                        anchorPosition={{
+                            top: this.state.anchorPositionTop,
+                            right: this.state.anchorPositionRight,
+                        }}
+                        onSubmit={(password) => {
+                            this.hidePasswordPrompt();
+                            this.makeDefaultPaymentMethod(password);
+                        }}
+                        submitButtonText={this.state.passwordButtonText}
+                        isDangerousAction
+                    />
+                    <ConfirmPopover
+                        contentStyles={!this.props.isSmallScreenWidth ? [styles.sidebarPopover] : undefined}
+                        isVisible={this.state.shouldShowConfirmPopover}
+                        title={this.props.translate('paymentsPage.deleteAccount')}
+                        prompt={this.props.translate('paymentsPage.deleteConfirmation')}
+                        confirmText={this.props.translate('common.delete')}
+                        cancelText={this.props.translate('common.cancel')}
+                        anchorPosition={{
+                            top: this.state.anchorPositionTop,
+                            right: this.state.anchorPositionRight,
+                        }}
+                        onConfirm={() => {
+                            this.setState({
+                                shouldShowConfirmPopover: false,
+                            });
+                            this.deletePaymentMethod();
+                        }}
+                        onCancel={() => {
+                            this.setState({shouldShowConfirmPopover: false});
+                        }}
+                        shouldShowCancelButton
+                        danger
+                    />
+                    <OfflineIndicator containerStyles={[styles.ml5, styles.mb2]} />
+                </KeyboardAvoidingView>
             </ScreenWrapper>
         );
     }

From f85189c1610dd7a90fadc10d8240caad2054a60f Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 31 Aug 2022 14:29:15 +0800
Subject: [PATCH 010/178] remove usages of avatarURL for policies, since we're
 sending it over in avatar now from PHP

---
 src/libs/ReportUtils.js                     | 2 --
 src/libs/actions/Policy.js                  | 6 +-----
 src/pages/workspace/WorkspaceInitialPage.js | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index ce3ac2f962eb..02d6a707842c 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -383,8 +383,6 @@ function getIcons(report, personalDetails, policies, defaultIcon = null) {
     if (isPolicyExpenseChat(report)) {
         const policyExpenseChatAvatarSource = lodashGet(policies, [
             `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'avatar',
-        ]) || lodashGet(policies, [
-            `${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'avatarURL',
         ]) || Expensicons.Workspace;
 
         // Return the workspace avatar if the user is the owner of the policy expense chat
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 814b5023fdb6..c8405aeaee92 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -62,8 +62,6 @@ function getSimplifiedEmployeeList(employeeList) {
  * @param {String} fullPolicyOrPolicySummary.outputCurrency
  * @param {String} [fullPolicyOrPolicySummary.avatar]
  * @param {String} [fullPolicyOrPolicySummary.value.avatar]
- * @param {String} [fullPolicyOrPolicySummary.avatarURL]
- * @param {String} [fullPolicyOrPolicySummary.value.avatarURL]
  * @param {Object} [fullPolicyOrPolicySummary.value.employeeList]
  * @param {Object} [fullPolicyOrPolicySummary.value.customUnits]
  * @param {Boolean} isFromFullPolicy,
@@ -82,9 +80,7 @@ function getSimplifiedPolicyObject(fullPolicyOrPolicySummary, isFromFullPolicy)
         // "GetFullPolicy" and "GetPolicySummaryList" returns different policy objects. If policy is retrieved by "GetFullPolicy",
         // avatar will be nested within the key "value"
         avatar: fullPolicyOrPolicySummary.avatar
-            || lodashGet(fullPolicyOrPolicySummary, 'value.avatar', '')
-            || fullPolicyOrPolicySummary.avatarURL
-            || lodashGet(fullPolicyOrPolicySummary, 'value.avatarURL', ''),
+            || lodashGet(fullPolicyOrPolicySummary, 'value.avatar', ''),
         customUnits: lodashGet(fullPolicyOrPolicySummary, 'value.customUnits', {}),
     };
 }
diff --git a/src/pages/workspace/WorkspaceInitialPage.js b/src/pages/workspace/WorkspaceInitialPage.js
index 2f47a219ad41..7a4f47507da9 100644
--- a/src/pages/workspace/WorkspaceInitialPage.js
+++ b/src/pages/workspace/WorkspaceInitialPage.js
@@ -81,7 +81,7 @@ class WorkspaceInitialPage extends React.Component {
         const policy = this.props.policy;
         const hasMembersError = PolicyUtils.hasPolicyMemberError(this.props.policyMemberList);
         const hasGeneralSettingsError = !_.isEmpty(lodashGet(this.props.policy, 'errorFields.generalSettings', {}))
-            || !_.isEmpty(lodashGet(this.props.policy, 'errorFields.avatarURL', {}));
+            || !_.isEmpty(lodashGet(this.props.policy, 'errorFields.avatar', {}));
         const hasCustomUnitsError = PolicyUtils.hasCustomUnitsError(this.props.policy);
         const menuItems = [
             {

From e896b42a3aa7d238d3f0560073043fa8ec67dffa Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Thu, 1 Sep 2022 10:01:31 +0000
Subject: [PATCH 011/178] fix: package.json & package-lock.json to reduce
 vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-GOT-2932019
---
 package-lock.json | 944 ++++++----------------------------------------
 package.json      |   2 +-
 2 files changed, 107 insertions(+), 839 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7d61484c8f4c..7b779ddeae32 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -125,7 +125,7 @@
         "css-loader": "^5.2.4",
         "diff-so-fancy": "^1.3.0",
         "electron": "^17.4.11",
-        "electron-builder": "23.3.1",
+        "electron-builder": "^23.5.0",
         "electron-notarize": "^1.2.1",
         "electron-reloader": "^1.2.1",
         "eslint": "^7.6.0",
@@ -11029,9 +11029,9 @@
       "dev": true
     },
     "node_modules/app-builder-lib": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.3.1.tgz",
-      "integrity": "sha512-mi4DG3m32cMJ5CtO9iYk41gBvGWLzJjQsaQgGOd4ZhmIuKyj8M/0rT1g0s/0qD4Tw8jsa//NXMXCC7vpGIfkTg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.5.0.tgz",
+      "integrity": "sha512-AJIqUK+fe9dMPwHZf7NTE1Z0qrLGAbwB7cCcsLxoV2tOSySBPqzOvqhU1l7rOGBaFQUHvYyQTuk1FDmVSW3Psw==",
       "dev": true,
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
@@ -11040,13 +11040,13 @@
         "7zip-bin": "~5.1.1",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.3.4",
         "ejs": "^3.1.7",
         "electron-osx-sign": "^0.6.0",
-        "electron-publish": "23.3.0",
+        "electron-publish": "23.5.0",
         "form-data": "^4.0.0",
         "fs-extra": "^10.1.0",
         "hosted-git-info": "^4.1.0",
@@ -13180,9 +13180,9 @@
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
     },
     "node_modules/builder-util": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.3.0.tgz",
-      "integrity": "sha512-m7RRd21N2yrnuGFd+ZqOY0ryeqWmBslDKmGDVz0wETqoEEqpiJsF3CGlsb6MRN2EQKDubvE5e+lBf8ATt06fnA==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.5.0.tgz",
+      "integrity": "sha512-TYz3sj2NMoG1/524/Je0p0RtEAKKjmTL6z2WQnzU6yM+WU/jHnA2OqX9Q/jys+rKuMy+7MCMdc+G+HrbpKWYSg==",
       "dev": true,
       "dependencies": {
         "@types/debug": "^4.1.6",
@@ -13190,7 +13190,7 @@
         "7zip-bin": "~5.1.1",
         "app-builder-bin": "4.0.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.0.3",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "cross-spawn": "^7.0.3",
         "debug": "^4.3.4",
@@ -13205,9 +13205,9 @@
       }
     },
     "node_modules/builder-util-runtime": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz",
-      "integrity": "sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "dependencies": {
         "debug": "^4.3.4",
@@ -14445,59 +14445,6 @@
         "proto-list": "~1.2.1"
       }
     },
-    "node_modules/configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/configstore/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/configstore/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/configstore/node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
     "node_modules/confusing-browser-globals": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
@@ -15356,15 +15303,6 @@
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
       "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/css-color-keywords": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
@@ -15819,15 +15757,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -16359,14 +16288,14 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.3.1.tgz",
-      "integrity": "sha512-YH9KtqBUqn4xzT8W/4I12CBOJXXleHeCQ1UyUvrhNu50ujY/U7XJ4ZZCaKvU2sJesDJqWgY9rqxaZaWVKAi9KQ==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.5.0.tgz",
+      "integrity": "sha512-PBkY1UTPIl3Jleqj6+OuzX2Cc/Co1U/Ykxsj9J/k9oI14VXs8kYJl3CtJUnj3hSz4qGD5D8eJX1zn6YDLPa0mA==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "23.3.1",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "app-builder-lib": "23.5.0",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "fs-extra": "^10.0.0",
         "iconv-lite": "^0.6.2",
         "js-yaml": "^4.1.0"
@@ -16620,18 +16549,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dotenv": {
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
@@ -16707,23 +16624,23 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.3.1.tgz",
-      "integrity": "sha512-NYM3iHuX7NyXvbZ+7BKDET54mXnB2oqshuZpe0QbDtbDp6UjoXAulO5g6YXtWA6OspdaTHio+BFpe7A88l1sHg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.5.0.tgz",
+      "integrity": "sha512-Um3KGFem3AHpJ9Cvb+s1zox6KKT4SQ9CgmNjG+4oOz0PYAh12G9UuU5/G2wznNhoIFkowQJQWa6JQbwsJjkxTQ==",
       "dev": true,
       "dependencies": {
         "@types/yargs": "^17.0.1",
-        "app-builder-lib": "23.3.1",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "app-builder-lib": "23.5.0",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
-        "dmg-builder": "23.3.1",
+        "dmg-builder": "23.5.0",
         "fs-extra": "^10.0.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.2.0",
-        "update-notifier": "^5.1.0",
-        "yargs": "^17.0.1"
+        "simple-update-notifier": "^1.0.7",
+        "yargs": "^17.5.1"
       },
       "bin": {
         "electron-builder": "cli.js",
@@ -16896,6 +16813,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz",
       "integrity": "sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==",
+      "deprecated": "Please use @electron/osx-sign moving forward. Be aware the API is slightly different",
       "dev": true,
       "dependencies": {
         "bluebird": "^3.5.0",
@@ -16941,14 +16859,14 @@
       "dev": true
     },
     "node_modules/electron-publish": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.3.0.tgz",
-      "integrity": "sha512-HTKOeRUDebSD/l6grAi5thWb/f80OggL1z4aI0no7Fa4SGWpl4rvqlMBtY2d/EjsAAosbk3x+Jeyyp5Th57Wpw==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.5.0.tgz",
+      "integrity": "sha512-dY/bAN5tIjEPX1AV5FK9TXKKoGGalGb53SgGbhiII3o+WLzK+4vew6rrmChBTwELP/q8r4a89X+slTDG/iPdww==",
       "dev": true,
       "dependencies": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "fs-extra": "^10.0.0",
         "lazy-val": "^1.0.5",
@@ -17481,15 +17399,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -21044,30 +20953,6 @@
         "node": ">=10.0"
       }
     },
-    "node_modules/global-dirs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-      "dev": true,
-      "dependencies": {
-        "ini": "2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/global-dirs/node_modules/ini": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -21444,15 +21329,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -22234,15 +22110,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/import-local": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
@@ -22890,31 +22757,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/is-installed-globally": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-      "dev": true,
-      "dependencies": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-installed-globally/node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -22943,18 +22785,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-npm": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -22977,15 +22807,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-object": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
@@ -23205,12 +23026,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
     "node_modules/isarray": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
@@ -26370,18 +26185,6 @@
         "language-subtag-registry": "~0.3.2"
       }
     },
-    "node_modules/latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "dependencies": {
-        "package-json": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -30124,30 +29927,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -31038,18 +30817,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "dependencies": {
-        "escape-goat": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pusher-js": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-7.4.0.tgz",
@@ -31245,30 +31012,6 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/rc/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/react": {
       "version": "18.0.0",
       "resolved": "https://registry.npmjs.org/react/-/react-18.0.0.tgz",
@@ -33117,30 +32860,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz",
-      "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==",
-      "dev": true,
-      "dependencies": {
-        "rc": "1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/regjsgen": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
@@ -34235,27 +33954,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/semver-diff/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -34699,6 +34397,27 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
+    "node_modules/simple-update-notifier": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz",
+      "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==",
+      "dev": true,
+      "dependencies": {
+        "semver": "~7.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/simple-update-notifier/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/simply-deferred": {
       "version": "3.0.0",
       "resolved": "git+ssh://git@github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
@@ -37094,18 +36813,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/unist-builder": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
@@ -37345,122 +37052,6 @@
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
-    "node_modules/update-notifier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-      "dev": true,
-      "dependencies": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
-    "node_modules/update-notifier/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/update-notifier/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/update-notifier/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier/node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "node_modules/update-notifier/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/urbanairship-react-native": {
       "version": "14.4.1",
       "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-14.4.1.tgz",
@@ -39884,15 +39475,6 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
@@ -48233,9 +47815,9 @@
       "dev": true
     },
     "app-builder-lib": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.3.1.tgz",
-      "integrity": "sha512-mi4DG3m32cMJ5CtO9iYk41gBvGWLzJjQsaQgGOd4ZhmIuKyj8M/0rT1g0s/0qD4Tw8jsa//NXMXCC7vpGIfkTg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.5.0.tgz",
+      "integrity": "sha512-AJIqUK+fe9dMPwHZf7NTE1Z0qrLGAbwB7cCcsLxoV2tOSySBPqzOvqhU1l7rOGBaFQUHvYyQTuk1FDmVSW3Psw==",
       "dev": true,
       "requires": {
         "@develar/schema-utils": "~2.6.5",
@@ -48244,13 +47826,13 @@
         "7zip-bin": "~5.1.1",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.3.4",
         "ejs": "^3.1.7",
         "electron-osx-sign": "^0.6.0",
-        "electron-publish": "23.3.0",
+        "electron-publish": "23.5.0",
         "form-data": "^4.0.0",
         "fs-extra": "^10.1.0",
         "hosted-git-info": "^4.1.0",
@@ -49970,9 +49552,9 @@
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
     },
     "builder-util": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.3.0.tgz",
-      "integrity": "sha512-m7RRd21N2yrnuGFd+ZqOY0ryeqWmBslDKmGDVz0wETqoEEqpiJsF3CGlsb6MRN2EQKDubvE5e+lBf8ATt06fnA==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.5.0.tgz",
+      "integrity": "sha512-TYz3sj2NMoG1/524/Je0p0RtEAKKjmTL6z2WQnzU6yM+WU/jHnA2OqX9Q/jys+rKuMy+7MCMdc+G+HrbpKWYSg==",
       "dev": true,
       "requires": {
         "@types/debug": "^4.1.6",
@@ -49980,7 +49562,7 @@
         "7zip-bin": "~5.1.1",
         "app-builder-bin": "4.0.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.0.3",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "cross-spawn": "^7.0.3",
         "debug": "^4.3.4",
@@ -50072,9 +49654,9 @@
       }
     },
     "builder-util-runtime": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz",
-      "integrity": "sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "requires": {
         "debug": "^4.3.4",
@@ -50953,49 +50535,6 @@
         "proto-list": "~1.2.1"
       }
     },
-    "configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "requires": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "write-file-atomic": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-          "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-          "dev": true,
-          "requires": {
-            "imurmurhash": "^0.1.4",
-            "is-typedarray": "^1.0.0",
-            "signal-exit": "^3.0.2",
-            "typedarray-to-buffer": "^3.1.5"
-          }
-        }
-      }
-    },
     "confusing-browser-globals": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
@@ -51685,12 +51224,6 @@
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
       "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
     },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true
-    },
     "css-color-keywords": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
@@ -52016,12 +51549,6 @@
         "regexp.prototype.flags": "^1.2.0"
       }
     },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
-    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -52442,14 +51969,14 @@
       }
     },
     "dmg-builder": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.3.1.tgz",
-      "integrity": "sha512-YH9KtqBUqn4xzT8W/4I12CBOJXXleHeCQ1UyUvrhNu50ujY/U7XJ4ZZCaKvU2sJesDJqWgY9rqxaZaWVKAi9KQ==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.5.0.tgz",
+      "integrity": "sha512-PBkY1UTPIl3Jleqj6+OuzX2Cc/Co1U/Ykxsj9J/k9oI14VXs8kYJl3CtJUnj3hSz4qGD5D8eJX1zn6YDLPa0mA==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "23.3.1",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "app-builder-lib": "23.5.0",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "dmg-license": "^1.0.11",
         "fs-extra": "^10.0.0",
         "iconv-lite": "^0.6.2",
@@ -52661,15 +52188,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "dotenv": {
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
@@ -52737,23 +52255,23 @@
       }
     },
     "electron-builder": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.3.1.tgz",
-      "integrity": "sha512-NYM3iHuX7NyXvbZ+7BKDET54mXnB2oqshuZpe0QbDtbDp6UjoXAulO5g6YXtWA6OspdaTHio+BFpe7A88l1sHg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.5.0.tgz",
+      "integrity": "sha512-Um3KGFem3AHpJ9Cvb+s1zox6KKT4SQ9CgmNjG+4oOz0PYAh12G9UuU5/G2wznNhoIFkowQJQWa6JQbwsJjkxTQ==",
       "dev": true,
       "requires": {
         "@types/yargs": "^17.0.1",
-        "app-builder-lib": "23.3.1",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "app-builder-lib": "23.5.0",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
-        "dmg-builder": "23.3.1",
+        "dmg-builder": "23.5.0",
         "fs-extra": "^10.0.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.2.0",
-        "update-notifier": "^5.1.0",
-        "yargs": "^17.0.1"
+        "simple-update-notifier": "^1.0.7",
+        "yargs": "^17.5.1"
       },
       "dependencies": {
         "@types/yargs": {
@@ -52922,14 +52440,14 @@
       }
     },
     "electron-publish": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.3.0.tgz",
-      "integrity": "sha512-HTKOeRUDebSD/l6grAi5thWb/f80OggL1z4aI0no7Fa4SGWpl4rvqlMBtY2d/EjsAAosbk3x+Jeyyp5Th57Wpw==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.5.0.tgz",
+      "integrity": "sha512-dY/bAN5tIjEPX1AV5FK9TXKKoGGalGb53SgGbhiII3o+WLzK+4vew6rrmChBTwELP/q8r4a89X+slTDG/iPdww==",
       "dev": true,
       "requires": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "fs-extra": "^10.0.0",
         "lazy-val": "^1.0.5",
@@ -53341,12 +52859,6 @@
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
-    "escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true
-    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -56062,23 +55574,6 @@
         "serialize-error": "^7.0.1"
       }
     },
-    "global-dirs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-      "dev": true,
-      "requires": {
-        "ini": "2.0.0"
-      },
-      "dependencies": {
-        "ini": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-          "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-          "dev": true
-        }
-      }
-    },
     "global-modules": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
@@ -56369,12 +55864,6 @@
         }
       }
     },
-    "has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true
-    },
     "hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -56981,12 +56470,6 @@
         }
       }
     },
-    "import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
-      "dev": true
-    },
     "import-local": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
@@ -57445,24 +56928,6 @@
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true
     },
-    "is-installed-globally": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-      "dev": true,
-      "requires": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      },
-      "dependencies": {
-        "is-path-inside": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-          "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-          "dev": true
-        }
-      }
-    },
     "is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -57479,12 +56944,6 @@
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
       "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
-    "is-npm": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
-      "dev": true
-    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -57498,12 +56957,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
     "is-object": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
@@ -57652,12 +57105,6 @@
         "is-docker": "^2.0.0"
       }
     },
-    "is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
     "isarray": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
@@ -60073,15 +59520,6 @@
         "language-subtag-registry": "~0.3.2"
       }
     },
-    "latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "requires": {
-        "package-json": "^6.3.0"
-      }
-    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -63013,26 +62451,6 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
-    "package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "requires": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
     "pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -63739,15 +63157,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "requires": {
-        "escape-goat": "^2.0.0"
-      }
-    },
     "pusher-js": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-7.4.0.tgz",
@@ -63885,26 +63294,6 @@
         "schema-utils": "^3.0.0"
       }
     },
-    "rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "dependencies": {
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-          "dev": true
-        }
-      }
-    },
     "react": {
       "version": "18.0.0",
       "resolved": "https://registry.npmjs.org/react/-/react-18.0.0.tgz",
@@ -65306,24 +64695,6 @@
         "unicode-match-property-value-ecmascript": "^2.0.0"
       }
     },
-    "registry-auth-token": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz",
-      "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==",
-      "dev": true,
-      "requires": {
-        "rc": "1.2.8"
-      }
-    },
-    "registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
     "regjsgen": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
@@ -66194,23 +65565,6 @@
       "dev": true,
       "optional": true
     },
-    "semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
     "send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -66580,6 +65934,23 @@
         }
       }
     },
+    "simple-update-notifier": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz",
+      "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==",
+      "dev": true,
+      "requires": {
+        "semver": "~7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        }
+      }
+    },
     "simply-deferred": {
       "version": "git+ssh://git@github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
       "integrity": "sha512-DSHaVm+6KduK2+cOnaA+choq8CowotOpFhmHDCL36Cb/CM4f++TumOhcdWCknMwI3IbZbf3u2fzVPvb4UVf8UA==",
@@ -68468,15 +67839,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
-    },
     "unist-builder": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
@@ -68645,94 +68007,6 @@
         }
       }
     },
-    "update-notifier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-      "dev": true,
-      "requires": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "ci-info": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-          "dev": true
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "is-ci": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-          "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-          "dev": true,
-          "requires": {
-            "ci-info": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "urbanairship-react-native": {
       "version": "14.4.1",
       "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-14.4.1.tgz",
@@ -70655,12 +69929,6 @@
         }
       }
     },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true
-    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
diff --git a/package.json b/package.json
index 5d5e76d46acc..949bab72b933 100644
--- a/package.json
+++ b/package.json
@@ -152,7 +152,7 @@
     "css-loader": "^5.2.4",
     "diff-so-fancy": "^1.3.0",
     "electron": "^17.4.11",
-    "electron-builder": "23.3.1",
+    "electron-builder": "23.5.0",
     "electron-notarize": "^1.2.1",
     "electron-reloader": "^1.2.1",
     "eslint": "^7.6.0",

From d00f2537c9f5722e29b97b443632e18cb82b1fc4 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 11:24:20 +0200
Subject: [PATCH 012/178] Add error boundary to test rendering

---
 tests/unit/LHNOrderTest.js | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/tests/unit/LHNOrderTest.js b/tests/unit/LHNOrderTest.js
index ffb3b62a381d..f0fa15ab1229 100644
--- a/tests/unit/LHNOrderTest.js
+++ b/tests/unit/LHNOrderTest.js
@@ -152,18 +152,39 @@ Onyx.init({
 });
 
 function getDefaultRenderedSidebarLinks() {
+    class ErrorBoundary extends React.Component {
+        constructor(props) {
+            super(props);
+            this.state = {hasError: false};
+        }
+
+        static getDerivedStateFromError(error) {
+            // Update state so the next render will show the fallback UI.
+            return {hasError: true, error};
+        }
+
+        componentDidCatch(error, errorInfo) {
+            console.error(error, errorInfo);
+        }
+
+        render() {
+            return this.props.children;
+        }
+    }
     // Wrap the SideBarLinks inside of LocaleContextProvider so that all the locale props
     // are passed to the component. If this is not done, then all the locale props are missing
     // and there are a lot of render warnings. It needs to be done like this because normally in
     // our app (App.js) is when the react application is wrapped in the context providers
     return render((
         <LocaleContextProvider>
-            <SidebarLinks
-                onLinkClick={() => {}}
-                insets={fakeInsets}
-                onAvatarClick={() => {}}
-                isSmallScreenWidth={false}
-            />
+            <ErrorBoundary>
+                <SidebarLinks
+                    onLinkClick={() => {}}
+                    insets={fakeInsets}
+                    onAvatarClick={() => {}}
+                    isSmallScreenWidth={false}
+                />
+            </ErrorBoundary>
         </LocaleContextProvider>
     ));
 }
@@ -617,6 +638,7 @@ describe('Sidebar', () => {
                 }))
 
                 // THEN they are still in alphabetical order
+
                 .then(() => {
                     const reportOptions = sidebarLinks.queryAllByText(/ReportID, /);
                     expect(reportOptions).toHaveLength(4);

From 0f88560b276fb93f0d748ed329701c143bca162d Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 11:26:53 +0200
Subject: [PATCH 013/178] Fix unit tests

---
 src/libs/OptionsListUtils.js |  2 +-
 tests/unit/LHNOrderTest.js   | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index a1e5027bf9fd..58c745bd3d64 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -464,7 +464,7 @@ function getOptions(reports, personalDetails, activeReportID, {
         const isChatRoom = ReportUtils.isChatRoom(report);
         const isDefaultRoom = ReportUtils.isDefaultRoom(report);
         const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
-        const logins = report.participants || [];
+        const logins = report && report.participants || [];
 
         // Report data can sometimes be incomplete. If we have no logins or reportID then we will skip this entry.
         const shouldFilterNoParticipants = _.isEmpty(logins) && !isChatRoom && !isDefaultRoom && !isPolicyExpenseChat;
diff --git a/tests/unit/LHNOrderTest.js b/tests/unit/LHNOrderTest.js
index f0fa15ab1229..0326c017d2cb 100644
--- a/tests/unit/LHNOrderTest.js
+++ b/tests/unit/LHNOrderTest.js
@@ -153,14 +153,10 @@ Onyx.init({
 
 function getDefaultRenderedSidebarLinks() {
     class ErrorBoundary extends React.Component {
-        constructor(props) {
-            super(props);
-            this.state = {hasError: false};
-        }
-
+        // Error boundaries have to implement this method. It's for providing a fallback UI, but
+        // we don't need that for unit testing, so this is basically a no-op.
         static getDerivedStateFromError(error) {
-            // Update state so the next render will show the fallback UI.
-            return {hasError: true, error};
+            return {error};
         }
 
         componentDidCatch(error, errorInfo) {
@@ -168,9 +164,11 @@ function getDefaultRenderedSidebarLinks() {
         }
 
         render() {
+            // eslint-disable-next-line react/prop-types
             return this.props.children;
         }
     }
+
     // Wrap the SideBarLinks inside of LocaleContextProvider so that all the locale props
     // are passed to the component. If this is not done, then all the locale props are missing
     // and there are a lot of render warnings. It needs to be done like this because normally in

From 7f863d4e1073c74f2ff560c80f38bee0fcf685c9 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 11:51:40 +0200
Subject: [PATCH 014/178] Use a custom memoizing function

---
 src/pages/home/sidebar/SidebarLinks.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index f4bdda7ec179..d10fdefa778e 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -3,7 +3,6 @@ import {View, TouchableOpacity} from 'react-native';
 import _ from 'underscore';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import memoizeOne from 'memoize-one';
 import styles from '../../../styles/styles';
 import * as StyleUtils from '../../../styles/StyleUtils';
 import ONYXKEYS from '../../../ONYXKEYS';
@@ -92,10 +91,15 @@ const defaultProps = {
     priorityMode: CONST.PRIORITY_MODE.DEFAULT,
 };
 
+function deepCompareRenderItems(activeReportID, priorityMode, unorderedReports, personalDetails, betas, reportActions) {
+    return `${activeReportID}_${priorityMode}_${JSON.stringify(unorderedReports)}_${JSON.stringify(personalDetails)}_${JSON.stringify(betas)}_${JSON.stringify(reportActions)}`;
+}
+
 class SidebarLinks extends React.Component {
     constructor(props) {
         super(props);
-        this.getRecentReportsOptionListItems = memoizeOne(this.getRecentReportsOptionListItems.bind(this));
+
+        this.getRecentReportsOptionListItems = _.memoize(this.getRecentReportsOptionListItems.bind(this), deepCompareRenderItems);
     }
 
     getRecentReportsOptionListItems(activeReportID, priorityMode, unorderedReports, personalDetails, betas, reportActions) {

From 4a4e10018d51b09f5b7ba19807f91e2d7a306c42 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:01:50 +0200
Subject: [PATCH 015/178] Duplicate the option list component

---
 .../LHNOptionsList/BaseOptionsList.js         | 257 ++++++++++++++++++
 src/components/LHNOptionsList/index.js        |  19 ++
 src/components/LHNOptionsList/index.native.js |  19 ++
 .../LHNOptionsList/optionsListPropTypes.js    | 105 +++++++
 4 files changed, 400 insertions(+)
 create mode 100644 src/components/LHNOptionsList/BaseOptionsList.js
 create mode 100644 src/components/LHNOptionsList/index.js
 create mode 100644 src/components/LHNOptionsList/index.native.js
 create mode 100644 src/components/LHNOptionsList/optionsListPropTypes.js

diff --git a/src/components/LHNOptionsList/BaseOptionsList.js b/src/components/LHNOptionsList/BaseOptionsList.js
new file mode 100644
index 000000000000..17ce25e26551
--- /dev/null
+++ b/src/components/LHNOptionsList/BaseOptionsList.js
@@ -0,0 +1,257 @@
+import _ from 'underscore';
+import React, {forwardRef, Component} from 'react';
+import {View} from 'react-native';
+import PropTypes from 'prop-types';
+import CONST from '../../CONST';
+import styles from '../../styles/styles';
+import variables from '../../styles/variables';
+import OptionRow from '../OptionRow';
+import SectionList from '../SectionList';
+import Text from '../Text';
+import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultProps} from './optionsListPropTypes';
+
+const propTypes = {
+    /** Determines whether the keyboard gets dismissed in response to a drag */
+    keyboardDismissMode: PropTypes.string,
+
+    /** Called when the user begins to drag the scroll view */
+    onScrollBeginDrag: PropTypes.func,
+
+    ...optionsListPropTypes,
+};
+
+const defaultProps = {
+    keyboardDismissMode: 'none',
+    onScrollBeginDrag: () => {},
+    ...optionsListDefaultProps,
+};
+
+class BaseOptionsList extends Component {
+    constructor(props) {
+        super(props);
+
+        this.renderItem = this.renderItem.bind(this);
+        this.renderSectionHeader = this.renderSectionHeader.bind(this);
+        this.getItemLayout = this.getItemLayout.bind(this);
+        this.buildFlatSectionArray = this.buildFlatSectionArray.bind(this);
+        this.extractKey = this.extractKey.bind(this);
+        this.onViewableItemsChanged = this.onViewableItemsChanged.bind(this);
+        this.viewabilityConfig = {viewAreaCoveragePercentThreshold: 95};
+        this.didLayout = false;
+
+        this.flattenedData = this.buildFlatSectionArray();
+    }
+
+    shouldComponentUpdate(nextProps) {
+        if (nextProps.focusedIndex !== this.props.focusedIndex) {
+            return true;
+        }
+
+        if (nextProps.selectedOptions.length !== this.props.selectedOptions.length) {
+            return true;
+        }
+
+        if (nextProps.headerMessage !== this.props.headerMessage) {
+            return true;
+        }
+
+        if (!_.isEqual(nextProps.sections, this.props.sections)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    componentDidUpdate(prevProps) {
+        if (_.isEqual(this.props.sections, prevProps.sections)) {
+            return;
+        }
+
+        this.flattenedData = this.buildFlatSectionArray();
+    }
+
+    onViewableItemsChanged() {
+        if (this.didLayout || !this.props.onLayout) {
+            return;
+        }
+
+        this.didLayout = true;
+        this.props.onLayout();
+    }
+
+    /**
+     * This function is used to compute the layout of any given item in our list.
+     * We need to implement it so that we can programmatically scroll to items outside the virtual render window of the SectionList.
+     *
+     * @param {Array} data - This is the same as the data we pass into the component
+     * @param {Number} flatDataArrayIndex - This index is provided by React Native, and refers to a flat array with data from all the sections. This flat array has some quirks:
+     *
+     *     1. It ALWAYS includes a list header and a list footer, even if we don't provide/render those.
+     *     2. Each section includes a header, even if we don't provide/render one.
+     *
+     *     For example, given a list with two sections, two items in each section, no header, no footer, and no section headers, the flat array might look something like this:
+     *
+     *     [{header}, {sectionHeader}, {item}, {item}, {sectionHeader}, {item}, {item}, {footer}]
+     *
+     * @returns {Object}
+     */
+    getItemLayout(data, flatDataArrayIndex) {
+        if (!_.has(this.flattenedData, flatDataArrayIndex)) {
+            this.flattenedData = this.buildFlatSectionArray();
+        }
+
+        const targetItem = this.flattenedData[flatDataArrayIndex];
+        return {
+            length: targetItem.length,
+            offset: targetItem.offset,
+            index: flatDataArrayIndex,
+        };
+    }
+
+    /**
+     * This helper function is used to memoize the computation needed for getItemLayout. It is run whenever section data changes.
+     *
+     * @returns {Array<Object>}
+     */
+    buildFlatSectionArray() {
+        const optionHeight = this.props.optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
+        let offset = 0;
+
+        // Start with just an empty list header
+        const flatArray = [{length: 0, offset}];
+
+        // Build the flat array
+        for (let sectionIndex = 0; sectionIndex < this.props.sections.length; sectionIndex++) {
+            const section = this.props.sections[sectionIndex];
+
+            // Add the section header
+            const sectionHeaderHeight = section.title && !this.props.hideSectionHeaders ? variables.optionsListSectionHeaderHeight : 0;
+            flatArray.push({length: sectionHeaderHeight, offset});
+            offset += sectionHeaderHeight;
+
+            // Add section items
+            for (let i = 0; i < section.data.length; i++) {
+                flatArray.push({length: optionHeight, offset});
+                offset += optionHeight;
+            }
+
+            // Add the section footer
+            flatArray.push({length: 0, offset});
+        }
+
+        // Then add the list footer
+        flatArray.push({length: 0, offset});
+        return flatArray;
+    }
+
+    /**
+     * Returns the key used by the list
+     * @param {Object} option
+     * @return {String}
+     */
+    extractKey(option) {
+        return option.keyForList;
+    }
+
+    /**
+     * Function which renders a row in the list
+     *
+     * @param {Object} params
+     * @param {Object} params.item
+     * @param {Number} params.index
+     * @param {Object} params.section
+     *
+     * @return {Component}
+     */
+    renderItem({item, index, section}) {
+        return (
+            <OptionRow
+                option={item}
+                mode={this.props.optionMode}
+                showTitleTooltip={this.props.showTitleTooltip}
+                backgroundColor={this.props.optionBackgroundColor}
+                hoverStyle={this.props.optionHoveredStyle}
+                optionIsFocused={!this.props.disableFocusOptions
+                        && this.props.focusedIndex === (index + section.indexOffset)}
+                onSelectRow={this.props.onSelectRow}
+                isSelected={Boolean(_.find(this.props.selectedOptions, option => option.login === item.login))}
+                showSelectedState={this.props.canSelectMultipleOptions}
+                hideAdditionalOptionStates={this.props.hideAdditionalOptionStates}
+                forceTextUnreadStyle={this.props.forceTextUnreadStyle}
+                isDisabled={this.props.isDisabled || section.isDisabled}
+            />
+        );
+    }
+
+    /**
+     * Function which renders a section header component
+     *
+     * @param {Object} params
+     * @param {Object} params.section
+     * @param {String} params.section.title
+     * @param {Boolean} params.section.shouldShow
+     *
+     * @return {Component}
+     */
+    renderSectionHeader({section: {title, shouldShow}}) {
+        if (title && shouldShow && !this.props.hideSectionHeaders) {
+            return (
+
+                // Note: The `optionsListSectionHeader` style provides an explicit height to section headers.
+                // We do this so that we can reference the height in `getItemLayout` –
+                // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
+                // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
+                <View style={styles.optionsListSectionHeader}>
+                    <Text style={[styles.p5, styles.textMicroBold, styles.colorHeading, styles.textUppercase]}>
+                        {title}
+                    </Text>
+                </View>
+            );
+        }
+
+        return <View />;
+    }
+
+    render() {
+        return (
+            <View style={this.props.listContainerStyles}>
+                {this.props.headerMessage ? (
+                    <View style={[styles.ph5, styles.pb5]}>
+                        <Text style={[styles.textLabel, styles.colorMuted]}>
+                            {this.props.headerMessage}
+                        </Text>
+                    </View>
+                ) : null}
+                <SectionList
+                    ref={this.props.innerRef}
+                    indicatorStyle="white"
+                    keyboardShouldPersistTaps="always"
+                    keyboardDismissMode={this.props.keyboardDismissMode}
+                    onScrollBeginDrag={this.props.onScrollBeginDrag}
+                    contentContainerStyle={this.props.contentContainerStyles}
+                    showsVerticalScrollIndicator={false}
+                    sections={this.props.sections}
+                    keyExtractor={this.extractKey}
+                    stickySectionHeadersEnabled={false}
+                    renderItem={this.renderItem}
+                    getItemLayout={this.getItemLayout}
+                    renderSectionHeader={this.renderSectionHeader}
+                    extraData={this.props.focusedIndex}
+                    initialNumToRender={5}
+                    maxToRenderPerBatch={5}
+                    windowSize={5}
+                    viewabilityConfig={this.viewabilityConfig}
+                    onViewableItemsChanged={this.onViewableItemsChanged}
+                />
+            </View>
+        );
+    }
+}
+
+BaseOptionsList.propTypes = propTypes;
+BaseOptionsList.defaultProps = defaultProps;
+
+export default forwardRef((props, ref) => (
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    <BaseOptionsList {...props} innerRef={ref} />
+));
diff --git a/src/components/LHNOptionsList/index.js b/src/components/LHNOptionsList/index.js
new file mode 100644
index 000000000000..7db02df5623f
--- /dev/null
+++ b/src/components/LHNOptionsList/index.js
@@ -0,0 +1,19 @@
+import React, {forwardRef} from 'react';
+import BaseOptionsList from './BaseOptionsList';
+import withWindowDimensions from '../withWindowDimensions';
+import {propTypes, defaultProps} from './optionsListPropTypes';
+
+const OptionsList = forwardRef((props, ref) => (
+    <BaseOptionsList
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        ref={ref}
+        keyboardDismissMode={props.isSmallScreenWidth ? 'on-drag' : 'none'}
+    />
+));
+
+OptionsList.propTypes = propTypes;
+OptionsList.defaultProps = defaultProps;
+OptionsList.displayName = 'OptionsList';
+
+export default withWindowDimensions(OptionsList);
diff --git a/src/components/LHNOptionsList/index.native.js b/src/components/LHNOptionsList/index.native.js
new file mode 100644
index 000000000000..7701096fde8f
--- /dev/null
+++ b/src/components/LHNOptionsList/index.native.js
@@ -0,0 +1,19 @@
+import React, {forwardRef} from 'react';
+import {Keyboard} from 'react-native';
+import BaseOptionsList from './BaseOptionsList';
+import {propTypes, defaultProps} from './optionsListPropTypes';
+
+const OptionsList = forwardRef((props, ref) => (
+    <BaseOptionsList
+        // eslint-disable-next-line react/jsx-props-no-spreading
+        {...props}
+        ref={ref}
+        onScrollBeginDrag={() => Keyboard.dismiss()}
+    />
+));
+
+OptionsList.propTypes = propTypes;
+OptionsList.defaultProps = defaultProps;
+OptionsList.displayName = 'OptionsList';
+
+export default OptionsList;
diff --git a/src/components/LHNOptionsList/optionsListPropTypes.js b/src/components/LHNOptionsList/optionsListPropTypes.js
new file mode 100644
index 000000000000..b51fc14d64d7
--- /dev/null
+++ b/src/components/LHNOptionsList/optionsListPropTypes.js
@@ -0,0 +1,105 @@
+import PropTypes from 'prop-types';
+import _ from 'underscore';
+import SectionList from '../SectionList';
+import styles from '../../styles/styles';
+import optionPropTypes from '../optionPropTypes';
+import CONST from '../../CONST';
+
+const propTypes = {
+    /** option Background Color */
+    optionBackgroundColor: PropTypes.string,
+
+    /** option flexStyle for the options list container */
+    listContainerStyles: PropTypes.arrayOf(PropTypes.object),
+
+    /** Style for hovered state */
+    // eslint-disable-next-line react/forbid-prop-types
+    optionHoveredStyle: PropTypes.object,
+
+    /** Extra styles for the section list container */
+    contentContainerStyles: PropTypes.arrayOf(PropTypes.object),
+
+    /** Sections for the section list */
+    sections: PropTypes.arrayOf(PropTypes.shape({
+        /** Title of the section */
+        title: PropTypes.string,
+
+        /** The initial index of this section given the total number of options in each section's data array */
+        indexOffset: PropTypes.number,
+
+        /** Array of options */
+        data: PropTypes.arrayOf(optionPropTypes),
+
+        /** Whether this section should show or not */
+        shouldShow: PropTypes.bool,
+    })),
+
+    /** Index for option to focus on */
+    focusedIndex: PropTypes.number,
+
+    /** Array of already selected options */
+    selectedOptions: PropTypes.arrayOf(optionPropTypes),
+
+    /** Whether we can select multiple options or not */
+    canSelectMultipleOptions: PropTypes.bool,
+
+    /** Whether to show headers above each section or not */
+    hideSectionHeaders: PropTypes.bool,
+
+    /** Whether to allow option focus or not */
+    disableFocusOptions: PropTypes.bool,
+
+    /** A flag to indicate whether to show additional optional states, such as pin and draft icons */
+    hideAdditionalOptionStates: PropTypes.bool,
+
+    /** Force the text style to be the unread style on all rows */
+    forceTextUnreadStyle: PropTypes.bool,
+
+    /** Callback to fire when a row is selected */
+    onSelectRow: PropTypes.func,
+
+    /** Optional header message */
+    headerMessage: PropTypes.string,
+
+    /** Passed via forwardRef so we can access the SectionList ref */
+    innerRef: PropTypes.oneOfType([
+        PropTypes.func,
+        PropTypes.shape({current: PropTypes.instanceOf(SectionList)}),
+    ]),
+
+    /** Whether to show the title tooltip */
+    showTitleTooltip: PropTypes.bool,
+
+    /** Toggle between compact and default view of the option */
+    optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
+
+    /** Whether to disable the interactivity of the list's option row(s) */
+    isDisabled: PropTypes.bool,
+
+    /** Callback to execute when the SectionList lays out */
+    onLayout: PropTypes.func,
+};
+
+const defaultProps = {
+    optionBackgroundColor: undefined,
+    optionHoveredStyle: undefined,
+    contentContainerStyles: [],
+    listContainerStyles: [styles.flex1],
+    sections: [],
+    focusedIndex: 0,
+    selectedOptions: [],
+    canSelectMultipleOptions: false,
+    hideSectionHeaders: false,
+    disableFocusOptions: false,
+    hideAdditionalOptionStates: false,
+    forceTextUnreadStyle: false,
+    onSelectRow: () => {},
+    headerMessage: '',
+    innerRef: null,
+    showTitleTooltip: false,
+    optionMode: undefined,
+    isDisabled: false,
+    onLayout: undefined,
+};
+
+export {propTypes, defaultProps};

From 67a2cc4802355e407362a3069be1249c82a07ed5 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:11:28 +0200
Subject: [PATCH 016/178] Remove showTitleTooltip and hideSectionHeaders props

---
 ...seOptionsList.js => BaseOptionsListLHN.js} | 45 +++------------
 src/components/LHNOptionsList/index.js        | 16 +++---
 src/components/LHNOptionsList/index.native.js |  4 +-
 .../LHNOptionsList/optionPropTypesLHN.js      | 56 +++++++++++++++++++
 ...ropTypes.js => optionsListPropTypesLHN.js} | 14 +----
 src/pages/home/sidebar/SidebarLinks.js        |  2 -
 6 files changed, 76 insertions(+), 61 deletions(-)
 rename src/components/LHNOptionsList/{BaseOptionsList.js => BaseOptionsListLHN.js} (81%)
 create mode 100644 src/components/LHNOptionsList/optionPropTypesLHN.js
 rename src/components/LHNOptionsList/{optionsListPropTypes.js => optionsListPropTypesLHN.js} (87%)

diff --git a/src/components/LHNOptionsList/BaseOptionsList.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
similarity index 81%
rename from src/components/LHNOptionsList/BaseOptionsList.js
rename to src/components/LHNOptionsList/BaseOptionsListLHN.js
index 17ce25e26551..e148200e80da 100644
--- a/src/components/LHNOptionsList/BaseOptionsList.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -8,7 +8,7 @@ import variables from '../../styles/variables';
 import OptionRow from '../OptionRow';
 import SectionList from '../SectionList';
 import Text from '../Text';
-import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultProps} from './optionsListPropTypes';
+import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultProps} from './optionsListPropTypesLHN';
 
 const propTypes = {
     /** Determines whether the keyboard gets dismissed in response to a drag */
@@ -26,12 +26,11 @@ const defaultProps = {
     ...optionsListDefaultProps,
 };
 
-class BaseOptionsList extends Component {
+class BaseOptionsListLHN extends Component {
     constructor(props) {
         super(props);
 
         this.renderItem = this.renderItem.bind(this);
-        this.renderSectionHeader = this.renderSectionHeader.bind(this);
         this.getItemLayout = this.getItemLayout.bind(this);
         this.buildFlatSectionArray = this.buildFlatSectionArray.bind(this);
         this.extractKey = this.extractKey.bind(this);
@@ -125,7 +124,7 @@ class BaseOptionsList extends Component {
             const section = this.props.sections[sectionIndex];
 
             // Add the section header
-            const sectionHeaderHeight = section.title && !this.props.hideSectionHeaders ? variables.optionsListSectionHeaderHeight : 0;
+            const sectionHeaderHeight = 0;
             flatArray.push({length: sectionHeaderHeight, offset});
             offset += sectionHeaderHeight;
 
@@ -168,7 +167,7 @@ class BaseOptionsList extends Component {
             <OptionRow
                 option={item}
                 mode={this.props.optionMode}
-                showTitleTooltip={this.props.showTitleTooltip}
+                showTitleTooltip
                 backgroundColor={this.props.optionBackgroundColor}
                 hoverStyle={this.props.optionHoveredStyle}
                 optionIsFocused={!this.props.disableFocusOptions
@@ -183,35 +182,6 @@ class BaseOptionsList extends Component {
         );
     }
 
-    /**
-     * Function which renders a section header component
-     *
-     * @param {Object} params
-     * @param {Object} params.section
-     * @param {String} params.section.title
-     * @param {Boolean} params.section.shouldShow
-     *
-     * @return {Component}
-     */
-    renderSectionHeader({section: {title, shouldShow}}) {
-        if (title && shouldShow && !this.props.hideSectionHeaders) {
-            return (
-
-                // Note: The `optionsListSectionHeader` style provides an explicit height to section headers.
-                // We do this so that we can reference the height in `getItemLayout` –
-                // we need to know the heights of all list items up-front in order to synchronously compute the layout of any given list item.
-                // So be aware that if you adjust the content of the section header (for example, change the font size), you may need to adjust this explicit height as well.
-                <View style={styles.optionsListSectionHeader}>
-                    <Text style={[styles.p5, styles.textMicroBold, styles.colorHeading, styles.textUppercase]}>
-                        {title}
-                    </Text>
-                </View>
-            );
-        }
-
-        return <View />;
-    }
-
     render() {
         return (
             <View style={this.props.listContainerStyles}>
@@ -235,7 +205,6 @@ class BaseOptionsList extends Component {
                     stickySectionHeadersEnabled={false}
                     renderItem={this.renderItem}
                     getItemLayout={this.getItemLayout}
-                    renderSectionHeader={this.renderSectionHeader}
                     extraData={this.props.focusedIndex}
                     initialNumToRender={5}
                     maxToRenderPerBatch={5}
@@ -248,10 +217,10 @@ class BaseOptionsList extends Component {
     }
 }
 
-BaseOptionsList.propTypes = propTypes;
-BaseOptionsList.defaultProps = defaultProps;
+BaseOptionsListLHN.propTypes = propTypes;
+BaseOptionsListLHN.defaultProps = defaultProps;
 
 export default forwardRef((props, ref) => (
     // eslint-disable-next-line react/jsx-props-no-spreading
-    <BaseOptionsList {...props} innerRef={ref} />
+    <BaseOptionsListLHN {...props} innerRef={ref} />
 ));
diff --git a/src/components/LHNOptionsList/index.js b/src/components/LHNOptionsList/index.js
index 7db02df5623f..d2337f2953cb 100644
--- a/src/components/LHNOptionsList/index.js
+++ b/src/components/LHNOptionsList/index.js
@@ -1,10 +1,10 @@
 import React, {forwardRef} from 'react';
-import BaseOptionsList from './BaseOptionsList';
+import BaseOptionsListLHN from './BaseOptionsListLHN';
 import withWindowDimensions from '../withWindowDimensions';
-import {propTypes, defaultProps} from './optionsListPropTypes';
+import {propTypes, defaultProps} from './optionsListPropTypesLHN';
 
-const OptionsList = forwardRef((props, ref) => (
-    <BaseOptionsList
+const OptionsListLHN = forwardRef((props, ref) => (
+    <BaseOptionsListLHN
         // eslint-disable-next-line react/jsx-props-no-spreading
         {...props}
         ref={ref}
@@ -12,8 +12,8 @@ const OptionsList = forwardRef((props, ref) => (
     />
 ));
 
-OptionsList.propTypes = propTypes;
-OptionsList.defaultProps = defaultProps;
-OptionsList.displayName = 'OptionsList';
+OptionsListLHN.propTypes = propTypes;
+OptionsListLHN.defaultProps = defaultProps;
+OptionsListLHN.displayName = 'OptionsListLHN';
 
-export default withWindowDimensions(OptionsList);
+export default withWindowDimensions(OptionsListLHN);
diff --git a/src/components/LHNOptionsList/index.native.js b/src/components/LHNOptionsList/index.native.js
index 7701096fde8f..a78d335cf7ea 100644
--- a/src/components/LHNOptionsList/index.native.js
+++ b/src/components/LHNOptionsList/index.native.js
@@ -1,7 +1,7 @@
 import React, {forwardRef} from 'react';
 import {Keyboard} from 'react-native';
-import BaseOptionsList from './BaseOptionsList';
-import {propTypes, defaultProps} from './optionsListPropTypes';
+import BaseOptionsList from './BaseOptionsListLHN';
+import {propTypes, defaultProps} from './optionsListPropTypesLHN';
 
 const OptionsList = forwardRef((props, ref) => (
     <BaseOptionsList
diff --git a/src/components/LHNOptionsList/optionPropTypesLHN.js b/src/components/LHNOptionsList/optionPropTypesLHN.js
new file mode 100644
index 000000000000..78dbd19b5339
--- /dev/null
+++ b/src/components/LHNOptionsList/optionPropTypesLHN.js
@@ -0,0 +1,56 @@
+import PropTypes from 'prop-types';
+import CONST from '../CONST';
+import participantPropTypes from './participantPropTypes';
+
+export default PropTypes.shape({
+    // Text to display
+    text: PropTypes.string,
+
+    // Alternate text to display
+    alternateText: PropTypes.string,
+
+    // Array of URLs or icons
+    icons: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.func])),
+
+    // Login (only present when there is a single participant)
+    login: PropTypes.string,
+
+    // reportID (only present when there is a matching report)
+    reportID: PropTypes.number,
+
+    // Whether the report has read or not
+    isUnread: PropTypes.bool,
+
+    // Whether the report has a draft comment or not
+    hasDraftComment: PropTypes.bool,
+
+    // Key used internally by React
+    keyForList: PropTypes.string,
+
+    // Search text we use to filter options
+    searchText: PropTypes.string,
+
+    // Whether the report is pinned or not
+    isPinned: PropTypes.bool,
+
+    // Whether the report corresponds to a chat room
+    isChatRoom: PropTypes.bool,
+
+    // Whether the option has an outstanding IOU
+    hasOutstandingIOU: PropTypes.bool,
+
+    // List of participants of the report
+    participantsList: PropTypes.arrayOf(participantPropTypes),
+
+    // Descriptive text to be displayed besides selection element
+    descriptiveText: PropTypes.string,
+
+    // The type of option we have e.g. user or report
+    type: PropTypes.string,
+
+    // Text to show for tooltip
+    tooltipText: PropTypes.string,
+
+    /** If we need to show a brick road indicator or not */
+    brickRoadIndicator: PropTypes.oneOf([CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR, '']),
+});
diff --git a/src/components/LHNOptionsList/optionsListPropTypes.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
similarity index 87%
rename from src/components/LHNOptionsList/optionsListPropTypes.js
rename to src/components/LHNOptionsList/optionsListPropTypesLHN.js
index b51fc14d64d7..8d690547e28a 100644
--- a/src/components/LHNOptionsList/optionsListPropTypes.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -2,7 +2,7 @@ import PropTypes from 'prop-types';
 import _ from 'underscore';
 import SectionList from '../SectionList';
 import styles from '../../styles/styles';
-import optionPropTypes from '../optionPropTypes';
+import optionPropTypesLHN from './optionPropTypesLHN';
 import CONST from '../../CONST';
 
 const propTypes = {
@@ -28,7 +28,7 @@ const propTypes = {
         indexOffset: PropTypes.number,
 
         /** Array of options */
-        data: PropTypes.arrayOf(optionPropTypes),
+        data: PropTypes.arrayOf(optionPropTypesLHN),
 
         /** Whether this section should show or not */
         shouldShow: PropTypes.bool,
@@ -38,14 +38,11 @@ const propTypes = {
     focusedIndex: PropTypes.number,
 
     /** Array of already selected options */
-    selectedOptions: PropTypes.arrayOf(optionPropTypes),
+    selectedOptions: PropTypes.arrayOf(optionPropTypesLHN),
 
     /** Whether we can select multiple options or not */
     canSelectMultipleOptions: PropTypes.bool,
 
-    /** Whether to show headers above each section or not */
-    hideSectionHeaders: PropTypes.bool,
-
     /** Whether to allow option focus or not */
     disableFocusOptions: PropTypes.bool,
 
@@ -67,9 +64,6 @@ const propTypes = {
         PropTypes.shape({current: PropTypes.instanceOf(SectionList)}),
     ]),
 
-    /** Whether to show the title tooltip */
-    showTitleTooltip: PropTypes.bool,
-
     /** Toggle between compact and default view of the option */
     optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
 
@@ -89,14 +83,12 @@ const defaultProps = {
     focusedIndex: 0,
     selectedOptions: [],
     canSelectMultipleOptions: false,
-    hideSectionHeaders: false,
     disableFocusOptions: false,
     hideAdditionalOptionStates: false,
     forceTextUnreadStyle: false,
     onSelectRow: () => {},
     headerMessage: '',
     innerRef: null,
-    showTitleTooltip: false,
     optionMode: undefined,
     isDisabled: false,
     onLayout: undefined,
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index d10fdefa778e..424716113985 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -195,8 +195,6 @@ class SidebarLinks extends React.Component {
                         this.props.onLinkClick();
                     }}
                     optionBackgroundColor={themeColors.sidebar}
-                    hideSectionHeaders
-                    showTitleTooltip
                     disableFocusOptions={this.props.isSmallScreenWidth}
                     optionMode={this.props.priorityMode === CONST.PRIORITY_MODE.GSD ? 'compact' : 'default'}
                     onLayout={App.setSidebarLoaded}

From fd9d0e2aad7c017592238d4cb25ae126e7b1b77a Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:13:08 +0200
Subject: [PATCH 017/178] Remove listContainerStyle prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 2 +-
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index e148200e80da..4e7dc0069709 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -184,7 +184,7 @@ class BaseOptionsListLHN extends Component {
 
     render() {
         return (
-            <View style={this.props.listContainerStyles}>
+            <View style={[styles.flex1]}>
                 {this.props.headerMessage ? (
                     <View style={[styles.ph5, styles.pb5]}>
                         <Text style={[styles.textLabel, styles.colorMuted]}>
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 8d690547e28a..2b18350d6ca1 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -9,9 +9,6 @@ const propTypes = {
     /** option Background Color */
     optionBackgroundColor: PropTypes.string,
 
-    /** option flexStyle for the options list container */
-    listContainerStyles: PropTypes.arrayOf(PropTypes.object),
-
     /** Style for hovered state */
     // eslint-disable-next-line react/forbid-prop-types
     optionHoveredStyle: PropTypes.object,
@@ -78,7 +75,6 @@ const defaultProps = {
     optionBackgroundColor: undefined,
     optionHoveredStyle: undefined,
     contentContainerStyles: [],
-    listContainerStyles: [styles.flex1],
     sections: [],
     focusedIndex: 0,
     selectedOptions: [],

From 3bc3974f8af0d0ea2342db8e2ab39c753a90ebb2 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:14:00 +0200
Subject: [PATCH 018/178] Remove optionHoveredStyle prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 1 -
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 4e7dc0069709..5273e27e3e70 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -169,7 +169,6 @@ class BaseOptionsListLHN extends Component {
                 mode={this.props.optionMode}
                 showTitleTooltip
                 backgroundColor={this.props.optionBackgroundColor}
-                hoverStyle={this.props.optionHoveredStyle}
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 2b18350d6ca1..57c9142c6639 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -9,10 +9,6 @@ const propTypes = {
     /** option Background Color */
     optionBackgroundColor: PropTypes.string,
 
-    /** Style for hovered state */
-    // eslint-disable-next-line react/forbid-prop-types
-    optionHoveredStyle: PropTypes.object,
-
     /** Extra styles for the section list container */
     contentContainerStyles: PropTypes.arrayOf(PropTypes.object),
 
@@ -73,7 +69,6 @@ const propTypes = {
 
 const defaultProps = {
     optionBackgroundColor: undefined,
-    optionHoveredStyle: undefined,
     contentContainerStyles: [],
     sections: [],
     focusedIndex: 0,

From 30d6839f7f38dbd257c66d5352788c5c9b47b261 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:15:51 +0200
Subject: [PATCH 019/178] Remove selectedOptions prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 5 -----
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 5273e27e3e70..fc8d9139b955 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -46,10 +46,6 @@ class BaseOptionsListLHN extends Component {
             return true;
         }
 
-        if (nextProps.selectedOptions.length !== this.props.selectedOptions.length) {
-            return true;
-        }
-
         if (nextProps.headerMessage !== this.props.headerMessage) {
             return true;
         }
@@ -172,7 +168,6 @@ class BaseOptionsListLHN extends Component {
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
-                isSelected={Boolean(_.find(this.props.selectedOptions, option => option.login === item.login))}
                 showSelectedState={this.props.canSelectMultipleOptions}
                 hideAdditionalOptionStates={this.props.hideAdditionalOptionStates}
                 forceTextUnreadStyle={this.props.forceTextUnreadStyle}
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 57c9142c6639..99351af4cf42 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import SectionList from '../SectionList';
-import styles from '../../styles/styles';
 import optionPropTypesLHN from './optionPropTypesLHN';
 import CONST from '../../CONST';
 
@@ -30,9 +29,6 @@ const propTypes = {
     /** Index for option to focus on */
     focusedIndex: PropTypes.number,
 
-    /** Array of already selected options */
-    selectedOptions: PropTypes.arrayOf(optionPropTypesLHN),
-
     /** Whether we can select multiple options or not */
     canSelectMultipleOptions: PropTypes.bool,
 
@@ -72,7 +68,6 @@ const defaultProps = {
     contentContainerStyles: [],
     sections: [],
     focusedIndex: 0,
-    selectedOptions: [],
     canSelectMultipleOptions: false,
     disableFocusOptions: false,
     hideAdditionalOptionStates: false,

From 04ade70cde7c8a0e295b01fdefbb9545ae8cd8fa Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:16:31 +0200
Subject: [PATCH 020/178] Remove canSelectMultipleOptions prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 2 +-
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index fc8d9139b955..fbf7d96c6c54 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -168,7 +168,7 @@ class BaseOptionsListLHN extends Component {
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
-                showSelectedState={this.props.canSelectMultipleOptions}
+                showSelectedState={false}
                 hideAdditionalOptionStates={this.props.hideAdditionalOptionStates}
                 forceTextUnreadStyle={this.props.forceTextUnreadStyle}
                 isDisabled={this.props.isDisabled || section.isDisabled}
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 99351af4cf42..dc34d8b1ee2f 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -29,9 +29,6 @@ const propTypes = {
     /** Index for option to focus on */
     focusedIndex: PropTypes.number,
 
-    /** Whether we can select multiple options or not */
-    canSelectMultipleOptions: PropTypes.bool,
-
     /** Whether to allow option focus or not */
     disableFocusOptions: PropTypes.bool,
 
@@ -68,7 +65,6 @@ const defaultProps = {
     contentContainerStyles: [],
     sections: [],
     focusedIndex: 0,
-    canSelectMultipleOptions: false,
     disableFocusOptions: false,
     hideAdditionalOptionStates: false,
     forceTextUnreadStyle: false,

From 7e6415f6ec1f11a9406e76bc72e92dc1560dfe0b Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:17:14 +0200
Subject: [PATCH 021/178] Remove hideAdditionalOptionStates prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 2 +-
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index fbf7d96c6c54..1851a59be14e 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -169,7 +169,7 @@ class BaseOptionsListLHN extends Component {
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
                 showSelectedState={false}
-                hideAdditionalOptionStates={this.props.hideAdditionalOptionStates}
+                hideAdditionalOptionStates={false}
                 forceTextUnreadStyle={this.props.forceTextUnreadStyle}
                 isDisabled={this.props.isDisabled || section.isDisabled}
             />
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index dc34d8b1ee2f..28cf37bab6dc 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -32,9 +32,6 @@ const propTypes = {
     /** Whether to allow option focus or not */
     disableFocusOptions: PropTypes.bool,
 
-    /** A flag to indicate whether to show additional optional states, such as pin and draft icons */
-    hideAdditionalOptionStates: PropTypes.bool,
-
     /** Force the text style to be the unread style on all rows */
     forceTextUnreadStyle: PropTypes.bool,
 
@@ -66,7 +63,6 @@ const defaultProps = {
     sections: [],
     focusedIndex: 0,
     disableFocusOptions: false,
-    hideAdditionalOptionStates: false,
     forceTextUnreadStyle: false,
     onSelectRow: () => {},
     headerMessage: '',

From e825e1b2d2e14b2c977c167b529351d72b7e49df Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:17:53 +0200
Subject: [PATCH 022/178] Remove forceTextUnreadStyle prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 2 +-
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 1851a59be14e..68198e30f85b 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -170,7 +170,7 @@ class BaseOptionsListLHN extends Component {
                 onSelectRow={this.props.onSelectRow}
                 showSelectedState={false}
                 hideAdditionalOptionStates={false}
-                forceTextUnreadStyle={this.props.forceTextUnreadStyle}
+                forceTextUnreadStyle={false}
                 isDisabled={this.props.isDisabled || section.isDisabled}
             />
         );
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 28cf37bab6dc..86789b74366d 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -32,9 +32,6 @@ const propTypes = {
     /** Whether to allow option focus or not */
     disableFocusOptions: PropTypes.bool,
 
-    /** Force the text style to be the unread style on all rows */
-    forceTextUnreadStyle: PropTypes.bool,
-
     /** Callback to fire when a row is selected */
     onSelectRow: PropTypes.func,
 
@@ -63,7 +60,6 @@ const defaultProps = {
     sections: [],
     focusedIndex: 0,
     disableFocusOptions: false,
-    forceTextUnreadStyle: false,
     onSelectRow: () => {},
     headerMessage: '',
     innerRef: null,

From 47f01cbab40103b496c0d5715be83c0e52435dc2 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:18:40 +0200
Subject: [PATCH 023/178] Remove headerMessage prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 7 -------
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 68198e30f85b..791af2a892d7 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -179,13 +179,6 @@ class BaseOptionsListLHN extends Component {
     render() {
         return (
             <View style={[styles.flex1]}>
-                {this.props.headerMessage ? (
-                    <View style={[styles.ph5, styles.pb5]}>
-                        <Text style={[styles.textLabel, styles.colorMuted]}>
-                            {this.props.headerMessage}
-                        </Text>
-                    </View>
-                ) : null}
                 <SectionList
                     ref={this.props.innerRef}
                     indicatorStyle="white"
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 86789b74366d..a1f829db032c 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -35,9 +35,6 @@ const propTypes = {
     /** Callback to fire when a row is selected */
     onSelectRow: PropTypes.func,
 
-    /** Optional header message */
-    headerMessage: PropTypes.string,
-
     /** Passed via forwardRef so we can access the SectionList ref */
     innerRef: PropTypes.oneOfType([
         PropTypes.func,
@@ -61,7 +58,6 @@ const defaultProps = {
     focusedIndex: 0,
     disableFocusOptions: false,
     onSelectRow: () => {},
-    headerMessage: '',
     innerRef: null,
     optionMode: undefined,
     isDisabled: false,

From 5ec8823e078357421d11c295623bded0546d92f9 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:19:42 +0200
Subject: [PATCH 024/178] Remove isDisabled prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 2 +-
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 791af2a892d7..496d3c48089d 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -171,7 +171,7 @@ class BaseOptionsListLHN extends Component {
                 showSelectedState={false}
                 hideAdditionalOptionStates={false}
                 forceTextUnreadStyle={false}
-                isDisabled={this.props.isDisabled || section.isDisabled}
+                isDisabled={false}
             />
         );
     }
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index a1f829db032c..8188a3746eba 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -44,9 +44,6 @@ const propTypes = {
     /** Toggle between compact and default view of the option */
     optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
 
-    /** Whether to disable the interactivity of the list's option row(s) */
-    isDisabled: PropTypes.bool,
-
     /** Callback to execute when the SectionList lays out */
     onLayout: PropTypes.func,
 };
@@ -60,7 +57,6 @@ const defaultProps = {
     onSelectRow: () => {},
     innerRef: null,
     optionMode: undefined,
-    isDisabled: false,
     onLayout: undefined,
 };
 

From 2e35baf1928cd0862f0ece4eb5bbe00e69aadf78 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:20:38 +0200
Subject: [PATCH 025/178] Remove default props

---
 src/components/LHNOptionsList/index.js        |  3 +-
 .../LHNOptionsList/optionsListPropTypesLHN.js | 33 +++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/src/components/LHNOptionsList/index.js b/src/components/LHNOptionsList/index.js
index d2337f2953cb..816a656061b7 100644
--- a/src/components/LHNOptionsList/index.js
+++ b/src/components/LHNOptionsList/index.js
@@ -1,7 +1,7 @@
 import React, {forwardRef} from 'react';
 import BaseOptionsListLHN from './BaseOptionsListLHN';
 import withWindowDimensions from '../withWindowDimensions';
-import {propTypes, defaultProps} from './optionsListPropTypesLHN';
+import {propTypes} from './optionsListPropTypesLHN';
 
 const OptionsListLHN = forwardRef((props, ref) => (
     <BaseOptionsListLHN
@@ -13,7 +13,6 @@ const OptionsListLHN = forwardRef((props, ref) => (
 ));
 
 OptionsListLHN.propTypes = propTypes;
-OptionsListLHN.defaultProps = defaultProps;
 OptionsListLHN.displayName = 'OptionsListLHN';
 
 export default withWindowDimensions(OptionsListLHN);
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 8188a3746eba..a99a9930a35d 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -6,10 +6,10 @@ import CONST from '../../CONST';
 
 const propTypes = {
     /** option Background Color */
-    optionBackgroundColor: PropTypes.string,
+    optionBackgroundColor: PropTypes.string.isRequired,
 
     /** Extra styles for the section list container */
-    contentContainerStyles: PropTypes.arrayOf(PropTypes.object),
+    contentContainerStyles: PropTypes.arrayOf(PropTypes.object).isRequired,
 
     /** Sections for the section list */
     sections: PropTypes.arrayOf(PropTypes.shape({
@@ -24,40 +24,29 @@ const propTypes = {
 
         /** Whether this section should show or not */
         shouldShow: PropTypes.bool,
-    })),
+    })).isRequired,
 
     /** Index for option to focus on */
-    focusedIndex: PropTypes.number,
+    focusedIndex: PropTypes.number.isRequired,
 
     /** Whether to allow option focus or not */
-    disableFocusOptions: PropTypes.bool,
+    disableFocusOptions: PropTypes.bool.isRequired,
 
     /** Callback to fire when a row is selected */
-    onSelectRow: PropTypes.func,
+    onSelectRow: PropTypes.func.isRequired,
 
     /** Passed via forwardRef so we can access the SectionList ref */
     innerRef: PropTypes.oneOfType([
         PropTypes.func,
         PropTypes.shape({current: PropTypes.instanceOf(SectionList)}),
-    ]),
+    ]).isRequired,
 
     /** Toggle between compact and default view of the option */
-    optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
+    optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)).isRequired,
 
     /** Callback to execute when the SectionList lays out */
-    onLayout: PropTypes.func,
+    onLayout: PropTypes.func.isRequired,
 };
 
-const defaultProps = {
-    optionBackgroundColor: undefined,
-    contentContainerStyles: [],
-    sections: [],
-    focusedIndex: 0,
-    disableFocusOptions: false,
-    onSelectRow: () => {},
-    innerRef: null,
-    optionMode: undefined,
-    onLayout: undefined,
-};
-
-export {propTypes, defaultProps};
+// eslint-disable-next-line import/prefer-default-export
+export {propTypes};

From a6a2a6795fe6842aa0b6cc055494b41d68daf07c Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:27:26 +0200
Subject: [PATCH 026/178] Duplicate the option row component

---
 .../LHNOptionsList/BaseOptionsListLHN.js      |   8 +-
 src/components/LHNOptionsList/OptionRowLHN.js | 317 ++++++++++++++++++
 2 files changed, 320 insertions(+), 5 deletions(-)
 create mode 100644 src/components/LHNOptionsList/OptionRowLHN.js

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 496d3c48089d..3b946b5329e4 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -5,10 +5,9 @@ import PropTypes from 'prop-types';
 import CONST from '../../CONST';
 import styles from '../../styles/styles';
 import variables from '../../styles/variables';
-import OptionRow from '../OptionRow';
 import SectionList from '../SectionList';
-import Text from '../Text';
-import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultProps} from './optionsListPropTypesLHN';
+import OptionRowLHN from './OptionRowLHN';
+import {propTypes as optionsListPropTypes} from './optionsListPropTypesLHN';
 
 const propTypes = {
     /** Determines whether the keyboard gets dismissed in response to a drag */
@@ -23,7 +22,6 @@ const propTypes = {
 const defaultProps = {
     keyboardDismissMode: 'none',
     onScrollBeginDrag: () => {},
-    ...optionsListDefaultProps,
 };
 
 class BaseOptionsListLHN extends Component {
@@ -160,7 +158,7 @@ class BaseOptionsListLHN extends Component {
      */
     renderItem({item, index, section}) {
         return (
-            <OptionRow
+            <OptionRowLHN
                 option={item}
                 mode={this.props.optionMode}
                 showTitleTooltip
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
new file mode 100644
index 000000000000..02754811b274
--- /dev/null
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -0,0 +1,317 @@
+import _ from 'underscore';
+import lodashGet from 'lodash/get';
+import React, {memo} from 'react';
+import PropTypes from 'prop-types';
+import {
+    TouchableOpacity,
+    View,
+    StyleSheet,
+} from 'react-native';
+import styles from '../styles/styles';
+import * as StyleUtils from '../styles/StyleUtils';
+import optionPropTypes from './optionPropTypes';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+import MultipleAvatars from './MultipleAvatars';
+import Hoverable from './Hoverable';
+import DisplayNames from './DisplayNames';
+import IOUBadge from './IOUBadge';
+import colors from '../styles/colors';
+import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import Text from './Text';
+import SelectCircle from './SelectCircle';
+import SubscriptAvatar from './SubscriptAvatar';
+import CONST from '../CONST';
+import * as ReportUtils from '../libs/ReportUtils';
+import variables from '../styles/variables';
+
+const propTypes = {
+    /** Background Color of the Option Row */
+    backgroundColor: PropTypes.string,
+
+    /** Style for hovered state */
+    // eslint-disable-next-line react/forbid-prop-types
+    hoverStyle: PropTypes.object,
+
+    /** Option to allow the user to choose from can be type 'report' or 'user' */
+    option: optionPropTypes.isRequired,
+
+    /** Whether this option is currently in focus so we can modify its style */
+    optionIsFocused: PropTypes.bool,
+
+    /** A function that is called when an option is selected. Selected option is passed as a param */
+    onSelectRow: PropTypes.func,
+
+    /** A flag to indicate whether to show additional optional states, such as pin and draft icons */
+    hideAdditionalOptionStates: PropTypes.bool,
+
+    /** Whether we should show the selected state */
+    showSelectedState: PropTypes.bool,
+
+    /** Whether this item is selected */
+    isSelected: PropTypes.bool,
+
+    /** Force the text style to be the unread style */
+    forceTextUnreadStyle: PropTypes.bool,
+
+    /** Whether to show the title tooltip */
+    showTitleTooltip: PropTypes.bool,
+
+    /** Toggle between compact and default view */
+    mode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
+
+    /** Whether this option should be disabled */
+    isDisabled: PropTypes.bool,
+
+    style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
+
+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {
+    backgroundColor: colors.white,
+    hoverStyle: styles.sidebarLinkHover,
+    hideAdditionalOptionStates: false,
+    showSelectedState: false,
+    isSelected: false,
+    forceTextUnreadStyle: false,
+    showTitleTooltip: false,
+    mode: 'default',
+    onSelectRow: () => {},
+    isDisabled: false,
+    optionIsFocused: false,
+    style: null,
+};
+
+const OptionRowLHN = (props) => {
+    let touchableRef = null;
+    const textStyle = props.optionIsFocused
+        ? styles.sidebarLinkActiveText
+        : styles.sidebarLinkText;
+    const textUnreadStyle = (props.option.isUnread || props.forceTextUnreadStyle)
+        ? [textStyle, styles.sidebarLinkTextUnread] : [textStyle];
+    const displayNameStyle = StyleUtils.combineStyles(props.mode === CONST.OPTION_MODE.COMPACT
+        ? [styles.optionDisplayName, ...textUnreadStyle, styles.optionDisplayNameCompact, styles.mr2]
+        : [styles.optionDisplayName, ...textUnreadStyle], props.style);
+    const alternateTextStyle = StyleUtils.combineStyles(props.mode === CONST.OPTION_MODE.COMPACT
+        ? [textStyle, styles.optionAlternateText, styles.textLabelSupporting, styles.optionAlternateTextCompact]
+        : [textStyle, styles.optionAlternateText, styles.textLabelSupporting], props.style);
+    const contentContainerStyles = props.mode === CONST.OPTION_MODE.COMPACT
+        ? [styles.flex1, styles.flexRow, styles.overflowHidden, styles.alignItemsCenter]
+        : [styles.flex1];
+    const sidebarInnerRowStyle = StyleSheet.flatten(props.mode === CONST.OPTION_MODE.COMPACT ? [
+        styles.chatLinkRowPressable,
+        styles.flexGrow1,
+        styles.optionItemAvatarNameWrapper,
+        styles.optionRowCompact,
+        styles.justifyContentCenter,
+    ] : [
+        styles.chatLinkRowPressable,
+        styles.flexGrow1,
+        styles.optionItemAvatarNameWrapper,
+        styles.optionRow,
+        styles.justifyContentCenter,
+    ]);
+    const hoveredBackgroundColor = props.hoverStyle && props.hoverStyle.backgroundColor
+        ? props.hoverStyle.backgroundColor
+        : props.backgroundColor;
+    const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
+    const isMultipleParticipant = lodashGet(props.option, 'participantsList.length', 0) > 1;
+
+    // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
+    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((props.option.participantsList || []).slice(0, 10), isMultipleParticipant);
+    const avatarTooltips = props.showTitleTooltip && !props.option.isChatRoom && !props.option.isArchivedRoom ? _.pluck(displayNamesWithTooltips, 'tooltip') : undefined;
+
+    return (
+        <Hoverable>
+            {hovered => (
+                <TouchableOpacity
+                    ref={el => touchableRef = el}
+                    onPress={(e) => {
+                        e.preventDefault();
+                        props.onSelectRow(props.option, touchableRef);
+                    }}
+                    disabled={props.isDisabled}
+                    activeOpacity={0.8}
+                    style={[
+                        styles.flexRow,
+                        styles.alignItemsCenter,
+                        styles.justifyContentBetween,
+                        styles.sidebarLink,
+                        styles.sidebarLinkInner,
+                        StyleUtils.getBackgroundColorStyle(props.backgroundColor),
+                        props.optionIsFocused ? styles.sidebarLinkActive : null,
+                        hovered && !props.optionIsFocused ? props.hoverStyle : null,
+                        props.isDisabled && styles.cursorDisabled,
+                    ]}
+                >
+                    <View style={sidebarInnerRowStyle}>
+                        <View
+                            style={[
+                                styles.flexRow,
+                                styles.alignItemsCenter,
+                            ]}
+                        >
+                            {
+                                !_.isEmpty(props.option.icons)
+                                && (
+                                    props.option.shouldShowSubscript ? (
+                                        <SubscriptAvatar
+                                            mainAvatar={props.option.icons[0]}
+                                            secondaryAvatar={props.option.icons[1]}
+                                            mainTooltip={props.option.ownerEmail}
+                                            secondaryTooltip={props.option.subtitle}
+                                            size={props.mode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
+                                        />
+                                    ) : (
+                                        <MultipleAvatars
+                                            icons={props.option.icons}
+                                            size={props.mode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
+                                            secondAvatarStyle={[
+                                                StyleUtils.getBackgroundAndBorderStyle(props.backgroundColor),
+                                                props.optionIsFocused
+                                                    ? StyleUtils.getBackgroundAndBorderStyle(focusedBackgroundColor)
+                                                    : undefined,
+                                                hovered && !props.optionIsFocused
+                                                    ? StyleUtils.getBackgroundAndBorderStyle(hoveredBackgroundColor)
+                                                    : undefined,
+                                            ]}
+                                            avatarTooltips={props.option.isPolicyExpenseChat ? [props.option.subtitle] : avatarTooltips}
+                                        />
+                                    )
+                                )
+                            }
+                            <View style={contentContainerStyles}>
+                                <DisplayNames
+                                    fullTitle={props.option.text}
+                                    displayNamesWithTooltips={displayNamesWithTooltips}
+                                    tooltipEnabled={props.showTitleTooltip}
+                                    numberOfLines={1}
+                                    textStyles={displayNameStyle}
+                                    shouldUseFullTitle={props.option.isChatRoom || props.option.isPolicyExpenseChat}
+                                />
+                                {props.option.alternateText ? (
+                                    <Text
+                                        style={alternateTextStyle}
+                                        numberOfLines={1}
+                                    >
+                                        {props.option.alternateText}
+                                    </Text>
+                                ) : null}
+                            </View>
+                            {props.option.descriptiveText ? (
+                                <View style={[styles.flexWrap]}>
+                                    <Text style={[styles.textLabel]}>
+                                        {props.option.descriptiveText}
+                                    </Text>
+                                </View>
+                            ) : null}
+                            {props.option.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (
+                                <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
+                                    <Icon
+                                        src={Expensicons.DotIndicator}
+                                        fill={colors.red}
+                                        height={variables.iconSizeSmall}
+                                        width={variables.iconSizeSmall}
+                                    />
+                                </View>
+                            )}
+                            {props.showSelectedState && <SelectCircle isChecked={props.isSelected} />}
+                        </View>
+                    </View>
+                    {!props.hideAdditionalOptionStates && (
+                        <View style={[styles.flexRow, styles.alignItemsCenter]}>
+                            {props.option.hasDraftComment && (
+                                <View style={styles.ml2}>
+                                    <Icon src={Expensicons.Pencil} height={16} width={16} />
+                                </View>
+                            )}
+                            {props.option.hasOutstandingIOU && (
+                                <IOUBadge iouReportID={props.option.iouReportID} />
+                            )}
+                            {props.option.isPinned && (
+                                <View style={styles.ml2}>
+                                    <Icon src={Expensicons.Pin} height={16} width={16} />
+                                </View>
+                            )}
+                        </View>
+                    )}
+                </TouchableOpacity>
+            )}
+        </Hoverable>
+    );
+};
+
+OptionRowLHN.propTypes = propTypes;
+OptionRowLHN.defaultProps = defaultProps;
+OptionRowLHN.displayName = 'OptionRow';
+
+// It it very important to use React.memo here so SectionList items will not unnecessarily re-render
+export default withLocalize(memo(OptionRowLHN, (prevProps, nextProps) => {
+    if (prevProps.optionIsFocused !== nextProps.optionIsFocused) {
+        return false;
+    }
+
+    if (prevProps.isSelected !== nextProps.isSelected) {
+        return false;
+    }
+
+    if (prevProps.mode !== nextProps.mode) {
+        return false;
+    }
+
+    if (prevProps.option.isUnread !== nextProps.option.isUnread) {
+        return false;
+    }
+
+    if (prevProps.option.alternateText !== nextProps.option.alternateText) {
+        return false;
+    }
+
+    if (prevProps.option.descriptiveText !== nextProps.option.descriptiveText) {
+        return false;
+    }
+
+    if (prevProps.option.hasDraftComment !== nextProps.option.hasDraftComment) {
+        return false;
+    }
+
+    if (prevProps.option.isPinned !== nextProps.option.isPinned) {
+        return false;
+    }
+
+    if (prevProps.option.hasOutstandingIOU !== nextProps.option.hasOutstandingIOU) {
+        return false;
+    }
+
+    if (!_.isEqual(prevProps.option.icons, nextProps.option.icons)) {
+        return false;
+    }
+
+    // Re-render when the text changes
+    if (prevProps.option.text !== nextProps.option.text) {
+        return false;
+    }
+
+    if (prevProps.showSelectedState !== nextProps.showSelectedState) {
+        return false;
+    }
+
+    if (prevProps.isDisabled !== nextProps.isDisabled) {
+        return false;
+    }
+
+    if (prevProps.showTitleTooltip !== nextProps.showTitleTooltip) {
+        return false;
+    }
+
+    if (prevProps.backgroundColor !== nextProps.backgroundColor) {
+        return false;
+    }
+
+    if (prevProps.option.brickRoadIndicator !== nextProps.option.brickRoadIndicator) {
+        return false;
+    }
+
+    return true;
+}));

From f1550a3cecbd337cddcf42b22c50ba48600280b4 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:28:12 +0200
Subject: [PATCH 027/178] Fix new paths

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

diff --git a/src/components/LHNOptionsList/optionPropTypesLHN.js b/src/components/LHNOptionsList/optionPropTypesLHN.js
index 78dbd19b5339..7067c3ee7ce4 100644
--- a/src/components/LHNOptionsList/optionPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionPropTypesLHN.js
@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
-import CONST from '../CONST';
-import participantPropTypes from './participantPropTypes';
+import CONST from '../../CONST';
+import participantPropTypes from '../participantPropTypes';
 
 export default PropTypes.shape({
     // Text to display

From 02c1b218c5dd55f6dd22a6b5b4dd0ac71edd0a3b Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:32:32 +0200
Subject: [PATCH 028/178] Remove default props from native component

---
 src/components/LHNOptionsList/index.native.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/LHNOptionsList/index.native.js b/src/components/LHNOptionsList/index.native.js
index a78d335cf7ea..3c207b127063 100644
--- a/src/components/LHNOptionsList/index.native.js
+++ b/src/components/LHNOptionsList/index.native.js
@@ -1,7 +1,7 @@
 import React, {forwardRef} from 'react';
 import {Keyboard} from 'react-native';
 import BaseOptionsList from './BaseOptionsListLHN';
-import {propTypes, defaultProps} from './optionsListPropTypesLHN';
+import {propTypes} from './optionsListPropTypesLHN';
 
 const OptionsList = forwardRef((props, ref) => (
     <BaseOptionsList
@@ -13,7 +13,6 @@ const OptionsList = forwardRef((props, ref) => (
 ));
 
 OptionsList.propTypes = propTypes;
-OptionsList.defaultProps = defaultProps;
 OptionsList.displayName = 'OptionsList';
 
 export default OptionsList;

From 2de9592f1e49d1943cb7291e8c99327e8b932f24 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:34:49 +0200
Subject: [PATCH 029/178] Remove showTitleTooltip prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js |  1 -
 src/components/LHNOptionsList/OptionRowLHN.js       | 12 ++----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 3b946b5329e4..055a9ecd589d 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -161,7 +161,6 @@ class BaseOptionsListLHN extends Component {
             <OptionRowLHN
                 option={item}
                 mode={this.props.optionMode}
-                showTitleTooltip
                 backgroundColor={this.props.optionBackgroundColor}
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 02754811b274..c871e8411971 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -54,9 +54,6 @@ const propTypes = {
     /** Force the text style to be the unread style */
     forceTextUnreadStyle: PropTypes.bool,
 
-    /** Whether to show the title tooltip */
-    showTitleTooltip: PropTypes.bool,
-
     /** Toggle between compact and default view */
     mode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
 
@@ -75,7 +72,6 @@ const defaultProps = {
     showSelectedState: false,
     isSelected: false,
     forceTextUnreadStyle: false,
-    showTitleTooltip: false,
     mode: 'default',
     onSelectRow: () => {},
     isDisabled: false,
@@ -120,7 +116,7 @@ const OptionRowLHN = (props) => {
 
     // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((props.option.participantsList || []).slice(0, 10), isMultipleParticipant);
-    const avatarTooltips = props.showTitleTooltip && !props.option.isChatRoom && !props.option.isArchivedRoom ? _.pluck(displayNamesWithTooltips, 'tooltip') : undefined;
+    const avatarTooltips = !props.option.isChatRoom && !props.option.isArchivedRoom ? _.pluck(displayNamesWithTooltips, 'tooltip') : undefined;
 
     return (
         <Hoverable>
@@ -185,7 +181,7 @@ const OptionRowLHN = (props) => {
                                 <DisplayNames
                                     fullTitle={props.option.text}
                                     displayNamesWithTooltips={displayNamesWithTooltips}
-                                    tooltipEnabled={props.showTitleTooltip}
+                                    tooltipEnabled
                                     numberOfLines={1}
                                     textStyles={displayNameStyle}
                                     shouldUseFullTitle={props.option.isChatRoom || props.option.isPolicyExpenseChat}
@@ -301,10 +297,6 @@ export default withLocalize(memo(OptionRowLHN, (prevProps, nextProps) => {
         return false;
     }
 
-    if (prevProps.showTitleTooltip !== nextProps.showTitleTooltip) {
-        return false;
-    }
-
     if (prevProps.backgroundColor !== nextProps.backgroundColor) {
         return false;
     }

From a39309b58b2c94087157334931a0e11a18d0aa20 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:35:34 +0200
Subject: [PATCH 030/178] Remove showSelectedState prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js | 1 -
 src/components/LHNOptionsList/OptionRowLHN.js       | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 055a9ecd589d..a89edd01db7b 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -165,7 +165,6 @@ class BaseOptionsListLHN extends Component {
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
-                showSelectedState={false}
                 hideAdditionalOptionStates={false}
                 forceTextUnreadStyle={false}
                 isDisabled={false}
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index c871e8411971..c006edd9e31b 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -45,9 +45,6 @@ const propTypes = {
     /** A flag to indicate whether to show additional optional states, such as pin and draft icons */
     hideAdditionalOptionStates: PropTypes.bool,
 
-    /** Whether we should show the selected state */
-    showSelectedState: PropTypes.bool,
-
     /** Whether this item is selected */
     isSelected: PropTypes.bool,
 
@@ -69,7 +66,6 @@ const defaultProps = {
     backgroundColor: colors.white,
     hoverStyle: styles.sidebarLinkHover,
     hideAdditionalOptionStates: false,
-    showSelectedState: false,
     isSelected: false,
     forceTextUnreadStyle: false,
     mode: 'default',
@@ -212,7 +208,6 @@ const OptionRowLHN = (props) => {
                                     />
                                 </View>
                             )}
-                            {props.showSelectedState && <SelectCircle isChecked={props.isSelected} />}
                         </View>
                     </View>
                     {!props.hideAdditionalOptionStates && (
@@ -289,10 +284,6 @@ export default withLocalize(memo(OptionRowLHN, (prevProps, nextProps) => {
         return false;
     }
 
-    if (prevProps.showSelectedState !== nextProps.showSelectedState) {
-        return false;
-    }
-
     if (prevProps.isDisabled !== nextProps.isDisabled) {
         return false;
     }

From 62aacd24e2fce5657aa88ea37b159858ffaba237 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:36:26 +0200
Subject: [PATCH 031/178] Remove hideAdditionalOptionStates prop

---
 .../LHNOptionsList/BaseOptionsListLHN.js      |  1 -
 src/components/LHNOptionsList/OptionRowLHN.js | 36 ++++++++-----------
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index a89edd01db7b..2e0db4c989c8 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -165,7 +165,6 @@ class BaseOptionsListLHN extends Component {
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
-                hideAdditionalOptionStates={false}
                 forceTextUnreadStyle={false}
                 isDisabled={false}
             />
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index c006edd9e31b..9476cada4edb 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -42,9 +42,6 @@ const propTypes = {
     /** A function that is called when an option is selected. Selected option is passed as a param */
     onSelectRow: PropTypes.func,
 
-    /** A flag to indicate whether to show additional optional states, such as pin and draft icons */
-    hideAdditionalOptionStates: PropTypes.bool,
-
     /** Whether this item is selected */
     isSelected: PropTypes.bool,
 
@@ -65,7 +62,6 @@ const propTypes = {
 const defaultProps = {
     backgroundColor: colors.white,
     hoverStyle: styles.sidebarLinkHover,
-    hideAdditionalOptionStates: false,
     isSelected: false,
     forceTextUnreadStyle: false,
     mode: 'default',
@@ -210,23 +206,21 @@ const OptionRowLHN = (props) => {
                             )}
                         </View>
                     </View>
-                    {!props.hideAdditionalOptionStates && (
-                        <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                            {props.option.hasDraftComment && (
-                                <View style={styles.ml2}>
-                                    <Icon src={Expensicons.Pencil} height={16} width={16} />
-                                </View>
-                            )}
-                            {props.option.hasOutstandingIOU && (
-                                <IOUBadge iouReportID={props.option.iouReportID} />
-                            )}
-                            {props.option.isPinned && (
-                                <View style={styles.ml2}>
-                                    <Icon src={Expensicons.Pin} height={16} width={16} />
-                                </View>
-                            )}
-                        </View>
-                    )}
+                    <View style={[styles.flexRow, styles.alignItemsCenter]}>
+                        {props.option.hasDraftComment && (
+                            <View style={styles.ml2}>
+                                <Icon src={Expensicons.Pencil} height={16} width={16} />
+                            </View>
+                        )}
+                        {props.option.hasOutstandingIOU && (
+                            <IOUBadge iouReportID={props.option.iouReportID} />
+                        )}
+                        {props.option.isPinned && (
+                            <View style={styles.ml2}>
+                                <Icon src={Expensicons.Pin} height={16} width={16} />
+                            </View>
+                        )}
+                    </View>
                 </TouchableOpacity>
             )}
         </Hoverable>

From ef2d28aa1a3134093596f9809fb199ce1403be17 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:37:23 +0200
Subject: [PATCH 032/178] Remove forceTextUnreadStyle prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js | 1 -
 src/components/LHNOptionsList/OptionRowLHN.js       | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 2e0db4c989c8..de97c2725002 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -165,7 +165,6 @@ class BaseOptionsListLHN extends Component {
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
-                forceTextUnreadStyle={false}
                 isDisabled={false}
             />
         );
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 9476cada4edb..1307d272b080 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -45,9 +45,6 @@ const propTypes = {
     /** Whether this item is selected */
     isSelected: PropTypes.bool,
 
-    /** Force the text style to be the unread style */
-    forceTextUnreadStyle: PropTypes.bool,
-
     /** Toggle between compact and default view */
     mode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
 
@@ -63,7 +60,6 @@ const defaultProps = {
     backgroundColor: colors.white,
     hoverStyle: styles.sidebarLinkHover,
     isSelected: false,
-    forceTextUnreadStyle: false,
     mode: 'default',
     onSelectRow: () => {},
     isDisabled: false,
@@ -76,8 +72,7 @@ const OptionRowLHN = (props) => {
     const textStyle = props.optionIsFocused
         ? styles.sidebarLinkActiveText
         : styles.sidebarLinkText;
-    const textUnreadStyle = (props.option.isUnread || props.forceTextUnreadStyle)
-        ? [textStyle, styles.sidebarLinkTextUnread] : [textStyle];
+    const textUnreadStyle = [textStyle, styles.sidebarLinkTextUnread];
     const displayNameStyle = StyleUtils.combineStyles(props.mode === CONST.OPTION_MODE.COMPACT
         ? [styles.optionDisplayName, ...textUnreadStyle, styles.optionDisplayNameCompact, styles.mr2]
         : [styles.optionDisplayName, ...textUnreadStyle], props.style);

From 958d5810968b8b9a0289c4b4774abb69671727dd Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:38:02 +0200
Subject: [PATCH 033/178] Remove isDisabled prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js |  1 -
 src/components/LHNOptionsList/OptionRowLHN.js       | 10 ----------
 2 files changed, 11 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index de97c2725002..9ad21c0c1641 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -165,7 +165,6 @@ class BaseOptionsListLHN extends Component {
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
-                isDisabled={false}
             />
         );
     }
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 1307d272b080..da8812aca45b 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -48,9 +48,6 @@ const propTypes = {
     /** Toggle between compact and default view */
     mode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
 
-    /** Whether this option should be disabled */
-    isDisabled: PropTypes.bool,
-
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
     ...withLocalizePropTypes,
@@ -62,7 +59,6 @@ const defaultProps = {
     isSelected: false,
     mode: 'default',
     onSelectRow: () => {},
-    isDisabled: false,
     optionIsFocused: false,
     style: null,
 };
@@ -114,7 +110,6 @@ const OptionRowLHN = (props) => {
                         e.preventDefault();
                         props.onSelectRow(props.option, touchableRef);
                     }}
-                    disabled={props.isDisabled}
                     activeOpacity={0.8}
                     style={[
                         styles.flexRow,
@@ -125,7 +120,6 @@ const OptionRowLHN = (props) => {
                         StyleUtils.getBackgroundColorStyle(props.backgroundColor),
                         props.optionIsFocused ? styles.sidebarLinkActive : null,
                         hovered && !props.optionIsFocused ? props.hoverStyle : null,
-                        props.isDisabled && styles.cursorDisabled,
                     ]}
                 >
                     <View style={sidebarInnerRowStyle}>
@@ -273,10 +267,6 @@ export default withLocalize(memo(OptionRowLHN, (prevProps, nextProps) => {
         return false;
     }
 
-    if (prevProps.isDisabled !== nextProps.isDisabled) {
-        return false;
-    }
-
     if (prevProps.backgroundColor !== nextProps.backgroundColor) {
         return false;
     }

From 023fb06840d6cab2c47d3ae9afd15495a2b74f14 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:39:24 +0200
Subject: [PATCH 034/178] Switch to using new LHN option list

---
 src/components/LHNOptionsList/OptionRowLHN.js | 60 +------------------
 src/pages/home/sidebar/SidebarLinks.js        |  3 +-
 2 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index da8812aca45b..cbdcdf2596a3 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -218,62 +218,6 @@ const OptionRowLHN = (props) => {
 
 OptionRowLHN.propTypes = propTypes;
 OptionRowLHN.defaultProps = defaultProps;
-OptionRowLHN.displayName = 'OptionRow';
+OptionRowLHN.displayName = 'OptionRowLHN';
 
-// It it very important to use React.memo here so SectionList items will not unnecessarily re-render
-export default withLocalize(memo(OptionRowLHN, (prevProps, nextProps) => {
-    if (prevProps.optionIsFocused !== nextProps.optionIsFocused) {
-        return false;
-    }
-
-    if (prevProps.isSelected !== nextProps.isSelected) {
-        return false;
-    }
-
-    if (prevProps.mode !== nextProps.mode) {
-        return false;
-    }
-
-    if (prevProps.option.isUnread !== nextProps.option.isUnread) {
-        return false;
-    }
-
-    if (prevProps.option.alternateText !== nextProps.option.alternateText) {
-        return false;
-    }
-
-    if (prevProps.option.descriptiveText !== nextProps.option.descriptiveText) {
-        return false;
-    }
-
-    if (prevProps.option.hasDraftComment !== nextProps.option.hasDraftComment) {
-        return false;
-    }
-
-    if (prevProps.option.isPinned !== nextProps.option.isPinned) {
-        return false;
-    }
-
-    if (prevProps.option.hasOutstandingIOU !== nextProps.option.hasOutstandingIOU) {
-        return false;
-    }
-
-    if (!_.isEqual(prevProps.option.icons, nextProps.option.icons)) {
-        return false;
-    }
-
-    // Re-render when the text changes
-    if (prevProps.option.text !== nextProps.option.text) {
-        return false;
-    }
-
-    if (prevProps.backgroundColor !== nextProps.backgroundColor) {
-        return false;
-    }
-
-    if (prevProps.option.brickRoadIndicator !== nextProps.option.brickRoadIndicator) {
-        return false;
-    }
-
-    return true;
-}));
+export default withLocalize(OptionRowLHN);
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 424716113985..f589eb9030f2 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -26,6 +26,7 @@ import * as ReportUtils from '../../../libs/ReportUtils';
 import withCurrentUserPersonalDetails from '../../../components/withCurrentUserPersonalDetails';
 import Timing from '../../../libs/actions/Timing';
 import reportActionPropTypes from '../report/reportActionPropTypes';
+import OptionsListLHN from '../../../components/LHNOptionsList';
 
 const propTypes = {
     /** Toggles the navigation menu open and closed */
@@ -181,7 +182,7 @@ class SidebarLinks extends React.Component {
                         />
                     </TouchableOpacity>
                 </View>
-                <OptionsList
+                <OptionsListLHN
                     contentContainerStyles={[
                         styles.sidebarListContainer,
                         {paddingBottom: StyleUtils.getSafeAreaMargins(this.props.insets).marginBottom},

From 1b6b6dab63ec6ef2fcdeccab408bd7ac115eb638 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:44:46 +0200
Subject: [PATCH 035/178] Clean up styles

---
 src/components/LHNOptionsList/OptionRowLHN.js | 39 ++++++++-----------
 src/libs/OptionsListUtils.js                  |  2 +-
 src/pages/home/sidebar/SidebarLinks.js        |  1 -
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index cbdcdf2596a3..97bb94a29bf7 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -1,29 +1,28 @@
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
-import React, {memo} from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import {
     TouchableOpacity,
     View,
     StyleSheet,
 } from 'react-native';
-import styles from '../styles/styles';
-import * as StyleUtils from '../styles/StyleUtils';
-import optionPropTypes from './optionPropTypes';
-import Icon from './Icon';
-import * as Expensicons from './Icon/Expensicons';
-import MultipleAvatars from './MultipleAvatars';
-import Hoverable from './Hoverable';
-import DisplayNames from './DisplayNames';
-import IOUBadge from './IOUBadge';
-import colors from '../styles/colors';
-import withLocalize, {withLocalizePropTypes} from './withLocalize';
-import Text from './Text';
-import SelectCircle from './SelectCircle';
-import SubscriptAvatar from './SubscriptAvatar';
-import CONST from '../CONST';
-import * as ReportUtils from '../libs/ReportUtils';
-import variables from '../styles/variables';
+import styles from '../../styles/styles';
+import * as StyleUtils from '../../styles/StyleUtils';
+import optionPropTypes from '../optionPropTypes';
+import Icon from '../Icon';
+import * as Expensicons from '../Icon/Expensicons';
+import MultipleAvatars from '../MultipleAvatars';
+import Hoverable from '../Hoverable';
+import DisplayNames from '../DisplayNames';
+import IOUBadge from '../IOUBadge';
+import colors from '../../styles/colors';
+import withLocalize, {withLocalizePropTypes} from '../withLocalize';
+import Text from '../Text';
+import SubscriptAvatar from '../SubscriptAvatar';
+import CONST from '../../CONST';
+import * as ReportUtils from '../../libs/ReportUtils';
+import variables from '../../styles/variables';
 
 const propTypes = {
     /** Background Color of the Option Row */
@@ -42,9 +41,6 @@ const propTypes = {
     /** A function that is called when an option is selected. Selected option is passed as a param */
     onSelectRow: PropTypes.func,
 
-    /** Whether this item is selected */
-    isSelected: PropTypes.bool,
-
     /** Toggle between compact and default view */
     mode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
 
@@ -56,7 +52,6 @@ const propTypes = {
 const defaultProps = {
     backgroundColor: colors.white,
     hoverStyle: styles.sidebarLinkHover,
-    isSelected: false,
     mode: 'default',
     onSelectRow: () => {},
     optionIsFocused: false,
diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 58c745bd3d64..c5d47f79db6a 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -464,7 +464,7 @@ function getOptions(reports, personalDetails, activeReportID, {
         const isChatRoom = ReportUtils.isChatRoom(report);
         const isDefaultRoom = ReportUtils.isDefaultRoom(report);
         const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
-        const logins = report && report.participants || [];
+        const logins = (report && report.participants) || [];
 
         // Report data can sometimes be incomplete. If we have no logins or reportID then we will skip this entry.
         const shouldFilterNoParticipants = _.isEmpty(logins) && !isChatRoom && !isDefaultRoom && !isPolicyExpenseChat;
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index f589eb9030f2..8fb1c173921d 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -12,7 +12,6 @@ import Navigation from '../../../libs/Navigation/Navigation';
 import ROUTES from '../../../ROUTES';
 import Icon from '../../../components/Icon';
 import Header from '../../../components/Header';
-import OptionsList from '../../../components/OptionsList';
 import * as Expensicons from '../../../components/Icon/Expensicons';
 import AvatarWithIndicator from '../../../components/AvatarWithIndicator';
 import * as OptionsListUtils from '../../../libs/OptionsListUtils';

From eee30e5b8008c0f05f2dde24e50ec2957b751b26 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 12:55:53 +0200
Subject: [PATCH 036/178] Fix default innerRef prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js      | 3 ++-
 src/components/LHNOptionsList/OptionRowLHN.js            | 2 +-
 src/components/LHNOptionsList/index.js                   | 3 ++-
 src/components/LHNOptionsList/optionsListPropTypesLHN.js | 8 ++++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 9ad21c0c1641..6cd5f343d3a9 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -7,7 +7,7 @@ import styles from '../../styles/styles';
 import variables from '../../styles/variables';
 import SectionList from '../SectionList';
 import OptionRowLHN from './OptionRowLHN';
-import {propTypes as optionsListPropTypes} from './optionsListPropTypesLHN';
+import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultPropTypes} from './optionsListPropTypesLHN';
 
 const propTypes = {
     /** Determines whether the keyboard gets dismissed in response to a drag */
@@ -22,6 +22,7 @@ const propTypes = {
 const defaultProps = {
     keyboardDismissMode: 'none',
     onScrollBeginDrag: () => {},
+    ...optionsListDefaultPropTypes,
 };
 
 class BaseOptionsListLHN extends Component {
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 97bb94a29bf7..17744a01173e 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -63,7 +63,7 @@ const OptionRowLHN = (props) => {
     const textStyle = props.optionIsFocused
         ? styles.sidebarLinkActiveText
         : styles.sidebarLinkText;
-    const textUnreadStyle = [textStyle, styles.sidebarLinkTextUnread];
+    const textUnreadStyle = [textStyle];
     const displayNameStyle = StyleUtils.combineStyles(props.mode === CONST.OPTION_MODE.COMPACT
         ? [styles.optionDisplayName, ...textUnreadStyle, styles.optionDisplayNameCompact, styles.mr2]
         : [styles.optionDisplayName, ...textUnreadStyle], props.style);
diff --git a/src/components/LHNOptionsList/index.js b/src/components/LHNOptionsList/index.js
index 816a656061b7..d2337f2953cb 100644
--- a/src/components/LHNOptionsList/index.js
+++ b/src/components/LHNOptionsList/index.js
@@ -1,7 +1,7 @@
 import React, {forwardRef} from 'react';
 import BaseOptionsListLHN from './BaseOptionsListLHN';
 import withWindowDimensions from '../withWindowDimensions';
-import {propTypes} from './optionsListPropTypesLHN';
+import {propTypes, defaultProps} from './optionsListPropTypesLHN';
 
 const OptionsListLHN = forwardRef((props, ref) => (
     <BaseOptionsListLHN
@@ -13,6 +13,7 @@ const OptionsListLHN = forwardRef((props, ref) => (
 ));
 
 OptionsListLHN.propTypes = propTypes;
+OptionsListLHN.defaultProps = defaultProps;
 OptionsListLHN.displayName = 'OptionsListLHN';
 
 export default withWindowDimensions(OptionsListLHN);
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index a99a9930a35d..c35dead9c1e5 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -39,7 +39,7 @@ const propTypes = {
     innerRef: PropTypes.oneOfType([
         PropTypes.func,
         PropTypes.shape({current: PropTypes.instanceOf(SectionList)}),
-    ]).isRequired,
+    ]),
 
     /** Toggle between compact and default view of the option */
     optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)).isRequired,
@@ -48,5 +48,9 @@ const propTypes = {
     onLayout: PropTypes.func.isRequired,
 };
 
+const defaultProps = {
+    innerRef: null,
+};
+
 // eslint-disable-next-line import/prefer-default-export
-export {propTypes};
+export {propTypes, defaultProps};

From 0f211a6556e38da363cbd2093e6f8e0a55d820e3 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 13:16:38 +0200
Subject: [PATCH 037/178] Add a skeleton utils class for new LHN options

---
 src/libs/OptionsListUtilsLHN.js | 38 +++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/libs/OptionsListUtilsLHN.js

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
new file mode 100644
index 000000000000..3c76af844a11
--- /dev/null
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -0,0 +1,38 @@
+import Onyx from 'react-native-onyx';
+import ONYXKEYS from '../ONYXKEYS';
+
+let reports;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT,
+    callback: val => reports = val,
+});
+
+let personalDetails;
+Onyx.connect({
+    key: ONYXKEYS.PERSONAL_DETAILS,
+    callback: val => personalDetails = val,
+});
+
+let currentlyViewedReportID;
+Onyx.connect({
+    key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
+    callback: val => currentlyViewedReportID = val,
+});
+
+let priorityMode;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIORITY_MODE,
+    callback: val => priorityMode = val,
+});
+
+let betas;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIORITY_MODE,
+    callback: val => betas = val,
+});
+
+let reportActions;
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+    callback: val => reportActions = val,
+});

From c0131c3d87428e143a9d64f933b76e717c9d97e8 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 13:33:02 +0200
Subject: [PATCH 038/178] Move create option to new utils and remove non-report
 logic

---
 src/libs/OptionsListUtils.js    |   2 +
 src/libs/OptionsListUtilsLHN.js | 176 +++++++++++++++++++++++++++++++-
 2 files changed, 177 insertions(+), 1 deletion(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index c5d47f79db6a..598a6af99a15 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -901,4 +901,6 @@ export {
     getCurrencyListForSections,
     getIOUConfirmationOptionsFromMyPersonalDetail,
     getIOUConfirmationOptionsFromParticipants,
+    getSearchText,
+    getBrickRoadIndicatorStatusForReport,
 };
diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index 3c76af844a11..627aaac316ea 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -1,5 +1,12 @@
 import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
+import _ from 'underscore/underscore-node';
+import Str from 'expensify-common/lib/str';
+import * as ReportUtils from './ReportUtils';
+import * as Localize from './Localize';
+import CONST from '../CONST';
+import {getPersonalDetailsForLogins, getSearchText, getBrickRoadIndicatorStatusForReport} from './OptionsListUtils';
+import * as CollectionUtils from './CollectionUtils';
 
 let reports;
 Onyx.connect({
@@ -31,8 +38,175 @@ Onyx.connect({
     callback: val => betas = val,
 });
 
+const lastReportActions = {};
 let reportActions;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
-    callback: val => reportActions = val,
+    callback: (actions, key) => {
+        reportActions = actions;
+        if (!key || !actions) {
+            return;
+        }
+        const reportID = CollectionUtils.extractCollectionItemID(key);
+        lastReportActions[reportID] = _.last(_.toArray(actions));
+    },
 });
+
+const policies = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    callback: (policy, key) => {
+        if (!policy || !key || !policy.name) {
+            return;
+        }
+
+        policies[key] = policy;
+    },
+});
+
+const iouReports = {};
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.REPORT_IOUS,
+    callback: (iouReport, key) => {
+        if (!iouReport || !key || !iouReport.ownerEmail) {
+            return;
+        }
+
+        iouReports[key] = iouReport;
+    },
+});
+
+let currentUserLogin;
+Onyx.connect({
+    key: ONYXKEYS.SESSION,
+    callback: val => currentUserLogin = val,
+});
+
+let loginList;
+Onyx.connect({
+    key: ONYXKEYS.LOGIN_LIST,
+    callback: val => loginList = val,
+});
+
+let preferredLocale;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    callback: val => preferredLocale = val || CONST.DEFAULT_LOCALE,
+});
+
+/**
+ * Gets all the data necessary for rendering an OptionRowLHN component
+ *
+ * @param {String} reportID
+ */
+function getOptionData(reportID) {
+    const report = reports[reportID];
+    const result = {
+        text: null,
+        alternateText: null,
+        brickRoadIndicator: null,
+        icons: null,
+        tooltipText: null,
+        ownerEmail: null,
+        subtitle: null,
+        participantsList: null,
+        login: null,
+        reportID: null,
+        phoneNumber: null,
+        payPalMeAddress: null,
+        isUnread: null,
+        hasDraftComment: false,
+        keyForList: null,
+        searchText: null,
+        isPinned: false,
+        hasOutstandingIOU: false,
+        iouReportID: null,
+        isIOUReportOwner: null,
+        iouReportAmount: 0,
+        isChatRoom: false,
+        isArchivedRoom: false,
+        shouldShowSubscript: false,
+        isPolicyExpenseChat: false,
+    };
+
+    const personalDetailMap = getPersonalDetailsForLogins(logins, personalDetails);
+    const personalDetailList = _.values(personalDetailMap);
+    const personalDetail = personalDetailList[0];
+    let hasMultipleParticipants = personalDetailList.length > 1;
+
+    result.isChatRoom = ReportUtils.isChatRoom(report);
+    result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
+    result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
+    result.shouldShowSubscript = result.isPolicyExpenseChat && !report.isOwnPolicyExpenseChat && !result.isArchivedRoom;
+    result.brickRoadIndicator = getBrickRoadIndicatorStatusForReport(report, reportActions);
+    result.ownerEmail = report.ownerEmail;
+    result.reportID = report.reportID;
+    result.isUnread = report.unreadActionCount > 0;
+    result.hasDraftComment = report.hasDraft;
+    result.isPinned = report.isPinned;
+    result.iouReportID = report.iouReportID;
+    result.keyForList = String(report.reportID);
+    result.tooltipText = ReportUtils.getReportParticipantsTitle(report.participants || []);
+    result.hasOutstandingIOU = report.hasOutstandingIOU;
+
+    hasMultipleParticipants = personalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat;
+    const subtitle = ReportUtils.getChatRoomSubtitle(report, policies);
+
+    let lastMessageTextFromReport = '';
+    if (ReportUtils.isReportMessageAttachment({text: report.lastMessageText, html: report.lastMessageHtml})) {
+        lastMessageTextFromReport = `[${Localize.translateLocal('common.attachment')}]`;
+    } else {
+        lastMessageTextFromReport = Str.htmlDecode(report ? report.lastMessageText : '');
+    }
+
+    const lastActorDetails = personalDetailMap[report.lastActorEmail] || null;
+    let lastMessageText = hasMultipleParticipants && lastActorDetails
+        ? `${lastActorDetails.displayName}: `
+        : '';
+    lastMessageText += report ? lastMessageTextFromReport : '';
+
+    if (result.isPolicyExpenseChat && result.isArchivedRoom) {
+        const archiveReason = (lastReportActions[report.reportID] && lastReportActions[report.reportID].originalMessage && lastReportActions[report.reportID].originalMessage.reason)
+            || CONST.REPORT.ARCHIVE_REASON.DEFAULT;
+        lastMessageText = Localize.translate(preferredLocale, `reportArchiveReasons.${archiveReason}`, {
+            displayName: archiveReason.displayName || report.lastActorEmail,
+            policyName: ReportUtils.getPolicyName(report, policies),
+        });
+    }
+
+    const isSearchingSomeonesPolicyExpenseChat = !report.isOwnPolicyExpenseChat && searchValue !== '';
+    const forcePolicyNamePreview = result.isPolicyExpenseChat ? isSearchingSomeonesPolicyExpenseChat : false;
+
+    if (result.isChatRoom || result.isPolicyExpenseChat) {
+        result.alternateText = (!forcePolicyNamePreview && lastMessageText)
+            ? lastMessageText
+            : subtitle;
+    } else {
+        result.alternateText = lastMessageText || Str.removeSMSDomain(personalDetail.login);
+    }
+
+    if (result.hasOutstandingIOU) {
+        const iouReport = iouReports[`${ONYXKEYS.COLLECTION.REPORT_IOUS}${report.iouReportID}`] || null;
+        if (iouReport) {
+            result.isIOUReportOwner = iouReport.ownerEmail === currentUserLogin;
+            result.iouReportAmount = iouReport.total;
+        }
+    }
+
+    if (!hasMultipleParticipants) {
+        result.login = personalDetail.login;
+        result.phoneNumber = personalDetail.phoneNumber;
+        result.payPalMeAddress = personalDetail.payPalMeAddress;
+    }
+
+    const reportName = ReportUtils.getReportName(report, personalDetailMap, policies);
+    result.text = reportName;
+    result.subtitle = subtitle;
+    result.participantsList = personalDetailList;
+    result.icons = ReportUtils.getIcons(report, personalDetails, policies, personalDetail.avatar);
+    result.searchText = getSearchText(report, reportName, personalDetailList, result.isChatRoom || result.isPolicyExpenseChat);
+
+    return result;
+}
+
+export default {getOptionData};

From 078e383e65070a9035b330291f3aeea1a0803c92 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 13:38:05 +0200
Subject: [PATCH 039/178] Optimize red brick road code

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

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 598a6af99a15..f93ef08d9d12 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -208,10 +208,10 @@ function getSearchText(report, reportName, personalDetailList, isChatRoomOrPolic
  * @returns {String}
  */
 function getBrickRoadIndicatorStatusForReport(report, reportActions) {
-    const reportErrors = lodashGet(report, 'errors', {});
-    const reportErrorFields = lodashGet(report, 'errorFields', {});
-    const reportID = lodashGet(report, 'reportID');
-    const reportsActions = lodashGet(reportActions, `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, {});
+    const reportErrors = report.errors || {};
+    const reportErrorFields = report.errorFields || {};
+    const reportID = report.reportID;
+    const reportsActions = reportActions[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] || {};
 
     const hasReportFieldErrors = _.some(reportErrorFields, fieldErrors => !_.isEmpty(fieldErrors));
     const hasReportActionErrors = _.some(reportsActions, action => !_.isEmpty(action.errors));

From c23c62529bab0a2bf9f7f325a5450bf7c5bf0a75 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 15:35:56 +0200
Subject: [PATCH 040/178] Correct lint errors

---
 src/libs/OptionsListUtilsLHN.js | 55 +++++++++++++++++----------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index 627aaac316ea..deaed7a63f77 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -1,11 +1,11 @@
 import Onyx from 'react-native-onyx';
-import ONYXKEYS from '../ONYXKEYS';
 import _ from 'underscore/underscore-node';
 import Str from 'expensify-common/lib/str';
+import ONYXKEYS from '../ONYXKEYS';
 import * as ReportUtils from './ReportUtils';
 import * as Localize from './Localize';
 import CONST from '../CONST';
-import {getPersonalDetailsForLogins, getSearchText, getBrickRoadIndicatorStatusForReport} from './OptionsListUtils';
+import * as OptionsListUtils from './OptionsListUtils';
 import * as CollectionUtils from './CollectionUtils';
 
 let reports;
@@ -20,23 +20,23 @@ Onyx.connect({
     callback: val => personalDetails = val,
 });
 
-let currentlyViewedReportID;
-Onyx.connect({
-    key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
-    callback: val => currentlyViewedReportID = val,
-});
-
-let priorityMode;
-Onyx.connect({
-    key: ONYXKEYS.NVP_PRIORITY_MODE,
-    callback: val => priorityMode = val,
-});
-
-let betas;
-Onyx.connect({
-    key: ONYXKEYS.NVP_PRIORITY_MODE,
-    callback: val => betas = val,
-});
+// let currentlyViewedReportID;
+// Onyx.connect({
+//     key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
+//     callback: val => currentlyViewedReportID = val,
+// });
+//
+// let priorityMode;
+// Onyx.connect({
+//     key: ONYXKEYS.NVP_PRIORITY_MODE,
+//     callback: val => priorityMode = val,
+// });
+//
+// let betas;
+// Onyx.connect({
+//     key: ONYXKEYS.NVP_PRIORITY_MODE,
+//     callback: val => betas = val,
+// });
 
 const lastReportActions = {};
 let reportActions;
@@ -82,11 +82,11 @@ Onyx.connect({
     callback: val => currentUserLogin = val,
 });
 
-let loginList;
-Onyx.connect({
-    key: ONYXKEYS.LOGIN_LIST,
-    callback: val => loginList = val,
-});
+// let loginList;
+// Onyx.connect({
+//     key: ONYXKEYS.LOGIN_LIST,
+//     callback: val => loginList = val,
+// });
 
 let preferredLocale;
 Onyx.connect({
@@ -98,6 +98,7 @@ Onyx.connect({
  * Gets all the data necessary for rendering an OptionRowLHN component
  *
  * @param {String} reportID
+ * @returns {Object}
  */
 function getOptionData(reportID) {
     const report = reports[reportID];
@@ -129,7 +130,7 @@ function getOptionData(reportID) {
         isPolicyExpenseChat: false,
     };
 
-    const personalDetailMap = getPersonalDetailsForLogins(logins, personalDetails);
+    const personalDetailMap = OptionsListUtils.getPersonalDetailsForLogins(report.participants, personalDetails);
     const personalDetailList = _.values(personalDetailMap);
     const personalDetail = personalDetailList[0];
     let hasMultipleParticipants = personalDetailList.length > 1;
@@ -138,7 +139,7 @@ function getOptionData(reportID) {
     result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
     result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
     result.shouldShowSubscript = result.isPolicyExpenseChat && !report.isOwnPolicyExpenseChat && !result.isArchivedRoom;
-    result.brickRoadIndicator = getBrickRoadIndicatorStatusForReport(report, reportActions);
+    result.brickRoadIndicator = OptionsListUtils.getBrickRoadIndicatorStatusForReport(report, reportActions);
     result.ownerEmail = report.ownerEmail;
     result.reportID = report.reportID;
     result.isUnread = report.unreadActionCount > 0;
@@ -204,7 +205,7 @@ function getOptionData(reportID) {
     result.subtitle = subtitle;
     result.participantsList = personalDetailList;
     result.icons = ReportUtils.getIcons(report, personalDetails, policies, personalDetail.avatar);
-    result.searchText = getSearchText(report, reportName, personalDetailList, result.isChatRoom || result.isPolicyExpenseChat);
+    result.searchText = OptionsListUtils.getSearchText(report, reportName, personalDetailList, result.isChatRoom || result.isPolicyExpenseChat);
 
     return result;
 }

From bc10dfbc3c29607fb91ab6a17277eda3fe27acbb Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 15:40:52 +0200
Subject: [PATCH 041/178] Remove searchValue variable

---
 src/libs/OptionsListUtilsLHN.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index deaed7a63f77..d165492aaaf6 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -175,13 +175,8 @@ function getOptionData(reportID) {
         });
     }
 
-    const isSearchingSomeonesPolicyExpenseChat = !report.isOwnPolicyExpenseChat && searchValue !== '';
-    const forcePolicyNamePreview = result.isPolicyExpenseChat ? isSearchingSomeonesPolicyExpenseChat : false;
-
     if (result.isChatRoom || result.isPolicyExpenseChat) {
-        result.alternateText = (!forcePolicyNamePreview && lastMessageText)
-            ? lastMessageText
-            : subtitle;
+        result.alternateText = lastMessageText || subtitle;
     } else {
         result.alternateText = lastMessageText || Str.removeSMSDomain(personalDetail.login);
     }

From a86ee91c1036c24d2b101166c3d2c623d22af8f9 Mon Sep 17 00:00:00 2001
From: David Bondy <dbondy@expensify.com>
Date: Fri, 2 Sep 2022 15:42:37 +0200
Subject: [PATCH 042/178] add new action for resendresetpassword

---
 src/libs/actions/Session/index.js | 41 +++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 423b369ebd08..64ecc579f174 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -286,6 +286,46 @@ function signInWithShortLivedToken(email, shortLivedToken) {
  * User forgot the password so let's send them the link to reset their password
  */
 function resetPassword() {
+    API.write('RequestPasswordReset', {
+        email: credentials.login,
+    },
+    {
+        optimisticData: [
+            {
+                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                key: ONYXKEYS.ACCOUNT,
+                value: {
+                    isLoading: true,
+                    forgotPassword: true,
+                    message: null,
+                    errors: null,
+                },
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                key: ONYXKEYS.ACCOUNT,
+                value: {
+                    isLoading: false,
+                    message: null,
+                },
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: CONST.ONYX.METHOD.MERGE,
+                key: ONYXKEYS.ACCOUNT,
+                value: {
+                    isLoading: false,
+                    message: null,
+                },
+            },
+        ],
+    });
+}
+
+function resendResetPassword() {
     API.write('RequestPasswordReset', {
         email: credentials.login,
     },
@@ -531,6 +571,7 @@ export {
     signOutAndRedirectToSignIn,
     resendValidationLink,
     resetPassword,
+    resendResetPassword,
     clearSignInData,
     cleanupSession,
     clearAccountMessages,

From 098048628e4f6942b7e2f8aa4233b568db889a5c Mon Sep 17 00:00:00 2001
From: David Bondy <dbondy@expensify.com>
Date: Fri, 2 Sep 2022 15:42:48 +0200
Subject: [PATCH 043/178] use new action

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

diff --git a/src/pages/signin/ResendValidationForm.js b/src/pages/signin/ResendValidationForm.js
index 00f1c1d629a1..66e6cc0312f7 100755
--- a/src/pages/signin/ResendValidationForm.js
+++ b/src/pages/signin/ResendValidationForm.js
@@ -89,7 +89,7 @@ const ResendValidationForm = (props) => {
                     success
                     text={props.translate('resendValidationForm.resendLink')}
                     isLoading={props.account.isLoading}
-                    onPress={() => (props.account.validated ? Session.resetPassword() : Session.resendValidationLink())}
+                    onPress={() => (props.account.validated ? Session.resendResetPassword() : Session.resendValidationLink())}
                     isDisabled={props.network.isOffline}
                 />
             </View>

From 0e2335c80fb6215c01843016feff1d6e1dd31db9 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 15:46:32 +0200
Subject: [PATCH 044/178] rename the mode prop to vewMode

---
 .../LHNOptionsList/BaseOptionsListLHN.js         |  2 +-
 src/components/LHNOptionsList/OptionRowLHN.js    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 6cd5f343d3a9..dd63eb07e9db 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -161,7 +161,7 @@ class BaseOptionsListLHN extends Component {
         return (
             <OptionRowLHN
                 option={item}
-                mode={this.props.optionMode}
+                viewMode={this.props.optionMode}
                 backgroundColor={this.props.optionBackgroundColor}
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 17744a01173e..ff359aa604f3 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -42,7 +42,7 @@ const propTypes = {
     onSelectRow: PropTypes.func,
 
     /** Toggle between compact and default view */
-    mode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
+    viewMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)),
 
     style: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.object), PropTypes.object]),
 
@@ -52,7 +52,7 @@ const propTypes = {
 const defaultProps = {
     backgroundColor: colors.white,
     hoverStyle: styles.sidebarLinkHover,
-    mode: 'default',
+    viewMode: 'default',
     onSelectRow: () => {},
     optionIsFocused: false,
     style: null,
@@ -64,16 +64,16 @@ const OptionRowLHN = (props) => {
         ? styles.sidebarLinkActiveText
         : styles.sidebarLinkText;
     const textUnreadStyle = [textStyle];
-    const displayNameStyle = StyleUtils.combineStyles(props.mode === CONST.OPTION_MODE.COMPACT
+    const displayNameStyle = StyleUtils.combineStyles(props.viewMode === CONST.OPTION_MODE.COMPACT
         ? [styles.optionDisplayName, ...textUnreadStyle, styles.optionDisplayNameCompact, styles.mr2]
         : [styles.optionDisplayName, ...textUnreadStyle], props.style);
-    const alternateTextStyle = StyleUtils.combineStyles(props.mode === CONST.OPTION_MODE.COMPACT
+    const alternateTextStyle = StyleUtils.combineStyles(props.viewMode === CONST.OPTION_MODE.COMPACT
         ? [textStyle, styles.optionAlternateText, styles.textLabelSupporting, styles.optionAlternateTextCompact]
         : [textStyle, styles.optionAlternateText, styles.textLabelSupporting], props.style);
-    const contentContainerStyles = props.mode === CONST.OPTION_MODE.COMPACT
+    const contentContainerStyles = props.viewMode === CONST.OPTION_MODE.COMPACT
         ? [styles.flex1, styles.flexRow, styles.overflowHidden, styles.alignItemsCenter]
         : [styles.flex1];
-    const sidebarInnerRowStyle = StyleSheet.flatten(props.mode === CONST.OPTION_MODE.COMPACT ? [
+    const sidebarInnerRowStyle = StyleSheet.flatten(props.viewMode === CONST.OPTION_MODE.COMPACT ? [
         styles.chatLinkRowPressable,
         styles.flexGrow1,
         styles.optionItemAvatarNameWrapper,
@@ -133,12 +133,12 @@ const OptionRowLHN = (props) => {
                                             secondaryAvatar={props.option.icons[1]}
                                             mainTooltip={props.option.ownerEmail}
                                             secondaryTooltip={props.option.subtitle}
-                                            size={props.mode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
+                                            size={props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                         />
                                     ) : (
                                         <MultipleAvatars
                                             icons={props.option.icons}
-                                            size={props.mode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
+                                            size={props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                             secondAvatarStyle={[
                                                 StyleUtils.getBackgroundAndBorderStyle(props.backgroundColor),
                                                 props.optionIsFocused

From a2e84e8772550149aa16b5d8da1009a7104f67ae Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 15:50:36 +0200
Subject: [PATCH 045/178] Remove background color prop

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js |  1 -
 src/components/LHNOptionsList/OptionRowLHN.js       | 11 ++++-------
 src/pages/home/sidebar/SidebarLinks.js              |  1 -
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index dd63eb07e9db..7979b9016dde 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -162,7 +162,6 @@ class BaseOptionsListLHN extends Component {
             <OptionRowLHN
                 option={item}
                 viewMode={this.props.optionMode}
-                backgroundColor={this.props.optionBackgroundColor}
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
                 onSelectRow={this.props.onSelectRow}
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index ff359aa604f3..fc3a82dd6326 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -23,11 +23,9 @@ import SubscriptAvatar from '../SubscriptAvatar';
 import CONST from '../../CONST';
 import * as ReportUtils from '../../libs/ReportUtils';
 import variables from '../../styles/variables';
+import themeColors from '../../styles/themes/default';
 
 const propTypes = {
-    /** Background Color of the Option Row */
-    backgroundColor: PropTypes.string,
-
     /** Style for hovered state */
     // eslint-disable-next-line react/forbid-prop-types
     hoverStyle: PropTypes.object,
@@ -50,7 +48,6 @@ const propTypes = {
 };
 
 const defaultProps = {
-    backgroundColor: colors.white,
     hoverStyle: styles.sidebarLinkHover,
     viewMode: 'default',
     onSelectRow: () => {},
@@ -88,7 +85,7 @@ const OptionRowLHN = (props) => {
     ]);
     const hoveredBackgroundColor = props.hoverStyle && props.hoverStyle.backgroundColor
         ? props.hoverStyle.backgroundColor
-        : props.backgroundColor;
+        : themeColors.sidebar;
     const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
     const isMultipleParticipant = lodashGet(props.option, 'participantsList.length', 0) > 1;
 
@@ -112,7 +109,7 @@ const OptionRowLHN = (props) => {
                         styles.justifyContentBetween,
                         styles.sidebarLink,
                         styles.sidebarLinkInner,
-                        StyleUtils.getBackgroundColorStyle(props.backgroundColor),
+                        StyleUtils.getBackgroundColorStyle(themeColors.sidebar),
                         props.optionIsFocused ? styles.sidebarLinkActive : null,
                         hovered && !props.optionIsFocused ? props.hoverStyle : null,
                     ]}
@@ -140,7 +137,7 @@ const OptionRowLHN = (props) => {
                                             icons={props.option.icons}
                                             size={props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                             secondAvatarStyle={[
-                                                StyleUtils.getBackgroundAndBorderStyle(props.backgroundColor),
+                                                StyleUtils.getBackgroundAndBorderStyle(themeColors.sidebar),
                                                 props.optionIsFocused
                                                     ? StyleUtils.getBackgroundAndBorderStyle(focusedBackgroundColor)
                                                     : undefined,
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 8fb1c173921d..7592be33feeb 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -194,7 +194,6 @@ class SidebarLinks extends React.Component {
                         Navigation.navigate(ROUTES.getReportRoute(option.reportID));
                         this.props.onLinkClick();
                     }}
-                    optionBackgroundColor={themeColors.sidebar}
                     disableFocusOptions={this.props.isSmallScreenWidth}
                     optionMode={this.props.priorityMode === CONST.PRIORITY_MODE.GSD ? 'compact' : 'default'}
                     onLayout={App.setSidebarLoaded}

From f28ba65f957b8634982b2ba8608c915e0f484870 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 15:57:25 +0200
Subject: [PATCH 046/178] Remove option prop

---
 .../LHNOptionsList/BaseOptionsListLHN.js      |  2 +-
 src/components/LHNOptionsList/OptionRowLHN.js | 53 ++++++++++---------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 7979b9016dde..0ca90c122fe2 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -160,7 +160,7 @@ class BaseOptionsListLHN extends Component {
     renderItem({item, index, section}) {
         return (
             <OptionRowLHN
-                option={item}
+                reportID={item.reportID}
                 viewMode={this.props.optionMode}
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === (index + section.indexOffset)}
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index fc3a82dd6326..2ed718cb7829 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -9,7 +9,6 @@ import {
 } from 'react-native';
 import styles from '../../styles/styles';
 import * as StyleUtils from '../../styles/StyleUtils';
-import optionPropTypes from '../optionPropTypes';
 import Icon from '../Icon';
 import * as Expensicons from '../Icon/Expensicons';
 import MultipleAvatars from '../MultipleAvatars';
@@ -24,14 +23,15 @@ import CONST from '../../CONST';
 import * as ReportUtils from '../../libs/ReportUtils';
 import variables from '../../styles/variables';
 import themeColors from '../../styles/themes/default';
+import OptionsListUtilsLHN from '../../libs/OptionsListUtilsLHN';
 
 const propTypes = {
     /** Style for hovered state */
     // eslint-disable-next-line react/forbid-prop-types
     hoverStyle: PropTypes.object,
 
-    /** Option to allow the user to choose from can be type 'report' or 'user' */
-    option: optionPropTypes.isRequired,
+    /** The ID of the report that the option is for */
+    reportID: PropTypes.string.isRequired,
 
     /** Whether this option is currently in focus so we can modify its style */
     optionIsFocused: PropTypes.bool,
@@ -56,6 +56,7 @@ const defaultProps = {
 };
 
 const OptionRowLHN = (props) => {
+    const optionItem = OptionsListUtilsLHN.getOptionData(props.reportID);
     let touchableRef = null;
     const textStyle = props.optionIsFocused
         ? styles.sidebarLinkActiveText
@@ -87,11 +88,11 @@ const OptionRowLHN = (props) => {
         ? props.hoverStyle.backgroundColor
         : themeColors.sidebar;
     const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
-    const isMultipleParticipant = lodashGet(props.option, 'participantsList.length', 0) > 1;
+    const isMultipleParticipant = lodashGet(optionItem, 'participantsList.length', 0) > 1;
 
     // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
-    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((props.option.participantsList || []).slice(0, 10), isMultipleParticipant);
-    const avatarTooltips = !props.option.isChatRoom && !props.option.isArchivedRoom ? _.pluck(displayNamesWithTooltips, 'tooltip') : undefined;
+    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((optionItem.participantsList || []).slice(0, 10), isMultipleParticipant);
+    const avatarTooltips = !optionItem.isChatRoom && !optionItem.isArchivedRoom ? _.pluck(displayNamesWithTooltips, 'tooltip') : undefined;
 
     return (
         <Hoverable>
@@ -100,7 +101,7 @@ const OptionRowLHN = (props) => {
                     ref={el => touchableRef = el}
                     onPress={(e) => {
                         e.preventDefault();
-                        props.onSelectRow(props.option, touchableRef);
+                        props.onSelectRow(optionItem, touchableRef);
                     }}
                     activeOpacity={0.8}
                     style={[
@@ -122,19 +123,19 @@ const OptionRowLHN = (props) => {
                             ]}
                         >
                             {
-                                !_.isEmpty(props.option.icons)
+                                !_.isEmpty(optionItem.icons)
                                 && (
-                                    props.option.shouldShowSubscript ? (
+                                    optionItem.shouldShowSubscript ? (
                                         <SubscriptAvatar
-                                            mainAvatar={props.option.icons[0]}
-                                            secondaryAvatar={props.option.icons[1]}
-                                            mainTooltip={props.option.ownerEmail}
-                                            secondaryTooltip={props.option.subtitle}
+                                            mainAvatar={optionItem.icons[0]}
+                                            secondaryAvatar={optionItem.icons[1]}
+                                            mainTooltip={optionItem.ownerEmail}
+                                            secondaryTooltip={optionItem.subtitle}
                                             size={props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                         />
                                     ) : (
                                         <MultipleAvatars
-                                            icons={props.option.icons}
+                                            icons={optionItem.icons}
                                             size={props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                             secondAvatarStyle={[
                                                 StyleUtils.getBackgroundAndBorderStyle(themeColors.sidebar),
@@ -145,37 +146,37 @@ const OptionRowLHN = (props) => {
                                                     ? StyleUtils.getBackgroundAndBorderStyle(hoveredBackgroundColor)
                                                     : undefined,
                                             ]}
-                                            avatarTooltips={props.option.isPolicyExpenseChat ? [props.option.subtitle] : avatarTooltips}
+                                            avatarTooltips={optionItem.isPolicyExpenseChat ? [optionItem.subtitle] : avatarTooltips}
                                         />
                                     )
                                 )
                             }
                             <View style={contentContainerStyles}>
                                 <DisplayNames
-                                    fullTitle={props.option.text}
+                                    fullTitle={optionItem.text}
                                     displayNamesWithTooltips={displayNamesWithTooltips}
                                     tooltipEnabled
                                     numberOfLines={1}
                                     textStyles={displayNameStyle}
-                                    shouldUseFullTitle={props.option.isChatRoom || props.option.isPolicyExpenseChat}
+                                    shouldUseFullTitle={optionItem.isChatRoom || optionItem.isPolicyExpenseChat}
                                 />
-                                {props.option.alternateText ? (
+                                {optionItem.alternateText ? (
                                     <Text
                                         style={alternateTextStyle}
                                         numberOfLines={1}
                                     >
-                                        {props.option.alternateText}
+                                        {optionItem.alternateText}
                                     </Text>
                                 ) : null}
                             </View>
-                            {props.option.descriptiveText ? (
+                            {optionItem.descriptiveText ? (
                                 <View style={[styles.flexWrap]}>
                                     <Text style={[styles.textLabel]}>
-                                        {props.option.descriptiveText}
+                                        {optionItem.descriptiveText}
                                     </Text>
                                 </View>
                             ) : null}
-                            {props.option.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (
+                            {optionItem.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR && (
                                 <View style={[styles.alignItemsCenter, styles.justifyContentCenter]}>
                                     <Icon
                                         src={Expensicons.DotIndicator}
@@ -188,15 +189,15 @@ const OptionRowLHN = (props) => {
                         </View>
                     </View>
                     <View style={[styles.flexRow, styles.alignItemsCenter]}>
-                        {props.option.hasDraftComment && (
+                        {optionItem.hasDraftComment && (
                             <View style={styles.ml2}>
                                 <Icon src={Expensicons.Pencil} height={16} width={16} />
                             </View>
                         )}
-                        {props.option.hasOutstandingIOU && (
-                            <IOUBadge iouReportID={props.option.iouReportID} />
+                        {optionItem.hasOutstandingIOU && (
+                            <IOUBadge iouReportID={optionItem.iouReportID} />
                         )}
-                        {props.option.isPinned && (
+                        {optionItem.isPinned && (
                             <View style={styles.ml2}>
                                 <Icon src={Expensicons.Pin} height={16} width={16} />
                             </View>

From edc747598b513f6b049881861983b67904027267 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 16:19:31 +0200
Subject: [PATCH 047/178] Switch to using a flatlist

---
 .../LHNOptionsList/BaseOptionsListLHN.js      | 67 ++-----------------
 src/components/LHNOptionsList/OptionRowLHN.js |  4 ++
 .../LHNOptionsList/optionsListPropTypesLHN.js |  3 -
 src/libs/OptionsListUtilsLHN.js               | 33 ++++-----
 src/pages/home/sidebar/SidebarLinks.js        |  7 +-
 5 files changed, 25 insertions(+), 89 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 0ca90c122fe2..ebcaba224e37 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -1,11 +1,10 @@
 import _ from 'underscore';
 import React, {forwardRef, Component} from 'react';
-import {View} from 'react-native';
+import {View, FlatList} from 'react-native';
 import PropTypes from 'prop-types';
 import CONST from '../../CONST';
 import styles from '../../styles/styles';
 import variables from '../../styles/variables';
-import SectionList from '../SectionList';
 import OptionRowLHN from './OptionRowLHN';
 import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultPropTypes} from './optionsListPropTypesLHN';
 
@@ -31,13 +30,10 @@ class BaseOptionsListLHN extends Component {
 
         this.renderItem = this.renderItem.bind(this);
         this.getItemLayout = this.getItemLayout.bind(this);
-        this.buildFlatSectionArray = this.buildFlatSectionArray.bind(this);
         this.extractKey = this.extractKey.bind(this);
         this.onViewableItemsChanged = this.onViewableItemsChanged.bind(this);
         this.viewabilityConfig = {viewAreaCoveragePercentThreshold: 95};
         this.didLayout = false;
-
-        this.flattenedData = this.buildFlatSectionArray();
     }
 
     shouldComponentUpdate(nextProps) {
@@ -56,14 +52,6 @@ class BaseOptionsListLHN extends Component {
         return false;
     }
 
-    componentDidUpdate(prevProps) {
-        if (_.isEqual(this.props.sections, prevProps.sections)) {
-            return;
-        }
-
-        this.flattenedData = this.buildFlatSectionArray();
-    }
-
     onViewableItemsChanged() {
         if (this.didLayout || !this.props.onLayout) {
             return;
@@ -90,11 +78,7 @@ class BaseOptionsListLHN extends Component {
      * @returns {Object}
      */
     getItemLayout(data, flatDataArrayIndex) {
-        if (!_.has(this.flattenedData, flatDataArrayIndex)) {
-            this.flattenedData = this.buildFlatSectionArray();
-        }
-
-        const targetItem = this.flattenedData[flatDataArrayIndex];
+        const targetItem = this.props.sections[flatDataArrayIndex];
         return {
             length: targetItem.length,
             offset: targetItem.offset,
@@ -102,42 +86,6 @@ class BaseOptionsListLHN extends Component {
         };
     }
 
-    /**
-     * This helper function is used to memoize the computation needed for getItemLayout. It is run whenever section data changes.
-     *
-     * @returns {Array<Object>}
-     */
-    buildFlatSectionArray() {
-        const optionHeight = this.props.optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
-        let offset = 0;
-
-        // Start with just an empty list header
-        const flatArray = [{length: 0, offset}];
-
-        // Build the flat array
-        for (let sectionIndex = 0; sectionIndex < this.props.sections.length; sectionIndex++) {
-            const section = this.props.sections[sectionIndex];
-
-            // Add the section header
-            const sectionHeaderHeight = 0;
-            flatArray.push({length: sectionHeaderHeight, offset});
-            offset += sectionHeaderHeight;
-
-            // Add section items
-            for (let i = 0; i < section.data.length; i++) {
-                flatArray.push({length: optionHeight, offset});
-                offset += optionHeight;
-            }
-
-            // Add the section footer
-            flatArray.push({length: 0, offset});
-        }
-
-        // Then add the list footer
-        flatArray.push({length: 0, offset});
-        return flatArray;
-    }
-
     /**
      * Returns the key used by the list
      * @param {Object} option
@@ -153,17 +101,16 @@ class BaseOptionsListLHN extends Component {
      * @param {Object} params
      * @param {Object} params.item
      * @param {Number} params.index
-     * @param {Object} params.section
      *
      * @return {Component}
      */
-    renderItem({item, index, section}) {
+    renderItem({item, index}) {
         return (
             <OptionRowLHN
-                reportID={item.reportID}
+                reportID={item.reportID.toString()}
                 viewMode={this.props.optionMode}
                 optionIsFocused={!this.props.disableFocusOptions
-                        && this.props.focusedIndex === (index + section.indexOffset)}
+                        && this.props.focusedIndex === index}
                 onSelectRow={this.props.onSelectRow}
             />
         );
@@ -172,7 +119,7 @@ class BaseOptionsListLHN extends Component {
     render() {
         return (
             <View style={[styles.flex1]}>
-                <SectionList
+                <FlatList
                     ref={this.props.innerRef}
                     indicatorStyle="white"
                     keyboardShouldPersistTaps="always"
@@ -180,7 +127,7 @@ class BaseOptionsListLHN extends Component {
                     onScrollBeginDrag={this.props.onScrollBeginDrag}
                     contentContainerStyle={this.props.contentContainerStyles}
                     showsVerticalScrollIndicator={false}
-                    sections={this.props.sections}
+                    data={this.props.sections}
                     keyExtractor={this.extractKey}
                     stickySectionHeadersEnabled={false}
                     renderItem={this.renderItem}
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 2ed718cb7829..8268dbf715fc 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -57,6 +57,10 @@ const defaultProps = {
 
 const OptionRowLHN = (props) => {
     const optionItem = OptionsListUtilsLHN.getOptionData(props.reportID);
+    if (!optionItem) {
+        return null;
+    }
+
     let touchableRef = null;
     const textStyle = props.optionIsFocused
         ? styles.sidebarLinkActiveText
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index c35dead9c1e5..2e0e0c72b6d7 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -5,9 +5,6 @@ import optionPropTypesLHN from './optionPropTypesLHN';
 import CONST from '../../CONST';
 
 const propTypes = {
-    /** option Background Color */
-    optionBackgroundColor: PropTypes.string.isRequired,
-
     /** Extra styles for the section list container */
     contentContainerStyles: PropTypes.arrayOf(PropTypes.object).isRequired,
 
diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index d165492aaaf6..508c6a17e54a 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import _ from 'underscore/underscore-node';
+import _ from 'underscore';
 import Str from 'expensify-common/lib/str';
 import ONYXKEYS from '../ONYXKEYS';
 import * as ReportUtils from './ReportUtils';
@@ -11,6 +11,7 @@ import * as CollectionUtils from './CollectionUtils';
 let reports;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
+    waitForCollectionCallback: true,
     callback: val => reports = val,
 });
 
@@ -52,28 +53,18 @@ Onyx.connect({
     },
 });
 
-const policies = {};
+let policies;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
-    callback: (policy, key) => {
-        if (!policy || !key || !policy.name) {
-            return;
-        }
-
-        policies[key] = policy;
-    },
+    waitForCollectionCallback: true,
+    callback: val => policies = val,
 });
 
-const iouReports = {};
+let iouReports;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_IOUS,
-    callback: (iouReport, key) => {
-        if (!iouReport || !key || !iouReport.ownerEmail) {
-            return;
-        }
-
-        iouReports[key] = iouReport;
-    },
+    waitForCollectionCallback: true,
+    callback: val => iouReports = val,
 });
 
 let currentUserLogin;
@@ -101,7 +92,10 @@ Onyx.connect({
  * @returns {Object}
  */
 function getOptionData(reportID) {
-    const report = reports[reportID];
+    const report = reports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
+    if (!report) {
+        return;
+    }
     const result = {
         text: null,
         alternateText: null,
@@ -133,7 +127,6 @@ function getOptionData(reportID) {
     const personalDetailMap = OptionsListUtils.getPersonalDetailsForLogins(report.participants, personalDetails);
     const personalDetailList = _.values(personalDetailMap);
     const personalDetail = personalDetailList[0];
-    let hasMultipleParticipants = personalDetailList.length > 1;
 
     result.isChatRoom = ReportUtils.isChatRoom(report);
     result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
@@ -150,7 +143,7 @@ function getOptionData(reportID) {
     result.tooltipText = ReportUtils.getReportParticipantsTitle(report.participants || []);
     result.hasOutstandingIOU = report.hasOutstandingIOU;
 
-    hasMultipleParticipants = personalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat;
+    const hasMultipleParticipants = personalDetailList.length > 1 || result.isChatRoom || result.isPolicyExpenseChat;
     const subtitle = ReportUtils.getChatRoomSubtitle(report, policies);
 
     let lastMessageTextFromReport = '';
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 7592be33feeb..016fabac295f 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -133,12 +133,7 @@ class SidebarLinks extends React.Component {
             this.props.betas,
             this.props.reportActions,
         );
-        const sections = [{
-            title: '',
-            indexOffset: 0,
-            data: optionListItems,
-            shouldShow: true,
-        }];
+        const sections = optionListItems;
         Timing.end(CONST.TIMING.SIDEBAR_LINKS_FILTER_REPORTS);
 
         return (

From e90157917b5bf2c6a1101c5129b2dd928b608bc5 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 16:23:57 +0200
Subject: [PATCH 048/178] Rename section prop to data

---
 .../LHNOptionsList/BaseOptionsListLHN.js           |  8 +++-----
 .../LHNOptionsList/optionsListPropTypesLHN.js      | 14 +-------------
 src/pages/home/sidebar/SidebarLinks.js             |  2 +-
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index ebcaba224e37..df27f9e5fe5b 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -2,9 +2,7 @@ import _ from 'underscore';
 import React, {forwardRef, Component} from 'react';
 import {View, FlatList} from 'react-native';
 import PropTypes from 'prop-types';
-import CONST from '../../CONST';
 import styles from '../../styles/styles';
-import variables from '../../styles/variables';
 import OptionRowLHN from './OptionRowLHN';
 import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultPropTypes} from './optionsListPropTypesLHN';
 
@@ -45,7 +43,7 @@ class BaseOptionsListLHN extends Component {
             return true;
         }
 
-        if (!_.isEqual(nextProps.sections, this.props.sections)) {
+        if (!_.isEqual(nextProps.sections, this.props.data)) {
             return true;
         }
 
@@ -78,7 +76,7 @@ class BaseOptionsListLHN extends Component {
      * @returns {Object}
      */
     getItemLayout(data, flatDataArrayIndex) {
-        const targetItem = this.props.sections[flatDataArrayIndex];
+        const targetItem = this.props.data[flatDataArrayIndex];
         return {
             length: targetItem.length,
             offset: targetItem.offset,
@@ -127,7 +125,7 @@ class BaseOptionsListLHN extends Component {
                     onScrollBeginDrag={this.props.onScrollBeginDrag}
                     contentContainerStyle={this.props.contentContainerStyles}
                     showsVerticalScrollIndicator={false}
-                    data={this.props.sections}
+                    data={this.props.data}
                     keyExtractor={this.extractKey}
                     stickySectionHeadersEnabled={false}
                     renderItem={this.renderItem}
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 2e0e0c72b6d7..7f0780135995 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -9,19 +9,7 @@ const propTypes = {
     contentContainerStyles: PropTypes.arrayOf(PropTypes.object).isRequired,
 
     /** Sections for the section list */
-    sections: PropTypes.arrayOf(PropTypes.shape({
-        /** Title of the section */
-        title: PropTypes.string,
-
-        /** The initial index of this section given the total number of options in each section's data array */
-        indexOffset: PropTypes.number,
-
-        /** Array of options */
-        data: PropTypes.arrayOf(optionPropTypesLHN),
-
-        /** Whether this section should show or not */
-        shouldShow: PropTypes.bool,
-    })).isRequired,
+    data: PropTypes.arrayOf(optionPropTypesLHN).isRequired,
 
     /** Index for option to focus on */
     focusedIndex: PropTypes.number.isRequired,
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 016fabac295f..ea791351d18b 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -181,7 +181,7 @@ class SidebarLinks extends React.Component {
                         styles.sidebarListContainer,
                         {paddingBottom: StyleUtils.getSafeAreaMargins(this.props.insets).marginBottom},
                     ]}
-                    sections={sections}
+                    data={sections}
                     focusedIndex={_.findIndex(this.orderedReports, (
                         option => option.reportID.toString() === this.props.currentlyViewedReportID.toString()
                     ))}

From 405e4f62d7089f110c9623cd87afec54dd4be939 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 16:39:41 +0200
Subject: [PATCH 049/178] WIP for new report ordering

---
 src/libs/OptionsListUtilsLHN.js        | 58 ++++++++++++++++++++------
 src/pages/home/sidebar/SidebarLinks.js | 31 +++-----------
 2 files changed, 50 insertions(+), 39 deletions(-)

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index 508c6a17e54a..caf978e5afc3 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -26,18 +26,18 @@ Onyx.connect({
 //     key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
 //     callback: val => currentlyViewedReportID = val,
 // });
-//
-// let priorityMode;
-// Onyx.connect({
-//     key: ONYXKEYS.NVP_PRIORITY_MODE,
-//     callback: val => priorityMode = val,
-// });
-//
-// let betas;
-// Onyx.connect({
-//     key: ONYXKEYS.NVP_PRIORITY_MODE,
-//     callback: val => betas = val,
-// });
+
+let priorityMode;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIORITY_MODE,
+    callback: val => priorityMode = val,
+});
+
+let betas;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PRIORITY_MODE,
+    callback: val => betas = val,
+});
 
 const lastReportActions = {};
 let reportActions;
@@ -85,6 +85,35 @@ Onyx.connect({
     callback: val => preferredLocale = val || CONST.DEFAULT_LOCALE,
 });
 
+function getOrderedReports() {
+    const prioritizeIOUDebts = true;
+    const prioritizeReportsWithDraftComments = true;
+    const includeRecentReports = true;
+    const includeMultipleParticipantReports = true;
+    const maxRecentReportsToShow = 0;
+    const showChatPreviewLine = true;
+    const prioritizePinnedReports = true;
+    const hideReadReports = priorityMode === CONST.PRIORITY_MODE.GSD ? true : false;
+    const sortByAlphaAsc = priorityMode === CONST.PRIORITY_MODE.GSD ? true : false;
+
+    let recentReportOptions = [];
+    const pinnedReportOptions = [];
+    let personalDetailsOptions = [];
+    const iouDebtReportOptions = [];
+    const draftReportOptions = [];
+    const reportMapForLogins = {};
+
+    let orderedReports = _.sortBy(reports, sortByAlphaAsc ? 'reportName' : 'lastMessageTimestamp');
+    if (!sortByAlphaAsc) {
+        orderedReports.reverse();
+    }
+
+    // Move the archived Rooms to the last
+    orderedReports = _.sortBy(orderedReports, report => ReportUtils.isArchivedRoom(report));
+
+    return [];
+}
+
 /**
  * Gets all the data necessary for rendering an OptionRowLHN component
  *
@@ -198,4 +227,7 @@ function getOptionData(reportID) {
     return result;
 }
 
-export default {getOptionData};
+export default {
+    getOptionData,
+    getOrderedReports,
+};
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index ea791351d18b..e257bd91d6f7 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -26,6 +26,7 @@ import withCurrentUserPersonalDetails from '../../../components/withCurrentUserP
 import Timing from '../../../libs/actions/Timing';
 import reportActionPropTypes from '../report/reportActionPropTypes';
 import OptionsListLHN from '../../../components/LHNOptionsList';
+import OptionsListUtilsLHN from '../../../libs/OptionsListUtilsLHN';
 
 const propTypes = {
     /** Toggles the navigation menu open and closed */
@@ -96,22 +97,8 @@ function deepCompareRenderItems(activeReportID, priorityMode, unorderedReports,
 }
 
 class SidebarLinks extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.getRecentReportsOptionListItems = _.memoize(this.getRecentReportsOptionListItems.bind(this), deepCompareRenderItems);
-    }
-
-    getRecentReportsOptionListItems(activeReportID, priorityMode, unorderedReports, personalDetails, betas, reportActions) {
-        const sidebarOptions = OptionsListUtils.getSidebarOptions(
-            unorderedReports,
-            personalDetails,
-            activeReportID,
-            priorityMode,
-            betas,
-            reportActions,
-        );
-        return sidebarOptions.recentReports;
+    getRecentReportsOptionListItems() {
+        return OptionsListUtilsLHN.getOrderedReports();
     }
 
     showSearchPage() {
@@ -125,15 +112,7 @@ class SidebarLinks extends React.Component {
         }
 
         Timing.start(CONST.TIMING.SIDEBAR_LINKS_FILTER_REPORTS);
-        const optionListItems = this.getRecentReportsOptionListItems(
-            this.props.currentlyViewedReportID,
-            this.props.priorityMode,
-            this.props.reports,
-            this.props.personalDetails,
-            this.props.betas,
-            this.props.reportActions,
-        );
-        const sections = optionListItems;
+        const optionListItems = this.getRecentReportsOptionListItems();
         Timing.end(CONST.TIMING.SIDEBAR_LINKS_FILTER_REPORTS);
 
         return (
@@ -181,7 +160,7 @@ class SidebarLinks extends React.Component {
                         styles.sidebarListContainer,
                         {paddingBottom: StyleUtils.getSafeAreaMargins(this.props.insets).marginBottom},
                     ]}
-                    data={sections}
+                    data={optionListItems}
                     focusedIndex={_.findIndex(this.orderedReports, (
                         option => option.reportID.toString() === this.props.currentlyViewedReportID.toString()
                     ))}

From 894debb435712feeafcfc23e6d81fd9d8d741026 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 17:05:51 +0200
Subject: [PATCH 050/178] WIP for new report ordering

---
 src/libs/OptionsListUtilsLHN.js | 123 +++++++++++++++++++++++++++++---
 1 file changed, 113 insertions(+), 10 deletions(-)

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index caf978e5afc3..590a5ad48269 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -7,6 +7,8 @@ import * as Localize from './Localize';
 import CONST from '../CONST';
 import * as OptionsListUtils from './OptionsListUtils';
 import * as CollectionUtils from './CollectionUtils';
+import Permissions from './Permissions';
+import lodashOrderBy from 'lodash/orderBy';
 
 let reports;
 Onyx.connect({
@@ -21,11 +23,11 @@ Onyx.connect({
     callback: val => personalDetails = val,
 });
 
-// let currentlyViewedReportID;
-// Onyx.connect({
-//     key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
-//     callback: val => currentlyViewedReportID = val,
-// });
+let currentlyViewedReportID;
+Onyx.connect({
+    key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,
+    callback: val => currentlyViewedReportID = val,
+});
 
 let priorityMode;
 Onyx.connect({
@@ -93,8 +95,8 @@ function getOrderedReports() {
     const maxRecentReportsToShow = 0;
     const showChatPreviewLine = true;
     const prioritizePinnedReports = true;
-    const hideReadReports = priorityMode === CONST.PRIORITY_MODE.GSD ? true : false;
-    const sortByAlphaAsc = priorityMode === CONST.PRIORITY_MODE.GSD ? true : false;
+    const hideReadReports = priorityMode === CONST.PRIORITY_MODE.GSD;
+    const sortByTimestampDescending = priorityMode !== CONST.PRIORITY_MODE.GSD;
 
     let recentReportOptions = [];
     const pinnedReportOptions = [];
@@ -103,15 +105,116 @@ function getOrderedReports() {
     const draftReportOptions = [];
     const reportMapForLogins = {};
 
-    let orderedReports = _.sortBy(reports, sortByAlphaAsc ? 'reportName' : 'lastMessageTimestamp');
-    if (!sortByAlphaAsc) {
+    const filteredReports = _.filter(reports, (report) => {
+        if (!report || !report.reportID) {
+            return false;
+        }
+
+        const isChatRoom = ReportUtils.isChatRoom(report);
+        const isDefaultRoom = ReportUtils.isDefaultRoom(report);
+        const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
+        const participants = (report && report.participants) || [];
+
+        // Skip this report if it has no participants and if it's not a type of report supported in the LHN
+        if (_.isEmpty(participants) && !isChatRoom && !isDefaultRoom && !isPolicyExpenseChat) {
+            return false;
+        }
+
+        const hasDraftComment = report.hasDraft || false;
+        const iouReport = report.iouReportID && iouReports[`${ONYXKEYS.COLLECTION.REPORT_IOUS}${report.iouReportID}`];
+        const iouReportOwner = report.hasOutstandingIOU && iouReport
+            ? iouReport.ownerEmail
+            : '';
+
+        const reportContainsIOUDebt = iouReportOwner && iouReportOwner !== currentUserLogin;
+        const shouldFilterReportIfEmpty = report.lastMessageTimestamp === 0
+
+            // We make exceptions for defaultRooms and policyExpenseChats so we can immediately
+            // highlight them in the LHN when they are created and have no messsages yet. We do
+            // not give archived rooms this exception since they do not need to be higlihted.
+            && !(!ReportUtils.isArchivedRoom(report) && (isDefaultRoom || isPolicyExpenseChat));
+
+        const shouldFilterReportIfRead = hideReadReports && report.unreadActionCount === 0;
+        const shouldFilterReport = shouldFilterReportIfEmpty || shouldFilterReportIfRead;
+        if (report.reportID.toString() !== currentlyViewedReportID.toString()
+            && !report.isPinned
+            && !hasDraftComment
+            && shouldFilterReport
+            && !reportContainsIOUDebt) {
+            return false;
+        }
+
+        // We let Free Plan default rooms to be shown in the App - it's the one exception to the beta, otherwise do not show policy rooms in product
+        if (ReportUtils.isDefaultRoom(report) && !Permissions.canUseDefaultRooms(betas) && ReportUtils.getPolicyType(report, policies) !== CONST.POLICY.TYPE.FREE) {
+            return false;
+        }
+
+        if (ReportUtils.isUserCreatedPolicyRoom(report) && !Permissions.canUsePolicyRooms(betas)) {
+            return false;
+        }
+
+        if (isPolicyExpenseChat && !Permissions.canUsePolicyExpenseChat(betas)) {
+            return false;
+        }
+
+        return true;
+
+        // Save the report in the map if this is a single participant so we can associate the reportID with the
+        // personal detail option later. Individuals should not be associated with single participant
+        // policyExpenseChats or chatRooms since those are not people.
+        // @TODO: Maybe remove
+        if (participants.length <= 1 && !isPolicyExpenseChat && !isChatRoom) {
+            reportMapForLogins[participants[0]] = report;
+        }
+    });
+
+    let orderedReports = _.sortBy(sortByTimestampDescending ? 'lastMessageTimestamp' : 'reportName');
+
+    if (sortByTimestampDescending) {
         orderedReports.reverse();
     }
 
     // Move the archived Rooms to the last
     orderedReports = _.sortBy(orderedReports, report => ReportUtils.isArchivedRoom(report));
 
-    return [];
+    // Put all the reports into the different buckets
+    for (let i = 0; i < orderedReports.length; i++) {
+        const report = orderedReports[i];
+
+        // If the report is pinned and we are using the option to display pinned reports on top then we need to
+        // collect the pinned reports so we can sort them alphabetically once they are collected
+        if (prioritizePinnedReports && report.isPinned) {
+            pinnedReportOptions.push(report);
+        } else if (prioritizeIOUDebts && report.hasOutstandingIOU && !report.isIOUReportOwner) {
+            iouDebtReportOptions.push(report);
+        } else if (prioritizeReportsWithDraftComments && report.hasDraft) {
+            draftReportOptions.push(report);
+        } else {
+            recentReportOptions.push(report);
+        }
+    }
+
+    // If we are prioritizing reports with draft comments, add them before the normal recent report options
+    // and sort them by report name.
+    if (prioritizeReportsWithDraftComments) {
+        const sortedDraftReports = _.sortBy(draftReportOptions, 'text');
+        recentReportOptions = sortedDraftReports.concat(recentReportOptions);
+    }
+
+    // If we are prioritizing IOUs the user owes, add them before the normal recent report options and reports
+    // with draft comments.
+    if (prioritizeIOUDebts) {
+        const sortedIOUReports = _.sortBy(iouDebtReportOptions, 'iouReportAmount').reverse();
+        recentReportOptions = sortedIOUReports.concat(recentReportOptions);
+    }
+
+    // If we are prioritizing our pinned reports then shift them to the front and sort them by report name
+    if (prioritizePinnedReports) {
+        const sortedPinnedReports = _.sortBy(pinnedReportOptions, 'text');
+        recentReportOptions = sortedPinnedReports.concat(recentReportOptions);
+    }
+
+    return recentReportOptions;
 }
 
 /**

From 205e8c37a568a4b2faad4c0f7b933d906edcd18b Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 17:09:44 +0200
Subject: [PATCH 051/178] Remove boolean options

---
 src/libs/OptionsListUtilsLHN.js | 47 +++++++++------------------------
 1 file changed, 12 insertions(+), 35 deletions(-)

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index 590a5ad48269..8e532aca7415 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -88,22 +88,13 @@ Onyx.connect({
 });
 
 function getOrderedReports() {
-    const prioritizeIOUDebts = true;
-    const prioritizeReportsWithDraftComments = true;
-    const includeRecentReports = true;
-    const includeMultipleParticipantReports = true;
-    const maxRecentReportsToShow = 0;
-    const showChatPreviewLine = true;
-    const prioritizePinnedReports = true;
     const hideReadReports = priorityMode === CONST.PRIORITY_MODE.GSD;
     const sortByTimestampDescending = priorityMode !== CONST.PRIORITY_MODE.GSD;
 
     let recentReportOptions = [];
     const pinnedReportOptions = [];
-    let personalDetailsOptions = [];
     const iouDebtReportOptions = [];
     const draftReportOptions = [];
-    const reportMapForLogins = {};
 
     const filteredReports = _.filter(reports, (report) => {
         if (!report || !report.reportID) {
@@ -158,17 +149,9 @@ function getOrderedReports() {
         }
 
         return true;
-
-        // Save the report in the map if this is a single participant so we can associate the reportID with the
-        // personal detail option later. Individuals should not be associated with single participant
-        // policyExpenseChats or chatRooms since those are not people.
-        // @TODO: Maybe remove
-        if (participants.length <= 1 && !isPolicyExpenseChat && !isChatRoom) {
-            reportMapForLogins[participants[0]] = report;
-        }
     });
 
-    let orderedReports = _.sortBy(sortByTimestampDescending ? 'lastMessageTimestamp' : 'reportName');
+    let orderedReports = _.sortBy(filteredReports, sortByTimestampDescending ? 'lastMessageTimestamp' : 'reportName');
 
     if (sortByTimestampDescending) {
         orderedReports.reverse();
@@ -183,36 +166,30 @@ function getOrderedReports() {
 
         // If the report is pinned and we are using the option to display pinned reports on top then we need to
         // collect the pinned reports so we can sort them alphabetically once they are collected
-        if (prioritizePinnedReports && report.isPinned) {
+        if (report.isPinned) {
             pinnedReportOptions.push(report);
-        } else if (prioritizeIOUDebts && report.hasOutstandingIOU && !report.isIOUReportOwner) {
+        } else if (report.hasOutstandingIOU && !report.isIOUReportOwner) {
             iouDebtReportOptions.push(report);
-        } else if (prioritizeReportsWithDraftComments && report.hasDraft) {
+        } else if (report.hasDraft) {
             draftReportOptions.push(report);
         } else {
             recentReportOptions.push(report);
         }
     }
 
-    // If we are prioritizing reports with draft comments, add them before the normal recent report options
+    // Prioritizing reports with draft comments, add them before the normal recent report options
     // and sort them by report name.
-    if (prioritizeReportsWithDraftComments) {
-        const sortedDraftReports = _.sortBy(draftReportOptions, 'text');
-        recentReportOptions = sortedDraftReports.concat(recentReportOptions);
-    }
+    const sortedDraftReports = _.sortBy(draftReportOptions, 'text');
+    recentReportOptions = sortedDraftReports.concat(recentReportOptions);
 
-    // If we are prioritizing IOUs the user owes, add them before the normal recent report options and reports
+    // Prioritizing IOUs the user owes, add them before the normal recent report options and reports
     // with draft comments.
-    if (prioritizeIOUDebts) {
-        const sortedIOUReports = _.sortBy(iouDebtReportOptions, 'iouReportAmount').reverse();
-        recentReportOptions = sortedIOUReports.concat(recentReportOptions);
-    }
+    const sortedIOUReports = _.sortBy(iouDebtReportOptions, 'iouReportAmount').reverse();
+    recentReportOptions = sortedIOUReports.concat(recentReportOptions);
 
     // If we are prioritizing our pinned reports then shift them to the front and sort them by report name
-    if (prioritizePinnedReports) {
-        const sortedPinnedReports = _.sortBy(pinnedReportOptions, 'text');
-        recentReportOptions = sortedPinnedReports.concat(recentReportOptions);
-    }
+    const sortedPinnedReports = _.sortBy(pinnedReportOptions, 'text');
+    recentReportOptions = sortedPinnedReports.concat(recentReportOptions);
 
     return recentReportOptions;
 }

From 1b713139e595a8dd4019648ebedea640a53fb46a Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 17:12:46 +0200
Subject: [PATCH 052/178] Fix lint errors

---
 src/libs/OptionsListUtils.js           |  1 -
 src/libs/OptionsListUtilsLHN.js        | 10 ++++++----
 src/pages/home/sidebar/SidebarLinks.js | 14 +++-----------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index f93ef08d9d12..08f1ad8a90ae 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -1,7 +1,6 @@
 /* eslint-disable no-continue */
 import _ from 'underscore';
 import Onyx from 'react-native-onyx';
-import lodashGet from 'lodash/get';
 import lodashOrderBy from 'lodash/orderBy';
 import Str from 'expensify-common/lib/str';
 import ONYXKEYS from '../ONYXKEYS';
diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index 8e532aca7415..530a66df19b4 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -8,7 +8,6 @@ import CONST from '../CONST';
 import * as OptionsListUtils from './OptionsListUtils';
 import * as CollectionUtils from './CollectionUtils';
 import Permissions from './Permissions';
-import lodashOrderBy from 'lodash/orderBy';
 
 let reports;
 Onyx.connect({
@@ -87,7 +86,10 @@ Onyx.connect({
     callback: val => preferredLocale = val || CONST.DEFAULT_LOCALE,
 });
 
-function getOrderedReports() {
+/**
+ * @returns {String[]} An array of reportIDs sorted in the proper order
+ */
+function getOrderedReportIDs() {
     const hideReadReports = priorityMode === CONST.PRIORITY_MODE.GSD;
     const sortByTimestampDescending = priorityMode !== CONST.PRIORITY_MODE.GSD;
 
@@ -191,7 +193,7 @@ function getOrderedReports() {
     const sortedPinnedReports = _.sortBy(pinnedReportOptions, 'text');
     recentReportOptions = sortedPinnedReports.concat(recentReportOptions);
 
-    return recentReportOptions;
+    return _.pluck(recentReportOptions, 'reportID');
 }
 
 /**
@@ -309,5 +311,5 @@ function getOptionData(reportID) {
 
 export default {
     getOptionData,
-    getOrderedReports,
+    getOrderedReportIDs,
 };
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index e257bd91d6f7..5193b1a52352 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -14,11 +14,9 @@ import Icon from '../../../components/Icon';
 import Header from '../../../components/Header';
 import * as Expensicons from '../../../components/Icon/Expensicons';
 import AvatarWithIndicator from '../../../components/AvatarWithIndicator';
-import * as OptionsListUtils from '../../../libs/OptionsListUtils';
 import Tooltip from '../../../components/Tooltip';
 import CONST from '../../../CONST';
 import participantPropTypes from '../../../components/participantPropTypes';
-import themeColors from '../../../styles/themes/default';
 import withLocalize, {withLocalizePropTypes} from '../../../components/withLocalize';
 import * as App from '../../../libs/actions/App';
 import * as ReportUtils from '../../../libs/ReportUtils';
@@ -40,6 +38,7 @@ const propTypes = {
 
     /* Onyx Props */
     /** List of reports */
+    // eslint-disable-next-line react/no-unused-prop-types
     reports: PropTypes.objectOf(PropTypes.shape({
         /** ID of the report */
         reportID: PropTypes.number,
@@ -55,6 +54,7 @@ const propTypes = {
     })),
 
     /** All report actions for all reports */
+    // eslint-disable-next-line react/no-unused-prop-types
     reportActions: PropTypes.objectOf(PropTypes.shape(reportActionPropTypes)),
 
     /** List of users' personal details */
@@ -92,15 +92,7 @@ const defaultProps = {
     priorityMode: CONST.PRIORITY_MODE.DEFAULT,
 };
 
-function deepCompareRenderItems(activeReportID, priorityMode, unorderedReports, personalDetails, betas, reportActions) {
-    return `${activeReportID}_${priorityMode}_${JSON.stringify(unorderedReports)}_${JSON.stringify(personalDetails)}_${JSON.stringify(betas)}_${JSON.stringify(reportActions)}`;
-}
-
 class SidebarLinks extends React.Component {
-    getRecentReportsOptionListItems() {
-        return OptionsListUtilsLHN.getOrderedReports();
-    }
-
     showSearchPage() {
         Navigation.navigate(ROUTES.SEARCH);
     }
@@ -112,7 +104,7 @@ class SidebarLinks extends React.Component {
         }
 
         Timing.start(CONST.TIMING.SIDEBAR_LINKS_FILTER_REPORTS);
-        const optionListItems = this.getRecentReportsOptionListItems();
+        const optionListItems = OptionsListUtilsLHN.getOrderedReportIDs();
         Timing.end(CONST.TIMING.SIDEBAR_LINKS_FILTER_REPORTS);
 
         return (

From ac4c9ab62d09788e29a3110c7449a5ce63dfbe89 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 17:14:22 +0200
Subject: [PATCH 053/178] Fix proptypes

---
 .../LHNOptionsList/optionPropTypesLHN.js      | 56 -------------------
 .../LHNOptionsList/optionsListPropTypesLHN.js |  3 +-
 2 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100644 src/components/LHNOptionsList/optionPropTypesLHN.js

diff --git a/src/components/LHNOptionsList/optionPropTypesLHN.js b/src/components/LHNOptionsList/optionPropTypesLHN.js
deleted file mode 100644
index 7067c3ee7ce4..000000000000
--- a/src/components/LHNOptionsList/optionPropTypesLHN.js
+++ /dev/null
@@ -1,56 +0,0 @@
-import PropTypes from 'prop-types';
-import CONST from '../../CONST';
-import participantPropTypes from '../participantPropTypes';
-
-export default PropTypes.shape({
-    // Text to display
-    text: PropTypes.string,
-
-    // Alternate text to display
-    alternateText: PropTypes.string,
-
-    // Array of URLs or icons
-    icons: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.func])),
-
-    // Login (only present when there is a single participant)
-    login: PropTypes.string,
-
-    // reportID (only present when there is a matching report)
-    reportID: PropTypes.number,
-
-    // Whether the report has read or not
-    isUnread: PropTypes.bool,
-
-    // Whether the report has a draft comment or not
-    hasDraftComment: PropTypes.bool,
-
-    // Key used internally by React
-    keyForList: PropTypes.string,
-
-    // Search text we use to filter options
-    searchText: PropTypes.string,
-
-    // Whether the report is pinned or not
-    isPinned: PropTypes.bool,
-
-    // Whether the report corresponds to a chat room
-    isChatRoom: PropTypes.bool,
-
-    // Whether the option has an outstanding IOU
-    hasOutstandingIOU: PropTypes.bool,
-
-    // List of participants of the report
-    participantsList: PropTypes.arrayOf(participantPropTypes),
-
-    // Descriptive text to be displayed besides selection element
-    descriptiveText: PropTypes.string,
-
-    // The type of option we have e.g. user or report
-    type: PropTypes.string,
-
-    // Text to show for tooltip
-    tooltipText: PropTypes.string,
-
-    /** If we need to show a brick road indicator or not */
-    brickRoadIndicator: PropTypes.oneOf([CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR, '']),
-});
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
index 7f0780135995..984feabab8eb 100644
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
@@ -1,7 +1,6 @@
 import PropTypes from 'prop-types';
 import _ from 'underscore';
 import SectionList from '../SectionList';
-import optionPropTypesLHN from './optionPropTypesLHN';
 import CONST from '../../CONST';
 
 const propTypes = {
@@ -9,7 +8,7 @@ const propTypes = {
     contentContainerStyles: PropTypes.arrayOf(PropTypes.object).isRequired,
 
     /** Sections for the section list */
-    data: PropTypes.arrayOf(optionPropTypesLHN).isRequired,
+    data: PropTypes.arrayOf(PropTypes.string).isRequired,
 
     /** Index for option to focus on */
     focusedIndex: PropTypes.number.isRequired,

From 61815e7834e6b3a82e5a21c20b6bffd544eced15 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 17:20:40 +0200
Subject: [PATCH 054/178] Correct the item passed to option row

---
 .../LHNOptionsList/BaseOptionsListLHN.js           | 14 ++------------
 src/libs/OptionsListUtilsLHN.js                    |  5 ++++-
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index df27f9e5fe5b..965ed7eb3b25 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -28,7 +28,6 @@ class BaseOptionsListLHN extends Component {
 
         this.renderItem = this.renderItem.bind(this);
         this.getItemLayout = this.getItemLayout.bind(this);
-        this.extractKey = this.extractKey.bind(this);
         this.onViewableItemsChanged = this.onViewableItemsChanged.bind(this);
         this.viewabilityConfig = {viewAreaCoveragePercentThreshold: 95};
         this.didLayout = false;
@@ -84,15 +83,6 @@ class BaseOptionsListLHN extends Component {
         };
     }
 
-    /**
-     * Returns the key used by the list
-     * @param {Object} option
-     * @return {String}
-     */
-    extractKey(option) {
-        return option.keyForList;
-    }
-
     /**
      * Function which renders a row in the list
      *
@@ -105,7 +95,7 @@ class BaseOptionsListLHN extends Component {
     renderItem({item, index}) {
         return (
             <OptionRowLHN
-                reportID={item.reportID.toString()}
+                reportID={item}
                 viewMode={this.props.optionMode}
                 optionIsFocused={!this.props.disableFocusOptions
                         && this.props.focusedIndex === index}
@@ -126,7 +116,7 @@ class BaseOptionsListLHN extends Component {
                     contentContainerStyle={this.props.contentContainerStyles}
                     showsVerticalScrollIndicator={false}
                     data={this.props.data}
-                    keyExtractor={this.extractKey}
+                    keyExtractor={item => item}
                     stickySectionHeadersEnabled={false}
                     renderItem={this.renderItem}
                     getItemLayout={this.getItemLayout}
diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index 530a66df19b4..559b5eaf56ff 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -193,7 +193,10 @@ function getOrderedReportIDs() {
     const sortedPinnedReports = _.sortBy(pinnedReportOptions, 'text');
     recentReportOptions = sortedPinnedReports.concat(recentReportOptions);
 
-    return _.pluck(recentReportOptions, 'reportID');
+    return _.chain(recentReportOptions)
+        .pluck('reportID')
+        .map(reportID => reportID.toString())
+        .value();
 }
 
 /**

From 350204a0ca2c3cb1d01e1d98a44fffe16850d244 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 2 Sep 2022 17:26:42 +0200
Subject: [PATCH 055/178] Fix the focused index

---
 src/pages/home/sidebar/SidebarLinks.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 5193b1a52352..e916d1320013 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -153,8 +153,8 @@ class SidebarLinks extends React.Component {
                         {paddingBottom: StyleUtils.getSafeAreaMargins(this.props.insets).marginBottom},
                     ]}
                     data={optionListItems}
-                    focusedIndex={_.findIndex(this.orderedReports, (
-                        option => option.reportID.toString() === this.props.currentlyViewedReportID.toString()
+                    focusedIndex={_.findIndex(optionListItems, (
+                        option => option === this.props.currentlyViewedReportID.toString()
                     ))}
                     onSelectRow={(option) => {
                         Navigation.navigate(ROUTES.getReportRoute(option.reportID));

From 89d2da27fdb8010597ffa5215c1254abf8295378 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@gmail.com>
Date: Mon, 5 Sep 2022 07:15:55 -0600
Subject: [PATCH 056/178] Update
 src/components/LHNOptionsList/BaseOptionsListLHN.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Szymon Kapała <szymon20000@gmail.com>
---
 src/components/LHNOptionsList/BaseOptionsListLHN.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 965ed7eb3b25..1f9edc6d9bc8 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -74,12 +74,12 @@ class BaseOptionsListLHN extends Component {
      *
      * @returns {Object}
      */
-    getItemLayout(data, flatDataArrayIndex) {
-        const targetItem = this.props.data[flatDataArrayIndex];
+    getItemLayout(data, index) {
+        const optionHeight = this.props.optionMode === CONST.OPTION_MODE.COMPACT ? variables.optionRowHeightCompact : variables.optionRowHeight;
         return {
-            length: targetItem.length,
-            offset: targetItem.offset,
-            index: flatDataArrayIndex,
+            length: optionHeight,
+            offset: index * optionHeight,
+            index: index,
         };
     }
 

From e041f92f7f5cf3b52f90f0591730b2d4ca8cc44f Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 5 Sep 2022 14:18:08 +0100
Subject: [PATCH 057/178] Import variables and CONST and simplify index
 property

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 1f9edc6d9bc8..a2d2dd96b544 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -4,7 +4,9 @@ import {View, FlatList} from 'react-native';
 import PropTypes from 'prop-types';
 import styles from '../../styles/styles';
 import OptionRowLHN from './OptionRowLHN';
+import variables from '../../styles/variables';
 import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultPropTypes} from './optionsListPropTypesLHN';
+import CONST from '../../CONST';
 
 const propTypes = {
     /** Determines whether the keyboard gets dismissed in response to a drag */
@@ -79,7 +81,7 @@ class BaseOptionsListLHN extends Component {
         return {
             length: optionHeight,
             offset: index * optionHeight,
-            index: index,
+            index,
         };
     }
 

From 8d51541156e2a72b9d802a4343b900d37cdde7c3 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 11:22:55 +0100
Subject: [PATCH 058/178] Add fake owner email constants

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

diff --git a/src/CONST.js b/src/CONST.js
index 903f70bdaa56..a974d81dbce2 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -311,6 +311,7 @@ const CONST = {
         MAX_PREVIEW_AVATARS: 4,
         MAX_ROOM_NAME_LENGTH: 80,
         LAST_MESSAGE_TEXT_MAX_LENGTH: 80,
+        OWNER_EMAIL_FAKE: '__FAKE__',
     },
     COMPOSER: {
         MAX_LINES: 16,
@@ -673,6 +674,7 @@ const CONST = {
         },
         ROOM_PREFIX: '#',
         CUSTOM_UNIT_RATE_BASE_OFFSET: 100,
+        OWNER_EMAIL_FAKE: '_FAKE_',
     },
 
     CUSTOM_UNITS: {

From f8bf2913af091a8c1c3c4211ec3762f5c041381a Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 11:23:28 +0100
Subject: [PATCH 059/178] Create addWorkspaceRoom action

---
 src/libs/actions/Report.js | 66 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 63 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 105ca3964226..c5602260a1f5 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -594,16 +594,18 @@ function fetchAllReports(
  * @param {String} ownerEmail
  * @param {Boolean} isOwnPolicyExpenseChat
  * @param {String} oldPolicyName
+ * @param {String} visibility
  * @returns {Object}
  */
 function createOptimisticChatReport(
     participantList,
     reportName = 'Chat Report',
     chatType = '',
-    policyID = '_FAKE_',
-    ownerEmail = '__FAKE__',
+    policyID = CONST.POLICY.OWNER_EMAIL_FAKE,
+    ownerEmail = CONST.REPORT.OWNER_EMAIL_FAKE,
     isOwnPolicyExpenseChat = false,
     oldPolicyName = '',
+    visibility = undefined,
 ) {
     return {
         chatType,
@@ -626,7 +628,7 @@ function createOptimisticChatReport(
         reportName,
         stateNum: 0,
         statusNum: 0,
-        visibility: undefined,
+        visibility,
     };
 }
 
@@ -1431,6 +1433,63 @@ function createPolicyRoom(policyID, reportName, visibility) {
         .finally(() => Onyx.set(ONYXKEYS.IS_LOADING_CREATE_POLICY_ROOM, false));
 }
 
+/**
+ * Add a workspace room optimistically and navigate to it.
+ *
+ * @param {Object} policy
+ * @param {String} reportName
+ * @param {String} visibility
+ */
+function addWorkspaceRoom(policy, reportName, visibility) {
+    const workspaceRoom = createOptimisticChatReport(
+        policy.emailList,
+        reportName,
+        CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
+        policy.policyID,
+        CONST.REPORT.OWNER_EMAIL_FAKE,
+        false,
+        '',
+        visibility,
+    );
+    const optimisticData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceRoom.reportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                },
+                ...workspaceRoom,
+            },
+        },
+    ];
+    const successData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceRoom.reportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+            },
+        },
+    ];
+    const failureData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceRoom.reportID}`,
+            value: {
+                pendingFields: {
+                    addWorkspaceRoom: null,
+                },
+            },
+        },
+    ];
+
+    API.write('AddWorkspaceRoom', {workspaceRoom}, {optimisticData, successData, failureData});
+    Navigation.navigate(ROUTES.getReportRoute(workspaceRoom.reportID));
+}
+
 /**
  * @param {Object} policyRoomReport
  * @param {Number} policyRoomReport.reportID
@@ -1625,6 +1684,7 @@ export {
     handleInaccessibleReport,
     setReportWithDraft,
     createPolicyRoom,
+    addWorkspaceRoom,
     setIsComposerFullSize,
     markCommentAsUnread,
     readNewestAction,

From 29e5449707b39918b47584d3e862c49ab32af954 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 11:39:09 +0100
Subject: [PATCH 060/178] Use addWorkspaceRoom

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

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 1dae4d8d5b67..532d62a93c29 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -35,16 +35,12 @@ const propTypes = {
         policyID: PropTypes.string,
     }).isRequired,
 
-    /** Are we loading the createPolicyRoom command */
-    isLoadingCreatePolicyRoom: PropTypes.bool,
-
     ...fullPolicyPropTypes,
 
     ...withLocalizePropTypes,
 };
 const defaultProps = {
     betas: [],
-    isLoadingCreatePolicyRoom: false,
     ...fullPolicyDefaultProps,
 };
 
@@ -60,7 +56,7 @@ class WorkspaceNewRoomPage extends React.Component {
             workspaceOptions: [],
         };
 
-        this.validateAndCreatePolicyRoom = this.validateAndCreatePolicyRoom.bind(this);
+        this.validateAndAddWorkspaceRoom = this.validateAndAddWorkspaceRoom.bind(this);
     }
 
     componentDidMount() {
@@ -81,15 +77,11 @@ class WorkspaceNewRoomPage extends React.Component {
         this.setState({workspaceOptions: _.map(workspaces, policy => ({label: policy.name, key: policy.id, value: policy.id}))});
     }
 
-    validateAndCreatePolicyRoom() {
+    validateAndAddWorkspaceRoom() {
         if (!this.validate()) {
             return;
         }
-        Report.createPolicyRoom(
-            this.state.policyID,
-            this.state.roomName,
-            this.state.visibility,
-        );
+        Report.addWorkspaceRoom(this.state.policyID, this.state.roomName, this.state.visibility);
     }
 
     /**
@@ -186,10 +178,9 @@ class WorkspaceNewRoomPage extends React.Component {
                 </ScrollView>
                 <FixedFooter>
                     <Button
-                        isLoading={this.props.isLoadingCreatePolicyRoom}
                         success
                         pressOnEnter
-                        onPress={this.validateAndCreatePolicyRoom}
+                        onPress={this.validateAndAddWorkspaceRoom}
                         style={[styles.w100]}
                         text={this.props.translate('newRoomPage.createRoom')}
                     />
@@ -214,9 +205,6 @@ export default compose(
         reports: {
             key: ONYXKEYS.COLLECTION.REPORT,
         },
-        isLoadingCreatePolicyRoom: {
-            key: ONYXKEYS.IS_LOADING_CREATE_POLICY_ROOM,
-        },
     }),
     withLocalize,
 )(WorkspaceNewRoomPage);

From 126095f6beb2a9a977f18d5167f5014bb9b661e1 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 13:00:53 +0100
Subject: [PATCH 061/178] Pass the selected policy to addWorkspaceRoom

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

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index 532d62a93c29..06ab17555ebb 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -81,7 +81,8 @@ class WorkspaceNewRoomPage extends React.Component {
         if (!this.validate()) {
             return;
         }
-        Report.addWorkspaceRoom(this.state.policyID, this.state.roomName, this.state.visibility);
+        const policy = this.props.policies[`${ONYXKEYS.COLLECTION.POLICY}${this.state.policyID}`];
+        Report.addWorkspaceRoom(policy, this.state.roomName, this.state.visibility);
     }
 
     /**

From 7795cac7006fab9b34d6f45f68929552271ad302 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 13:02:22 +0100
Subject: [PATCH 062/178] Access the policy id properly

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

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index c5602260a1f5..4c8da2bfb2c0 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1445,7 +1445,7 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         policy.emailList,
         reportName,
         CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
-        policy.policyID,
+        policy.id,
         CONST.REPORT.OWNER_EMAIL_FAKE,
         false,
         '',

From ae97e156771f189fdc14932756052edb87b04888 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 13:02:58 +0100
Subject: [PATCH 063/178] Convert the workspaceRoom to json before sending

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

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 4c8da2bfb2c0..d71ddcf5527c 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1486,7 +1486,7 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         },
     ];
 
-    API.write('AddWorkspaceRoom', {workspaceRoom}, {optimisticData, successData, failureData});
+    API.write('AddWorkspaceRoom', {workspaceRoom: JSON.stringify(workspaceRoom)}, {optimisticData, successData, failureData});
     Navigation.navigate(ROUTES.getReportRoute(workspaceRoom.reportID));
 }
 

From e9fe6cfc6d37460eea8836811b2624259b04057e Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 15:54:45 +0100
Subject: [PATCH 064/178] Add the room's created action optimistically

---
 src/libs/actions/Report.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index d71ddcf5527c..d473b25755cc 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1451,17 +1451,23 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         '',
         visibility,
     );
+    const createdActionData = createOptimisticCreatedReportAction(workspaceRoom.ownerEmail);
     const optimisticData = [
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceRoom.reportID}`,
             value: {
                 pendingFields: {
-                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+                    addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 },
                 ...workspaceRoom,
             },
         },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
+            value: createdActionData,
+        },
     ];
     const successData = [
         {

From e0080da5f975cafdfa1c484d5f8977a3ec9dcbaf Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 17:10:16 +0100
Subject: [PATCH 065/178] Clear the created room pendingAction

---
 src/libs/actions/Report.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index d473b25755cc..fef97c6f30b5 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1479,6 +1479,13 @@ function addWorkspaceRoom(policy, reportName, visibility) {
                 },
             },
         },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
+            value: {
+                pendingAction: null,
+            },
+        },
     ];
     const failureData = [
         {
@@ -1490,6 +1497,13 @@ function addWorkspaceRoom(policy, reportName, visibility) {
                 },
             },
         },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
+            value: {
+                pendingAction: null,
+            },
+        },
     ];
 
     API.write('AddWorkspaceRoom', {workspaceRoom: JSON.stringify(workspaceRoom)}, {optimisticData, successData, failureData});

From fc3f25ab7bcc182bb81ed04bf9f6531392fa72c3 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 7 Sep 2022 18:06:47 +0100
Subject: [PATCH 066/178] Fix clearing the pending action under key 0

---
 src/libs/actions/Report.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index fef97c6f30b5..655922114a4f 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1483,7 +1483,9 @@ function addWorkspaceRoom(policy, reportName, visibility) {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
             value: {
-                pendingAction: null,
+                0: {
+                    pendingAction: null,
+                },
             },
         },
     ];
@@ -1501,7 +1503,9 @@ function addWorkspaceRoom(policy, reportName, visibility) {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
             value: {
-                pendingAction: null,
+                0: {
+                    pendingAction: null,
+                },
             },
         },
     ];

From d868cf1fcb5aa11ff0bf79f7877c0f77e3015ca0 Mon Sep 17 00:00:00 2001
From: David Bondy <dbondy@expensify.com>
Date: Thu, 8 Sep 2022 12:27:00 +0100
Subject: [PATCH 067/178] create unique command for different usage of resend
 pw reset email

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

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 64ecc579f174..b323b67e3d97 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -326,7 +326,7 @@ function resetPassword() {
 }
 
 function resendResetPassword() {
-    API.write('RequestPasswordReset', {
+    API.write('ResendRequestPasswordReset', {
         email: credentials.login,
     },
     {

From 0285d035478abeafcdabf2b6213eebacc748a0ef Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 8 Sep 2022 18:16:21 +0100
Subject: [PATCH 068/178] Hide the composer when pending add room or error

---
 src/pages/home/ReportScreen.js | 36 ++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 0ae86f2fed5a..40a0befeebdb 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -26,6 +26,8 @@ import addViewportResizeListener from '../../libs/VisualViewport';
 import {withNetwork} from '../../components/OnyxProvider';
 import compose from '../../libs/compose';
 import networkPropTypes from '../../components/networkPropTypes';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
+import OfflineIndicator from '../../components/OfflineIndicator';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -80,6 +82,8 @@ const propTypes = {
 
     /** Information about the network */
     network: networkPropTypes.isRequired,
+
+    ...windowDimensionsPropTypes,
 };
 
 const defaultProps = {
@@ -219,6 +223,11 @@ class ReportScreen extends React.Component {
         if (isArchivedRoom) {
             reportClosedAction = lodashFindLast(this.props.reportActions, action => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED);
         }
+        const isPendingAddWorkspaceRoom = lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom', '') === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
+        const hasAddWorkspaceRoomError = !_.isEmpty(lodashGet(this.props.report, 'errorFields.addWorkspaceRoom', {}));
+
+        // Hide the composer for an archived room, or a room pending add while offline, or when there is an error adding the room
+        const hideComposer = isArchivedRoom || (isPendingAddWorkspaceRoom && this.props.network.isOffline) || hasAddWorkspaceRoomError;
         return (
             <ScreenWrapper
                 style={[styles.appContent, styles.flex1, {marginTop: this.state.viewportOffsetTop}]}
@@ -248,16 +257,22 @@ class ReportScreen extends React.Component {
                                 isComposerFullSize={this.props.isComposerFullSize}
                             />
                         )}
-                    {(isArchivedRoom || this.props.session.shouldShowComposeInput) && (
+                    {(hideComposer || this.props.session.shouldShowComposeInput) && (
                         <View style={[this.setChatFooterStyles(this.props.network.isOffline), this.props.isComposerFullSize && styles.chatFooterFullCompose]}>
-                            {
-                                isArchivedRoom
-                                    ? (
-                                        <ArchivedReportFooter
-                                            reportClosedAction={reportClosedAction}
-                                            report={this.props.report}
-                                        />
-                                    ) : (
+                            {isArchivedRoom && (
+                                <ArchivedReportFooter
+                                    reportClosedAction={reportClosedAction}
+                                    report={this.props.report}
+                                />
+                            )}
+                            {hideComposer
+                                ? (
+                                    !this.props.isSmallScreenWidth && (
+                                        <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />
+                                    )
+                                )
+                                : (
+                                    this.props.session.shouldShowComposeInput && (
                                         <SwipeableView onSwipeDown={Keyboard.dismiss}>
                                             <ReportActionCompose
                                                 onSubmit={this.onSubmitComment}
@@ -268,7 +283,7 @@ class ReportScreen extends React.Component {
                                             />
                                         </SwipeableView>
                                     )
-                            }
+                                )}
                         </View>
                     )}
                 </View>
@@ -281,6 +296,7 @@ ReportScreen.propTypes = propTypes;
 ReportScreen.defaultProps = defaultProps;
 
 export default compose(
+    withWindowDimensions,
     withNetwork(),
     withOnyx({
         isSidebarLoaded: {

From 6aee8127d7eaa1b6b8fb6c183294149966ea6bce Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 8 Sep 2022 18:20:18 +0100
Subject: [PATCH 069/178] Remove duplicate conditional

---
 src/pages/home/ReportScreen.js | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 40a0befeebdb..63c0f6b7379e 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -272,17 +272,15 @@ class ReportScreen extends React.Component {
                                     )
                                 )
                                 : (
-                                    this.props.session.shouldShowComposeInput && (
-                                        <SwipeableView onSwipeDown={Keyboard.dismiss}>
-                                            <ReportActionCompose
-                                                onSubmit={this.onSubmitComment}
-                                                reportID={reportID}
-                                                reportActions={this.props.reportActions}
-                                                report={this.props.report}
-                                                isComposerFullSize={this.props.isComposerFullSize}
-                                            />
-                                        </SwipeableView>
-                                    )
+                                    <SwipeableView onSwipeDown={Keyboard.dismiss}>
+                                        <ReportActionCompose
+                                            onSubmit={this.onSubmitComment}
+                                            reportID={reportID}
+                                            reportActions={this.props.reportActions}
+                                            report={this.props.report}
+                                            isComposerFullSize={this.props.isComposerFullSize}
+                                        />
+                                    </SwipeableView>
                                 )}
                         </View>
                     )}

From 893fb2639e597471ba28e2ea7664e671f2849130 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Mon, 12 Sep 2022 11:11:44 -0700
Subject: [PATCH 070/178] OfflineWithFeedback for add workspace room

---
 src/pages/home/ReportScreen.js | 58 ++++++++++++++++++++--------------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 63c0f6b7379e..2533ee8f29d2 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -28,6 +28,7 @@ import compose from '../../libs/compose';
 import networkPropTypes from '../../components/networkPropTypes';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
 import OfflineIndicator from '../../components/OfflineIndicator';
+import OfflineWithFeedback from '../../components/OfflineWithFeedback';
 
 const propTypes = {
     /** Navigation route context info provided by react navigation */
@@ -233,31 +234,39 @@ class ReportScreen extends React.Component {
                 style={[styles.appContent, styles.flex1, {marginTop: this.state.viewportOffsetTop}]}
                 keyboardAvoidingViewBehavior={Platform.OS === 'android' ? '' : 'padding'}
             >
-                <HeaderView
-                    reportID={reportID}
-                    onNavigationMenuButtonClicked={() => Navigation.navigate(ROUTES.HOME)}
-                />
+                <OfflineWithFeedback
+                    pendingAction={lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom', '')}
+                >
+                    <HeaderView
+                        reportID={reportID}
+                        onNavigationMenuButtonClicked={() => Navigation.navigate(ROUTES.HOME)}
+                    />
+                </OfflineWithFeedback>
 
-                <View
-                    nativeID={CONST.REPORT.DROP_NATIVE_ID}
+                <OfflineWithFeedback
                     style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
-                    onLayout={event => this.setState({skeletonViewContainerHeight: event.nativeEvent.layout.height})}
+                    pendingAction={lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom', '')}
                 >
-                    {this.shouldShowLoader()
-                        ? (
-                            <ReportActionsSkeletonView
-                                containerHeight={this.state.skeletonViewContainerHeight}
-                            />
-                        )
-                        : (
-                            <ReportActionsView
-                                reportActions={this.props.reportActions}
-                                report={this.props.report}
-                                session={this.props.session}
-                                isComposerFullSize={this.props.isComposerFullSize}
-                            />
-                        )}
-                    {(hideComposer || this.props.session.shouldShowComposeInput) && (
+                    <View
+                        nativeID={CONST.REPORT.DROP_NATIVE_ID}
+                        style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
+                        onLayout={event => this.setState({skeletonViewContainerHeight: event.nativeEvent.layout.height})}
+                    >
+                        {this.shouldShowLoader()
+                            ? (
+                                <ReportActionsSkeletonView
+                                    containerHeight={this.state.skeletonViewContainerHeight}
+                                />
+                            )
+                            : (
+                                <ReportActionsView
+                                    reportActions={this.props.reportActions}
+                                    report={this.props.report}
+                                    session={this.props.session}
+                                    isComposerFullSize={this.props.isComposerFullSize}
+                                />
+                            )}
+                        {(hideComposer || this.props.session.shouldShowComposeInput) && (
                         <View style={[this.setChatFooterStyles(this.props.network.isOffline), this.props.isComposerFullSize && styles.chatFooterFullCompose]}>
                             {isArchivedRoom && (
                                 <ArchivedReportFooter
@@ -283,8 +292,9 @@ class ReportScreen extends React.Component {
                                     </SwipeableView>
                                 )}
                         </View>
-                    )}
-                </View>
+                        )}
+                    </View>
+                </OfflineWithFeedback>
             </ScreenWrapper>
         );
     }

From 1ac43d00f831b7cb3e45f53e654b88d353efec23 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Mon, 12 Sep 2022 12:16:42 -0700
Subject: [PATCH 071/178] Only hide composer for an archived room or error

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

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 2533ee8f29d2..858d2ad92bf7 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -224,11 +224,10 @@ class ReportScreen extends React.Component {
         if (isArchivedRoom) {
             reportClosedAction = lodashFindLast(this.props.reportActions, action => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED);
         }
-        const isPendingAddWorkspaceRoom = lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom', '') === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD;
         const hasAddWorkspaceRoomError = !_.isEmpty(lodashGet(this.props.report, 'errorFields.addWorkspaceRoom', {}));
 
-        // Hide the composer for an archived room, or a room pending add while offline, or when there is an error adding the room
-        const hideComposer = isArchivedRoom || (isPendingAddWorkspaceRoom && this.props.network.isOffline) || hasAddWorkspaceRoomError;
+        // Hide the composer for an archived room or when there is an error adding the room
+        const hideComposer = isArchivedRoom || hasAddWorkspaceRoomError;
         return (
             <ScreenWrapper
                 style={[styles.appContent, styles.flex1, {marginTop: this.state.viewportOffsetTop}]}

From 59d991aaaf069f091ade4670d42483761cc22994 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Mon, 12 Sep 2022 12:31:11 -0700
Subject: [PATCH 072/178] Wrap created message in OfflineWithFeedback

---
 .../home/report/ReportActionItemCreated.js    | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/pages/home/report/ReportActionItemCreated.js b/src/pages/home/report/ReportActionItemCreated.js
index f0a2a3a6e09d..ac808c66ffd2 100644
--- a/src/pages/home/report/ReportActionItemCreated.js
+++ b/src/pages/home/report/ReportActionItemCreated.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import {Pressable, View} from 'react-native';
+import lodashGet from 'lodash/get';
 import {withOnyx} from 'react-native-onyx';
 import PropTypes from 'prop-types';
 import ONYXKEYS from '../../../ONYXKEYS';
@@ -8,6 +9,7 @@ import ReportWelcomeText from '../../../components/ReportWelcomeText';
 import participantPropTypes from '../../../components/participantPropTypes';
 import * as ReportUtils from '../../../libs/ReportUtils';
 import styles from '../../../styles/styles';
+import OfflineWithFeedback from '../../../components/OfflineWithFeedback';
 
 const propTypes = {
     /** The report currently being looked at */
@@ -37,24 +39,29 @@ const defaultProps = {
 const ReportActionItemCreated = (props) => {
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(props.report);
     const icons = ReportUtils.getIcons(props.report, props.personalDetails, props.policies);
+    const pendingAction = isPolicyExpenseChat ? lodashGet(props.report, 'pendingFields.addWorkspaceRoom', '') : '';
 
     return (
-        <View style={[
-            styles.chatContent,
-            styles.pb8,
-            styles.p5,
-        ]}
+        <OfflineWithFeedback
+            pendingAction={pendingAction}
         >
-            <View style={[styles.justifyContentCenter, styles.alignItemsCenter, styles.flex1]}>
-                <Pressable onPress={() => ReportUtils.navigateToDetailsPage(props.report)}>
-                    <RoomHeaderAvatars
-                        icons={icons}
-                        shouldShowLargeAvatars={isPolicyExpenseChat}
-                    />
-                </Pressable>
-                <ReportWelcomeText report={props.report} />
+            <View style={[
+                styles.chatContent,
+                styles.pb8,
+                styles.p5,
+            ]}
+            >
+                <View style={[styles.justifyContentCenter, styles.alignItemsCenter, styles.flex1]}>
+                    <Pressable onPress={() => ReportUtils.navigateToDetailsPage(props.report)}>
+                        <RoomHeaderAvatars
+                            icons={icons}
+                            shouldShowLargeAvatars={isPolicyExpenseChat}
+                        />
+                    </Pressable>
+                    <ReportWelcomeText report={props.report} />
+                </View>
             </View>
-        </View>
+        </OfflineWithFeedback>
     );
 };
 

From a565376a193483aa7b76f50452088747f4103bbd Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Mon, 12 Sep 2022 12:32:02 -0700
Subject: [PATCH 073/178] Remove OfflineWithFeedback around report contents

---
 src/pages/home/ReportScreen.js | 46 +++++++++++++++-------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 858d2ad92bf7..ecc89aa02297 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -241,31 +241,26 @@ class ReportScreen extends React.Component {
                         onNavigationMenuButtonClicked={() => Navigation.navigate(ROUTES.HOME)}
                     />
                 </OfflineWithFeedback>
-
-                <OfflineWithFeedback
+                <View
+                    nativeID={CONST.REPORT.DROP_NATIVE_ID}
                     style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
-                    pendingAction={lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom', '')}
+                    onLayout={event => this.setState({skeletonViewContainerHeight: event.nativeEvent.layout.height})}
                 >
-                    <View
-                        nativeID={CONST.REPORT.DROP_NATIVE_ID}
-                        style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
-                        onLayout={event => this.setState({skeletonViewContainerHeight: event.nativeEvent.layout.height})}
-                    >
-                        {this.shouldShowLoader()
-                            ? (
-                                <ReportActionsSkeletonView
-                                    containerHeight={this.state.skeletonViewContainerHeight}
-                                />
-                            )
-                            : (
-                                <ReportActionsView
-                                    reportActions={this.props.reportActions}
-                                    report={this.props.report}
-                                    session={this.props.session}
-                                    isComposerFullSize={this.props.isComposerFullSize}
-                                />
-                            )}
-                        {(hideComposer || this.props.session.shouldShowComposeInput) && (
+                    {this.shouldShowLoader()
+                        ? (
+                            <ReportActionsSkeletonView
+                                containerHeight={this.state.skeletonViewContainerHeight}
+                            />
+                        )
+                        : (
+                            <ReportActionsView
+                                reportActions={this.props.reportActions}
+                                report={this.props.report}
+                                session={this.props.session}
+                                isComposerFullSize={this.props.isComposerFullSize}
+                            />
+                        )}
+                    {(hideComposer || this.props.session.shouldShowComposeInput) && (
                         <View style={[this.setChatFooterStyles(this.props.network.isOffline), this.props.isComposerFullSize && styles.chatFooterFullCompose]}>
                             {isArchivedRoom && (
                                 <ArchivedReportFooter
@@ -291,9 +286,8 @@ class ReportScreen extends React.Component {
                                     </SwipeableView>
                                 )}
                         </View>
-                        )}
-                    </View>
-                </OfflineWithFeedback>
+                    )}
+                </View>
             </ScreenWrapper>
         );
     }

From 2fe7dced4bb5877a0f12922d9c7309f2e3940d90 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Mon, 12 Sep 2022 13:26:33 -0700
Subject: [PATCH 074/178] Remove actorEmail from created report actions

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

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 655922114a4f..85e380feaf54 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -642,7 +642,6 @@ function createOptimisticCreatedReportAction(ownerEmail) {
         0: {
             actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
             pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-            actorEmail: currentUserEmail,
             actorAccountID: currentUserAccountID,
             message: [
                 {

From 9ad322ed48593b55bbd3d59a57972db0e498eb31 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Tue, 13 Sep 2022 22:44:54 +0530
Subject: [PATCH 075/178] Add new API command

---
 src/libs/actions/Session/index.js | 124 ++++++++++++++++++++++++++++++
 src/pages/SetPasswordPage.js      |   4 +-
 2 files changed, 126 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 423b369ebd08..898d08d8a1b9 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -431,6 +431,128 @@ function changePasswordAndSignIn(authToken, password) {
         });
 }
 
+/**
+ * Validates new user login, sets a new password and authenticates them
+ * @param {Number} accountID
+ * @param {String} validateCode
+ * @param {String} password
+ */
+function setPasswordForNewAccountAndSignin(accountID, validateCode, password) {
+    const optimisticData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: true,
+            },
+        },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.SESSION,
+            value: {
+                errors: null,
+            },
+        },
+    ];
+
+    const successData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+                errors: null,
+            },
+        },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.SESSION,
+            value: {
+                errors: null,
+            },
+        },
+    ];
+
+    const failureData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.SESSION,
+            value: {
+                errors: {
+                    [DateUtils.getMicroseconds()]: Localize.translateLocal('setPasswordPage.passwordNotSet'),
+                },
+            },
+        },
+    ];
+    API.write('SetPasswordForNewAccountAndSignin', {
+        accountID, validateCode, password,
+    }, {optimisticData, successData, failureData});
+}
+
+/**
+ * Updates a password and authenticates them
+ * @param {Number} accountID
+ * @param {String} validateCode
+ * @param {String} password
+ */
+function updatePasswordAndSignin(accountID, validateCode, password) {
+    const optimisticData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: true,
+            },
+        },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.SESSION,
+            value: {
+                errors: null,
+            },
+        },
+    ];
+
+    const successData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+                errors: null,
+            },
+        },
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.SESSION,
+            value: {
+                errors: null,
+            },
+        },
+    ];
+
+    const failureData = [
+        {
+            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            key: ONYXKEYS.ACCOUNT,
+            value: {
+                isLoading: false,
+            },
+        },
+    ];
+
+    API.write('UpdatePasswordAndSignin', {
+        accountID, validateCode, password,
+    }, {optimisticData, successData, failureData});
+}
+
 /**
  * @param {Number} accountID
  * @param {String} validateCode
@@ -525,6 +647,8 @@ function setShouldShowComposeInput(shouldShowComposeInput) {
 export {
     beginSignIn,
     setPassword,
+    setPasswordForNewAccountAndSignin,
+    updatePasswordAndSignin,
     signIn,
     signInWithShortLivedToken,
     signOut,
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index ae46a1c53c76..06f028c001a3 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -91,8 +91,8 @@ class SetPasswordPage extends Component {
         const accountID = lodashGet(this.props.route.params, 'accountID', '');
         const validateCode = lodashGet(this.props.route.params, 'validateCode', '');
 
-        if (this.props.credentials.authToken) {
-            Session.changePasswordAndSignIn(this.props.credentials.authToken, this.state.password);
+        if (this.props.account.validated) {
+            Session.updatePasswordAndSignin(accountID, validateCode, this.state.password);
         } else {
             Session.setPassword(this.state.password, validateCode, accountID);
         }

From 1ed435e0ba3676a44242cdf8fb06e45f20eb1b4a Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 13 Sep 2022 14:46:07 -0600
Subject: [PATCH 076/178] Fix method docs

---
 src/components/LHNOptionsList/BaseOptionsListLHN.js | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index a2d2dd96b544..6fab6d9fee73 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -65,14 +65,7 @@ class BaseOptionsListLHN extends Component {
      * We need to implement it so that we can programmatically scroll to items outside the virtual render window of the SectionList.
      *
      * @param {Array} data - This is the same as the data we pass into the component
-     * @param {Number} flatDataArrayIndex - This index is provided by React Native, and refers to a flat array with data from all the sections. This flat array has some quirks:
-     *
-     *     1. It ALWAYS includes a list header and a list footer, even if we don't provide/render those.
-     *     2. Each section includes a header, even if we don't provide/render one.
-     *
-     *     For example, given a list with two sections, two items in each section, no header, no footer, and no section headers, the flat array might look something like this:
-     *
-     *     [{header}, {sectionHeader}, {item}, {item}, {sectionHeader}, {item}, {item}, {footer}]
+     * @param {Number} index the current item's index in the set of data
      *
      * @returns {Object}
      */

From 3e48e255a42ee28e7050c4c59fed941628299bfd Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Tue, 13 Sep 2022 14:04:41 -0700
Subject: [PATCH 077/178] Fix room created pendingAction

---
 src/pages/home/report/ReportActionItemCreated.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/home/report/ReportActionItemCreated.js b/src/pages/home/report/ReportActionItemCreated.js
index ac808c66ffd2..017c576d531c 100644
--- a/src/pages/home/report/ReportActionItemCreated.js
+++ b/src/pages/home/report/ReportActionItemCreated.js
@@ -39,11 +39,10 @@ const defaultProps = {
 const ReportActionItemCreated = (props) => {
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(props.report);
     const icons = ReportUtils.getIcons(props.report, props.personalDetails, props.policies);
-    const pendingAction = isPolicyExpenseChat ? lodashGet(props.report, 'pendingFields.addWorkspaceRoom', '') : '';
 
     return (
         <OfflineWithFeedback
-            pendingAction={pendingAction}
+            pendingAction={lodashGet(props.report, 'pendingFields.addWorkspaceRoom', '')}
         >
             <View style={[
                 styles.chatContent,

From 5384829284236d86777c28818df6259a2a999eaa Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Tue, 13 Sep 2022 14:08:36 -0700
Subject: [PATCH 078/178] Add room offline feedback for composer

---
 src/pages/home/ReportScreen.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index ecc89aa02297..69c8fa6c8623 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -224,6 +224,7 @@ class ReportScreen extends React.Component {
         if (isArchivedRoom) {
             reportClosedAction = lodashFindLast(this.props.reportActions, action => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED);
         }
+        const addWorkspaceRoomPendingAction = lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom', '');
         const hasAddWorkspaceRoomError = !_.isEmpty(lodashGet(this.props.report, 'errorFields.addWorkspaceRoom', {}));
 
         // Hide the composer for an archived room or when there is an error adding the room
@@ -234,7 +235,7 @@ class ReportScreen extends React.Component {
                 keyboardAvoidingViewBehavior={Platform.OS === 'android' ? '' : 'padding'}
             >
                 <OfflineWithFeedback
-                    pendingAction={lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom', '')}
+                    pendingAction={addWorkspaceRoomPendingAction}
                 >
                     <HeaderView
                         reportID={reportID}
@@ -276,13 +277,17 @@ class ReportScreen extends React.Component {
                                 )
                                 : (
                                     <SwipeableView onSwipeDown={Keyboard.dismiss}>
-                                        <ReportActionCompose
-                                            onSubmit={this.onSubmitComment}
-                                            reportID={reportID}
-                                            reportActions={this.props.reportActions}
-                                            report={this.props.report}
-                                            isComposerFullSize={this.props.isComposerFullSize}
-                                        />
+                                        <OfflineWithFeedback
+                                            pendingAction={addWorkspaceRoomPendingAction}
+                                        >
+                                            <ReportActionCompose
+                                                onSubmit={this.onSubmitComment}
+                                                reportID={reportID}
+                                                reportActions={this.props.reportActions}
+                                                report={this.props.report}
+                                                isComposerFullSize={this.props.isComposerFullSize}
+                                            />
+                                        </OfflineWithFeedback>
                                     </SwipeableView>
                                 )}
                         </View>

From 3c1b63fff36edf5bfc0727600d905e4dab8acbda Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 13 Sep 2022 15:55:02 -0600
Subject: [PATCH 079/178] Fix report actions not being passed properly to
 OptionsListUtils

---
 src/libs/OptionsListUtilsLHN.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index 559b5eaf56ff..add7a5da9241 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -45,12 +45,12 @@ let reportActions;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     callback: (actions, key) => {
-        reportActions = actions;
         if (!key || !actions) {
             return;
         }
         const reportID = CollectionUtils.extractCollectionItemID(key);
         lastReportActions[reportID] = _.last(_.toArray(actions));
+        reportActions[key] = actions;
     },
 });
 
@@ -74,12 +74,6 @@ Onyx.connect({
     callback: val => currentUserLogin = val,
 });
 
-// let loginList;
-// Onyx.connect({
-//     key: ONYXKEYS.LOGIN_LIST,
-//     callback: val => loginList = val,
-// });
-
 let preferredLocale;
 Onyx.connect({
     key: ONYXKEYS.NVP_PREFERRED_LOCALE,

From 9bf11063dcbc989739c8df5296229c2547a58ade Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Tue, 13 Sep 2022 15:03:45 -0700
Subject: [PATCH 080/178] Use updated function names

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

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index ad89ee7968d5..e7b23b45483b 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1440,7 +1440,7 @@ function createPolicyRoom(policyID, reportName, visibility) {
  * @param {String} visibility
  */
 function addWorkspaceRoom(policy, reportName, visibility) {
-    const workspaceRoom = createOptimisticChatReport(
+    const workspaceRoom = buildOptimisticChatReport(
         policy.emailList,
         reportName,
         CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
@@ -1450,7 +1450,7 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         '',
         visibility,
     );
-    const createdActionData = createOptimisticCreatedReportAction(workspaceRoom.ownerEmail);
+    const createdActionData = buildOptimisticCreatedReportAction(workspaceRoom.ownerEmail);
     const optimisticData = [
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,

From a1157f9d3ae8517792e9374fdf3fab3c7f61d791 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Tue, 13 Sep 2022 15:19:26 -0700
Subject: [PATCH 081/178] Fix pendingAction default type

---
 src/pages/home/ReportScreen.js                   | 2 +-
 src/pages/home/report/ReportActionItemCreated.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 64e00c224fd2..a04a44e0a95b 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -227,7 +227,7 @@ class ReportScreen extends React.Component {
         if (isArchivedRoom) {
             reportClosedAction = lodashFindLast(this.props.reportActions, action => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED);
         }
-        const addWorkspaceRoomPendingAction = lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom', '');
+        const addWorkspaceRoomPendingAction = lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom');
         const hasAddWorkspaceRoomError = !_.isEmpty(lodashGet(this.props.report, 'errorFields.addWorkspaceRoom', {}));
 
         // Hide the composer for an archived room or when there is an error adding the room
diff --git a/src/pages/home/report/ReportActionItemCreated.js b/src/pages/home/report/ReportActionItemCreated.js
index 017c576d531c..76509bccdbff 100644
--- a/src/pages/home/report/ReportActionItemCreated.js
+++ b/src/pages/home/report/ReportActionItemCreated.js
@@ -42,7 +42,7 @@ const ReportActionItemCreated = (props) => {
 
     return (
         <OfflineWithFeedback
-            pendingAction={lodashGet(props.report, 'pendingFields.addWorkspaceRoom', '')}
+            pendingAction={lodashGet(props.report, 'pendingFields.addWorkspaceRoom')}
         >
             <View style={[
                 styles.chatContent,

From 5eddedb172f456e077bbdef996b92da61738b99a Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 13 Sep 2022 16:20:31 -0600
Subject: [PATCH 082/178] Fix report actions not being passed properly to
 OptionsListUtils

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

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index add7a5da9241..6682e27c5e4c 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -41,7 +41,7 @@ Onyx.connect({
 });
 
 const lastReportActions = {};
-let reportActions;
+const reportActions = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     callback: (actions, key) => {

From edf01586a2b8ba72da3762deab1a94da95d359ee Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Tue, 13 Sep 2022 15:54:10 -0700
Subject: [PATCH 083/178] Room participants from current user and employees

---
 src/libs/actions/Report.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index e7b23b45483b..b2dde58dffab 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1440,8 +1440,10 @@ function createPolicyRoom(policyID, reportName, visibility) {
  * @param {String} visibility
  */
 function addWorkspaceRoom(policy, reportName, visibility) {
+    // The participants include the current user (admin) and the employees. Participants must not be empty.
+    const participants = [currentUserEmail, ...policy.employeeList];
     const workspaceRoom = buildOptimisticChatReport(
-        policy.emailList,
+        participants,
         reportName,
         CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
         policy.id,

From f8d3e4a6ffdb3d818f8ac9435ff752fad5152eff Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 13 Sep 2022 17:13:47 -0600
Subject: [PATCH 084/178] WIP to get tests passing

---
 src/libs/OptionsListUtilsLHN.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/OptionsListUtilsLHN.js
index 6682e27c5e4c..972089a7e713 100644
--- a/src/libs/OptionsListUtilsLHN.js
+++ b/src/libs/OptionsListUtilsLHN.js
@@ -19,6 +19,7 @@ Onyx.connect({
 let personalDetails;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS,
+    waitForCollectionCallback: true,
     callback: val => personalDetails = val,
 });
 
@@ -108,7 +109,7 @@ function getOrderedReportIDs() {
         }
 
         const hasDraftComment = report.hasDraft || false;
-        const iouReport = report.iouReportID && iouReports[`${ONYXKEYS.COLLECTION.REPORT_IOUS}${report.iouReportID}`];
+        const iouReport = report.iouReportID && iouReports && iouReports[`${ONYXKEYS.COLLECTION.REPORT_IOUS}${report.iouReportID}`];
         const iouReportOwner = report.hasOutstandingIOU && iouReport
             ? iouReport.ownerEmail
             : '';
@@ -243,7 +244,7 @@ function getOptionData(reportID) {
     result.brickRoadIndicator = OptionsListUtils.getBrickRoadIndicatorStatusForReport(report, reportActions);
     result.ownerEmail = report.ownerEmail;
     result.reportID = report.reportID;
-    result.isUnread = report.unreadActionCount > 0;
+    result.isUnread = ReportUtils.isUnread(report);
     result.hasDraftComment = report.hasDraft;
     result.isPinned = report.isPinned;
     result.iouReportID = report.iouReportID;
@@ -283,7 +284,7 @@ function getOptionData(reportID) {
     }
 
     if (result.hasOutstandingIOU) {
-        const iouReport = iouReports[`${ONYXKEYS.COLLECTION.REPORT_IOUS}${report.iouReportID}`] || null;
+        const iouReport = (iouReports && iouReports[`${ONYXKEYS.COLLECTION.REPORT_IOUS}${report.iouReportID}`]) || null;
         if (iouReport) {
             result.isIOUReportOwner = iouReport.ownerEmail === currentUserLogin;
             result.iouReportAmount = iouReport.total;

From 1f7e7a7d7a751c598a7ee5e5ddce861e2bf373bb Mon Sep 17 00:00:00 2001
From: sahil <thesahindia@gmail.com>
Date: Thu, 15 Sep 2022 00:36:06 +0530
Subject: [PATCH 085/178] move splitExtensionFromFileName to FileUtils

---
 src/components/AttachmentModal.js  | 18 +++---------------
 src/libs/fileDownload/FileUtils.js | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/components/AttachmentModal.js b/src/components/AttachmentModal.js
index 64999e9005db..bac249e8715d 100755
--- a/src/components/AttachmentModal.js
+++ b/src/components/AttachmentModal.js
@@ -10,6 +10,7 @@ import Modal from './Modal';
 import AttachmentView from './AttachmentView';
 import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
+import * as FileUtils from '../libs/fileDownload/FileUtils';
 import themeColors from '../styles/themes/default';
 import addEncryptedAuthTokenToURL from '../libs/addEncryptedAuthTokenToURL';
 import compose from '../libs/compose';
@@ -110,19 +111,6 @@ class AttachmentModal extends PureComponent {
             : CONST.MODAL.MODAL_TYPE.CENTERED;
     }
 
-    /**
-     * Returns the filename split into fileName and fileExtension
-     *
-     * @param {String} fullFileName
-     * @returns {Object}
-     */
-    splitExtensionFromFileName(fullFileName) {
-        const fileName = fullFileName.trim();
-        const splitFileName = fileName.split('.');
-        const fileExtension = splitFileName.pop();
-        return {fileName: splitFileName.join('.'), fileExtension};
-    }
-
     /**
      * Execute the onConfirm callback and close the modal.
      */
@@ -170,7 +158,7 @@ class AttachmentModal extends PureComponent {
             return false;
         }
 
-        const {fileExtension} = this.splitExtensionFromFileName(lodashGet(file, 'name', ''));
+        const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(file, 'name', ''));
         if (!_.contains(CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_EXTENSIONS, fileExtension.toLowerCase())) {
             const invalidReason = `${this.props.translate('attachmentPicker.notAllowedExtension')} ${CONST.API_ATTACHMENT_VALIDATIONS.ALLOWED_EXTENSIONS.join(', ')}`;
             this.setState({
@@ -243,7 +231,7 @@ class AttachmentModal extends PureComponent {
             ? [styles.imageModalImageCenterContainer]
             : [styles.imageModalImageCenterContainer, attachmentViewPaddingStyles];
 
-        const {fileName, fileExtension} = this.splitExtensionFromFileName(this.props.originalFileName || lodashGet(this.state, 'file.name', ''));
+        const {fileName, fileExtension} = FileUtils.splitExtensionFromFileName(this.props.originalFileName || lodashGet(this.state, 'file.name', ''));
 
         return (
             <>
diff --git a/src/libs/fileDownload/FileUtils.js b/src/libs/fileDownload/FileUtils.js
index 5271216fa741..197b00e22eb6 100644
--- a/src/libs/fileDownload/FileUtils.js
+++ b/src/libs/fileDownload/FileUtils.js
@@ -103,10 +103,24 @@ function getFileType(fileUrl) {
     return CONST.ATTACHMENT_FILE_TYPE.FILE;
 }
 
+/**
+ * Returns the filename split into fileName and fileExtension
+ *
+ * @param {String} fullFileName
+ * @returns {Object}
+ */
+function splitExtensionFromFileName(fullFileName) {
+    const fileName = fullFileName.trim();
+    const splitFileName = fileName.split('.');
+    const fileExtension = splitFileName.pop();
+    return {fileName: splitFileName.join('.'), fileExtension};
+}
+
 export {
     showGeneralErrorAlert,
     showSuccessAlert,
     showPermissionErrorAlert,
+    splitExtensionFromFileName,
     getAttachmentName,
     getFileType,
 };

From 689a0ca94069517516f1850201592e0cd817a097 Mon Sep 17 00:00:00 2001
From: sahil <thesahindia@gmail.com>
Date: Thu, 15 Sep 2022 00:49:14 +0530
Subject: [PATCH 086/178] create a function to check if attachment extension is
 allowed for avatar

---
 src/CONST.js                            |  2 ++
 src/components/AvatarWithImagePicker.js | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/CONST.js b/src/CONST.js
index 89fc0e3e8317..308c0a4191a2 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -25,6 +25,8 @@ const CONST = {
 
     AVATAR_MAX_ATTACHMENT_SIZE: 6291456,
 
+    AVATAR_ALLOWED_EXTENSIONS: ['jpg', 'jpeg', 'png', 'gif', 'bmp'],
+
     // Minimum width and height size in px for a selected image
     AVATAR_MIN_WIDTH_PX: 80,
     AVATAR_MIN_HEIGHT_PX: 80,
diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index d9202a2f356c..63aa778b100c 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -20,6 +20,7 @@ import CONST from '../CONST';
 import SpinningIndicatorAnimation from '../styles/animation/SpinningIndicatorAnimation';
 import Tooltip from './Tooltip';
 import stylePropTypes from '../styles/stylePropTypes';
+import * as FileUtils from '../libs/fileDownload/FileUtils';
 
 const propTypes = {
     /** Avatar URL to display */
@@ -124,6 +125,17 @@ class AvatarWithImagePicker extends React.Component {
         this.setState({isErrorModalVisible: false});
     }
 
+    /**
+     * Check if the attachment extension is allowed.
+     *
+     * @param {Object} image
+     * @returns {Boolean}
+     */
+    isValidExtension(image) {
+        const {fileExtension} = FileUtils.splitExtensionFromFileName(image.name);
+        return _.contains(CONST.AVATAR_ALLOWED_EXTENSIONS, fileExtension);
+    }
+
     /**
      * Check if the attachment size is less than allowed size.
      *

From eecc01751f10853f6586f79e9bba2e65571b614a Mon Sep 17 00:00:00 2001
From: sahil <thesahindia@gmail.com>
Date: Thu, 15 Sep 2022 01:00:35 +0530
Subject: [PATCH 087/178] add the check for valid extension

---
 src/components/AvatarWithImagePicker.js | 7 +++++++
 src/languages/en.js                     | 1 +
 src/languages/es.js                     | 1 +
 3 files changed, 9 insertions(+)

diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index 63aa778b100c..a2e19d36d25c 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -166,6 +166,13 @@ class AvatarWithImagePicker extends React.Component {
      * @param {Object} image
      */
     showAvatarCropModal(image) {
+        if (!this.isValidExtension(image)) {
+            this.showErrorModal(
+                this.props.translate('avatarWithImagePicker.imageUploadFailed'),
+                `${this.props.translate('avatarWithImagePicker.notAllowedExtension')} ${CONST.AVATAR_ALLOWED_EXTENSIONS.join(', ')}.`,
+            );
+            return;
+        }
         if (!this.isValidSize(image)) {
             this.showErrorModal(
                 this.props.translate('avatarWithImagePicker.imageUploadFailed'),
diff --git a/src/languages/en.js b/src/languages/en.js
index c70131508112..237e25f6c09c 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -267,6 +267,7 @@ export default {
         deleteWorkspaceError: 'Sorry, there was an unexpected problem deleting your workspace avatar.',
         sizeExceeded: ({maxUploadSizeInMB}) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
         tooSmallResolution: ({minHeightInPx, minWidthInPx}) => `Please upload an image larger than ${minHeightInPx}x${minWidthInPx} pixels`,
+        notAllowedExtension: 'Profile picture must be one of the following types:',
     },
     profilePage: {
         profile: 'Profile',
diff --git a/src/languages/es.js b/src/languages/es.js
index 68b50e078565..a7856fec5f5a 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -267,6 +267,7 @@ export default {
         deleteWorkspaceError: 'Lo sentimos, hubo un problema eliminando el avatar de su espacio de trabajo.',
         sizeExceeded: ({maxUploadSizeInMB}) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
         tooSmallResolution: ({minHeightInPx, minWidthInPx}) => `Por favor elige una imagen mas grande que ${minHeightInPx}x${minWidthInPx} píxeles`,
+        notAllowedExtension: 'La foto de perfil debe ser de uno de los siguientes tipos:',
     },
     profilePage: {
         profile: 'Perfil',

From 409c6f3221edd0c6bf0f02c1b8e519cbbb0e701a Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 14 Sep 2022 14:00:36 -0600
Subject: [PATCH 088/178] Add some TODOs, rename isOptionFocused prop

---
 .../LHNOptionsList/BaseOptionsListLHN.js           |  6 ++++--
 src/components/LHNOptionsList/OptionRowLHN.js      | 14 +++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/BaseOptionsListLHN.js
index 6fab6d9fee73..e5dfb775ea6c 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/BaseOptionsListLHN.js
@@ -40,6 +40,7 @@ class BaseOptionsListLHN extends Component {
             return true;
         }
 
+        // @TODO: remove this prop and the one below since they are not used anymore
         if (nextProps.headerMessage !== this.props.headerMessage) {
             return true;
         }
@@ -64,6 +65,8 @@ class BaseOptionsListLHN extends Component {
      * This function is used to compute the layout of any given item in our list.
      * We need to implement it so that we can programmatically scroll to items outside the virtual render window of the SectionList.
      *
+     * @TODO: we can probably remove this method entirely since we don't need to scroll to items outside the virtual render window (was only used for arrow key navigation)
+     *
      * @param {Array} data - This is the same as the data we pass into the component
      * @param {Number} index the current item's index in the set of data
      *
@@ -92,8 +95,7 @@ class BaseOptionsListLHN extends Component {
             <OptionRowLHN
                 reportID={item}
                 viewMode={this.props.optionMode}
-                optionIsFocused={!this.props.disableFocusOptions
-                        && this.props.focusedIndex === index}
+                isFocused={this.props.focusedIndex === index}
                 onSelectRow={this.props.onSelectRow}
             />
         );
diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 8268dbf715fc..32f987b4136d 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -34,7 +34,7 @@ const propTypes = {
     reportID: PropTypes.string.isRequired,
 
     /** Whether this option is currently in focus so we can modify its style */
-    optionIsFocused: PropTypes.bool,
+    isFocused: PropTypes.bool,
 
     /** A function that is called when an option is selected. Selected option is passed as a param */
     onSelectRow: PropTypes.func,
@@ -51,7 +51,7 @@ const defaultProps = {
     hoverStyle: styles.sidebarLinkHover,
     viewMode: 'default',
     onSelectRow: () => {},
-    optionIsFocused: false,
+    isFocused: false,
     style: null,
 };
 
@@ -62,7 +62,7 @@ const OptionRowLHN = (props) => {
     }
 
     let touchableRef = null;
-    const textStyle = props.optionIsFocused
+    const textStyle = props.isFocused
         ? styles.sidebarLinkActiveText
         : styles.sidebarLinkText;
     const textUnreadStyle = [textStyle];
@@ -115,8 +115,8 @@ const OptionRowLHN = (props) => {
                         styles.sidebarLink,
                         styles.sidebarLinkInner,
                         StyleUtils.getBackgroundColorStyle(themeColors.sidebar),
-                        props.optionIsFocused ? styles.sidebarLinkActive : null,
-                        hovered && !props.optionIsFocused ? props.hoverStyle : null,
+                        props.isFocused ? styles.sidebarLinkActive : null,
+                        hovered && !props.isFocused ? props.hoverStyle : null,
                     ]}
                 >
                     <View style={sidebarInnerRowStyle}>
@@ -143,10 +143,10 @@ const OptionRowLHN = (props) => {
                                             size={props.viewMode === CONST.OPTION_MODE.COMPACT ? CONST.AVATAR_SIZE.SMALL : CONST.AVATAR_SIZE.DEFAULT}
                                             secondAvatarStyle={[
                                                 StyleUtils.getBackgroundAndBorderStyle(themeColors.sidebar),
-                                                props.optionIsFocused
+                                                props.isFocused
                                                     ? StyleUtils.getBackgroundAndBorderStyle(focusedBackgroundColor)
                                                     : undefined,
-                                                hovered && !props.optionIsFocused
+                                                hovered && !props.isFocused
                                                     ? StyleUtils.getBackgroundAndBorderStyle(hoveredBackgroundColor)
                                                     : undefined,
                                             ]}

From c03c351ffcd02b8ae4bd61518509856da8f85fdb Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 14 Sep 2022 14:01:39 -0600
Subject: [PATCH 089/178] Rename file to have a more proper naming convention

---
 src/components/LHNOptionsList/OptionRowLHN.js        | 2 +-
 src/libs/{OptionsListUtilsLHN.js => SidebarUtils.js} | 0
 src/pages/home/sidebar/SidebarLinks.js               | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/libs/{OptionsListUtilsLHN.js => SidebarUtils.js} (100%)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 32f987b4136d..f77e2a906abd 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -23,7 +23,7 @@ import CONST from '../../CONST';
 import * as ReportUtils from '../../libs/ReportUtils';
 import variables from '../../styles/variables';
 import themeColors from '../../styles/themes/default';
-import OptionsListUtilsLHN from '../../libs/OptionsListUtilsLHN';
+import OptionsListUtilsLHN from '../../libs/SidebarUtils';
 
 const propTypes = {
     /** Style for hovered state */
diff --git a/src/libs/OptionsListUtilsLHN.js b/src/libs/SidebarUtils.js
similarity index 100%
rename from src/libs/OptionsListUtilsLHN.js
rename to src/libs/SidebarUtils.js
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 9f8d596577ae..080fca5e1d43 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -24,7 +24,7 @@ import withCurrentUserPersonalDetails from '../../../components/withCurrentUserP
 import Timing from '../../../libs/actions/Timing';
 import reportActionPropTypes from '../report/reportActionPropTypes';
 import OptionsListLHN from '../../../components/LHNOptionsList';
-import OptionsListUtilsLHN from '../../../libs/OptionsListUtilsLHN';
+import OptionsListUtilsLHN from '../../../libs/SidebarUtils';
 
 const propTypes = {
     /** Toggles the navigation menu open and closed */

From 6718910677f145ab5eb794c41db0926cfee39c4a Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 14 Sep 2022 15:35:06 -0600
Subject: [PATCH 090/178] Refactor LHN OptionList to remove a bunch of unneeded
 props

---
 ...aseOptionsListLHN.js => LHNOptionsList.js} | 56 +++++++------------
 src/components/LHNOptionsList/index.js        | 19 -------
 src/components/LHNOptionsList/index.native.js | 18 ------
 .../LHNOptionsList/optionsListPropTypesLHN.js | 40 -------------
 src/pages/home/sidebar/SidebarLinks.js        |  4 +-
 5 files changed, 22 insertions(+), 115 deletions(-)
 rename src/components/LHNOptionsList/{BaseOptionsListLHN.js => LHNOptionsList.js} (69%)
 delete mode 100644 src/components/LHNOptionsList/index.js
 delete mode 100644 src/components/LHNOptionsList/index.native.js
 delete mode 100644 src/components/LHNOptionsList/optionsListPropTypesLHN.js

diff --git a/src/components/LHNOptionsList/BaseOptionsListLHN.js b/src/components/LHNOptionsList/LHNOptionsList.js
similarity index 69%
rename from src/components/LHNOptionsList/BaseOptionsListLHN.js
rename to src/components/LHNOptionsList/LHNOptionsList.js
index e5dfb775ea6c..32ae9eee8223 100644
--- a/src/components/LHNOptionsList/BaseOptionsListLHN.js
+++ b/src/components/LHNOptionsList/LHNOptionsList.js
@@ -1,30 +1,34 @@
 import _ from 'underscore';
-import React, {forwardRef, Component} from 'react';
+import React, {Component} from 'react';
 import {View, FlatList} from 'react-native';
 import PropTypes from 'prop-types';
 import styles from '../../styles/styles';
 import OptionRowLHN from './OptionRowLHN';
 import variables from '../../styles/variables';
-import {propTypes as optionsListPropTypes, defaultProps as optionsListDefaultPropTypes} from './optionsListPropTypesLHN';
 import CONST from '../../CONST';
 
 const propTypes = {
-    /** Determines whether the keyboard gets dismissed in response to a drag */
-    keyboardDismissMode: PropTypes.string,
+    /** Extra styles for the section list container */
+    // eslint-disable-next-line react/forbid-prop-types
+    contentContainerStyles: PropTypes.arrayOf(PropTypes.object).isRequired,
 
-    /** Called when the user begins to drag the scroll view */
-    onScrollBeginDrag: PropTypes.func,
+    /** Sections for the section list */
+    data: PropTypes.arrayOf(PropTypes.string).isRequired,
 
-    ...optionsListPropTypes,
-};
+    /** Index for option to focus on */
+    focusedIndex: PropTypes.number.isRequired,
+
+    /** Callback to fire when a row is selected */
+    onSelectRow: PropTypes.func.isRequired,
+
+    /** Toggle between compact and default view of the option */
+    optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)).isRequired,
 
-const defaultProps = {
-    keyboardDismissMode: 'none',
-    onScrollBeginDrag: () => {},
-    ...optionsListDefaultPropTypes,
+    /** Callback to execute when the SectionList lays out */
+    onLayout: PropTypes.func.isRequired,
 };
 
-class BaseOptionsListLHN extends Component {
+class LHNOptionsList extends Component {
     constructor(props) {
         super(props);
 
@@ -36,20 +40,7 @@ class BaseOptionsListLHN extends Component {
     }
 
     shouldComponentUpdate(nextProps) {
-        if (nextProps.focusedIndex !== this.props.focusedIndex) {
-            return true;
-        }
-
-        // @TODO: remove this prop and the one below since they are not used anymore
-        if (nextProps.headerMessage !== this.props.headerMessage) {
-            return true;
-        }
-
-        if (!_.isEqual(nextProps.sections, this.props.data)) {
-            return true;
-        }
-
-        return false;
+        return nextProps.focusedIndex !== this.props.focusedIndex;
     }
 
     onViewableItemsChanged() {
@@ -105,11 +96,8 @@ class BaseOptionsListLHN extends Component {
         return (
             <View style={[styles.flex1]}>
                 <FlatList
-                    ref={this.props.innerRef}
                     indicatorStyle="white"
                     keyboardShouldPersistTaps="always"
-                    keyboardDismissMode={this.props.keyboardDismissMode}
-                    onScrollBeginDrag={this.props.onScrollBeginDrag}
                     contentContainerStyle={this.props.contentContainerStyles}
                     showsVerticalScrollIndicator={false}
                     data={this.props.data}
@@ -129,10 +117,6 @@ class BaseOptionsListLHN extends Component {
     }
 }
 
-BaseOptionsListLHN.propTypes = propTypes;
-BaseOptionsListLHN.defaultProps = defaultProps;
+LHNOptionsList.propTypes = propTypes;
 
-export default forwardRef((props, ref) => (
-    // eslint-disable-next-line react/jsx-props-no-spreading
-    <BaseOptionsListLHN {...props} innerRef={ref} />
-));
+export default LHNOptionsList;
diff --git a/src/components/LHNOptionsList/index.js b/src/components/LHNOptionsList/index.js
deleted file mode 100644
index d2337f2953cb..000000000000
--- a/src/components/LHNOptionsList/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React, {forwardRef} from 'react';
-import BaseOptionsListLHN from './BaseOptionsListLHN';
-import withWindowDimensions from '../withWindowDimensions';
-import {propTypes, defaultProps} from './optionsListPropTypesLHN';
-
-const OptionsListLHN = forwardRef((props, ref) => (
-    <BaseOptionsListLHN
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        ref={ref}
-        keyboardDismissMode={props.isSmallScreenWidth ? 'on-drag' : 'none'}
-    />
-));
-
-OptionsListLHN.propTypes = propTypes;
-OptionsListLHN.defaultProps = defaultProps;
-OptionsListLHN.displayName = 'OptionsListLHN';
-
-export default withWindowDimensions(OptionsListLHN);
diff --git a/src/components/LHNOptionsList/index.native.js b/src/components/LHNOptionsList/index.native.js
deleted file mode 100644
index 3c207b127063..000000000000
--- a/src/components/LHNOptionsList/index.native.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React, {forwardRef} from 'react';
-import {Keyboard} from 'react-native';
-import BaseOptionsList from './BaseOptionsListLHN';
-import {propTypes} from './optionsListPropTypesLHN';
-
-const OptionsList = forwardRef((props, ref) => (
-    <BaseOptionsList
-        // eslint-disable-next-line react/jsx-props-no-spreading
-        {...props}
-        ref={ref}
-        onScrollBeginDrag={() => Keyboard.dismiss()}
-    />
-));
-
-OptionsList.propTypes = propTypes;
-OptionsList.displayName = 'OptionsList';
-
-export default OptionsList;
diff --git a/src/components/LHNOptionsList/optionsListPropTypesLHN.js b/src/components/LHNOptionsList/optionsListPropTypesLHN.js
deleted file mode 100644
index 984feabab8eb..000000000000
--- a/src/components/LHNOptionsList/optionsListPropTypesLHN.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import PropTypes from 'prop-types';
-import _ from 'underscore';
-import SectionList from '../SectionList';
-import CONST from '../../CONST';
-
-const propTypes = {
-    /** Extra styles for the section list container */
-    contentContainerStyles: PropTypes.arrayOf(PropTypes.object).isRequired,
-
-    /** Sections for the section list */
-    data: PropTypes.arrayOf(PropTypes.string).isRequired,
-
-    /** Index for option to focus on */
-    focusedIndex: PropTypes.number.isRequired,
-
-    /** Whether to allow option focus or not */
-    disableFocusOptions: PropTypes.bool.isRequired,
-
-    /** Callback to fire when a row is selected */
-    onSelectRow: PropTypes.func.isRequired,
-
-    /** Passed via forwardRef so we can access the SectionList ref */
-    innerRef: PropTypes.oneOfType([
-        PropTypes.func,
-        PropTypes.shape({current: PropTypes.instanceOf(SectionList)}),
-    ]),
-
-    /** Toggle between compact and default view of the option */
-    optionMode: PropTypes.oneOf(_.values(CONST.OPTION_MODE)).isRequired,
-
-    /** Callback to execute when the SectionList lays out */
-    onLayout: PropTypes.func.isRequired,
-};
-
-const defaultProps = {
-    innerRef: null,
-};
-
-// eslint-disable-next-line import/prefer-default-export
-export {propTypes, defaultProps};
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 080fca5e1d43..a126da8fd656 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -23,7 +23,7 @@ import * as ReportUtils from '../../../libs/ReportUtils';
 import withCurrentUserPersonalDetails from '../../../components/withCurrentUserPersonalDetails';
 import Timing from '../../../libs/actions/Timing';
 import reportActionPropTypes from '../report/reportActionPropTypes';
-import OptionsListLHN from '../../../components/LHNOptionsList';
+import LHNOptionsList from '../../../components/LHNOptionsList/LHNOptionsList';
 import OptionsListUtilsLHN from '../../../libs/SidebarUtils';
 
 const propTypes = {
@@ -144,7 +144,7 @@ class SidebarLinks extends React.Component {
                         />
                     </TouchableOpacity>
                 </View>
-                <OptionsListLHN
+                <LHNOptionsList
                     contentContainerStyles={[
                         styles.sidebarListContainer,
                         {paddingBottom: StyleUtils.getSafeAreaMargins(this.props.insets).marginBottom},

From dd5b1162885aeaf31affd1376ffd8bbb2280c3fe Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Wed, 14 Sep 2022 15:36:07 -0600
Subject: [PATCH 091/178] Remove should component update

---
 src/components/LHNOptionsList/LHNOptionsList.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.js b/src/components/LHNOptionsList/LHNOptionsList.js
index 32ae9eee8223..94b803c9e2ab 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.js
+++ b/src/components/LHNOptionsList/LHNOptionsList.js
@@ -39,10 +39,6 @@ class LHNOptionsList extends Component {
         this.didLayout = false;
     }
 
-    shouldComponentUpdate(nextProps) {
-        return nextProps.focusedIndex !== this.props.focusedIndex;
-    }
-
     onViewableItemsChanged() {
         if (this.didLayout || !this.props.onLayout) {
             return;

From ab70b5cd1d6f84b1b0950e88acfa393a4030865d Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 14 Sep 2022 15:57:12 -0700
Subject: [PATCH 092/178] Use Onyx.set so the room exists after navigating

---
 src/libs/actions/Report.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index b2dde58dffab..4f315ad10241 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1453,9 +1453,12 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         visibility,
     );
     const createdActionData = buildOptimisticCreatedReportAction(workspaceRoom.ownerEmail);
+
+    // Onyx.set is used on the optimistic data so that it is present before navigating to the workspace room. With Onyx.merge the workspace room reportID is not present when
+    // storeCurrentlyViewedReport is called on the ReportScreen, so fetchChatReportsByIDs is called, it throws an error, and the user is navigated away from the report.
     const optimisticData = [
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceRoom.reportID}`,
             value: {
                 pendingFields: {
@@ -1465,7 +1468,7 @@ function addWorkspaceRoom(policy, reportName, visibility) {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
             value: createdActionData,
         },

From f540685a88d1984502ce5f6849c491274076f3ef Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Wed, 14 Sep 2022 16:10:26 -0700
Subject: [PATCH 093/178] Update comment to explain error case

---
 src/libs/actions/Report.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 4f315ad10241..754311a83ff3 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1455,7 +1455,8 @@ function addWorkspaceRoom(policy, reportName, visibility) {
     const createdActionData = buildOptimisticCreatedReportAction(workspaceRoom.ownerEmail);
 
     // Onyx.set is used on the optimistic data so that it is present before navigating to the workspace room. With Onyx.merge the workspace room reportID is not present when
-    // storeCurrentlyViewedReport is called on the ReportScreen, so fetchChatReportsByIDs is called, it throws an error, and the user is navigated away from the report.
+    // storeCurrentlyViewedReport is called on the ReportScreen, so fetchChatReportsByIDs is called which is unnecessary since the optimistic data will be stored in Onyx.
+    // If there was an error creating the room, then fetchChatReportsByIDs throws an error and the user is navigated away from the report instead of showing the RBR error message.
     const optimisticData = [
         {
             onyxMethod: CONST.ONYX.METHOD.SET,

From 99a4f6a4780286b50639d0dcd255d261f1ab4eb0 Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Thu, 15 Sep 2022 00:57:57 -0500
Subject: [PATCH 094/178] Improve PaymentMethodList

---
 .../settings/Payments/PaymentMethodList.js    | 22 +++----------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 9fb552d9d00b..dc1ba4b82437 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -147,23 +147,6 @@ class PaymentMethodList extends Component {
             });
         }
 
-        if (!this.props.shouldShowAddPaymentMethodButton) {
-            return combinedPaymentMethods;
-        }
-
-        combinedPaymentMethods.push({
-            type: BUTTON,
-            text: this.props.translate('paymentMethodList.addPaymentMethod'),
-            icon: Expensicons.CreditCard,
-            style: [styles.buttonCTA],
-            iconStyles: [styles.buttonCTAIcon],
-            onPress: e => this.props.onPress(e),
-            isDisabled: this.props.isLoadingPayments,
-            shouldShowRightIcon: true,
-            success: true,
-            key: 'addPaymentMethodButton',
-        });
-
         return combinedPaymentMethods;
     }
 
@@ -260,8 +243,9 @@ class PaymentMethodList extends Component {
                                         icon={Expensicons.CreditCard}
                                         onPress={e => this.props.onPress(e)}
                                         isDisabled={this.props.isLoadingPayments || isOffline}
-                                        style={[styles.mh4, styles.mb4]}
-                                        iconStyles={[styles.mr4]}
+                                        style={[styles.buttonCTA]}
+                                        iconStyles={[styles.buttonCTAIcon]}
+                                        key="addPaymentMethodButton"
                                         success
                                         shouldShowRightIcon
                                         large

From 1bf2aa19bf9c4accc03ec6cb498a6565c9b3e501 Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Thu, 15 Sep 2022 01:13:27 -0500
Subject: [PATCH 095/178] Requested changes

---
 .../settings/Payments/PaymentMethodList.js    | 73 +++++++++----------
 1 file changed, 33 insertions(+), 40 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index dc1ba4b82437..9da0f0c2158a 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -22,8 +22,6 @@ import OfflineWithFeedback from '../../../components/OfflineWithFeedback';
 import * as PaymentMethods from '../../../libs/actions/PaymentMethods';
 import Log from '../../../libs/Log';
 
-const MENU_ITEM = 'menuItem';
-
 const propTypes = {
     /** What to do when a menu item is pressed */
     onPress: PropTypes.func.isRequired,
@@ -122,7 +120,6 @@ class PaymentMethodList extends Component {
 
         combinedPaymentMethods = _.map(combinedPaymentMethods, paymentMethod => ({
             ...paymentMethod,
-            type: MENU_ITEM,
             onPress: e => this.props.onPress(e, paymentMethod.accountType, paymentMethod.accountData, paymentMethod.isDefault),
             iconFill: this.isPaymentMethodActive(paymentMethod) ? StyleUtils.getIconFillColor(CONST.BUTTON_STATES.PRESSED) : null,
             wrapperStyle: this.isPaymentMethodActive(paymentMethod) ? [StyleUtils.getButtonBackgroundColorStyle(CONST.BUTTON_STATES.PRESSED)] : null,
@@ -137,17 +134,7 @@ class PaymentMethodList extends Component {
      * @returns {Array}
      */
     createPaymentMethodList() {
-        const combinedPaymentMethods = this.getFilteredPaymentMethods();
-
-        // If we have not added any payment methods, show a default empty state
-        if (_.isEmpty(combinedPaymentMethods)) {
-            combinedPaymentMethods.push({
-                key: 'addFirstPaymentMethodHelpText',
-                text: this.props.translate('paymentMethodList.addFirstPaymentMethod'),
-            });
-        }
-
-        return combinedPaymentMethods;
+        return this.getFilteredPaymentMethods();
     }
 
     /**
@@ -189,37 +176,42 @@ class PaymentMethodList extends Component {
      * @return {React.Component}
      */
     renderItem({item}) {
-        if (item.type === MENU_ITEM) {
-            return (
-                <OfflineWithFeedback
-                    onClose={() => this.dismissError(item)}
-                    pendingAction={item.pendingAction}
-                    errors={item.errors}
-                    errorRowStyles={styles.ph6}
-                >
-                    <MenuItem
-                        onPress={item.onPress}
-                        title={item.title}
-                        description={item.description}
-                        icon={item.icon}
-                        disabled={item.disabled}
-                        iconFill={item.iconFill}
-                        iconHeight={item.iconSize}
-                        iconWidth={item.iconSize}
-                        badgeText={this.getDefaultBadgeText(item.isDefault)}
-                        wrapperStyle={item.wrapperStyle}
-                        shouldShowSelectedState={this.props.shouldShowSelectedState}
-                        isSelected={this.props.selectedMethodID === item.methodID}
-                    />
-                </OfflineWithFeedback>
-            );
-        }
+        return (
+            <OfflineWithFeedback
+                onClose={() => this.dismissError(item)}
+                pendingAction={item.pendingAction}
+                errors={item.errors}
+                errorRowStyles={styles.ph6}
+            >
+                <MenuItem
+                    onPress={item.onPress}
+                    title={item.title}
+                    description={item.description}
+                    icon={item.icon}
+                    disabled={item.disabled}
+                    iconFill={item.iconFill}
+                    iconHeight={item.iconSize}
+                    iconWidth={item.iconSize}
+                    badgeText={this.getDefaultBadgeText(item.isDefault)}
+                    wrapperStyle={item.wrapperStyle}
+                    shouldShowSelectedState={this.props.shouldShowSelectedState}
+                    isSelected={this.props.selectedMethodID === item.methodID}
+                />
+            </OfflineWithFeedback>
+        );
+    }
 
+    /**
+     * Create a component if the list is empty
+     *
+     * @return {React.Component}
+     */
+    renderListEmptyComponent() {
         return (
             <Text
                 style={[styles.popoverMenuItem]}
             >
-                {item.text}
+                {this.props.translate('paymentMethodList.addFirstPaymentMethod')}
             </Text>
         );
     }
@@ -231,6 +223,7 @@ class PaymentMethodList extends Component {
                     data={this.createPaymentMethodList()}
                     renderItem={this.renderItem}
                     keyExtractor={item => item.key}
+                    ListEmptyComponent={this.renderListEmptyComponent()}
                 />
                 {
                     this.props.shouldShowAddPaymentMethodButton

From 28637845ce063ec4f332f8b119e867abde76f94e Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Thu, 15 Sep 2022 01:18:39 -0500
Subject: [PATCH 096/178] Missing styles

---
 src/pages/settings/Payments/PaymentMethodList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 9da0f0c2158a..e8f692ade1d3 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -236,7 +236,7 @@ class PaymentMethodList extends Component {
                                         icon={Expensicons.CreditCard}
                                         onPress={e => this.props.onPress(e)}
                                         isDisabled={this.props.isLoadingPayments || isOffline}
-                                        style={[styles.buttonCTA]}
+                                        style={[styles.mh4, styles.mb4, styles.buttonCTA]}
                                         iconStyles={[styles.buttonCTAIcon]}
                                         key="addPaymentMethodButton"
                                         success

From c49c0cc38e40cb94cdfcd386f282b342bd2e3a4e Mon Sep 17 00:00:00 2001
From: sahil <thesahindia@gmail.com>
Date: Thu, 15 Sep 2022 19:36:58 +0530
Subject: [PATCH 097/178] change extension to lower case

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

diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index a2e19d36d25c..34b20e19f4d7 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -133,7 +133,7 @@ class AvatarWithImagePicker extends React.Component {
      */
     isValidExtension(image) {
         const {fileExtension} = FileUtils.splitExtensionFromFileName(image.name);
-        return _.contains(CONST.AVATAR_ALLOWED_EXTENSIONS, fileExtension);
+        return _.contains(CONST.AVATAR_ALLOWED_EXTENSIONS, fileExtension.toLowerCase());
     }
 
     /**

From d11d8246f46a2efb2bd2674ac0a1591603d067de Mon Sep 17 00:00:00 2001
From: sahil <thesahindia@gmail.com>
Date: Thu, 15 Sep 2022 19:44:24 +0530
Subject: [PATCH 098/178] use lodashGet

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

diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index 34b20e19f4d7..fa1f2f7de346 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -132,7 +132,7 @@ class AvatarWithImagePicker extends React.Component {
      * @returns {Boolean}
      */
     isValidExtension(image) {
-        const {fileExtension} = FileUtils.splitExtensionFromFileName(image.name);
+        const fileExtension = lodashGet(FileUtils.splitExtensionFromFileName(image.name), 'fileExtension', '');
         return _.contains(CONST.AVATAR_ALLOWED_EXTENSIONS, fileExtension.toLowerCase());
     }
 

From 0e7a29e5f11c51e5454cc24b6b27a2c47cf48aff Mon Sep 17 00:00:00 2001
From: sahil <thesahindia@gmail.com>
Date: Thu, 15 Sep 2022 19:57:51 +0530
Subject: [PATCH 099/178] add allowed extensions in the message

---
 src/components/AvatarWithImagePicker.js | 2 +-
 src/languages/en.js                     | 2 +-
 src/languages/es.js                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index fa1f2f7de346..a66bfafe9c4e 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -169,7 +169,7 @@ class AvatarWithImagePicker extends React.Component {
         if (!this.isValidExtension(image)) {
             this.showErrorModal(
                 this.props.translate('avatarWithImagePicker.imageUploadFailed'),
-                `${this.props.translate('avatarWithImagePicker.notAllowedExtension')} ${CONST.AVATAR_ALLOWED_EXTENSIONS.join(', ')}.`,
+                this.props.translate('avatarWithImagePicker.notAllowedExtension', {allowedExtensions: CONST.AVATAR_ALLOWED_EXTENSIONS}),
             );
             return;
         }
diff --git a/src/languages/en.js b/src/languages/en.js
index 237e25f6c09c..bca4907f32b6 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -267,7 +267,7 @@ export default {
         deleteWorkspaceError: 'Sorry, there was an unexpected problem deleting your workspace avatar.',
         sizeExceeded: ({maxUploadSizeInMB}) => `The selected image exceeds the maximum upload size of ${maxUploadSizeInMB}MB.`,
         tooSmallResolution: ({minHeightInPx, minWidthInPx}) => `Please upload an image larger than ${minHeightInPx}x${minWidthInPx} pixels`,
-        notAllowedExtension: 'Profile picture must be one of the following types:',
+        notAllowedExtension: ({allowedExtensions}) => `Profile picture must be one of the following types: ${allowedExtensions.join(', ')}.`,
     },
     profilePage: {
         profile: 'Profile',
diff --git a/src/languages/es.js b/src/languages/es.js
index a7856fec5f5a..2d54a9684572 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -267,7 +267,7 @@ export default {
         deleteWorkspaceError: 'Lo sentimos, hubo un problema eliminando el avatar de su espacio de trabajo.',
         sizeExceeded: ({maxUploadSizeInMB}) => `La imagen supera el tamaño máximo de ${maxUploadSizeInMB}MB.`,
         tooSmallResolution: ({minHeightInPx, minWidthInPx}) => `Por favor elige una imagen mas grande que ${minHeightInPx}x${minWidthInPx} píxeles`,
-        notAllowedExtension: 'La foto de perfil debe ser de uno de los siguientes tipos:',
+        notAllowedExtension: ({allowedExtensions}) => `La foto de perfil debe ser de uno de los siguientes tipos: ${allowedExtensions.join(', ')}.`,
     },
     profilePage: {
         profile: 'Perfil',

From dd2ad85f9b63f5925b6309b6b22e93b79907c6b4 Mon Sep 17 00:00:00 2001
From: David Bondy <dbondy@expensify.com>
Date: Thu, 15 Sep 2022 11:48:35 -0600
Subject: [PATCH 100/178] since optimistic data resets message and errors for
 us we dont need to set it in success/failure data

---
 src/libs/actions/Session/index.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index b323b67e3d97..645bb3957eaf 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -295,10 +295,9 @@ function resetPassword() {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.ACCOUNT,
                 value: {
-                    isLoading: true,
+                    errors: null,
                     forgotPassword: true,
                     message: null,
-                    errors: null,
                 },
             },
         ],
@@ -308,7 +307,6 @@ function resetPassword() {
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     isLoading: false,
-                    message: null,
                 },
             },
         ],
@@ -318,7 +316,6 @@ function resetPassword() {
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     isLoading: false,
-                    message: null,
                 },
             },
         ],
@@ -358,7 +355,6 @@ function resendResetPassword() {
                 key: ONYXKEYS.ACCOUNT,
                 value: {
                     isLoading: false,
-                    message: null,
                 },
             },
         ],

From bb49c89eaceef37360522810badd5836870bf392 Mon Sep 17 00:00:00 2001
From: Matt Allen <mallen@expensify.com>
Date: Thu, 15 Sep 2022 11:10:57 -0700
Subject: [PATCH 101/178] Update CONTRIBUTING.md

Added to line 56
> or as a reported "Bug:" in the [#expensify-open-source](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#asking-questions) Slack channel.
---
 contributingGuides/CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index 2cde9aff521f..23f8a2b65e23 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -53,11 +53,11 @@ It’s possible that you found a bug or enhancement that we haven’t posted to
 
 Please follow these steps to propose a job:
 
-1. Check to ensure an issue does not already exist for this topic in the [New Expensify Issue list](https://github.com/Expensify/App/issues). Please use your best judgement by searching for similar titles and issue descriptions.
+1. Check to ensure an issue does not already exist for this topic in the [New Expensify Issue list](https://github.com/Expensify/App/issues) or as a reported "Bug:" in the [#expensify-open-source](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#asking-questions) Slack channel. Please use your best judgement by searching for similar titles and issue descriptions.
 2. If your bug or enhancement matches an existing issue, please feel free to comment on that GitHub issue with your findings if you think it will help solve the issue.
 4. If there is no existing GitHub issue or Upwork job, check if the issue is happening on prod (as opposed to only happening on dev)
 5. If the issue is just in dev then it means it's a new issue and has not been deployed to production. In this case, you should try to find the offending PR and comment in the issue tied to the PR and ask the assigned users to add the `DeployBlockerCash` label. If you can't find it, follow the reporting instructions in the next item, but note that the issue is a regression only found in dev and not in prod.
-6. If the issue happens in main, staging or production then report the issue(s) in the [#expensify-open-source](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#asking-questions) Slack channel, prefixed with `BUG:` or `Feature Request:`. Please use the templates for bugs and feature requests that are bookmarked in #expensify-open-source. View [this guide](https://github.com/Expensify/App/blob/main/contributingGuides/HOW_TO_CREATE_A_PLAN.md) for help creating a plan when proposing a feature request. 
+6. If the issue happens in main, staging or production then report the issue(s) in the #expensify-open-source Slack channel, prefixed with `BUG:` or `Feature Request:`. Please use the templates for bugs and feature requests that are bookmarked in #expensify-open-source. View [this guide](https://github.com/Expensify/App/blob/main/contributingGuides/HOW_TO_CREATE_A_PLAN.md) for help creating a plan when proposing a feature request. 
 7. After review in #expensify-open-source, if you've provided a quality proposal that we choose to implement, a GitHub issue will be created and your Slack handle will be included in the original post after `Issue reported by:`
 8. If an external contributor other than yourself is hired to work on the issue, you will also be hired for the same job in Upwork. No additional work is needed. If the issue is fixed internally, a dedicated job will be created to hire and pay you after the issue is fixed. 
 9. Payment will be made 7 days after code is deployed to production if there are no regressions. If a regression is discovered, payment will be issued 7 days after all regressions are fixed. 

From a67dcdc8d13b0418c1a3878cf13d16f88040f87e Mon Sep 17 00:00:00 2001
From: David Bondy <dbondy@expensify.com>
Date: Thu, 15 Sep 2022 14:23:46 -0600
Subject: [PATCH 102/178] get rid of success and failure data since theyre no
 longer needed

---
 src/libs/actions/Session/index.js | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 645bb3957eaf..df966488e72a 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -300,25 +300,7 @@ function resetPassword() {
                     message: null,
                 },
             },
-        ],
-        successData: [
-            {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
-                key: ONYXKEYS.ACCOUNT,
-                value: {
-                    isLoading: false,
-                },
-            },
-        ],
-        failureData: [
-            {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
-                key: ONYXKEYS.ACCOUNT,
-                value: {
-                    isLoading: false,
-                },
-            },
-        ],
+        ]
     });
 }
 

From 76e91672841925f27223980384a445398f8cfb30 Mon Sep 17 00:00:00 2001
From: David Bondy <dbondy@expensify.com>
Date: Thu, 15 Sep 2022 14:52:41 -0600
Subject: [PATCH 103/178] fix style

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

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index df966488e72a..58c2321c2d15 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -300,7 +300,7 @@ function resetPassword() {
                     message: null,
                 },
             },
-        ]
+        ],
     });
 }
 

From d16b08da670411f80cc2b816c6b0dfb88fbe7568 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 15 Sep 2022 13:54:18 -0700
Subject: [PATCH 104/178] Set optimistic report notification pref to daily

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

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 754311a83ff3..37dbd929f52b 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -619,7 +619,7 @@ function buildOptimisticChatReport(
         lastMessageTimestamp: 0,
         lastVisitedTimestamp: 0,
         maxSequenceNumber: 0,
-        notificationPreference: '',
+        notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.DAILY,
         oldPolicyName,
         ownerEmail,
         participants: participantList,

From 6237de87a8abe35bd1b433ae37981fafe1a065b9 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 15 Sep 2022 15:32:12 -0700
Subject: [PATCH 105/178] Pass individual params to AddWorkspaceRoom

---
 src/libs/actions/Report.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 37dbd929f52b..4e7c6872fbf8 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1515,7 +1515,16 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         },
     ];
 
-    API.write('AddWorkspaceRoom', {workspaceRoom: JSON.stringify(workspaceRoom)}, {optimisticData, successData, failureData});
+    API.write(
+        'AddWorkspaceRoom',
+        {
+            policyID: workspaceRoom.policyID,
+            reportName,
+            visibility,
+            reportID: workspaceRoom.reportID,
+        },
+        {optimisticData, successData, failureData},
+    );
     Navigation.navigate(ROUTES.getReportRoute(workspaceRoom.reportID));
 }
 

From 59e5b43d593c792188fcbe96207540a2a77d658f Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Fri, 16 Sep 2022 05:08:47 +0530
Subject: [PATCH 106/178] move selection to state

---
 src/components/OptionsSelector/BaseOptionsSelector.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index cbcb0faa415c..577252cdf385 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -45,6 +45,10 @@ class BaseOptionsSelector extends Component {
         this.state = {
             allOptions,
             focusedIndex: this.props.shouldTextInputAppearBelowOptions ? allOptions.length : 0,
+            selection: {
+                start: this.props.value.length,
+                end: this.props.value.length,
+            },
         };
     }
 
@@ -206,7 +210,7 @@ class BaseOptionsSelector extends Component {
     selectRow(option, ref) {
         if (this.props.shouldFocusOnSelectRow) {
             // Input is permanently focused on native platforms, so we always highlight the text inside of it
-            this.textInput.setNativeProps({selection: {start: 0, end: this.props.value.length}});
+            this.setState({selection: {start: 0, end: this.props.value.length}});
             if (this.relatedTarget && ref === findNodeHandle(this.relatedTarget)) {
                 this.textInput.focus();
             }
@@ -251,6 +255,8 @@ class BaseOptionsSelector extends Component {
                 }}
                 selectTextOnFocus
                 blurOnSubmit={Boolean(this.state.allOptions.length)}
+                selection={this.state.selection}
+                onSelectionChange={e => this.setState({selection: e.nativeEvent.selection})}
             />
         );
         const optionsList = this.props.shouldShowOptions ? (

From bfdbbc541d617aa19e2ea6590cabccfb600b0f5a Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Fri, 16 Sep 2022 05:09:08 +0530
Subject: [PATCH 107/178] rm setNativeProps

---
 src/components/OptionsSelector/BaseOptionsSelector.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index 577252cdf385..6c7227255d07 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -240,12 +240,7 @@ class BaseOptionsSelector extends Component {
                 ref={el => this.textInput = el}
                 value={this.props.value}
                 label={this.props.textInputLabel}
-                onChangeText={(text) => {
-                    if (this.props.shouldFocusOnSelectRow) {
-                        this.textInput.setNativeProps({selection: null});
-                    }
-                    this.props.onChangeText(text);
-                }}
+                onChangeText={this.props.onChangeText}
                 placeholder={this.props.placeholderText || this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                 onBlur={(e) => {
                     if (!this.props.shouldFocusOnSelectRow) {

From d8b1efd0e329e5441b62a2c0b5d10e1295f0400c Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 15 Sep 2022 16:43:37 -0700
Subject: [PATCH 108/178] Show add workspace room error messages

---
 src/pages/home/report/ReportActionItemCreated.js | 2 ++
 src/styles/styles.js                             | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/pages/home/report/ReportActionItemCreated.js b/src/pages/home/report/ReportActionItemCreated.js
index 76509bccdbff..cef9895d554f 100644
--- a/src/pages/home/report/ReportActionItemCreated.js
+++ b/src/pages/home/report/ReportActionItemCreated.js
@@ -43,6 +43,8 @@ const ReportActionItemCreated = (props) => {
     return (
         <OfflineWithFeedback
             pendingAction={lodashGet(props.report, 'pendingFields.addWorkspaceRoom')}
+            errors={lodashGet(props.report, 'errorFields.addWorkspaceRoom')}
+            errorRowStyles={styles.addWorkspaceRoomErrorRow}
         >
             <View style={[
                 styles.chatContent,
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 467a5609a4bf..e0f9ca7699b7 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -2671,6 +2671,12 @@ const styles = {
         fontFamily: fontFamily.GTA,
         marginLeft: 6,
     },
+
+    addWorkspaceRoomErrorRow: {
+        padding: 20,
+        maxWidth: 450,
+        alignSelf: 'center',
+    },
 };
 
 export default styles;

From f932c9265796d7adbfd1f28e3253d1409c64010a Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Fri, 16 Sep 2022 05:38:49 +0530
Subject: [PATCH 109/178] composer - migrate setNativeProps to state

---
 src/pages/home/report/ReportActionCompose.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/pages/home/report/ReportActionCompose.js b/src/pages/home/report/ReportActionCompose.js
index a82101de219f..11616d76a97c 100755
--- a/src/pages/home/report/ReportActionCompose.js
+++ b/src/pages/home/report/ReportActionCompose.js
@@ -144,6 +144,7 @@ class ReportActionCompose extends React.Component {
                 end: props.comment.length,
             },
             maxLines: props.isSmallScreenWidth ? CONST.COMPOSER.MAX_LINES_SMALL_SCREEN : CONST.COMPOSER.MAX_LINES,
+            value: props.comment,
         };
     }
 
@@ -311,9 +312,6 @@ class ReportActionCompose extends React.Component {
     addEmojiToTextBox(emoji) {
         const newComment = this.comment.slice(0, this.state.selection.start)
             + emoji + this.comment.slice(this.state.selection.end, this.comment.length);
-        this.textInput.setNativeProps({
-            text: newComment,
-        });
         this.setState(prevState => ({
             selection: {
                 start: prevState.selection.start + emoji.length,
@@ -372,9 +370,9 @@ class ReportActionCompose extends React.Component {
      * @param {String} newComment
      */
     updateComment(newComment) {
-        this.textInput.setNativeProps({text: newComment});
         this.setState({
             isCommentEmpty: !!newComment.match(/^(\s|`)*$/),
+            value: newComment,
         });
 
         // Indicate that draft has been created.
@@ -627,7 +625,6 @@ class ReportActionCompose extends React.Component {
                                             this.setState({isDraggingOver: false});
                                         }}
                                         style={[styles.textInputCompose, this.props.isComposerFullSize ? styles.textInputFullCompose : styles.flex4]}
-                                        defaultValue={this.props.comment}
                                         maxLines={this.state.maxLines}
                                         onFocus={() => this.setIsFocused(true)}
                                         onBlur={() => this.setIsFocused(false)}
@@ -640,6 +637,7 @@ class ReportActionCompose extends React.Component {
                                         isFullComposerAvailable={this.state.isFullComposerAvailable}
                                         setIsFullComposerAvailable={this.setIsFullComposerAvailable}
                                         isComposerFullSize={this.props.isComposerFullSize}
+                                        value={this.state.value}
                                     />
                                 </View>
                             </>

From ec88f2af2e7df78d0b9b1d3114dca000cb947e4f Mon Sep 17 00:00:00 2001
From: Rushat Gabhane <rushatgabhane@gmail.com>
Date: Fri, 16 Sep 2022 05:45:16 +0530
Subject: [PATCH 110/178] composerEdit - rm setNative props

---
 src/pages/home/report/ReportActionItemMessageEdit.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItemMessageEdit.js b/src/pages/home/report/ReportActionItemMessageEdit.js
index d3cb3ae0a3fc..8c844c50b516 100644
--- a/src/pages/home/report/ReportActionItemMessageEdit.js
+++ b/src/pages/home/report/ReportActionItemMessageEdit.js
@@ -97,7 +97,6 @@ class ReportActionItemMessageEdit extends React.Component {
      * @param {String} newDraft
      */
     updateDraft(newDraft) {
-        this.textInput.setNativeProps({text: newDraft});
         this.setState({draft: newDraft});
 
         // This component is rendered only when draft is set to a non-empty string. In order to prevent component

From 14ab87c4a11c82a80480d8fdcd4fb0d905716d08 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 15 Sep 2022 17:32:23 -0700
Subject: [PATCH 111/178] Simplify hiding the composer

---
 src/pages/home/ReportScreen.js | 51 +++++++++++++++-------------------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index a04a44e0a95b..fc2a124b0c4d 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -264,37 +264,32 @@ class ReportScreen extends React.Component {
                                 isComposerFullSize={this.props.isComposerFullSize}
                             />
                         )}
-                    {(hideComposer || this.props.session.shouldShowComposeInput) && (
+                    {isArchivedRoom && (
+                        <ArchivedReportFooter
+                            reportClosedAction={reportClosedAction}
+                            report={this.props.report}
+                        />
+                    )}
+                    {(this.props.shouldShowComposeInput && !hideComposer) && (
                         <View style={[this.setChatFooterStyles(this.props.network.isOffline), this.props.isComposerFullSize && styles.chatFooterFullCompose]}>
-                            {isArchivedRoom && (
-                                <ArchivedReportFooter
-                                    reportClosedAction={reportClosedAction}
-                                    report={this.props.report}
-                                />
-                            )}
-                            {hideComposer
-                                ? (
-                                    !this.props.isSmallScreenWidth && (
-                                        <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />
-                                    )
-                                )
-                                : (
-                                    <SwipeableView onSwipeDown={Keyboard.dismiss}>
-                                        <OfflineWithFeedback
-                                            pendingAction={addWorkspaceRoomPendingAction}
-                                        >
-                                            <ReportActionCompose
-                                                onSubmit={this.onSubmitComment}
-                                                reportID={reportID}
-                                                reportActions={this.props.reportActions}
-                                                report={this.props.report}
-                                                isComposerFullSize={this.props.isComposerFullSize}
-                                            />
-                                        </OfflineWithFeedback>
-                                    </SwipeableView>
-                                )}
+                            <SwipeableView onSwipeDown={Keyboard.dismiss}>
+                                <OfflineWithFeedback
+                                    pendingAction={addWorkspaceRoomPendingAction}
+                                >
+                                    <ReportActionCompose
+                                        onSubmit={this.onSubmitComment}
+                                        reportID={reportID}
+                                        reportActions={this.props.reportActions}
+                                        report={this.props.report}
+                                        isComposerFullSize={this.props.isComposerFullSize}
+                                    />
+                                </OfflineWithFeedback>
+                            </SwipeableView>
                         </View>
                     )}
+                    {(hideComposer && !this.props.isSmallScreenWidth) && (
+                        <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />
+                    )}
                 </View>
             </ScreenWrapper>
         );

From e5fb0d7025ea4b87674c9f2b934f8276db925a0b Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 15 Sep 2022 17:46:21 -0700
Subject: [PATCH 112/178] Horizontal padding only on add room error row

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

diff --git a/src/styles/styles.js b/src/styles/styles.js
index e0f9ca7699b7..057e418b92e6 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -2673,7 +2673,7 @@ const styles = {
     },
 
     addWorkspaceRoomErrorRow: {
-        padding: 20,
+        paddingHorizontal: 20,
         maxWidth: 450,
         alignSelf: 'center',
     },

From 44d46677413d1d7ca59bdd6c4f9432d8c26ca07a Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 15 Sep 2022 17:46:47 -0700
Subject: [PATCH 113/178] Wrap archived footer in chat footer style again

---
 src/pages/home/ReportScreen.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index fc2a124b0c4d..c6c20cc06f31 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -265,12 +265,14 @@ class ReportScreen extends React.Component {
                             />
                         )}
                     {isArchivedRoom && (
-                        <ArchivedReportFooter
-                            reportClosedAction={reportClosedAction}
-                            report={this.props.report}
-                        />
+                        <View style={styles.chatFooter}>
+                            <ArchivedReportFooter
+                                reportClosedAction={reportClosedAction}
+                                report={this.props.report}
+                            />
+                        </View>
                     )}
-                    {(this.props.shouldShowComposeInput && !hideComposer) && (
+                    {(!hideComposer) && (
                         <View style={[this.setChatFooterStyles(this.props.network.isOffline), this.props.isComposerFullSize && styles.chatFooterFullCompose]}>
                             <SwipeableView onSwipeDown={Keyboard.dismiss}>
                                 <OfflineWithFeedback

From 877b45aff111cb6fceb6aa6b2719c7f569c8df6c Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Thu, 15 Sep 2022 17:56:09 -0700
Subject: [PATCH 114/178] Use shouldShowComposeInput again

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

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index c6c20cc06f31..ea12664f2cf3 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -272,7 +272,7 @@ class ReportScreen extends React.Component {
                             />
                         </View>
                     )}
-                    {(!hideComposer) && (
+                    {(!hideComposer && this.props.session.shouldShowComposeInput) && (
                         <View style={[this.setChatFooterStyles(this.props.network.isOffline), this.props.isComposerFullSize && styles.chatFooterFullCompose]}>
                             <SwipeableView onSwipeDown={Keyboard.dismiss}>
                                 <OfflineWithFeedback

From a9767e182292d9c619180a9d974598a31c3452ca Mon Sep 17 00:00:00 2001
From: Sahil <thesahindia@gmail.com>
Date: Fri, 16 Sep 2022 21:43:00 +0530
Subject: [PATCH 115/178] handle null case for the image

Co-authored-by: Manan <manan.jadhav@gmail.com>
---
 src/components/AvatarWithImagePicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index a66bfafe9c4e..6b0105d68c1e 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -132,7 +132,7 @@ class AvatarWithImagePicker extends React.Component {
      * @returns {Boolean}
      */
     isValidExtension(image) {
-        const fileExtension = lodashGet(FileUtils.splitExtensionFromFileName(image.name), 'fileExtension', '');
+      const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(image, 'name', ''));
         return _.contains(CONST.AVATAR_ALLOWED_EXTENSIONS, fileExtension.toLowerCase());
     }
 

From 7232397f8a911918f889bea65469064955c6435f Mon Sep 17 00:00:00 2001
From: sahil <thesahindia@gmail.com>
Date: Fri, 16 Sep 2022 21:52:06 +0530
Subject: [PATCH 116/178] fix lint error

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

diff --git a/src/components/AvatarWithImagePicker.js b/src/components/AvatarWithImagePicker.js
index 6b0105d68c1e..3de205fd6717 100644
--- a/src/components/AvatarWithImagePicker.js
+++ b/src/components/AvatarWithImagePicker.js
@@ -132,7 +132,7 @@ class AvatarWithImagePicker extends React.Component {
      * @returns {Boolean}
      */
     isValidExtension(image) {
-      const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(image, 'name', ''));
+        const {fileExtension} = FileUtils.splitExtensionFromFileName(lodashGet(image, 'name', ''));
         return _.contains(CONST.AVATAR_ALLOWED_EXTENSIONS, fileExtension.toLowerCase());
     }
 

From 5af7f36b94dded826408d90d6f1826c23ad0740c Mon Sep 17 00:00:00 2001
From: Josue Echandia <josueechandiasto@gmail.com>
Date: Fri, 16 Sep 2022 12:16:29 -0500
Subject: [PATCH 117/178] Requested changes

---
 src/pages/settings/Payments/PaymentMethodList.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index e8f692ade1d3..990f1e3f7c5b 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -128,15 +128,6 @@ class PaymentMethodList extends Component {
         return combinedPaymentMethods;
     }
 
-    /**
-     * Take all of the different payment methods and create a list that can be easily digested by renderItem
-     *
-     * @returns {Array}
-     */
-    createPaymentMethodList() {
-        return this.getFilteredPaymentMethods();
-    }
-
     /**
      * Dismisses the error on the payment method
      * @param {Object} item
@@ -202,7 +193,7 @@ class PaymentMethodList extends Component {
     }
 
     /**
-     * Create a component if the list is empty
+     * Show add first payment copy when payment methods are
      *
      * @return {React.Component}
      */
@@ -220,7 +211,7 @@ class PaymentMethodList extends Component {
         return (
             <>
                 <FlatList
-                    data={this.createPaymentMethodList()}
+                    data={this.getFilteredPaymentMethods()}
                     renderItem={this.renderItem}
                     keyExtractor={item => item.key}
                     ListEmptyComponent={this.renderListEmptyComponent()}

From 72f00033c317e8bb0480d011e3a2f4ed870fb1af Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Sat, 17 Sep 2022 00:05:30 +0530
Subject: [PATCH 118/178] fix propType warning

---
 .../AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js   | 9 +++++++--
 .../anchorForCommentsOnlyPropTypes.js                    | 3 ---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js
index e65b423fa517..62790c7a5c45 100644
--- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js
+++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js
@@ -10,8 +10,13 @@ import * as ContextMenuActions from '../../pages/home/report/ContextMenu/Context
 import Tooltip from '../Tooltip';
 import canUseTouchScreen from '../../libs/canUseTouchscreen';
 import styles from '../../styles/styles';
-import withWindowDimensions from '../withWindowDimensions';
-import {propTypes, defaultProps} from './anchorForCommentsOnlyPropTypes';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../withWindowDimensions';
+import {propTypes as anchorForCommentsOnlyPropTypes, defaultProps} from './anchorForCommentsOnlyPropTypes';
+
+const propTypes = {
+    ...anchorForCommentsOnlyPropTypes,
+    ...windowDimensionsPropTypes,
+};
 
 /*
  * This is a default anchor component for regular links.
diff --git a/src/components/AnchorForCommentsOnly/anchorForCommentsOnlyPropTypes.js b/src/components/AnchorForCommentsOnly/anchorForCommentsOnlyPropTypes.js
index 7661efaf0af3..6246f581435a 100644
--- a/src/components/AnchorForCommentsOnly/anchorForCommentsOnlyPropTypes.js
+++ b/src/components/AnchorForCommentsOnly/anchorForCommentsOnlyPropTypes.js
@@ -1,6 +1,5 @@
 import PropTypes from 'prop-types';
 import stylePropTypes from '../../styles/stylePropTypes';
-import {windowDimensionsPropTypes} from '../withWindowDimensions';
 
 const propTypes = {
     /** The URL to open */
@@ -25,8 +24,6 @@ const propTypes = {
 
     /** Press handler for the link, when not passed, default href is used to create a link like behaviour */
     onPress: PropTypes.func,
-
-    ...windowDimensionsPropTypes,
 };
 
 const defaultProps = {

From d0274c01f299467335f46159cd8e9dd0938b9356 Mon Sep 17 00:00:00 2001
From: Matt Allen <mallen@expensify.com>
Date: Fri, 16 Sep 2022 11:45:19 -0700
Subject: [PATCH 119/178] Update contributingGuides/CONTRIBUTING.md

Co-authored-by: Alex Beaman <alexbeaman@expensify.com>
---
 contributingGuides/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index 23f8a2b65e23..50f40c03271f 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -53,7 +53,7 @@ It’s possible that you found a bug or enhancement that we haven’t posted to
 
 Please follow these steps to propose a job:
 
-1. Check to ensure an issue does not already exist for this topic in the [New Expensify Issue list](https://github.com/Expensify/App/issues) or as a reported "Bug:" in the [#expensify-open-source](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#asking-questions) Slack channel. Please use your best judgement by searching for similar titles and issue descriptions.
+1. Check to ensure an issue does not already exist for this topic in the [New Expensify Issue list](https://github.com/Expensify/App/issues) or as a reported `Bug:` in the [#expensify-open-source](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#asking-questions) Slack channel. Please use your best judgement by searching for similar titles and issue descriptions.
 2. If your bug or enhancement matches an existing issue, please feel free to comment on that GitHub issue with your findings if you think it will help solve the issue.
 4. If there is no existing GitHub issue or Upwork job, check if the issue is happening on prod (as opposed to only happening on dev)
 5. If the issue is just in dev then it means it's a new issue and has not been deployed to production. In this case, you should try to find the offending PR and comment in the issue tied to the PR and ask the assigned users to add the `DeployBlockerCash` label. If you can't find it, follow the reporting instructions in the next item, but note that the issue is a regression only found in dev and not in prod.

From 86c70287123eaf48c406792981c85a22ef8732ba Mon Sep 17 00:00:00 2001
From: Matt Allen <mallen@expensify.com>
Date: Fri, 16 Sep 2022 11:46:36 -0700
Subject: [PATCH 120/178] Update contributingGuides/CONTRIBUTING.md

Co-authored-by: Alex Beaman <alexbeaman@expensify.com>
---
 contributingGuides/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
index 50f40c03271f..fac1cd75b06f 100644
--- a/contributingGuides/CONTRIBUTING.md
+++ b/contributingGuides/CONTRIBUTING.md
@@ -57,7 +57,7 @@ Please follow these steps to propose a job:
 2. If your bug or enhancement matches an existing issue, please feel free to comment on that GitHub issue with your findings if you think it will help solve the issue.
 4. If there is no existing GitHub issue or Upwork job, check if the issue is happening on prod (as opposed to only happening on dev)
 5. If the issue is just in dev then it means it's a new issue and has not been deployed to production. In this case, you should try to find the offending PR and comment in the issue tied to the PR and ask the assigned users to add the `DeployBlockerCash` label. If you can't find it, follow the reporting instructions in the next item, but note that the issue is a regression only found in dev and not in prod.
-6. If the issue happens in main, staging or production then report the issue(s) in the #expensify-open-source Slack channel, prefixed with `BUG:` or `Feature Request:`. Please use the templates for bugs and feature requests that are bookmarked in #expensify-open-source. View [this guide](https://github.com/Expensify/App/blob/main/contributingGuides/HOW_TO_CREATE_A_PLAN.md) for help creating a plan when proposing a feature request. 
+6. If the issue happens in main, staging, or production then report the issue(s) in the #expensify-open-source Slack channel, prefixed with `BUG:` or `Feature Request:`. Please use the templates for bugs and feature requests that are bookmarked in #expensify-open-source. View [this guide](https://github.com/Expensify/App/blob/main/contributingGuides/HOW_TO_CREATE_A_PLAN.md) for help creating a plan when proposing a feature request. 
 7. After review in #expensify-open-source, if you've provided a quality proposal that we choose to implement, a GitHub issue will be created and your Slack handle will be included in the original post after `Issue reported by:`
 8. If an external contributor other than yourself is hired to work on the issue, you will also be hired for the same job in Upwork. No additional work is needed. If the issue is fixed internally, a dedicated job will be created to hire and pay you after the issue is fixed. 
 9. Payment will be made 7 days after code is deployed to production if there are no regressions. If a regression is discovered, payment will be issued 7 days after all regressions are fixed. 

From bb6527d7390b34a1a193cda711ecb38ebdf291de Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Fri, 16 Sep 2022 11:57:42 -0700
Subject: [PATCH 121/178] Handle dismissing an add workspace room error

---
 src/libs/actions/Report.js                       | 10 ++++++++++
 src/pages/home/report/ReportActionItemCreated.js |  5 +++++
 2 files changed, 15 insertions(+)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 4e7c6872fbf8..136d23990ab4 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1528,6 +1528,15 @@ function addWorkspaceRoom(policy, reportName, visibility) {
     Navigation.navigate(ROUTES.getReportRoute(workspaceRoom.reportID));
 }
 
+/**
+ * @param {Number} reportID The reportID of the workspace room
+ */
+function navigateToConciergeChatAndDeleteWorkspaceRoom(reportID) {
+    navigateToConciergeChat();
+    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, null);
+    Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, null);
+}
+
 /**
  * @param {Object} policyRoomReport
  * @param {Number} policyRoomReport.reportID
@@ -1732,6 +1741,7 @@ export {
     setReportWithDraft,
     createPolicyRoom,
     addWorkspaceRoom,
+    navigateToConciergeChatAndDeleteWorkspaceRoom,
     setIsComposerFullSize,
     markCommentAsUnread,
     readNewestAction,
diff --git a/src/pages/home/report/ReportActionItemCreated.js b/src/pages/home/report/ReportActionItemCreated.js
index cef9895d554f..f2409026f0a4 100644
--- a/src/pages/home/report/ReportActionItemCreated.js
+++ b/src/pages/home/report/ReportActionItemCreated.js
@@ -10,10 +10,14 @@ import participantPropTypes from '../../../components/participantPropTypes';
 import * as ReportUtils from '../../../libs/ReportUtils';
 import styles from '../../../styles/styles';
 import OfflineWithFeedback from '../../../components/OfflineWithFeedback';
+import * as Report from '../../../libs/actions/Report';
 
 const propTypes = {
     /** The report currently being looked at */
     report: PropTypes.shape({
+        /** The id of the report */
+        reportID: PropTypes.number,
+
         /**  Avatars corresponding to a chat */
         icons: PropTypes.arrayOf(PropTypes.string),
 
@@ -45,6 +49,7 @@ const ReportActionItemCreated = (props) => {
             pendingAction={lodashGet(props.report, 'pendingFields.addWorkspaceRoom')}
             errors={lodashGet(props.report, 'errorFields.addWorkspaceRoom')}
             errorRowStyles={styles.addWorkspaceRoomErrorRow}
+            onClose={() => Report.navigateToConciergeChatAndDeleteWorkspaceRoom(props.report.reportID)}
         >
             <View style={[
                 styles.chatContent,

From ee989bf9487255178a824872a9fbf782853c500a Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Fri, 16 Sep 2022 12:11:51 -0700
Subject: [PATCH 122/178] Gray out the room when adding it fails

---
 src/libs/actions/Report.js     | 22 +---------------------
 src/pages/home/ReportScreen.js |  6 ++++--
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 136d23990ab4..78d3921f209c 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1494,26 +1494,6 @@ function addWorkspaceRoom(policy, reportName, visibility) {
             },
         },
     ];
-    const failureData = [
-        {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceRoom.reportID}`,
-            value: {
-                pendingFields: {
-                    addWorkspaceRoom: null,
-                },
-            },
-        },
-        {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
-            value: {
-                0: {
-                    pendingAction: null,
-                },
-            },
-        },
-    ];
 
     API.write(
         'AddWorkspaceRoom',
@@ -1523,7 +1503,7 @@ function addWorkspaceRoom(policy, reportName, visibility) {
             visibility,
             reportID: workspaceRoom.reportID,
         },
-        {optimisticData, successData, failureData},
+        {optimisticData, successData},
     );
     Navigation.navigate(ROUTES.getReportRoute(workspaceRoom.reportID));
 }
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index ea12664f2cf3..70c2c8f3bcaf 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -228,10 +228,10 @@ class ReportScreen extends React.Component {
             reportClosedAction = lodashFindLast(this.props.reportActions, action => action.actionName === CONST.REPORT.ACTIONS.TYPE.CLOSED);
         }
         const addWorkspaceRoomPendingAction = lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom');
-        const hasAddWorkspaceRoomError = !_.isEmpty(lodashGet(this.props.report, 'errorFields.addWorkspaceRoom', {}));
+        const addWorkspaceRoomErrors = lodashGet(this.props.report, 'errorFields.addWorkspaceRoom');
 
         // Hide the composer for an archived room or when there is an error adding the room
-        const hideComposer = isArchivedRoom || hasAddWorkspaceRoomError;
+        const hideComposer = isArchivedRoom || !_.isEmpty(addWorkspaceRoomErrors);
         return (
             <ScreenWrapper
                 style={[styles.appContent, styles.flex1, {marginTop: this.state.viewportOffsetTop}]}
@@ -239,6 +239,8 @@ class ReportScreen extends React.Component {
             >
                 <OfflineWithFeedback
                     pendingAction={addWorkspaceRoomPendingAction}
+                    errors={addWorkspaceRoomErrors}
+                    errorRowStyles={styles.dNone}
                 >
                     <HeaderView
                         reportID={reportID}

From 2c175afa1834f715c21960262194176156ea2df8 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Fri, 16 Sep 2022 12:19:42 -0700
Subject: [PATCH 123/178] Fix large screen hidden composer offline indicator

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

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 70c2c8f3bcaf..1daa9f9aa103 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -292,7 +292,7 @@ class ReportScreen extends React.Component {
                         </View>
                     )}
                     {(hideComposer && !this.props.isSmallScreenWidth) && (
-                        <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />
+                        <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow, styles.chatFooter]} />
                     )}
                 </View>
             </ScreenWrapper>

From f54314ff3027b9e29d13e3a10e6327e0fa6f6f8d Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Fri, 16 Sep 2022 12:49:35 -0700
Subject: [PATCH 124/178] Space for the hidden composer offline indicator

---
 src/pages/home/ReportScreen.js | 24 +++++++++++++++---------
 src/styles/styles.js           |  4 ++++
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 1daa9f9aa103..709b88b7cbd1 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -266,12 +266,21 @@ class ReportScreen extends React.Component {
                                 isComposerFullSize={this.props.isComposerFullSize}
                             />
                         )}
-                    {isArchivedRoom && (
-                        <View style={styles.chatFooter}>
-                            <ArchivedReportFooter
-                                reportClosedAction={reportClosedAction}
-                                report={this.props.report}
-                            />
+                    {(isArchivedRoom || hideComposer) && (
+                        <View style={[styles.chatFooter]}>
+                            {isArchivedRoom && (
+                                <ArchivedReportFooter
+                                    reportClosedAction={reportClosedAction}
+                                    report={this.props.report}
+                                />
+                            )}
+                            {!this.props.isSmallScreenWidth && (
+                                <View style={styles.offlineIndicatorRow}>
+                                    {hideComposer && (
+                                        <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow]} />
+                                    )}
+                                </View>
+                            )}
                         </View>
                     )}
                     {(!hideComposer && this.props.session.shouldShowComposeInput) && (
@@ -291,9 +300,6 @@ class ReportScreen extends React.Component {
                             </SwipeableView>
                         </View>
                     )}
-                    {(hideComposer && !this.props.isSmallScreenWidth) && (
-                        <OfflineIndicator containerStyles={[styles.chatItemComposeSecondaryRow, styles.chatFooter]} />
-                    )}
                 </View>
             </ScreenWrapper>
         );
diff --git a/src/styles/styles.js b/src/styles/styles.js
index 057e418b92e6..0bf907b88ca2 100644
--- a/src/styles/styles.js
+++ b/src/styles/styles.js
@@ -666,6 +666,10 @@ const styles = {
         paddingBottom: 9,
     },
 
+    offlineIndicatorRow: {
+        height: 25,
+    },
+
     // Actions
     actionAvatar: {
         borderRadius: 20,

From 3a9fd3ce44419d478e4af93bf734a1089d5d5a1d Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Fri, 16 Sep 2022 13:28:47 -0700
Subject: [PATCH 125/178] Show workspace rooms that failed to add in LHN

---
 src/libs/OptionsListUtils.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 2ab2d89ee9c8..ed45fb696a1a 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -487,12 +487,16 @@ function getOptions(reports, personalDetails, activeReportID, {
             : '';
 
         const reportContainsIOUDebt = iouReportOwner && iouReportOwner !== currentUserLogin;
+        const hasAddWorkspaceRoomError = report.errorFields && !_.isEmpty(report.errorFields.addWorkspaceRoom);
         const shouldFilterReportIfEmpty = !showReportsWithNoComments && report.lastMessageTimestamp === 0
 
                 // We make exceptions for defaultRooms and policyExpenseChats so we can immediately
                 // highlight them in the LHN when they are created and have no messsages yet. We do
                 // not give archived rooms this exception since they do not need to be higlihted.
-                && !(!ReportUtils.isArchivedRoom(report) && (isDefaultRoom || isPolicyExpenseChat));
+                && !(!ReportUtils.isArchivedRoom(report) && (isDefaultRoom || isPolicyExpenseChat))
+
+                // Also make an exception for workspace rooms that failed to be added
+                && !hasAddWorkspaceRoomError;
 
         const shouldFilterReportIfRead = hideReadReports && !ReportUtils.isUnread(report);
         const shouldFilterReport = shouldFilterReportIfEmpty || shouldFilterReportIfRead;

From cddadd3797f7ac3a757534ae3e25c3b93eddc232 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 14:29:15 -0600
Subject: [PATCH 126/178] Use onLayout since it's only called on mount

---
 .../LHNOptionsList/LHNOptionsList.js          | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/components/LHNOptionsList/LHNOptionsList.js b/src/components/LHNOptionsList/LHNOptionsList.js
index 94b803c9e2ab..2febd53ac03d 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.js
+++ b/src/components/LHNOptionsList/LHNOptionsList.js
@@ -34,25 +34,13 @@ class LHNOptionsList extends Component {
 
         this.renderItem = this.renderItem.bind(this);
         this.getItemLayout = this.getItemLayout.bind(this);
-        this.onViewableItemsChanged = this.onViewableItemsChanged.bind(this);
         this.viewabilityConfig = {viewAreaCoveragePercentThreshold: 95};
-        this.didLayout = false;
-    }
-
-    onViewableItemsChanged() {
-        if (this.didLayout || !this.props.onLayout) {
-            return;
-        }
-
-        this.didLayout = true;
-        this.props.onLayout();
     }
 
     /**
-     * This function is used to compute the layout of any given item in our list.
-     * We need to implement it so that we can programmatically scroll to items outside the virtual render window of the SectionList.
-     *
-     * @TODO: we can probably remove this method entirely since we don't need to scroll to items outside the virtual render window (was only used for arrow key navigation)
+     * This function is used to compute the layout of any given item in our list. Since we know that each item will have the exact same height, this is a performance optimization
+     * so that the heights can be determined before the options are rendered. Otherwise, the heights are determined when each option is rendering and it causes a lot of overhead on large
+     * lists.
      *
      * @param {Array} data - This is the same as the data we pass into the component
      * @param {Number} index the current item's index in the set of data
@@ -106,7 +94,7 @@ class LHNOptionsList extends Component {
                     maxToRenderPerBatch={5}
                     windowSize={5}
                     viewabilityConfig={this.viewabilityConfig}
-                    onViewableItemsChanged={this.onViewableItemsChanged}
+                    onLayout={this.props.onLayout}
                 />
             </View>
         );

From 3af87d73bbcb488cbbbf9b135155c981c0a12a4c Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 14:41:26 -0600
Subject: [PATCH 127/178] Remove viewabilityConfig

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

diff --git a/src/components/LHNOptionsList/LHNOptionsList.js b/src/components/LHNOptionsList/LHNOptionsList.js
index 2febd53ac03d..94105757963e 100644
--- a/src/components/LHNOptionsList/LHNOptionsList.js
+++ b/src/components/LHNOptionsList/LHNOptionsList.js
@@ -34,7 +34,6 @@ class LHNOptionsList extends Component {
 
         this.renderItem = this.renderItem.bind(this);
         this.getItemLayout = this.getItemLayout.bind(this);
-        this.viewabilityConfig = {viewAreaCoveragePercentThreshold: 95};
     }
 
     /**
@@ -93,7 +92,6 @@ class LHNOptionsList extends Component {
                     initialNumToRender={5}
                     maxToRenderPerBatch={5}
                     windowSize={5}
-                    viewabilityConfig={this.viewabilityConfig}
                     onLayout={this.props.onLayout}
                 />
             </View>

From 46f02513c548f1203f132f0448bd41e908456c0b Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 14:59:08 -0600
Subject: [PATCH 128/178] Ignore console debug timing logs

---
 jest/setup.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/jest/setup.js b/jest/setup.js
index c380ebb56669..dc562083c6b3 100644
--- a/jest/setup.js
+++ b/jest/setup.js
@@ -13,3 +13,14 @@ jest.mock('../src/libs/Notification/PushNotification', () => ({
 }));
 
 jest.mock('react-native-blob-util', () => ({}));
+
+// Turn off the console logs for timing events. They are not relevant for unit tests and create a lot of noise
+jest.spyOn(console, 'debug').mockImplementation((...params) => {
+    if (params[0].indexOf('Timing:') === 0) {
+        return;
+    }
+
+    // Send the message to console.log but don't re-used console.debug or else this mock method is called in an infinite loop. Instead, just prefix the output with the word "DEBUG"
+    // eslint-disable-next-line no-console
+    console.log('DEBUG', ...params);
+});

From 4b1c407df958e0abe26eee9e559d717dc4a17e5b Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 15:28:13 -0600
Subject: [PATCH 129/178] Fix display names on reports

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

diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 972089a7e713..14e78a5d6efe 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -19,7 +19,6 @@ Onyx.connect({
 let personalDetails;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS,
-    waitForCollectionCallback: true,
     callback: val => personalDetails = val,
 });
 

From 8a9806acae8761c6acecbbf0aaed407e5807ca04 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 16:05:25 -0600
Subject: [PATCH 130/178] Remove unnecessary logic

---
 src/libs/SidebarUtils.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 14e78a5d6efe..79ff09a10794 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -100,7 +100,7 @@ function getOrderedReportIDs() {
         const isChatRoom = ReportUtils.isChatRoom(report);
         const isDefaultRoom = ReportUtils.isDefaultRoom(report);
         const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
-        const participants = (report && report.participants) || [];
+        const participants = report.participants || [];
 
         // Skip this report if it has no participants and if it's not a type of report supported in the LHN
         if (_.isEmpty(participants) && !isChatRoom && !isDefaultRoom && !isPolicyExpenseChat) {
@@ -121,9 +121,9 @@ function getOrderedReportIDs() {
             // not give archived rooms this exception since they do not need to be higlihted.
             && !(!ReportUtils.isArchivedRoom(report) && (isDefaultRoom || isPolicyExpenseChat));
 
-        const shouldFilterReportIfRead = hideReadReports && report.unreadActionCount === 0;
+        const shouldFilterReportIfRead = hideReadReports && !ReportUtils.isUnread(report);
         const shouldFilterReport = shouldFilterReportIfEmpty || shouldFilterReportIfRead;
-        if (report.reportID.toString() !== currentlyViewedReportID.toString()
+        if (report.reportID.toString() !== currentlyViewedReportID
             && !report.isPinned
             && !hasDraftComment
             && shouldFilterReport

From 87fcd06d9b3cea880aea28045937a977a75daacd Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 16:11:34 -0600
Subject: [PATCH 131/178] Unmount components before clearing onyx

---
 tests/unit/LHNOrderTest.js | 44 ++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/tests/unit/LHNOrderTest.js b/tests/unit/LHNOrderTest.js
index 4ae496b352b0..afdece39c9fa 100644
--- a/tests/unit/LHNOrderTest.js
+++ b/tests/unit/LHNOrderTest.js
@@ -260,7 +260,9 @@ describe('Sidebar', () => {
                     expect(sidebarLinks.toJSON()).not.toBe(null);
                     expect(sidebarLinks.toJSON().children.length).toBe(2);
                     expect(sidebarLinks.getAllByText('ReportID, One')).toHaveLength(1);
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
 
         test('orders items with most recently updated on top', () => {
@@ -293,7 +295,9 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Two');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
 
         // @TODO: this test broke after merging the PR which moved hasDraft onto the
@@ -369,7 +373,9 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, One');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, Two');
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
 
         test('reorders the reports to keep draft reports on top', () => {
@@ -404,7 +410,9 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, Two');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
 
         test('removes the pencil icon when draft is removed', () => {
@@ -438,7 +446,9 @@ describe('Sidebar', () => {
                 // THEN the pencil icon goes away
                 .then(() => {
                     expect(sidebarLinks.queryAllByAccessibilityHint('Pencil Icon')).toHaveLength(0);
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
 
         test('removes the pin icon when chat is unpinned', () => {
@@ -471,11 +481,13 @@ describe('Sidebar', () => {
                 // THEN the pencil icon goes away
                 .then(() => {
                     expect(sidebarLinks.queryAllByAccessibilityHint('Pin Icon')).toHaveLength(0);
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
 
         test('puts draft reports at the top when the page refreshes', () => {
-            getDefaultRenderedSidebarLinks();
+            const sidebarLinks = getDefaultRenderedSidebarLinks();
             let sidebarAfterRefresh;
 
             return waitForPromisesToResolve()
@@ -513,6 +525,11 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, Two');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
+                })
+
+                .then(() => {
+                    sidebarLinks.unmount();
+                    sidebarAfterRefresh.unmount();
                 });
         });
 
@@ -551,7 +568,9 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, Two');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
     });
 
@@ -606,7 +625,9 @@ describe('Sidebar', () => {
                 .then(() => {
                     expect(sidebarLinks.queryAllByText(/ReportID, /)).toHaveLength(2);
                     expect(sidebarLinks.queryAllByText(/ReportID, One/)).toHaveLength(0);
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
 
         it('alphabetizes chats', () => {
@@ -648,7 +669,6 @@ describe('Sidebar', () => {
                 }))
 
                 // THEN they are still in alphabetical order
-
                 .then(() => {
                     const reportOptions = sidebarLinks.queryAllByText(/ReportID, /);
                     expect(reportOptions).toHaveLength(4);
@@ -656,7 +676,9 @@ describe('Sidebar', () => {
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, One');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[3].children[0].props.children).toBe('ReportID, Two');
-                });
+                })
+
+                .then(sidebarLinks.unmount);
         });
     });
 });

From e6eb624adbca94b0f86c4bdfc8ff69fcf1e38c8c Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 16:22:32 -0600
Subject: [PATCH 132/178] Uncomment test for draft reports and get it passing

---
 src/libs/SidebarUtils.js   |  5 ++-
 tests/unit/LHNOrderTest.js | 76 ++++++++++++++++++--------------------
 2 files changed, 39 insertions(+), 42 deletions(-)

diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 79ff09a10794..85fc56a11620 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -166,7 +166,10 @@ function getOrderedReportIDs() {
             pinnedReportOptions.push(report);
         } else if (report.hasOutstandingIOU && !report.isIOUReportOwner) {
             iouDebtReportOptions.push(report);
-        } else if (report.hasDraft) {
+
+        // If the active report has a draft, we do not put it in the group of draft reports because we want it to maintain it's current position. Otherwise the report's position
+        // jumps around in the LHN and it's kind of confusing to the user to see the LHN reorder when they start typing a comment on a report.
+        } else if (report.hasDraft && report.reportID.toString() !== currentlyViewedReportID) {
             draftReportOptions.push(report);
         } else {
             recentReportOptions.push(report);
diff --git a/tests/unit/LHNOrderTest.js b/tests/unit/LHNOrderTest.js
index afdece39c9fa..e5ada18a01d1 100644
--- a/tests/unit/LHNOrderTest.js
+++ b/tests/unit/LHNOrderTest.js
@@ -300,47 +300,41 @@ describe('Sidebar', () => {
                 .then(sidebarLinks.unmount);
         });
 
-        // @TODO: this test broke after merging the PR which moved hasDraft onto the
-        // report object. Due to the difficulty of debugging setDerivedStateFromProps() (it's called dozens
-        // of times in this simple flow, with many different data formats that is difficult to reason
-        // about), the plan is to refactor and remove setDerivedStateFromProps(). As part of that refactor
-        // the goal will be to have this test running again.
-        // Also, it's important to note that while this test is broken, the UI works correctly when
-        // being tested manually (a real head-scratcher).
-        // test('doesn\'t change the order when adding a draft to the active report', () => {
-        //     // GIVEN the sidebar is rendered in default mode (most recent first)
-        //     // while currently viewing report 1
-        //     const sidebarLinks = getDefaultRenderedSidebarLinks();
-        //
-        //     return waitForPromisesToResolve()
-        //
-        //         // WHEN Onyx is updated with some personal details and multiple reports
-        //         // and a draft on the active report (report 1 is the oldest report, so it's listed at the bottom)
-        //         .then(() => Onyx.multiSet({
-        //             [ONYXKEYS.NVP_PRIORITY_MODE]: 'default',
-        //             [ONYXKEYS.PERSONAL_DETAILS]: fakePersonalDetails,
-        //             [ONYXKEYS.CURRENTLY_VIEWED_REPORTID]: '1',
-        //             [`${ONYXKEYS.COLLECTION.REPORT}1`]: {...fakeReport1, hasDraft: true},
-        //             [`${ONYXKEYS.COLLECTION.REPORT}2`]: fakeReport2,
-        //             [`${ONYXKEYS.COLLECTION.REPORT}3`]: fakeReport3,
-        //             [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: fakeReport1Actions,
-        //             [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport2Actions,
-        //             [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
-        //         }))
-        //
-        //         // THEN there should be a pencil icon and report one should still be the last one
-        //         .then(() => {
-        //             const pencilIcon = sidebarLinks.getAllByAccessibilityHint('Pencil Icon');
-        //             expect(pencilIcon).toHaveLength(1);
-        //
-        //             // console.log(sidebarLinks.toJSON().children[1].children[0].props.data[0].data)
-        //
-        //             // The reports should be in the order 3 > 2 > 1
-        //             const reportOptions = sidebarLinks.getAllByText(/ReportID, (One|Two|Three)/);
-        //             expect(reportOptions).toHaveLength(3);
-        //             expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-        //         });
-        // });
+        test('doesn\'t change the order when adding a draft to the active report', () => {
+            // GIVEN the sidebar is rendered in default mode (most recent first)
+            // while currently viewing report 1
+            const sidebarLinks = getDefaultRenderedSidebarLinks();
+
+            return waitForPromisesToResolve()
+
+                // WHEN Onyx is updated with some personal details and multiple reports
+                // and a draft on the active report (report 1 is the oldest report, so it's listed at the bottom)
+                .then(() => Onyx.multiSet({
+                    [ONYXKEYS.NVP_PRIORITY_MODE]: 'default',
+                    [ONYXKEYS.PERSONAL_DETAILS]: fakePersonalDetails,
+                    [ONYXKEYS.CURRENTLY_VIEWED_REPORTID]: '1',
+                    [`${ONYXKEYS.COLLECTION.REPORT}1`]: {...fakeReport1, hasDraft: true},
+                    [`${ONYXKEYS.COLLECTION.REPORT}2`]: fakeReport2,
+                    [`${ONYXKEYS.COLLECTION.REPORT}3`]: fakeReport3,
+                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: fakeReport1Actions,
+                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport2Actions,
+                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
+                }))
+
+                // THEN there should be a pencil icon and report one should still be the last one because putting a draft on the active report should not change it's location
+                // in the ordered list
+                .then(() => {
+                    const pencilIcon = sidebarLinks.getAllByAccessibilityHint('Pencil Icon');
+                    expect(pencilIcon).toHaveLength(1);
+
+                    // The reports should be in the order 3 > 2 > 1
+                    const reportOptions = sidebarLinks.getAllByText(/ReportID, (One|Two|Three)/);
+                    expect(reportOptions).toHaveLength(3);
+                    expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
+                })
+
+                .then(sidebarLinks.unmount);
+        });
 
         test('reorders the reports to always have the most recently updated one on top', () => {
             const sidebarLinks = getDefaultRenderedSidebarLinks();

From 7493711cf9106e821d2673a93f766332c6abe5f6 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 16:34:16 -0600
Subject: [PATCH 133/178] Remove test that doesn't make sense

---
 tests/unit/LHNOrderTest.js | 129 ++++++++++++-------------------------
 1 file changed, 41 insertions(+), 88 deletions(-)

diff --git a/tests/unit/LHNOrderTest.js b/tests/unit/LHNOrderTest.js
index e5ada18a01d1..c6e36b795970 100644
--- a/tests/unit/LHNOrderTest.js
+++ b/tests/unit/LHNOrderTest.js
@@ -211,27 +211,27 @@ describe('Sidebar', () => {
         afterEach(Onyx.clear);
 
         test('is not rendered when there are no props passed to it', () => {
-            // GIVEN all the default props are passed to SidebarLinks
-            // WHEN it is rendered
+            // Given all the default props are passed to SidebarLinks
+            // When it is rendered
             const sidebarLinks = getDefaultRenderedSidebarLinks();
 
-            // THEN it should render nothing and be null
+            // Then it should render nothing and be null
             // This is expected because there is an early return when there are no personal details
             expect(sidebarLinks.toJSON()).toBe(null);
         });
 
         test('is rendered with an empty list when personal details exist', () => {
-            // GIVEN the sidebar is rendered with default props
+            // Given the sidebar is rendered with default props
             const sidebarLinks = getDefaultRenderedSidebarLinks();
 
             return waitForPromisesToResolve()
 
-                // WHEN Onyx is updated with some personal details
+                // When Onyx is updated with some personal details
                 .then(() => Onyx.multiSet({
                     [ONYXKEYS.PERSONAL_DETAILS]: fakePersonalDetails,
                 }))
 
-                // THEN the component should be rendered with an empty list since it will get past the early return
+                // Then the component should be rendered with an empty list since it will get past the early return
                 .then(() => {
                     expect(sidebarLinks.toJSON()).not.toBe(null);
                     expect(sidebarLinks.toJSON().children.length).toBe(2);
@@ -240,13 +240,13 @@ describe('Sidebar', () => {
         });
 
         test('contains one report when a report is in Onyx', () => {
-            // GIVEN the sidebar is rendered in default mode (most recent first)
+            // Given the sidebar is rendered in default mode (most recent first)
             // while currently viewing report 1
             const sidebarLinks = getDefaultRenderedSidebarLinks();
 
             return waitForPromisesToResolve()
 
-                // WHEN Onyx is updated with some personal details and a report
+                // When Onyx is updated with some personal details and a report
                 .then(() => Onyx.multiSet({
                     [ONYXKEYS.NVP_PRIORITY_MODE]: 'default',
                     [ONYXKEYS.PERSONAL_DETAILS]: fakePersonalDetails,
@@ -255,7 +255,7 @@ describe('Sidebar', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: fakeReport1Actions,
                 }))
 
-                // THEN the component should be rendered with an item for the fake report
+                // Then the component should be rendered with an item for the fake report
                 .then(() => {
                     expect(sidebarLinks.toJSON()).not.toBe(null);
                     expect(sidebarLinks.toJSON().children.length).toBe(2);
@@ -266,13 +266,13 @@ describe('Sidebar', () => {
         });
 
         test('orders items with most recently updated on top', () => {
-            // GIVEN the sidebar is rendered in default mode (most recent first)
+            // Given the sidebar is rendered in default mode (most recent first)
             // while currently viewing report 1
             const sidebarLinks = getDefaultRenderedSidebarLinks();
 
             return waitForPromisesToResolve()
 
-                // WHEN Onyx is updated with some personal details and multiple reports
+                // When Onyx is updated with some personal details and multiple reports
                 .then(() => Onyx.multiSet({
                     [ONYXKEYS.NVP_PRIORITY_MODE]: 'default',
                     [ONYXKEYS.PERSONAL_DETAILS]: fakePersonalDetails,
@@ -285,7 +285,7 @@ describe('Sidebar', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
                 }))
 
-                // THEN the component should be rendered with the mostly recently updated report first
+                // Then the component should be rendered with the mostly recently updated report first
                 .then(() => {
                     expect(sidebarLinks.toJSON()).not.toBe(null);
                     const reportOptions = sidebarLinks.getAllByText(/ReportID, (One|Two|Three)/);
@@ -301,13 +301,13 @@ describe('Sidebar', () => {
         });
 
         test('doesn\'t change the order when adding a draft to the active report', () => {
-            // GIVEN the sidebar is rendered in default mode (most recent first)
+            // Given the sidebar is rendered in default mode (most recent first)
             // while currently viewing report 1
             const sidebarLinks = getDefaultRenderedSidebarLinks();
 
             return waitForPromisesToResolve()
 
-                // WHEN Onyx is updated with some personal details and multiple reports
+                // When Onyx is updated with some personal details and multiple reports
                 // and a draft on the active report (report 1 is the oldest report, so it's listed at the bottom)
                 .then(() => Onyx.multiSet({
                     [ONYXKEYS.NVP_PRIORITY_MODE]: 'default',
@@ -321,7 +321,7 @@ describe('Sidebar', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
                 }))
 
-                // THEN there should be a pencil icon and report one should still be the last one because putting a draft on the active report should not change it's location
+                // Then there should be a pencil icon and report one should still be the last one because putting a draft on the active report should not change it's location
                 // in the ordered list
                 .then(() => {
                     const pencilIcon = sidebarLinks.getAllByAccessibilityHint('Pencil Icon');
@@ -341,7 +341,7 @@ describe('Sidebar', () => {
 
             return waitForPromisesToResolve()
 
-                // GIVEN the sidebar is rendered in default mode (most recent first)
+                // Given the sidebar is rendered in default mode (most recent first)
                 // while currently viewing report 1
                 // with reports in top-to-bottom order of 3 > 2 > 1
                 .then(() => Onyx.multiSet({
@@ -356,10 +356,10 @@ describe('Sidebar', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
                 }))
 
-                // WHEN a new comment is added to report 1 (eg. it's lastMessageTimestamp is updated)
+                // When a new comment is added to report 1 (eg. it's lastMessageTimestamp is updated)
                 .then(() => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}1`, {lastMessageTimestamp: Date.now()}))
 
-                // THEN the order of the reports should be 1 > 3 > 2
+                // Then the order of the reports should be 1 > 3 > 2
                 //                                         ^--- (1 goes to the front and pushes other two down)
                 .then(() => {
                     const reportOptions = sidebarLinks.getAllByText(/ReportID, (One|Two|Three)/);
@@ -377,7 +377,7 @@ describe('Sidebar', () => {
 
             return waitForPromisesToResolve()
 
-                // GIVEN the sidebar is rendered in default mode (most recent first)
+                // Given the sidebar is rendered in default mode (most recent first)
                 // while currently viewing report 2 (the one in the middle)
                 // with a draft on report 2
                 // with reports in top-to-bottom order of 3 > 2 > 1
@@ -393,10 +393,10 @@ describe('Sidebar', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
                 }))
 
-                // WHEN the currently active chat is switched to report 1 (the one on the bottom)
+                // When the currently active chat is switched to report 1 (the one on the bottom)
                 .then(() => Onyx.merge(ONYXKEYS.CURRENTLY_VIEWED_REPORTID, '1'))
 
-                // THEN the order of the reports should be 2 > 3 > 1
+                // Then the order of the reports should be 2 > 3 > 1
                 //                                         ^--- (2 goes to the front and pushes 3 down)
                 .then(() => {
                     const reportOptions = sidebarLinks.getAllByText(/ReportID, (One|Two|Three)/);
@@ -414,7 +414,7 @@ describe('Sidebar', () => {
 
             return waitForPromisesToResolve()
 
-                // GIVEN the sidebar is rendered in default mode (most recent first)
+                // Given the sidebar is rendered in default mode (most recent first)
                 // while currently viewing report 2 (the one in the middle)
                 // with a draft on report 2
                 // with reports in top-to-bottom order of 3 > 2 > 1
@@ -434,10 +434,10 @@ describe('Sidebar', () => {
                     expect(sidebarLinks.getAllByAccessibilityHint('Pencil Icon')).toHaveLength(1);
                 })
 
-                // WHEN the draft on report 2 is removed
+                // When the draft on report 2 is removed
                 .then(() => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}2`, {hasDraft: null}))
 
-                // THEN the pencil icon goes away
+                // Then the pencil icon goes away
                 .then(() => {
                     expect(sidebarLinks.queryAllByAccessibilityHint('Pencil Icon')).toHaveLength(0);
                 })
@@ -450,7 +450,7 @@ describe('Sidebar', () => {
 
             return waitForPromisesToResolve()
 
-                // GIVEN the sidebar is rendered in default mode (most recent first)
+                // Given the sidebar is rendered in default mode (most recent first)
                 // while currently viewing report 2 (the one in the middle)
                 // with report 2 pinned
                 .then(() => Onyx.multiSet({
@@ -469,10 +469,10 @@ describe('Sidebar', () => {
                     expect(sidebarLinks.getAllByAccessibilityHint('Pin Icon')).toHaveLength(1);
                 })
 
-                // WHEN the chat is unpinned
+                // When the chat is unpinned
                 .then(() => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}2`, {isPinned: false}))
 
-                // THEN the pencil icon goes away
+                // Then the pencil icon goes away
                 .then(() => {
                     expect(sidebarLinks.queryAllByAccessibilityHint('Pin Icon')).toHaveLength(0);
                 })
@@ -480,59 +480,12 @@ describe('Sidebar', () => {
                 .then(sidebarLinks.unmount);
         });
 
-        test('puts draft reports at the top when the page refreshes', () => {
-            const sidebarLinks = getDefaultRenderedSidebarLinks();
-            let sidebarAfterRefresh;
-
-            return waitForPromisesToResolve()
-
-                // GIVEN the sidebar is rendered in default mode (most recent first)
-                // while currently viewing report 2 (the one in the middle)
-                // with a draft on report 2
-                // with reports in top-to-bottom order of 3 > 2 > 1
-                .then(() => Onyx.multiSet({
-                    [ONYXKEYS.NVP_PRIORITY_MODE]: 'default',
-                    [ONYXKEYS.PERSONAL_DETAILS]: fakePersonalDetails,
-                    [ONYXKEYS.CURRENTLY_VIEWED_REPORTID]: '2',
-                    [`${ONYXKEYS.COLLECTION.REPORT}1`]: fakeReport1,
-                    [`${ONYXKEYS.COLLECTION.REPORT}2`]: {hasDraft: true, ...fakeReport2},
-                    [`${ONYXKEYS.COLLECTION.REPORT}3`]: fakeReport3,
-                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: fakeReport1Actions,
-                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport2Actions,
-                    [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
-                }))
-
-                // WHEN the sidebar is re-rendered from scratch, simulating a page refresh
-                // because data is still in Onyx
-                .then(() => {
-                    sidebarAfterRefresh = getDefaultRenderedSidebarLinks();
-
-                    // ensures rendering is done
-                    return waitForPromisesToResolve();
-                })
-
-                // THEN the reports are in the order 2 > 3 > 1
-                //                                   ^--- (2 goes to the front and pushes 3 down)
-                .then(() => {
-                    const reportOptions = sidebarAfterRefresh.getAllByText(/ReportID, (One|Two|Three)/);
-                    expect(reportOptions).toHaveLength(3);
-                    expect(reportOptions[0].children[0].props.children).toBe('ReportID, Two');
-                    expect(reportOptions[1].children[0].props.children).toBe('ReportID, Three');
-                    expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-                })
-
-                .then(() => {
-                    sidebarLinks.unmount();
-                    sidebarAfterRefresh.unmount();
-                });
-        });
-
         it('sorts chats by pinned > IOU > draft', () => {
             const sidebarLinks = getDefaultRenderedSidebarLinks();
 
             return waitForPromisesToResolve()
 
-                // GIVEN the sidebar is rendered in default mode (most recent first)
+                // Given the sidebar is rendered in default mode (most recent first)
                 // while currently viewing report 2 (the one in the middle)
                 // with a draft on report 2
                 // with the current user set to email9@
@@ -552,7 +505,7 @@ describe('Sidebar', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
                 }))
 
-                // THEN the reports are ordered by IOU > Pinned > Draft
+                // Then the reports are ordered by IOU > Pinned > Draft
                 // there is a pencil icon
                 // there is a pinned icon
                 // there is an IOU badge
@@ -574,7 +527,7 @@ describe('Sidebar', () => {
 
             return waitForPromisesToResolve()
 
-                // GIVEN the sidebar is rendered in #focus mode (hides read chats)
+                // Given the sidebar is rendered in #focus mode (hides read chats)
                 // with report 1 and 2 having unread actions
                 .then(() => Onyx.multiSet({
                     [ONYXKEYS.NVP_PRIORITY_MODE]: 'gsd',
@@ -588,7 +541,7 @@ describe('Sidebar', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
                 }))
 
-                // THEN the reports 1 and 2 are shown and 3 is not
+                // Then the reports 1 and 2 are shown and 3 is not
                 .then(() => {
                     const reportOptions = sidebarLinks.queryAllByText(/ReportID, /);
                     expect(reportOptions).toHaveLength(2);
@@ -596,26 +549,26 @@ describe('Sidebar', () => {
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Two');
                 })
 
-                // WHEN report3 becomes unread
+                // When report3 becomes unread
                 .then(() => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}3`, {lastReadSequenceNumber: TEST_MAX_SEQUENCE_NUMBER - 1}))
 
-                // THEN all three chats are showing
+                // Then all three chats are showing
                 .then(() => {
                     expect(sidebarLinks.queryAllByText(/ReportID, /)).toHaveLength(3);
                 })
 
-                // WHEN report 1 becomes read (it's the active report)
+                // When report 1 becomes read (it's the active report)
                 .then(() => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}1`, {lastReadSequenceNumber: TEST_MAX_SEQUENCE_NUMBER}))
 
-                // THEN all three chats are still showing
+                // Then all three chats are still showing
                 .then(() => {
                     expect(sidebarLinks.queryAllByText(/ReportID, /)).toHaveLength(3);
                 })
 
-                // WHEN report 2 becomes the active report
+                // When report 2 becomes the active report
                 .then(() => Onyx.merge(ONYXKEYS.CURRENTLY_VIEWED_REPORTID, '2'))
 
-                // THEN report 1 should now disappear
+                // Then report 1 should now disappear
                 .then(() => {
                     expect(sidebarLinks.queryAllByText(/ReportID, /)).toHaveLength(2);
                     expect(sidebarLinks.queryAllByText(/ReportID, One/)).toHaveLength(0);
@@ -629,7 +582,7 @@ describe('Sidebar', () => {
 
             return waitForPromisesToResolve()
 
-                // GIVEN the sidebar is rendered in #focus mode (hides read chats)
+                // Given the sidebar is rendered in #focus mode (hides read chats)
                 // with all reports having unread chats
                 .then(() => Onyx.multiSet({
                     [ONYXKEYS.NVP_PRIORITY_MODE]: 'gsd',
@@ -643,7 +596,7 @@ describe('Sidebar', () => {
                     [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2`]: fakeReport3Actions,
                 }))
 
-                // THEN the reports are in alphabetical order
+                // Then the reports are in alphabetical order
                 .then(() => {
                     const reportOptions = sidebarLinks.queryAllByText(/ReportID, /);
                     expect(reportOptions).toHaveLength(3);
@@ -652,7 +605,7 @@ describe('Sidebar', () => {
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, Two');
                 })
 
-                // WHEN a new report is added
+                // When a new report is added
                 .then(() => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}4`, {
                     reportID: 4,
                     reportName: 'Report Four',
@@ -662,7 +615,7 @@ describe('Sidebar', () => {
                     participants: ['email7@test.com', 'email8@test.com'],
                 }))
 
-                // THEN they are still in alphabetical order
+                // Then they are still in alphabetical order
                 .then(() => {
                     const reportOptions = sidebarLinks.queryAllByText(/ReportID, /);
                     expect(reportOptions).toHaveLength(4);

From 709210bbf3caafd9416962719eb52149ab290dd2 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Fri, 16 Sep 2022 16:36:33 -0600
Subject: [PATCH 134/178] Ignore a lint error

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

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 423b369ebd08..e0a1117fc6a2 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -348,6 +348,7 @@ function setPassword(password, validateCode, accountID) {
             }
 
             // This request can fail if the password is not complex enough
+            // eslint-disable-next-line rulesdir/prefer-localization
             Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message});
         })
         .finally(() => {

From 6575ffbb9947f33635ec5b25cd6917aa585d5d57 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Mon, 19 Sep 2022 14:42:29 +0530
Subject: [PATCH 135/178] Remove unused function

---
 src/libs/actions/Session/index.js | 32 -------------------------------
 1 file changed, 32 deletions(-)

diff --git a/src/libs/actions/Session/index.js b/src/libs/actions/Session/index.js
index 18f4e51b43d8..a87f4c3c59a5 100644
--- a/src/libs/actions/Session/index.js
+++ b/src/libs/actions/Session/index.js
@@ -325,37 +325,6 @@ function resetPassword() {
     });
 }
 
-/**
- * Set the password for the current account.
- * Then it will create a temporary login for them which is used when re-authenticating
- * after an authToken expires.
- *
- * @param {String} password
- * @param {String} validateCode
- * @param {Number} accountID
- */
-function setPassword(password, validateCode, accountID) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, isLoading: true});
-    DeprecatedAPI.SetPassword({
-        password,
-        validateCode,
-        accountID,
-    })
-        .then((response) => {
-            if (response.jsonCode === 200) {
-                createTemporaryLogin(response.authToken, response.email);
-                return;
-            }
-
-            // This request can fail if the password is not complex enough
-            // eslint-disable-next-line rulesdir/prefer-localization
-            Onyx.merge(ONYXKEYS.ACCOUNT, {errors: {[DateUtils.getMicroseconds()]: response.message}});
-        })
-        .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {isLoading: false});
-        });
-}
-
 function invalidateCredentials() {
     Onyx.merge(ONYXKEYS.CREDENTIALS, {autoGeneratedLogin: '', autoGeneratedPassword: ''});
 }
@@ -646,7 +615,6 @@ function setShouldShowComposeInput(shouldShowComposeInput) {
 
 export {
     beginSignIn,
-    setPassword,
     setPasswordForNewAccountAndSignin,
     updatePasswordAndSignin,
     signIn,

From 29afc50b7097165866a80dadfb08537c6e844e04 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 09:17:41 -0600
Subject: [PATCH 136/178] Committing new changes after resolving conflict

---
 package-lock.json | 950 ++++++----------------------------------------
 1 file changed, 110 insertions(+), 840 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4f5ed43862d2..bcc2c5a0fed4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -128,7 +128,7 @@
         "css-loader": "^5.2.4",
         "diff-so-fancy": "^1.3.0",
         "electron": "^17.4.11",
-        "electron-builder": "23.3.1",
+        "electron-builder": "23.5.0",
         "electron-notarize": "^1.2.1",
         "electron-reloader": "^1.2.1",
         "eslint": "^7.6.0",
@@ -14262,9 +14262,9 @@
       "dev": true
     },
     "node_modules/app-builder-lib": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.3.1.tgz",
-      "integrity": "sha512-mi4DG3m32cMJ5CtO9iYk41gBvGWLzJjQsaQgGOd4ZhmIuKyj8M/0rT1g0s/0qD4Tw8jsa//NXMXCC7vpGIfkTg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.5.0.tgz",
+      "integrity": "sha512-AJIqUK+fe9dMPwHZf7NTE1Z0qrLGAbwB7cCcsLxoV2tOSySBPqzOvqhU1l7rOGBaFQUHvYyQTuk1FDmVSW3Psw==",
       "dev": true,
       "dependencies": {
         "@develar/schema-utils": "~2.6.5",
@@ -14273,13 +14273,13 @@
         "7zip-bin": "~5.1.1",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.3.4",
         "ejs": "^3.1.7",
         "electron-osx-sign": "^0.6.0",
-        "electron-publish": "23.3.0",
+        "electron-publish": "23.5.0",
         "form-data": "^4.0.0",
         "fs-extra": "^10.1.0",
         "hosted-git-info": "^4.1.0",
@@ -16419,9 +16419,9 @@
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
     },
     "node_modules/builder-util": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.3.0.tgz",
-      "integrity": "sha512-m7RRd21N2yrnuGFd+ZqOY0ryeqWmBslDKmGDVz0wETqoEEqpiJsF3CGlsb6MRN2EQKDubvE5e+lBf8ATt06fnA==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.5.0.tgz",
+      "integrity": "sha512-TYz3sj2NMoG1/524/Je0p0RtEAKKjmTL6z2WQnzU6yM+WU/jHnA2OqX9Q/jys+rKuMy+7MCMdc+G+HrbpKWYSg==",
       "dev": true,
       "dependencies": {
         "@types/debug": "^4.1.6",
@@ -16429,7 +16429,7 @@
         "7zip-bin": "~5.1.1",
         "app-builder-bin": "4.0.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.0.3",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "cross-spawn": "^7.0.3",
         "debug": "^4.3.4",
@@ -16444,9 +16444,9 @@
       }
     },
     "node_modules/builder-util-runtime": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz",
-      "integrity": "sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "dependencies": {
         "debug": "^4.3.4",
@@ -17685,59 +17685,6 @@
         "proto-list": "~1.2.1"
       }
     },
-    "node_modules/configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "dependencies": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/configstore/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/configstore/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
-    "node_modules/configstore/node_modules/write-file-atomic": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "is-typedarray": "^1.0.0",
-        "signal-exit": "^3.0.2",
-        "typedarray-to-buffer": "^3.1.5"
-      }
-    },
     "node_modules/confusing-browser-globals": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
@@ -18600,15 +18547,6 @@
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
       "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/css-color-keywords": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
@@ -19047,15 +18985,6 @@
       "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
       "dev": true
     },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -19459,14 +19388,14 @@
       }
     },
     "node_modules/dmg-builder": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.3.1.tgz",
-      "integrity": "sha512-YH9KtqBUqn4xzT8W/4I12CBOJXXleHeCQ1UyUvrhNu50ujY/U7XJ4ZZCaKvU2sJesDJqWgY9rqxaZaWVKAi9KQ==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.5.0.tgz",
+      "integrity": "sha512-PBkY1UTPIl3Jleqj6+OuzX2Cc/Co1U/Ykxsj9J/k9oI14VXs8kYJl3CtJUnj3hSz4qGD5D8eJX1zn6YDLPa0mA==",
       "dev": true,
       "dependencies": {
-        "app-builder-lib": "23.3.1",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "app-builder-lib": "23.5.0",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "fs-extra": "^10.0.0",
         "iconv-lite": "^0.6.2",
         "js-yaml": "^4.1.0"
@@ -19707,18 +19636,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "node_modules/dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "dependencies": {
-        "is-obj": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/dotenv": {
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
@@ -19795,23 +19712,23 @@
       }
     },
     "node_modules/electron-builder": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.3.1.tgz",
-      "integrity": "sha512-NYM3iHuX7NyXvbZ+7BKDET54mXnB2oqshuZpe0QbDtbDp6UjoXAulO5g6YXtWA6OspdaTHio+BFpe7A88l1sHg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.5.0.tgz",
+      "integrity": "sha512-Um3KGFem3AHpJ9Cvb+s1zox6KKT4SQ9CgmNjG+4oOz0PYAh12G9UuU5/G2wznNhoIFkowQJQWa6JQbwsJjkxTQ==",
       "dev": true,
       "dependencies": {
         "@types/yargs": "^17.0.1",
-        "app-builder-lib": "23.3.1",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "app-builder-lib": "23.5.0",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
-        "dmg-builder": "23.3.1",
+        "dmg-builder": "23.5.0",
         "fs-extra": "^10.0.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.2.0",
-        "update-notifier": "^5.1.0",
-        "yargs": "^17.0.1"
+        "simple-update-notifier": "^1.0.7",
+        "yargs": "^17.5.1"
       },
       "bin": {
         "electron-builder": "cli.js",
@@ -19984,6 +19901,7 @@
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/electron-osx-sign/-/electron-osx-sign-0.6.0.tgz",
       "integrity": "sha512-+hiIEb2Xxk6eDKJ2FFlpofCnemCbjbT5jz+BKGpVBrRNT3kWTGs4DfNX6IzGwgi33hUcXF+kFs9JW+r6Wc1LRg==",
+      "deprecated": "Please use @electron/osx-sign moving forward. Be aware the API is slightly different",
       "dev": true,
       "dependencies": {
         "bluebird": "^3.5.0",
@@ -20029,14 +19947,14 @@
       "dev": true
     },
     "node_modules/electron-publish": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.3.0.tgz",
-      "integrity": "sha512-HTKOeRUDebSD/l6grAi5thWb/f80OggL1z4aI0no7Fa4SGWpl4rvqlMBtY2d/EjsAAosbk3x+Jeyyp5Th57Wpw==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.5.0.tgz",
+      "integrity": "sha512-dY/bAN5tIjEPX1AV5FK9TXKKoGGalGb53SgGbhiII3o+WLzK+4vew6rrmChBTwELP/q8r4a89X+slTDG/iPdww==",
       "dev": true,
       "dependencies": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "fs-extra": "^10.0.0",
         "lazy-val": "^1.0.5",
@@ -20569,15 +20487,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -23982,30 +23891,6 @@
         "node": ">=10.0"
       }
     },
-    "node_modules/global-dirs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-      "dev": true,
-      "dependencies": {
-        "ini": "2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/global-dirs/node_modules/ini": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/global-tunnel-ng": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
@@ -24344,15 +24229,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -24991,15 +24867,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/import-local": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
@@ -25133,7 +25000,8 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "node_modules/inline-style-parser": {
       "version": "0.1.1",
@@ -25626,31 +25494,6 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
-    "node_modules/is-installed-globally": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-      "dev": true,
-      "dependencies": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-installed-globally/node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -25679,18 +25522,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-npm": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
     "node_modules/is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -25713,15 +25544,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/is-object": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
@@ -25941,12 +25763,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
     "node_modules/isarray": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
@@ -29099,18 +28915,6 @@
         "language-subtag-registry": "~0.3.2"
       }
     },
-    "node_modules/latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "dependencies": {
-        "package-json": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -32849,30 +32653,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "dependencies": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/package-json/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -33758,18 +33538,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "dependencies": {
-        "escape-goat": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/pusher-js": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-7.4.0.tgz",
@@ -33967,30 +33735,6 @@
         "webpack": "^4.0.0 || ^5.0.0"
       }
     },
-    "node_modules/rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "dependencies": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "bin": {
-        "rc": "cli.js"
-      }
-    },
-    "node_modules/rc/node_modules/strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/react": {
       "version": "18.0.0",
       "resolved": "https://registry.npmjs.org/react/-/react-18.0.0.tgz",
@@ -35851,30 +35595,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/registry-auth-token": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz",
-      "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==",
-      "dev": true,
-      "dependencies": {
-        "rc": "1.2.8"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "dependencies": {
-        "rc": "^1.2.8"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/regjsgen": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
@@ -36898,27 +36618,6 @@
       "dev": true,
       "optional": true
     },
-    "node_modules/semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/semver-diff/node_modules/semver": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      }
-    },
     "node_modules/send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -37362,6 +37061,27 @@
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
       "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
+    "node_modules/simple-update-notifier": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz",
+      "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==",
+      "dev": true,
+      "dependencies": {
+        "semver": "~7.0.0"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
+    "node_modules/simple-update-notifier/node_modules/semver": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+      "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
     "node_modules/simply-deferred": {
       "version": "3.0.0",
       "resolved": "git+ssh://git@github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
@@ -39743,18 +39463,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "node_modules/unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "dependencies": {
-        "crypto-random-string": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/unist-builder": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
@@ -39994,122 +39702,6 @@
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
       "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
-    "node_modules/update-notifier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-      "dev": true,
-      "dependencies": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/yeoman/update-notifier?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/update-notifier/node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-      "dev": true
-    },
-    "node_modules/update-notifier/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/update-notifier/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/update-notifier/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/update-notifier/node_modules/is-ci": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-      "dev": true,
-      "dependencies": {
-        "ci-info": "^2.0.0"
-      },
-      "bin": {
-        "is-ci": "bin.js"
-      }
-    },
-    "node_modules/update-notifier/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/urbanairship-react-native": {
       "version": "14.4.1",
       "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-14.4.1.tgz",
@@ -41732,15 +41324,6 @@
         "uuid": "dist/bin/uuid"
       }
     },
-    "node_modules/xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
@@ -52777,9 +52360,9 @@
       "dev": true
     },
     "app-builder-lib": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.3.1.tgz",
-      "integrity": "sha512-mi4DG3m32cMJ5CtO9iYk41gBvGWLzJjQsaQgGOd4ZhmIuKyj8M/0rT1g0s/0qD4Tw8jsa//NXMXCC7vpGIfkTg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-23.5.0.tgz",
+      "integrity": "sha512-AJIqUK+fe9dMPwHZf7NTE1Z0qrLGAbwB7cCcsLxoV2tOSySBPqzOvqhU1l7rOGBaFQUHvYyQTuk1FDmVSW3Psw==",
       "dev": true,
       "requires": {
         "@develar/schema-utils": "~2.6.5",
@@ -52788,13 +52371,13 @@
         "7zip-bin": "~5.1.1",
         "async-exit-hook": "^2.0.1",
         "bluebird-lst": "^1.0.9",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chromium-pickle-js": "^0.2.0",
         "debug": "^4.3.4",
         "ejs": "^3.1.7",
         "electron-osx-sign": "^0.6.0",
-        "electron-publish": "23.3.0",
+        "electron-publish": "23.5.0",
         "form-data": "^4.0.0",
         "fs-extra": "^10.1.0",
         "hosted-git-info": "^4.1.0",
@@ -54520,9 +54103,9 @@
       "integrity": "sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ=="
     },
     "builder-util": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.3.0.tgz",
-      "integrity": "sha512-m7RRd21N2yrnuGFd+ZqOY0ryeqWmBslDKmGDVz0wETqoEEqpiJsF3CGlsb6MRN2EQKDubvE5e+lBf8ATt06fnA==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-23.5.0.tgz",
+      "integrity": "sha512-TYz3sj2NMoG1/524/Je0p0RtEAKKjmTL6z2WQnzU6yM+WU/jHnA2OqX9Q/jys+rKuMy+7MCMdc+G+HrbpKWYSg==",
       "dev": true,
       "requires": {
         "@types/debug": "^4.1.6",
@@ -54530,7 +54113,7 @@
         "7zip-bin": "~5.1.1",
         "app-builder-bin": "4.0.0",
         "bluebird-lst": "^1.0.9",
-        "builder-util-runtime": "9.0.3",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "cross-spawn": "^7.0.3",
         "debug": "^4.3.4",
@@ -54622,9 +54205,9 @@
       }
     },
     "builder-util-runtime": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.0.3.tgz",
-      "integrity": "sha512-SfG2wnyjpUbbdtpnqDpWwklujofC6GarGpvdWrEkg9p5AD/xJmTF2buTNaqs3qtsNBEVQDDjZz9xc2GGpVyMfA==",
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.1.1.tgz",
+      "integrity": "sha512-azRhYLEoDvRDR8Dhis4JatELC/jUvYjm4cVSj7n9dauGTOM2eeNn9KS0z6YA6oDsjI1xphjNbY6PZZeHPzzqaw==",
       "dev": true,
       "requires": {
         "debug": "^4.3.4",
@@ -55504,49 +55087,6 @@
         "proto-list": "~1.2.1"
       }
     },
-    "configstore": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/configstore/-/configstore-5.0.1.tgz",
-      "integrity": "sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==",
-      "dev": true,
-      "requires": {
-        "dot-prop": "^5.2.0",
-        "graceful-fs": "^4.1.2",
-        "make-dir": "^3.0.0",
-        "unique-string": "^2.0.0",
-        "write-file-atomic": "^3.0.0",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "make-dir": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-          "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-          "dev": true,
-          "requires": {
-            "semver": "^6.0.0"
-          }
-        },
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        },
-        "write-file-atomic": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
-          "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
-          "dev": true,
-          "requires": {
-            "imurmurhash": "^0.1.4",
-            "is-typedarray": "^1.0.0",
-            "signal-exit": "^3.0.2",
-            "typedarray-to-buffer": "^3.1.5"
-          }
-        }
-      }
-    },
     "confusing-browser-globals": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.11.tgz",
@@ -56240,12 +55780,6 @@
       "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
       "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
     },
-    "crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "dev": true
-    },
     "css-color-keywords": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/css-color-keywords/-/css-color-keywords-1.0.0.tgz",
@@ -56558,12 +56092,6 @@
       "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
       "dev": true
     },
-    "deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "dev": true
-    },
     "deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -56887,14 +56415,14 @@
       }
     },
     "dmg-builder": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.3.1.tgz",
-      "integrity": "sha512-YH9KtqBUqn4xzT8W/4I12CBOJXXleHeCQ1UyUvrhNu50ujY/U7XJ4ZZCaKvU2sJesDJqWgY9rqxaZaWVKAi9KQ==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-23.5.0.tgz",
+      "integrity": "sha512-PBkY1UTPIl3Jleqj6+OuzX2Cc/Co1U/Ykxsj9J/k9oI14VXs8kYJl3CtJUnj3hSz4qGD5D8eJX1zn6YDLPa0mA==",
       "dev": true,
       "requires": {
-        "app-builder-lib": "23.3.1",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "app-builder-lib": "23.5.0",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "dmg-license": "^1.0.11",
         "fs-extra": "^10.0.0",
         "iconv-lite": "^0.6.2",
@@ -57088,15 +56616,6 @@
         "tslib": "^2.0.3"
       }
     },
-    "dot-prop": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
-      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
-      "dev": true,
-      "requires": {
-        "is-obj": "^2.0.0"
-      }
-    },
     "dotenv": {
       "version": "8.6.0",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-8.6.0.tgz",
@@ -57165,23 +56684,23 @@
       }
     },
     "electron-builder": {
-      "version": "23.3.1",
-      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.3.1.tgz",
-      "integrity": "sha512-NYM3iHuX7NyXvbZ+7BKDET54mXnB2oqshuZpe0QbDtbDp6UjoXAulO5g6YXtWA6OspdaTHio+BFpe7A88l1sHg==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-23.5.0.tgz",
+      "integrity": "sha512-Um3KGFem3AHpJ9Cvb+s1zox6KKT4SQ9CgmNjG+4oOz0PYAh12G9UuU5/G2wznNhoIFkowQJQWa6JQbwsJjkxTQ==",
       "dev": true,
       "requires": {
         "@types/yargs": "^17.0.1",
-        "app-builder-lib": "23.3.1",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "app-builder-lib": "23.5.0",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
-        "dmg-builder": "23.3.1",
+        "dmg-builder": "23.5.0",
         "fs-extra": "^10.0.0",
         "is-ci": "^3.0.0",
         "lazy-val": "^1.0.5",
         "read-config-file": "6.2.0",
-        "update-notifier": "^5.1.0",
-        "yargs": "^17.0.1"
+        "simple-update-notifier": "^1.0.7",
+        "yargs": "^17.5.1"
       },
       "dependencies": {
         "@types/yargs": {
@@ -57350,14 +56869,14 @@
       }
     },
     "electron-publish": {
-      "version": "23.3.0",
-      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.3.0.tgz",
-      "integrity": "sha512-HTKOeRUDebSD/l6grAi5thWb/f80OggL1z4aI0no7Fa4SGWpl4rvqlMBtY2d/EjsAAosbk3x+Jeyyp5Th57Wpw==",
+      "version": "23.5.0",
+      "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-23.5.0.tgz",
+      "integrity": "sha512-dY/bAN5tIjEPX1AV5FK9TXKKoGGalGb53SgGbhiII3o+WLzK+4vew6rrmChBTwELP/q8r4a89X+slTDG/iPdww==",
       "dev": true,
       "requires": {
         "@types/fs-extra": "^9.0.11",
-        "builder-util": "23.3.0",
-        "builder-util-runtime": "9.0.3",
+        "builder-util": "23.5.0",
+        "builder-util-runtime": "9.1.1",
         "chalk": "^4.1.1",
         "fs-extra": "^10.0.0",
         "lazy-val": "^1.0.5",
@@ -57769,12 +57288,6 @@
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
       "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
     },
-    "escape-goat": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz",
-      "integrity": "sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==",
-      "dev": true
-    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -60362,23 +59875,6 @@
         "serialize-error": "^7.0.1"
       }
     },
-    "global-dirs": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.0.tgz",
-      "integrity": "sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==",
-      "dev": true,
-      "requires": {
-        "ini": "2.0.0"
-      },
-      "dependencies": {
-        "ini": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
-          "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
-          "dev": true
-        }
-      }
-    },
     "global-tunnel-ng": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz",
@@ -60638,12 +60134,6 @@
         }
       }
     },
-    "has-yarn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz",
-      "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==",
-      "dev": true
-    },
     "hash-base": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
@@ -61116,12 +60606,6 @@
         }
       }
     },
-    "import-lazy": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz",
-      "integrity": "sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A==",
-      "dev": true
-    },
     "import-local": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
@@ -61221,7 +60705,8 @@
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "inline-style-parser": {
       "version": "0.1.1",
@@ -61565,24 +61050,6 @@
       "integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
       "dev": true
     },
-    "is-installed-globally": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
-      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
-      "dev": true,
-      "requires": {
-        "global-dirs": "^3.0.0",
-        "is-path-inside": "^3.0.2"
-      },
-      "dependencies": {
-        "is-path-inside": {
-          "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-          "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-          "dev": true
-        }
-      }
-    },
     "is-interactive": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
@@ -61599,12 +61066,6 @@
       "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
       "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA=="
     },
-    "is-npm": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-5.0.0.tgz",
-      "integrity": "sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==",
-      "dev": true
-    },
     "is-number": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
@@ -61618,12 +61079,6 @@
         "has-tostringtag": "^1.0.0"
       }
     },
-    "is-obj": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
-      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
-      "dev": true
-    },
     "is-object": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
@@ -61772,12 +61227,6 @@
         "is-docker": "^2.0.0"
       }
     },
-    "is-yarn-global": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz",
-      "integrity": "sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==",
-      "dev": true
-    },
     "isarray": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
@@ -64186,15 +63635,6 @@
         "language-subtag-registry": "~0.3.2"
       }
     },
-    "latest-version": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-5.1.0.tgz",
-      "integrity": "sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==",
-      "dev": true,
-      "requires": {
-        "package-json": "^6.3.0"
-      }
-    },
     "lazy-cache": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz",
@@ -67126,26 +66566,6 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="
     },
-    "package-json": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz",
-      "integrity": "sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==",
-      "dev": true,
-      "requires": {
-        "got": "^9.6.0",
-        "registry-auth-token": "^4.0.0",
-        "registry-url": "^5.0.0",
-        "semver": "^6.2.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
     "pako": {
       "version": "1.0.11",
       "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
@@ -67850,15 +67270,6 @@
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
       "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
     },
-    "pupa": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz",
-      "integrity": "sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==",
-      "dev": true,
-      "requires": {
-        "escape-goat": "^2.0.0"
-      }
-    },
     "pusher-js": {
       "version": "7.4.0",
       "resolved": "https://registry.npmjs.org/pusher-js/-/pusher-js-7.4.0.tgz",
@@ -67998,26 +67409,6 @@
         "schema-utils": "^3.0.0"
       }
     },
-    "rc": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
-      "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
-      "dev": true,
-      "requires": {
-        "deep-extend": "^0.6.0",
-        "ini": "~1.3.0",
-        "minimist": "^1.2.0",
-        "strip-json-comments": "~2.0.1"
-      },
-      "dependencies": {
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-          "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==",
-          "dev": true
-        }
-      }
-    },
     "react": {
       "version": "18.0.0",
       "resolved": "https://registry.npmjs.org/react/-/react-18.0.0.tgz",
@@ -69428,24 +68819,6 @@
         "unicode-match-property-value-ecmascript": "^2.0.0"
       }
     },
-    "registry-auth-token": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz",
-      "integrity": "sha512-PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg==",
-      "dev": true,
-      "requires": {
-        "rc": "1.2.8"
-      }
-    },
-    "registry-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-5.1.0.tgz",
-      "integrity": "sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==",
-      "dev": true,
-      "requires": {
-        "rc": "^1.2.8"
-      }
-    },
     "regjsgen": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.6.0.tgz",
@@ -70258,23 +69631,6 @@
       "dev": true,
       "optional": true
     },
-    "semver-diff": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-3.1.1.tgz",
-      "integrity": "sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==",
-      "dev": true,
-      "requires": {
-        "semver": "^6.3.0"
-      },
-      "dependencies": {
-        "semver": {
-          "version": "6.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
-          "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
-          "dev": true
-        }
-      }
-    },
     "send": {
       "version": "0.18.0",
       "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
@@ -70644,6 +70000,23 @@
         }
       }
     },
+    "simple-update-notifier": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.0.7.tgz",
+      "integrity": "sha512-BBKgR84BJQJm6WjWFMHgLVuo61FBDSj1z/xSFUIozqO6wO7ii0JxCqlIud7Enr/+LhlbNI0whErq96P2qHNWew==",
+      "dev": true,
+      "requires": {
+        "semver": "~7.0.0"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
+          "integrity": "sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==",
+          "dev": true
+        }
+      }
+    },
     "simply-deferred": {
       "version": "git+ssh://git@github.com/Expensify/simply-deferred.git#77a08a95754660c7bd6e0b6979fdf84e8e831bf5",
       "integrity": "sha512-DSHaVm+6KduK2+cOnaA+choq8CowotOpFhmHDCL36Cb/CM4f++TumOhcdWCknMwI3IbZbf3u2fzVPvb4UVf8UA==",
@@ -72524,15 +71897,6 @@
         "imurmurhash": "^0.1.4"
       }
     },
-    "unique-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
-      "integrity": "sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==",
-      "dev": true,
-      "requires": {
-        "crypto-random-string": "^2.0.0"
-      }
-    },
     "unist-builder": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
@@ -72701,94 +72065,6 @@
         }
       }
     },
-    "update-notifier": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-5.1.0.tgz",
-      "integrity": "sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==",
-      "dev": true,
-      "requires": {
-        "boxen": "^5.0.0",
-        "chalk": "^4.1.0",
-        "configstore": "^5.0.1",
-        "has-yarn": "^2.1.0",
-        "import-lazy": "^2.1.0",
-        "is-ci": "^2.0.0",
-        "is-installed-globally": "^0.4.0",
-        "is-npm": "^5.0.0",
-        "is-yarn-global": "^0.3.0",
-        "latest-version": "^5.1.0",
-        "pupa": "^2.1.1",
-        "semver": "^7.3.4",
-        "semver-diff": "^3.1.1",
-        "xdg-basedir": "^4.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "ci-info": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-          "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
-          "dev": true
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "is-ci": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
-          "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
-          "dev": true,
-          "requires": {
-            "ci-info": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
     "urbanairship-react-native": {
       "version": "14.4.1",
       "resolved": "https://registry.npmjs.org/urbanairship-react-native/-/urbanairship-react-native-14.4.1.tgz",
@@ -74039,12 +73315,6 @@
         }
       }
     },
-    "xdg-basedir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz",
-      "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==",
-      "dev": true
-    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",

From 47f49877fac549a655cbab8fc1b03d661c488859 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Mon, 19 Sep 2022 15:36:03 +0000
Subject: [PATCH 137/178] Update version to 1.2.2-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 4ee66d3fb79d..be6d47569d41 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020100
-        versionName "1.2.1-0"
+        versionCode 1001020200
+        versionName "1.2.2-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 99e91a3df77c..f8e000ab82e5 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.1.0</string>
+	<string>1.2.2.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 272bb944f4ff..5765d17971b1 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.2.1</string>
+	<string>1.2.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.1.0</string>
+	<string>1.2.2.0</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 4f5ed43862d2..0b446b22602a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.1-0",
+  "version": "1.2.2-0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.1-0",
+      "version": "1.2.2-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index a4c72fd576d8..1ba7ca90d976 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.1-0",
+  "version": "1.2.2-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 ef187eef531add5ca4c1829f83b442591da5cebe Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 10:33:29 -0600
Subject: [PATCH 138/178] Add new proptypes and missing proptype definitions

---
 src/components/LHNOptionsList/OptionRowLHN.js | 3 ++-
 src/components/OptionRow.js                   | 8 ++++++++
 src/pages/home/sidebar/SidebarLinks.js        | 2 --
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index f77e2a906abd..19de8f56e625 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -119,7 +119,7 @@ const OptionRowLHN = (props) => {
                         hovered && !props.isFocused ? props.hoverStyle : null,
                     ]}
                 >
-                    <View style={sidebarInnerRowStyle}>
+                    <View accessibilityHint="Navigates to a chat" style={sidebarInnerRowStyle}>
                         <View
                             style={[
                                 styles.flexRow,
@@ -168,6 +168,7 @@ const OptionRowLHN = (props) => {
                                     <Text
                                         style={alternateTextStyle}
                                         numberOfLines={1}
+                                        accessibilityLabel="Last chat message preview"
                                     >
                                         {optionItem.alternateText}
                                     </Text>
diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index 6ac45e98709d..e7fea15006ac 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -26,6 +26,12 @@ import * as ReportUtils from '../libs/ReportUtils';
 import variables from '../styles/variables';
 
 const propTypes = {
+    /** The accessability hint for the entire option row. Primarily used for unit testing to identify the component */
+    accessibilityHint: PropTypes.string,
+
+    /** The accessability hint for alternative text label. Primarily used for unit testing to identify the component */
+    alternateTextAccessibilityLabel: PropTypes.string,
+
     /** Background Color of the Option Row */
     backgroundColor: PropTypes.string,
 
@@ -69,6 +75,8 @@ const propTypes = {
 };
 
 const defaultProps = {
+    accessibilityHint: '',
+    alternateTextAccessibilityLabel: '',
     backgroundColor: colors.white,
     hoverStyle: styles.sidebarLinkHover,
     hideAdditionalOptionStates: false,
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 1ba8b95d1459..054677ce23d9 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -150,8 +150,6 @@ class SidebarLinks extends React.Component {
                     </TouchableOpacity>
                 </View>
                 <LHNOptionsList
-                    optionRowAlternateTextAccessibilityLabel="Last chat message preview"
-                    optionRowAccessibilityHint="Navigates to a chat"
                     contentContainerStyles={[
                         styles.sidebarListContainer,
                         {paddingBottom: StyleUtils.getSafeAreaMargins(this.props.insets).marginBottom},

From 16474e07e0d0bb3e1643bdfe306fd25acb994521 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 10:33:46 -0600
Subject: [PATCH 139/178] Fix typo in comment

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

diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index e7fea15006ac..0a6a9f7b7a83 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -26,10 +26,10 @@ import * as ReportUtils from '../libs/ReportUtils';
 import variables from '../styles/variables';
 
 const propTypes = {
-    /** The accessability hint for the entire option row. Primarily used for unit testing to identify the component */
+    /** The accessibility hint for the entire option row. Primarily used for unit testing to identify the component */
     accessibilityHint: PropTypes.string,
 
-    /** The accessability hint for alternative text label. Primarily used for unit testing to identify the component */
+    /** The accessibility hint for alternative text label. Primarily used for unit testing to identify the component */
     alternateTextAccessibilityLabel: PropTypes.string,
 
     /** Background Color of the Option Row */

From 82409704be525a1a84b17994d1dd839a7a434a21 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 10:45:38 -0600
Subject: [PATCH 140/178] Protect against an undefined event

---
 src/components/LHNOptionsList/OptionRowLHN.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 19de8f56e625..ee8930a07d9c 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -104,7 +104,10 @@ const OptionRowLHN = (props) => {
                 <TouchableOpacity
                     ref={el => touchableRef = el}
                     onPress={(e) => {
-                        e.preventDefault();
+                        if (e) {
+                            e.preventDefault();
+                        }
+
                         props.onSelectRow(optionItem, touchableRef);
                     }}
                     activeOpacity={0.8}

From 546f914e63692cddb19564486c7cd58805e0b796 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 10:51:13 -0600
Subject: [PATCH 141/178] Fix unread style props for the new sidebar

---
 src/components/LHNOptionsList/OptionRowLHN.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index ee8930a07d9c..7f490950ba15 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -65,7 +65,8 @@ const OptionRowLHN = (props) => {
     const textStyle = props.isFocused
         ? styles.sidebarLinkActiveText
         : styles.sidebarLinkText;
-    const textUnreadStyle = [textStyle];
+    const textUnreadStyle = optionItem.isUnread
+        ? [textStyle, styles.sidebarLinkTextUnread] : [textStyle];
     const displayNameStyle = StyleUtils.combineStyles(props.viewMode === CONST.OPTION_MODE.COMPACT
         ? [styles.optionDisplayName, ...textUnreadStyle, styles.optionDisplayNameCompact, styles.mr2]
         : [styles.optionDisplayName, ...textUnreadStyle], props.style);
@@ -160,6 +161,7 @@ const OptionRowLHN = (props) => {
                             }
                             <View style={contentContainerStyles}>
                                 <DisplayNames
+                                    accessibilityLabel="Chat user display names"
                                     fullTitle={optionItem.text}
                                     displayNamesWithTooltips={displayNamesWithTooltips}
                                     tooltipEnabled

From c5a19107d64b0715ed5f3f9a672e7b743f39a337 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 19 Sep 2022 11:27:56 -0600
Subject: [PATCH 142/178] use correct paginate function

---
 .github/libs/GithubUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/libs/GithubUtils.js b/.github/libs/GithubUtils.js
index 86b332830a3c..d6e501f261d9 100644
--- a/.github/libs/GithubUtils.js
+++ b/.github/libs/GithubUtils.js
@@ -487,7 +487,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,

From a033035e9ae2a89ecf0bdfc08fac71bc8c9a89ea Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Mon, 19 Sep 2022 11:40:59 -0600
Subject: [PATCH 143/178] compile actions

---
 .github/actions/javascript/awaitStagingDeploys/index.js         | 2 +-
 .github/actions/javascript/checkDeployBlockers/index.js         | 2 +-
 .github/actions/javascript/contributorChecklist/index.js        | 2 +-
 .github/actions/javascript/createOrUpdateStagingDeploy/index.js | 2 +-
 .github/actions/javascript/getDeployPullRequestList/index.js    | 2 +-
 .github/actions/javascript/getPullRequestDetails/index.js       | 2 +-
 .github/actions/javascript/getReleaseBody/index.js              | 2 +-
 .github/actions/javascript/isPullRequestMergeable/index.js      | 2 +-
 .github/actions/javascript/isStagingDeployLocked/index.js       | 2 +-
 .github/actions/javascript/markPullRequestsAsDeployed/index.js  | 2 +-
 .github/actions/javascript/reopenIssueWithComment/index.js      | 2 +-
 .github/actions/javascript/triggerWorkflowAndWait/index.js      | 2 +-
 .github/actions/javascript/verifySignedCommits/index.js         | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/actions/javascript/awaitStagingDeploys/index.js b/.github/actions/javascript/awaitStagingDeploys/index.js
index 9cc942c7c84a..17cf036dcd3b 100644
--- a/.github/actions/javascript/awaitStagingDeploys/index.js
+++ b/.github/actions/javascript/awaitStagingDeploys/index.js
@@ -604,7 +604,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/checkDeployBlockers/index.js b/.github/actions/javascript/checkDeployBlockers/index.js
index 7f85c08dda9f..04d49c425b2f 100644
--- a/.github/actions/javascript/checkDeployBlockers/index.js
+++ b/.github/actions/javascript/checkDeployBlockers/index.js
@@ -574,7 +574,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/contributorChecklist/index.js b/.github/actions/javascript/contributorChecklist/index.js
index 94d6cf8e0829..28a984ad8987 100644
--- a/.github/actions/javascript/contributorChecklist/index.js
+++ b/.github/actions/javascript/contributorChecklist/index.js
@@ -672,7 +672,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
index bda90fbf2abb..aa043797e971 100644
--- a/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
+++ b/.github/actions/javascript/createOrUpdateStagingDeploy/index.js
@@ -801,7 +801,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/getDeployPullRequestList/index.js b/.github/actions/javascript/getDeployPullRequestList/index.js
index 3720b7e1c7b3..d2c6e2ba2ff0 100644
--- a/.github/actions/javascript/getDeployPullRequestList/index.js
+++ b/.github/actions/javascript/getDeployPullRequestList/index.js
@@ -734,7 +734,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/getPullRequestDetails/index.js b/.github/actions/javascript/getPullRequestDetails/index.js
index b06196149058..1dc611325fc3 100644
--- a/.github/actions/javascript/getPullRequestDetails/index.js
+++ b/.github/actions/javascript/getPullRequestDetails/index.js
@@ -649,7 +649,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/getReleaseBody/index.js b/.github/actions/javascript/getReleaseBody/index.js
index e113f7bf9846..7fc7a77bafcc 100644
--- a/.github/actions/javascript/getReleaseBody/index.js
+++ b/.github/actions/javascript/getReleaseBody/index.js
@@ -563,7 +563,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/isPullRequestMergeable/index.js b/.github/actions/javascript/isPullRequestMergeable/index.js
index dd772566fcfe..0063c0e29166 100644
--- a/.github/actions/javascript/isPullRequestMergeable/index.js
+++ b/.github/actions/javascript/isPullRequestMergeable/index.js
@@ -595,7 +595,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/isStagingDeployLocked/index.js b/.github/actions/javascript/isStagingDeployLocked/index.js
index 90c2bcd0ddbe..5d48a817d4d7 100644
--- a/.github/actions/javascript/isStagingDeployLocked/index.js
+++ b/.github/actions/javascript/isStagingDeployLocked/index.js
@@ -527,7 +527,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/markPullRequestsAsDeployed/index.js b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
index 99a87b77713e..9b5bf1bb74c9 100644
--- a/.github/actions/javascript/markPullRequestsAsDeployed/index.js
+++ b/.github/actions/javascript/markPullRequestsAsDeployed/index.js
@@ -696,7 +696,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/reopenIssueWithComment/index.js b/.github/actions/javascript/reopenIssueWithComment/index.js
index 36fe21e79c7d..8a20d9a5b37b 100644
--- a/.github/actions/javascript/reopenIssueWithComment/index.js
+++ b/.github/actions/javascript/reopenIssueWithComment/index.js
@@ -538,7 +538,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/triggerWorkflowAndWait/index.js b/.github/actions/javascript/triggerWorkflowAndWait/index.js
index ce4c22802c02..29184c7dd5da 100644
--- a/.github/actions/javascript/triggerWorkflowAndWait/index.js
+++ b/.github/actions/javascript/triggerWorkflowAndWait/index.js
@@ -707,7 +707,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,
diff --git a/.github/actions/javascript/verifySignedCommits/index.js b/.github/actions/javascript/verifySignedCommits/index.js
index ca0d77044f21..959adb1373d4 100644
--- a/.github/actions/javascript/verifySignedCommits/index.js
+++ b/.github/actions/javascript/verifySignedCommits/index.js
@@ -527,7 +527,7 @@ class GithubUtils {
      * @returns {Promise<String>}
      */
     static getActorWhoClosedIssue(issueNumber) {
-        return this.octokit.paginate(this.octokit.issues.listEvents, {
+        return this.paginate(this.octokit.issues.listEvents, {
             owner: GITHUB_OWNER,
             repo: APP_REPO,
             issue_number: issueNumber,

From 8b1a91b3096fcd9238fcf6816504d56d13a1bcc6 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 12:34:46 -0600
Subject: [PATCH 144/178] Fix inconsistent module name

---
 src/components/LHNOptionsList/OptionRowLHN.js | 4 ++--
 src/pages/home/sidebar/SidebarLinks.js        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index 7f490950ba15..096092187680 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -23,7 +23,7 @@ import CONST from '../../CONST';
 import * as ReportUtils from '../../libs/ReportUtils';
 import variables from '../../styles/variables';
 import themeColors from '../../styles/themes/default';
-import OptionsListUtilsLHN from '../../libs/SidebarUtils';
+import SidebarUtils from '../../libs/SidebarUtils';
 
 const propTypes = {
     /** Style for hovered state */
@@ -56,7 +56,7 @@ const defaultProps = {
 };
 
 const OptionRowLHN = (props) => {
-    const optionItem = OptionsListUtilsLHN.getOptionData(props.reportID);
+    const optionItem = SidebarUtils.getOptionData(props.reportID);
     if (!optionItem) {
         return null;
     }
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 054677ce23d9..16695985c049 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -25,7 +25,7 @@ import withWindowDimensions from '../../../components/withWindowDimensions';
 import Timing from '../../../libs/actions/Timing';
 import reportActionPropTypes from '../report/reportActionPropTypes';
 import LHNOptionsList from '../../../components/LHNOptionsList/LHNOptionsList';
-import OptionsListUtilsLHN from '../../../libs/SidebarUtils';
+import SidebarUtils from '../../../libs/SidebarUtils';
 
 const propTypes = {
     /** Toggles the navigation menu open and closed */
@@ -102,7 +102,7 @@ class SidebarLinks extends React.Component {
         }
 
         Timing.start(CONST.TIMING.SIDEBAR_LINKS_FILTER_REPORTS);
-        const optionListItems = OptionsListUtilsLHN.getOrderedReportIDs();
+        const optionListItems = SidebarUtils.getOrderedReportIDs();
         Timing.end(CONST.TIMING.SIDEBAR_LINKS_FILTER_REPORTS);
 
         return (

From a191891dd6ff276f6dd611e52f36ad370e3d7ecc Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 12:34:53 -0600
Subject: [PATCH 145/178] Remove unused package

---
 package-lock.json | 11 -----------
 package.json      |  1 -
 2 files changed, 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0b446b22602a..46d050de6afd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,6 @@
         "htmlparser2": "^7.2.0",
         "localforage": "^1.10.0",
         "lodash": "4.17.21",
-        "memoize-one": "^6.0.0",
         "metro-config": "^0.71.3",
         "moment": "^2.29.4",
         "moment-timezone": "^0.5.31",
@@ -29866,11 +29865,6 @@
         "node": ">= 4.0.0"
       }
     },
-    "node_modules/memoize-one": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
-      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
-    },
     "node_modules/memoizerific": {
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
@@ -64773,11 +64767,6 @@
         "fs-monkey": "^1.0.3"
       }
     },
-    "memoize-one": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
-      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
-    },
     "memoizerific": {
       "version": "1.11.3",
       "resolved": "https://registry.npmjs.org/memoizerific/-/memoizerific-1.11.3.tgz",
diff --git a/package.json b/package.json
index 1ba7ca90d976..21bffcb5adc7 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,6 @@
     "htmlparser2": "^7.2.0",
     "localforage": "^1.10.0",
     "lodash": "4.17.21",
-    "memoize-one": "^6.0.0",
     "metro-config": "^0.71.3",
     "moment": "^2.29.4",
     "moment-timezone": "^0.5.31",

From 2b0adba22de5370d9f2cb2f4dc637cc6f6c49715 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 12:47:34 -0600
Subject: [PATCH 146/178] Remove unnecessary logic

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

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 65ab387e5856..bb789b54bede 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -472,7 +472,7 @@ function getOptions(reports, personalDetails, activeReportID, {
         const isChatRoom = ReportUtils.isChatRoom(report);
         const isDefaultRoom = ReportUtils.isDefaultRoom(report);
         const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
-        const logins = (report && report.participants) || [];
+        const logins = report.participants || [];
 
         // Report data can sometimes be incomplete. If we have no logins or reportID then we will skip this entry.
         const shouldFilterNoParticipants = _.isEmpty(logins) && !isChatRoom && !isDefaultRoom && !isPolicyExpenseChat;

From 157cf62f2589e3b8e1926d1a39f33c0b6d727bc0 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 12:58:35 -0600
Subject: [PATCH 147/178] Subscribe to some additional keys to ensure data
 doesn't get stale

---
 src/pages/home/sidebar/SidebarLinks.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 16695985c049..2c02822e8206 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -197,5 +197,11 @@ export default compose(
         reportActions: {
             key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
         },
+        policies: {
+            key: ONYXKEYS.COLLECTION.POLICY,
+        },
+        preferredLocale: {
+            key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+        },
     }),
 )(SidebarLinks);

From 66bdd9c685e096d2b7d26587f6af1924ad030666 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 13:05:40 -0600
Subject: [PATCH 148/178] Add comments to explain how the onyx subscriptions
 work

---
 src/libs/SidebarUtils.js               | 8 ++++++++
 src/pages/home/sidebar/SidebarLinks.js | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 85fc56a11620..51e082352bbd 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -9,6 +9,14 @@ import * as OptionsListUtils from './OptionsListUtils';
 import * as CollectionUtils from './CollectionUtils';
 import Permissions from './Permissions';
 
+// Note: It is very important that the keys subscribed to here are the same
+// keys that are connected to SidebarLinks withOnyx(). If there was a key missing from SidebarLinks and it's data was updated
+// for that key, then there would be no re-render and the options wouldn't reflect the new data because SidebarUtils.getOrderedReportIDs() wouldn't be triggered.
+// There are a couple of keys here which are OK to have stale data. iouReports for example, doesn't need to exist in withOnyx() because
+// when IOUs change, it also triggers a change on the reports collection. Having redudant subscriptions causes more re-renders which should be avoided.
+// Session also can remain stale because the only way for the current user to change is to sign out and sign in, which would clear out all the Onyx
+// data anyway and cause SidebarLinks to rerender.
+
 let reports;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
diff --git a/src/pages/home/sidebar/SidebarLinks.js b/src/pages/home/sidebar/SidebarLinks.js
index 2c02822e8206..00b655f9da7b 100644
--- a/src/pages/home/sidebar/SidebarLinks.js
+++ b/src/pages/home/sidebar/SidebarLinks.js
@@ -179,6 +179,11 @@ export default compose(
     withCurrentUserPersonalDetails,
     withWindowDimensions,
     withOnyx({
+        // Note: It is very important that the keys subscribed to here are the same
+        // keys that are subscribed to at the top of SidebarUtils.js. If there was a key missing from here and data was updated
+        // for that key, then there would be no re-render and the options wouldn't reflect the new data because SidebarUtils.getOrderedReportIDs() wouldn't be triggered.
+        // This could be changed if each OptionRowLHN used withOnyx() to connect to the Onyx keys, but if you had 10,000 reports
+        // with 10,000 withOnyx() connections, it would have unknown performance implications.
         reports: {
             key: ONYXKEYS.COLLECTION.REPORT,
         },

From dd4d139bc6400c320fa57cefa5fd9353d99ddd48 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Mon, 19 Sep 2022 13:08:24 -0600
Subject: [PATCH 149/178] Remove all component unmounting

---
 tests/unit/LHNOrderTest.js | 50 +++++++++++++-------------------------
 1 file changed, 17 insertions(+), 33 deletions(-)

diff --git a/tests/unit/LHNOrderTest.js b/tests/unit/LHNOrderTest.js
index 497e2474af59..a93703bb9e64 100644
--- a/tests/unit/LHNOrderTest.js
+++ b/tests/unit/LHNOrderTest.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import Onyx from 'react-native-onyx';
-import {render} from '@testing-library/react-native';
+import {render, cleanup} from '@testing-library/react-native';
 import SidebarLinks from '../../src/pages/home/sidebar/SidebarLinks';
 import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
 import {LocaleContextProvider} from '../../src/components/withLocalize';
@@ -199,9 +199,13 @@ function getDefaultRenderedSidebarLinks() {
 }
 
 describe('Sidebar', () => {
+    // Clear out Onyx after each test so that each test starts with a clean slate
+    afterEach(() => {
+        cleanup();
+        Onyx.clear();
+    });
+
     describe('in default mode', () => {
-        // Clear out Onyx after each test so that each test starts with a clean slate
-        afterEach(Onyx.clear);
 
         test('is not rendered when there are no props passed to it', () => {
             // Given all the default props are passed to SidebarLinks
@@ -253,9 +257,7 @@ describe('Sidebar', () => {
                     expect(sidebarLinks.toJSON()).not.toBe(null);
                     expect(sidebarLinks.toJSON().children.length).toBe(2);
                     expect(sidebarLinks.getAllByText('ReportID, One')).toHaveLength(1);
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
 
         test('orders items with most recently updated on top', () => {
@@ -288,9 +290,7 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Two');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
 
         test('doesn\'t change the order when adding a draft to the active report', () => {
@@ -324,9 +324,7 @@ describe('Sidebar', () => {
                     const reportOptions = sidebarLinks.getAllByText(/ReportID, (One|Two|Three)/);
                     expect(reportOptions).toHaveLength(3);
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
 
         test('reorders the reports to always have the most recently updated one on top', () => {
@@ -360,9 +358,7 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, One');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, Two');
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
 
         test('reorders the reports to keep draft reports on top', () => {
@@ -397,9 +393,7 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, Two');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
 
         test('removes the pencil icon when draft is removed', () => {
@@ -433,9 +427,7 @@ describe('Sidebar', () => {
                 // Then the pencil icon goes away
                 .then(() => {
                     expect(sidebarLinks.queryAllByAccessibilityHint('Pencil Icon')).toHaveLength(0);
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
 
         test('removes the pin icon when chat is unpinned', () => {
@@ -468,9 +460,7 @@ describe('Sidebar', () => {
                 // Then the pencil icon goes away
                 .then(() => {
                     expect(sidebarLinks.queryAllByAccessibilityHint('Pin Icon')).toHaveLength(0);
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
 
         it('sorts chats by pinned > IOU > draft', () => {
@@ -508,9 +498,7 @@ describe('Sidebar', () => {
                     expect(reportOptions[0].children[0].props.children).toBe('ReportID, Two');
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, One');
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
     });
 
@@ -565,9 +553,7 @@ describe('Sidebar', () => {
                 .then(() => {
                     expect(sidebarLinks.queryAllByText(/ReportID, /)).toHaveLength(2);
                     expect(sidebarLinks.queryAllByText(/ReportID, One/)).toHaveLength(0);
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
 
         it('alphabetizes chats', () => {
@@ -616,9 +602,7 @@ describe('Sidebar', () => {
                     expect(reportOptions[1].children[0].props.children).toBe('ReportID, One');
                     expect(reportOptions[2].children[0].props.children).toBe('ReportID, Three');
                     expect(reportOptions[3].children[0].props.children).toBe('ReportID, Two');
-                })
-
-                .then(sidebarLinks.unmount);
+                });
         });
     });
 });

From 41dc249bdc347c7fd1baeed0067a646a17f73b45 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Mon, 19 Sep 2022 12:46:54 -0700
Subject: [PATCH 150/178] Remove unnecessary comment

---
 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 c9204e26a254..09085ae3f7a0 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -231,8 +231,6 @@ class ReportScreen extends React.Component {
         }
         const addWorkspaceRoomPendingAction = lodashGet(this.props.report, 'pendingFields.addWorkspaceRoom');
         const addWorkspaceRoomErrors = lodashGet(this.props.report, 'errorFields.addWorkspaceRoom');
-
-        // Hide the composer for an archived room or when there is an error adding the room
         const hideComposer = isArchivedRoom || !_.isEmpty(addWorkspaceRoomErrors);
         return (
             <ScreenWrapper

From 069a4c8d6168dfcc993b75b81bd0c68bf690940e Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Mon, 19 Sep 2022 12:50:11 -0700
Subject: [PATCH 151/178] Remove unnecessary variable

---
 src/libs/actions/Report.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index c96c2c4928a4..48380e64792a 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1470,7 +1470,6 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         '',
         visibility,
     );
-    const createdActionData = buildOptimisticCreatedReportAction(workspaceRoom.ownerEmail);
 
     // Onyx.set is used on the optimistic data so that it is present before navigating to the workspace room. With Onyx.merge the workspace room reportID is not present when
     // storeCurrentlyViewedReport is called on the ReportScreen, so fetchChatReportsByIDs is called which is unnecessary since the optimistic data will be stored in Onyx.
@@ -1489,7 +1488,7 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
-            value: createdActionData,
+            value: buildOptimisticCreatedReportAction(workspaceRoom.ownerEmail),
         },
     ];
     const successData = [

From 85668cc547a46b114236076721158ab92c18fa57 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Mon, 19 Sep 2022 16:11:40 -0700
Subject: [PATCH 152/178] center align IOUDetails completed tick

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

diff --git a/src/components/ReportActionItem/IOUPreview.js b/src/components/ReportActionItem/IOUPreview.js
index ef40ce8be744..121fd115b023 100644
--- a/src/components/ReportActionItem/IOUPreview.js
+++ b/src/components/ReportActionItem/IOUPreview.js
@@ -141,8 +141,8 @@ const IOUPreview = (props) => {
                             errorRowStyles={[styles.mbn1]}
                         >
                             <View>
-                                <View style={styles.flexRow}>
-                                    <View style={[styles.flex1, styles.flexRow]}>
+                                <View style={[styles.flexRow]}>
+                                    <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
                                         <Text style={styles.h1}>
                                             {cachedTotal}
                                         </Text>

From eba3320ddf6911adae71e013a244ec4d71baae76 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Mon, 19 Sep 2022 18:18:46 -0700
Subject: [PATCH 153/178] create workspaces with API.write

---
 src/libs/actions/Policy.js            | 6 +++---
 src/pages/workspace/withFullPolicy.js | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 5fac77a56380..0f071cbab92c 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -816,7 +816,7 @@ function createWorkspace() {
     // We need to use makeRequestWithSideEffects as we try to redirect to the policy right after creation
     // The policy hasn't been merged in Onyx data at this point, leading to an intermittent Not Found screen
     // eslint-disable-next-line rulesdir/no-api-side-effects-method
-    API.makeRequestWithSideEffects('CreateWorkspace', {
+    API.write('CreateWorkspace', {
         policyID,
         announceChatReportID,
         adminsChatReportID,
@@ -965,9 +965,9 @@ function createWorkspace() {
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
             value: null,
         }],
-    }).then(() => {
-        Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID));
     });
+
+    Navigation.navigate(ROUTES.getWorkspaceInitialRoute(policyID));
 }
 
 function openWorkspaceReimburseView(policyID) {
diff --git a/src/pages/workspace/withFullPolicy.js b/src/pages/workspace/withFullPolicy.js
index 45f608d685b2..83f078eab74d 100644
--- a/src/pages/workspace/withFullPolicy.js
+++ b/src/pages/workspace/withFullPolicy.js
@@ -106,10 +106,13 @@ export default function (WrappedComponent) {
         const isFromFullPolicy = lodashGet(props, 'policy.isFromFullPolicy', false) || lodashGet(props, `policy.policy_${policyID}.isFromFullPolicy`, false);
 
         if (_.isString(policyID) && !_.isEmpty(policyID) && (!isFromFullPolicy || !isPreviousRouteInSameWorkspace(currentRoute.name, policyID))) {
+            console.log(">>>> loading full policy");
             Policy.loadFullPolicy(policyID);
             Policy.updateLastAccessedWorkspace(policyID);
         }
 
+        console.log(">>>> withFullPolicy policy", props.policy);
+
         previousRouteName = currentRoute.name;
         previousRoutePolicyID = policyID;
 

From abb9b1dea63e4d5563cc04a34d6356f6b02d434c Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Mon, 19 Sep 2022 18:22:01 -0700
Subject: [PATCH 154/178] remove debug statements

---
 src/pages/workspace/withFullPolicy.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/workspace/withFullPolicy.js b/src/pages/workspace/withFullPolicy.js
index 83f078eab74d..45f608d685b2 100644
--- a/src/pages/workspace/withFullPolicy.js
+++ b/src/pages/workspace/withFullPolicy.js
@@ -106,13 +106,10 @@ export default function (WrappedComponent) {
         const isFromFullPolicy = lodashGet(props, 'policy.isFromFullPolicy', false) || lodashGet(props, `policy.policy_${policyID}.isFromFullPolicy`, false);
 
         if (_.isString(policyID) && !_.isEmpty(policyID) && (!isFromFullPolicy || !isPreviousRouteInSameWorkspace(currentRoute.name, policyID))) {
-            console.log(">>>> loading full policy");
             Policy.loadFullPolicy(policyID);
             Policy.updateLastAccessedWorkspace(policyID);
         }
 
-        console.log(">>>> withFullPolicy policy", props.policy);
-
         previousRouteName = currentRoute.name;
         previousRoutePolicyID = policyID;
 

From 87a5655b396681454b82aabbcc40d0b94e217032 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Tue, 20 Sep 2022 14:00:28 +0000
Subject: [PATCH 155/178] Update version to 1.2.3-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 be6d47569d41..9f59017d2753 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020200
-        versionName "1.2.2-0"
+        versionCode 1001020300
+        versionName "1.2.3-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index f8e000ab82e5..33d546d95a50 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.2.0</string>
+	<string>1.2.3.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 5765d17971b1..ed1115811875 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.2.2</string>
+	<string>1.2.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.2.0</string>
+	<string>1.2.3.0</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 0b446b22602a..a958ecb5b239 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.2-0",
+  "version": "1.2.3-0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.2-0",
+      "version": "1.2.3-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 1ba7ca90d976..ab920aedd8ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.2-0",
+  "version": "1.2.3-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 bf47c1c90401cbaa9327b839c9c3d7919b0feb50 Mon Sep 17 00:00:00 2001
From: Rajat Parashar <parasharrajat@users.noreply.github.com>
Date: Tue, 20 Sep 2022 21:31:48 +0530
Subject: [PATCH 156/178] Add Screenshot option for Safari mWeb

---
 .github/PULL_REQUEST_TEMPLATE.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 3585d0f52e40..8d0dc882bb59 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -157,8 +157,11 @@ For example:
 #### Web
 <!-- Insert screenshots of your changes on the web platform-->
 
-#### Mobile Web
-<!-- Insert screenshots of your changes on the web platform (from a mobile browser)-->
+#### Mobile Web - Chrome
+<!-- Insert screenshots of your changes on the web platform (from chrome mobile browser)-->
+
+#### Mobile Web - Safari
+<!-- Insert screenshots of your changes on the web platform (from safari mobile browser)-->
 
 #### Desktop
 <!-- Insert screenshots of your changes on the desktop platform-->

From eba32027465d2a439c2a65e5374c30d5f963a542 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Tue, 20 Sep 2022 23:13:50 +0530
Subject: [PATCH 157/178] Handle errors properly

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

diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index cd33d2b7f6f7..59926c9ca402 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -96,7 +96,9 @@ class SetPasswordPage extends Component {
     render() {
         const buttonText = this.props.translate('setPasswordPage.setPassword');
         const sessionError = this.props.session.errors && ErrorUtils.getLatestErrorMessage(this.props.session);
-        const error = sessionError || ErrorUtils.getLatestErrorMessage(this.props.account);
+        const accountError = this.props.account.errors && ErrorUtils.getLatestErrorMessage(this.props.account);
+        const error = accountError || sessionError;
+        const isErrorVisible = !this.props.account.isLoading && !_.isEmpty(error);
         return (
             <SafeAreaView style={[styles.signInPage]}>
                 <SignInPageLayout
@@ -119,7 +121,7 @@ class SetPasswordPage extends Component {
                             onSubmit={this.validateAndSubmitForm}
                             containerStyles={[styles.mb2, styles.mh0]}
                             message={error}
-                            isAlertVisible={!_.isEmpty(error)}
+                            isAlertVisible={isErrorVisible}
                             isDisabled={!this.state.isFormValid}
                         />
                     </View>

From ac4ef6226b667fce0fa59f74cd1a96f102916d3f Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Tue, 20 Sep 2022 23:14:14 +0530
Subject: [PATCH 158/178] Add offline indicator

---
 src/pages/SetPasswordPage.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index 59926c9ca402..cf32bae47d8d 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -20,6 +20,7 @@ import compose from '../libs/compose';
 import NewPasswordForm from './settings/NewPasswordForm';
 import FormAlertWithSubmitButton from '../components/FormAlertWithSubmitButton';
 import * as ErrorUtils from '../libs/ErrorUtils';
+import OfflineIndicator from '../components/OfflineIndicator';
 
 const propTypes = {
     /* Onyx Props */
@@ -125,6 +126,7 @@ class SetPasswordPage extends Component {
                             isDisabled={!this.state.isFormValid}
                         />
                     </View>
+                    <OfflineIndicator containerStyles={[styles.mv1]} />
                 </SignInPageLayout>
             </SafeAreaView>
         );

From b6f4319bbb8177e620535d5222eba3270877b454 Mon Sep 17 00:00:00 2001
From: neil-marcellini <neil@expensify.com>
Date: Tue, 20 Sep 2022 11:06:50 -0700
Subject: [PATCH 159/178] Use backend policyReport naming vs workspaceRoom

---
 src/libs/actions/Report.js                    | 33 ++++++++++---------
 .../home/report/ReportActionItemCreated.js    |  2 +-
 src/pages/workspace/WorkspaceNewRoomPage.js   |  8 ++---
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 48380e64792a..5e242bb395b3 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -1451,16 +1451,16 @@ function createPolicyRoom(policyID, reportName, visibility) {
 }
 
 /**
- * Add a workspace room optimistically and navigate to it.
+ * Add a policy report (workspace room) optimistically and navigate to it.
  *
  * @param {Object} policy
  * @param {String} reportName
  * @param {String} visibility
  */
-function addWorkspaceRoom(policy, reportName, visibility) {
+function addPolicyReport(policy, reportName, visibility) {
     // The participants include the current user (admin) and the employees. Participants must not be empty.
     const participants = [currentUserEmail, ...policy.employeeList];
-    const workspaceRoom = buildOptimisticChatReport(
+    const policyReport = buildOptimisticChatReport(
         participants,
         reportName,
         CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
@@ -1474,27 +1474,28 @@ function addWorkspaceRoom(policy, reportName, visibility) {
     // Onyx.set is used on the optimistic data so that it is present before navigating to the workspace room. With Onyx.merge the workspace room reportID is not present when
     // storeCurrentlyViewedReport is called on the ReportScreen, so fetchChatReportsByIDs is called which is unnecessary since the optimistic data will be stored in Onyx.
     // If there was an error creating the room, then fetchChatReportsByIDs throws an error and the user is navigated away from the report instead of showing the RBR error message.
+    // Therefore, Onyx.set is used instead of Onyx.merge.
     const optimisticData = [
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceRoom.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${policyReport.reportID}`,
             value: {
                 pendingFields: {
                     addWorkspaceRoom: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
                 },
-                ...workspaceRoom,
+                ...policyReport,
             },
         },
         {
             onyxMethod: CONST.ONYX.METHOD.SET,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
-            value: buildOptimisticCreatedReportAction(workspaceRoom.ownerEmail),
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${policyReport.reportID}`,
+            value: buildOptimisticCreatedReportAction(policyReport.ownerEmail),
         },
     ];
     const successData = [
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT}${workspaceRoom.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT}${policyReport.reportID}`,
             value: {
                 pendingFields: {
                     addWorkspaceRoom: null,
@@ -1503,7 +1504,7 @@ function addWorkspaceRoom(policy, reportName, visibility) {
         },
         {
             onyxMethod: CONST.ONYX.METHOD.MERGE,
-            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${workspaceRoom.reportID}`,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${policyReport.reportID}`,
             value: {
                 0: {
                     pendingAction: null,
@@ -1515,20 +1516,20 @@ function addWorkspaceRoom(policy, reportName, visibility) {
     API.write(
         'AddWorkspaceRoom',
         {
-            policyID: workspaceRoom.policyID,
+            policyID: policyReport.policyID,
             reportName,
             visibility,
-            reportID: workspaceRoom.reportID,
+            reportID: policyReport.reportID,
         },
         {optimisticData, successData},
     );
-    Navigation.navigate(ROUTES.getReportRoute(workspaceRoom.reportID));
+    Navigation.navigate(ROUTES.getReportRoute(policyReport.reportID));
 }
 
 /**
- * @param {Number} reportID The reportID of the workspace room
+ * @param {Number} reportID The reportID of the policy report (workspace room)
  */
-function navigateToConciergeChatAndDeleteWorkspaceRoom(reportID) {
+function navigateToConciergeChatAndDeletePolicyReport(reportID) {
     navigateToConciergeChat();
     Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`, null);
     Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`, null);
@@ -1744,8 +1745,8 @@ export {
     handleInaccessibleReport,
     setReportWithDraft,
     createPolicyRoom,
-    addWorkspaceRoom,
-    navigateToConciergeChatAndDeleteWorkspaceRoom,
+    addPolicyReport,
+    navigateToConciergeChatAndDeletePolicyReport,
     setIsComposerFullSize,
     markCommentAsUnread,
     readNewestAction,
diff --git a/src/pages/home/report/ReportActionItemCreated.js b/src/pages/home/report/ReportActionItemCreated.js
index 9f5ab4c0b0a6..0259d86e545c 100644
--- a/src/pages/home/report/ReportActionItemCreated.js
+++ b/src/pages/home/report/ReportActionItemCreated.js
@@ -48,7 +48,7 @@ const ReportActionItemCreated = (props) => {
             pendingAction={lodashGet(props.report, 'pendingFields.addWorkspaceRoom')}
             errors={lodashGet(props.report, 'errorFields.addWorkspaceRoom')}
             errorRowStyles={styles.addWorkspaceRoomErrorRow}
-            onClose={() => Report.navigateToConciergeChatAndDeleteWorkspaceRoom(props.report.reportID)}
+            onClose={() => Report.navigateToConciergeChatAndDeletePolicyReport(props.report.reportID)}
         >
             <View
                 accessibilityLabel="Chat welcome message"
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
index ceaa4e1cadf3..5256391e37fa 100644
--- a/src/pages/workspace/WorkspaceNewRoomPage.js
+++ b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -58,7 +58,7 @@ class WorkspaceNewRoomPage extends React.Component {
             workspaceOptions: [],
         };
 
-        this.validateAndAddWorkspaceRoom = this.validateAndAddWorkspaceRoom.bind(this);
+        this.validateAndAddPolicyReport = this.validateAndAddPolicyReport.bind(this);
     }
 
     componentDidMount() {
@@ -79,12 +79,12 @@ class WorkspaceNewRoomPage extends React.Component {
         this.setState({workspaceOptions: _.map(workspaces, policy => ({label: policy.name, key: policy.id, value: policy.id}))});
     }
 
-    validateAndAddWorkspaceRoom() {
+    validateAndAddPolicyReport() {
         if (!this.validate()) {
             return;
         }
         const policy = this.props.policies[`${ONYXKEYS.COLLECTION.POLICY}${this.state.policyID}`];
-        Report.addWorkspaceRoom(policy, this.state.roomName, this.state.visibility);
+        Report.addPolicyReport(policy, this.state.roomName, this.state.visibility);
     }
 
     /**
@@ -183,7 +183,7 @@ class WorkspaceNewRoomPage extends React.Component {
                     <Button
                         success
                         pressOnEnter
-                        onPress={this.validateAndAddWorkspaceRoom}
+                        onPress={this.validateAndAddPolicyReport}
                         style={[styles.w100]}
                         text={this.props.translate('newRoomPage.createRoom')}
                     />

From 5645f57b755983b29ec8fe517befd229d64a5a6f Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 20 Sep 2022 11:54:48 -0700
Subject: [PATCH 160/178] use policyIDListExcludingWorkspacesWithPendingActions

---
 src/libs/actions/App.js | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 2e2a493ed468..5268c67ca24d 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -54,6 +54,20 @@ Onyx.connect({
     },
 });
 
+// When we reconnect the app, we don't want to fetch workspaces created optimistically while offline since they don't exist yet in the back-end.
+// If we fetched them then they'd return as empty objects which would clear out the optimistic policy values initially created locally.
+// Once the re-queued call to CreateWorkspace returns, the full contents of the workspace excluded here are correctly saved into Onyx.
+let policyIDListExcludingWorkspacesWithPendingActions = [];
+Onyx.connect({
+    key: ONYXKEYS.COLLECTION.POLICY,
+    waitForCollectionCallback: true,
+    callback: (policies) => {
+        const policiesExcludingWorkspacesWithPendingActions = _.reject(policies, policy => lodashGet(policy, 'pendingAction', null)
+            && lodashGet(policy, 'type', null) === CONST.POLICY.TYPE.FREE);
+        policyIDListExcludingWorkspacesWithPendingActions = _.compact(_.pluck(policiesExcludingWorkspacesWithPendingActions, 'id'));
+    },
+});
+
 /**
 * @param {String} locale
 */
@@ -124,7 +138,7 @@ function openApp() {
  * Refreshes data when the app reconnects
  */
 function reconnectApp() {
-    API.read('ReconnectApp', {policyIDList}, {
+    API.read('ReconnectApp', {policyIDListExcludingWorkspacesWithPendingActions}, {
         optimisticData: [{
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,

From 521366b2185e2be658d4bb883f3c3144a6afe338 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 20 Sep 2022 12:06:37 -0700
Subject: [PATCH 161/178] Update App.js

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

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 5268c67ca24d..775aafe60ec6 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -56,7 +56,7 @@ Onyx.connect({
 
 // When we reconnect the app, we don't want to fetch workspaces created optimistically while offline since they don't exist yet in the back-end.
 // If we fetched them then they'd return as empty objects which would clear out the optimistic policy values initially created locally.
-// Once the re-queued call to CreateWorkspace returns, the full contents of the workspace excluded here are correctly saved into Onyx.
+// Once the re-queued call updating the excluded workspace returns, its contents should be correctly saved into Onyx.
 let policyIDListExcludingWorkspacesWithPendingActions = [];
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,

From 7844d5c0d8a876cab223c711556eb1e24e7a9067 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 20 Sep 2022 12:09:02 -0700
Subject: [PATCH 162/178] only exclude workspaces with pending action = add

---
 src/libs/actions/App.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 775aafe60ec6..f5115cb2c6f0 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -56,13 +56,14 @@ Onyx.connect({
 
 // When we reconnect the app, we don't want to fetch workspaces created optimistically while offline since they don't exist yet in the back-end.
 // If we fetched them then they'd return as empty objects which would clear out the optimistic policy values initially created locally.
-// Once the re-queued call updating the excluded workspace returns, its contents should be correctly saved into Onyx.
+// Once the re-queued call to CreateWorkspace returns, the contents of the workspace excluded here should be correctly saved into Onyx.
 let policyIDListExcludingWorkspacesWithPendingActions = [];
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
     callback: (policies) => {
-        const policiesExcludingWorkspacesWithPendingActions = _.reject(policies, policy => lodashGet(policy, 'pendingAction', null)
+        const policiesExcludingWorkspacesWithPendingActions = _.reject(policies,
+            policy => lodashGet(policy, 'pendingAction', null) === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD
             && lodashGet(policy, 'type', null) === CONST.POLICY.TYPE.FREE);
         policyIDListExcludingWorkspacesWithPendingActions = _.compact(_.pluck(policiesExcludingWorkspacesWithPendingActions, 'id'));
     },

From b1c2db2facbe0fc15de6f12f5fbb40a23e0820a3 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 20 Sep 2022 12:13:14 -0700
Subject: [PATCH 163/178] rename to
 policyIDListExcludingWorkspacesCreatedOffline

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

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index f5115cb2c6f0..91503516fc50 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -57,15 +57,15 @@ Onyx.connect({
 // When we reconnect the app, we don't want to fetch workspaces created optimistically while offline since they don't exist yet in the back-end.
 // If we fetched them then they'd return as empty objects which would clear out the optimistic policy values initially created locally.
 // Once the re-queued call to CreateWorkspace returns, the contents of the workspace excluded here should be correctly saved into Onyx.
-let policyIDListExcludingWorkspacesWithPendingActions = [];
+let policyIDListExcludingWorkspacesCreatedOffline = [];
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
     callback: (policies) => {
-        const policiesExcludingWorkspacesWithPendingActions = _.reject(policies,
+        const policiesExcludingWorkspacesCreatedOffline = _.reject(policies,
             policy => lodashGet(policy, 'pendingAction', null) === CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD
             && lodashGet(policy, 'type', null) === CONST.POLICY.TYPE.FREE);
-        policyIDListExcludingWorkspacesWithPendingActions = _.compact(_.pluck(policiesExcludingWorkspacesWithPendingActions, 'id'));
+        policyIDListExcludingWorkspacesCreatedOffline = _.compact(_.pluck(policiesExcludingWorkspacesCreatedOffline, 'id'));
     },
 });
 
@@ -139,7 +139,7 @@ function openApp() {
  * Refreshes data when the app reconnects
  */
 function reconnectApp() {
-    API.read('ReconnectApp', {policyIDListExcludingWorkspacesWithPendingActions}, {
+    API.read('ReconnectApp', {policyIDListExcludingWorkspacesCreatedOffline}, {
         optimisticData: [{
             onyxMethod: CONST.ONYX.METHOD.MERGE,
             key: ONYXKEYS.IS_LOADING_REPORT_DATA,

From 3dedd09b15eaf0524593f31476e898fc9ea67879 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 20 Sep 2022 12:14:41 -0700
Subject: [PATCH 164/178] remove unused comment

---
 src/libs/actions/Policy.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 50fd83712692..9e84c7be9d69 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -809,9 +809,6 @@ function createWorkspace() {
         expenseReportActionData,
     } = Report.buildOptimisticWorkspaceChats(policyID, workspaceName);
 
-    // We need to use makeRequestWithSideEffects as we try to redirect to the policy right after creation
-    // The policy hasn't been merged in Onyx data at this point, leading to an intermittent Not Found screen
-    // eslint-disable-next-line rulesdir/no-api-side-effects-method
     API.write('CreateWorkspace', {
         policyID,
         announceChatReportID,

From a7ad213e073dd6ba2125818119876e281826ec39 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 20 Sep 2022 12:15:31 -0700
Subject: [PATCH 165/178] Update comment

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

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
index 91503516fc50..6e98afa085f1 100644
--- a/src/libs/actions/App.js
+++ b/src/libs/actions/App.js
@@ -56,7 +56,7 @@ Onyx.connect({
 
 // When we reconnect the app, we don't want to fetch workspaces created optimistically while offline since they don't exist yet in the back-end.
 // If we fetched them then they'd return as empty objects which would clear out the optimistic policy values initially created locally.
-// Once the re-queued call to CreateWorkspace returns, the contents of the workspace excluded here should be correctly saved into Onyx.
+// Once the re-queued call to CreateWorkspace returns, the full contents of the workspace excluded here should be correctly saved into Onyx.
 let policyIDListExcludingWorkspacesCreatedOffline = [];
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,

From 23bd4ddf98739ccc4be0e309c1d77507a9a84cf6 Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 20 Sep 2022 13:18:39 -0600
Subject: [PATCH 166/178] Add workspace exception

---
 src/libs/SidebarUtils.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index 51e082352bbd..02366c391b7e 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -122,12 +122,16 @@ function getOrderedReportIDs() {
             : '';
 
         const reportContainsIOUDebt = iouReportOwner && iouReportOwner !== currentUserLogin;
+        const hasAddWorkspaceRoomError = report.errorFields && !_.isEmpty(report.errorFields.addWorkspaceRoom);
         const shouldFilterReportIfEmpty = report.lastMessageTimestamp === 0
 
             // We make exceptions for defaultRooms and policyExpenseChats so we can immediately
             // highlight them in the LHN when they are created and have no messsages yet. We do
             // not give archived rooms this exception since they do not need to be higlihted.
-            && !(!ReportUtils.isArchivedRoom(report) && (isDefaultRoom || isPolicyExpenseChat));
+            && !(!ReportUtils.isArchivedRoom(report) && (isDefaultRoom || isPolicyExpenseChat))
+
+            // Also make an exception for workspace rooms that failed to be added
+            && !hasAddWorkspaceRoomError;
 
         const shouldFilterReportIfRead = hideReadReports && !ReportUtils.isUnread(report);
         const shouldFilterReport = shouldFilterReportIfEmpty || shouldFilterReportIfRead;

From f6fb287689fa1019676b78ea0558e07b167fad6d Mon Sep 17 00:00:00 2001
From: Tim Golen <tgolen@expensify.com>
Date: Tue, 20 Sep 2022 13:22:26 -0600
Subject: [PATCH 167/178] Remove extra blank line

---
 tests/unit/LHNOrderTest.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/unit/LHNOrderTest.js b/tests/unit/LHNOrderTest.js
index a93703bb9e64..85e38d8282ba 100644
--- a/tests/unit/LHNOrderTest.js
+++ b/tests/unit/LHNOrderTest.js
@@ -206,7 +206,6 @@ describe('Sidebar', () => {
     });
 
     describe('in default mode', () => {
-
         test('is not rendered when there are no props passed to it', () => {
             // Given all the default props are passed to SidebarLinks
             // When it is rendered

From ffd1c81a5443a0b9b409b92da7de0121e67182e9 Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 20 Sep 2022 12:45:18 -0700
Subject: [PATCH 168/178] use set instead of merge

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

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 9e84c7be9d69..5a1f14c1fe35 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -819,7 +819,7 @@ function createWorkspace() {
     },
     {
         optimisticData: [{
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
             value: {
                 id: policyID,

From 3dc5b412b5c021980a4f63618a5d73016e0e325d Mon Sep 17 00:00:00 2001
From: Francois Laithier <francois@expensify.com>
Date: Tue, 20 Sep 2022 14:48:58 -0700
Subject: [PATCH 169/178] Add `app_id` for fastlane's
 `upload_symbols_to_crashlytics` Testflight build step

---
 fastlane/Fastfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index e3157fbd214e..1f0f7c68cd27 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -141,6 +141,7 @@ platform :ios do
     end
 
     upload_symbols_to_crashlytics(
+      app_id: "1:921154746561:ios:216bd10ccc947659027c40"
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH],
       gsp_path: "./ios/GoogleService-Info.plist",
       binary_path: "./ios/Pods/FirebaseCrashlytics/upload-symbols"

From dcc100202df876ec9a2c752b07cb93b66843a4cd Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Tue, 20 Sep 2022 15:42:54 -0700
Subject: [PATCH 170/178] use set instead of merge for all optimistic data

---
 src/libs/actions/Policy.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 5a1f14c1fe35..5de94702631d 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -832,7 +832,7 @@ function createWorkspace() {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.POLICY_MEMBER_LIST}${policyID}`,
             value: {
                 [sessionEmail]: {
@@ -842,32 +842,32 @@ function createWorkspace() {
             },
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${announceChatReportID}`,
             value: announceChatData,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${announceChatReportID}`,
             value: announceReportActionData,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${adminsChatReportID}`,
             value: adminsChatData,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${adminsChatReportID}`,
             value: adminsReportActionData,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT}${expenseChatReportID}`,
             value: expenseChatData,
         },
         {
-            onyxMethod: CONST.ONYX.METHOD.MERGE,
+            onyxMethod: CONST.ONYX.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseChatReportID}`,
             value: expenseReportActionData,
         }],

From 0f475f666e094ad6fb16e36d2c335f91196b22c4 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar <monil@expensify.com>
Date: Wed, 21 Sep 2022 16:07:03 +0530
Subject: [PATCH 171/178] Return early if errors in Onyx object is empty

---
 src/libs/ErrorUtils.js       | 3 +++
 src/pages/SetPasswordPage.js | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libs/ErrorUtils.js b/src/libs/ErrorUtils.js
index bcc6c59cae2b..e1ca7233ba8a 100644
--- a/src/libs/ErrorUtils.js
+++ b/src/libs/ErrorUtils.js
@@ -42,6 +42,9 @@ function getAuthenticateErrorMessage(response) {
  * @returns {String}
  */
 function getLatestErrorMessage(onyxData) {
+    if (_.isEmpty(onyxData.errors)) {
+        return '';
+    }
     return _.chain(onyxData.errors || [])
         .keys()
         .sortBy()
diff --git a/src/pages/SetPasswordPage.js b/src/pages/SetPasswordPage.js
index cf32bae47d8d..5a53757b7025 100755
--- a/src/pages/SetPasswordPage.js
+++ b/src/pages/SetPasswordPage.js
@@ -96,9 +96,7 @@ class SetPasswordPage extends Component {
 
     render() {
         const buttonText = this.props.translate('setPasswordPage.setPassword');
-        const sessionError = this.props.session.errors && ErrorUtils.getLatestErrorMessage(this.props.session);
-        const accountError = this.props.account.errors && ErrorUtils.getLatestErrorMessage(this.props.account);
-        const error = accountError || sessionError;
+        const error = ErrorUtils.getLatestErrorMessage(this.props.account) || ErrorUtils.getLatestErrorMessage(this.props.session);
         const isErrorVisible = !this.props.account.isLoading && !_.isEmpty(error);
         return (
             <SafeAreaView style={[styles.signInPage]}>

From 1e85a737196549b50267b122094943ed90e49045 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 21 Sep 2022 11:44:58 -0600
Subject: [PATCH 172/178] rm offline message from options selector, rm prop

---
 src/components/IOUConfirmationList.js          |  1 -
 .../OptionsSelector/BaseOptionsSelector.js     | 18 +-----------------
 .../optionsSelectorPropTypes.js                |  4 ----
 3 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/components/IOUConfirmationList.js b/src/components/IOUConfirmationList.js
index 33e8a668bd3d..fc63985dd19f 100755
--- a/src/components/IOUConfirmationList.js
+++ b/src/components/IOUConfirmationList.js
@@ -351,7 +351,6 @@ class IOUConfirmationList extends Component {
                 forceTextUnreadStyle
                 autoFocus
                 shouldTextInputAppearBelowOptions
-                shouldShowOfflineMessage
                 optionHoveredStyle={canModifyParticipants ? styles.hoveredComponentBG : {}}
                 footerContent={shouldShowSettlementButton
                     ? (
diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
index cbcb0faa415c..690e21b6b073 100755
--- a/src/components/OptionsSelector/BaseOptionsSelector.js
+++ b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -3,19 +3,15 @@ import lodashGet from 'lodash/get';
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import {View, findNodeHandle} from 'react-native';
-import {withOnyx} from 'react-native-onyx';
 import Button from '../Button';
 import FixedFooter from '../FixedFooter';
 import OptionsList from '../OptionsList';
-import Text from '../Text';
-import compose from '../../libs/compose';
 import CONST from '../../CONST';
 import styles from '../../styles/styles';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import TextInput from '../TextInput';
 import ArrowKeyFocusManager from '../ArrowKeyFocusManager';
 import KeyboardShortcut from '../../libs/KeyboardShortcut';
-import ONYXKEYS from '../../ONYXKEYS';
 import FullScreenLoadingIndicator from '../FullscreenLoadingIndicator';
 import {propTypes as optionsSelectorPropTypes, defaultProps as optionsSelectorDefaultProps} from './optionsSelectorPropTypes';
 
@@ -301,11 +297,6 @@ class BaseOptionsSelector extends Component {
                 </View>
                 {shouldShowFooter && (
                     <FixedFooter>
-                        {this.props.shouldShowOfflineMessage && this.props.network.isOffline && (
-                            <Text style={[styles.formError, styles.pb2]}>
-                                {this.props.translate('session.offlineMessage')}
-                            </Text>
-                        )}
                         {shouldShowDefaultConfirmButton && (
                             <Button
                                 success
@@ -327,11 +318,4 @@ class BaseOptionsSelector extends Component {
 BaseOptionsSelector.defaultProps = defaultProps;
 BaseOptionsSelector.propTypes = propTypes;
 
-export default compose(
-    withLocalize,
-    withOnyx({
-        network: {
-            key: ONYXKEYS.NETWORK,
-        },
-    }),
-)(BaseOptionsSelector);
+export default withLocalize(BaseOptionsSelector);
diff --git a/src/components/OptionsSelector/optionsSelectorPropTypes.js b/src/components/OptionsSelector/optionsSelectorPropTypes.js
index 8187b608f7ed..ae41fe0f8190 100644
--- a/src/components/OptionsSelector/optionsSelectorPropTypes.js
+++ b/src/components/OptionsSelector/optionsSelectorPropTypes.js
@@ -81,9 +81,6 @@ const propTypes = {
     /** If true, the text input will be below the options in the selector, not above. */
     shouldTextInputAppearBelowOptions: PropTypes.bool,
 
-    /** If true, a message will display in the footer if the app is offline. */
-    shouldShowOfflineMessage: PropTypes.bool,
-
     /** Custom content to display in the footer instead of the default button. */
     footerContent: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
 
@@ -111,7 +108,6 @@ const defaultProps = {
     confirmButtonText: undefined,
     onConfirmSelection: () => {},
     shouldTextInputAppearBelowOptions: false,
-    shouldShowOfflineMessage: false,
     footerContent: undefined,
     optionHoveredStyle: styles.hoveredComponentBG,
     shouldShowOptions: true,

From 78c4f4129b23d257a76c01e744d75a86dc03816f Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 21 Sep 2022 11:58:19 -0600
Subject: [PATCH 173/178] rm unused translation

---
 src/languages/es.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/languages/es.js b/src/languages/es.js
index 2d54a9684572..7c46d899be89 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -778,7 +778,6 @@ export default {
     },
     session: {
         offlineMessageRetry: 'Parece que estás desconectado. Por favor chequea tu conexión e inténtalo otra vez',
-        offlineMessage: 'Parece que estás desconectado.',
     },
     workspace: {
         common: {

From e4e809ed483341e9be2ed37e98ba8356ff485740 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 21 Sep 2022 11:59:18 -0600
Subject: [PATCH 174/178] rm unused translation from en.js

---
 src/languages/en.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index bca4907f32b6..cb53b7c4262c 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -776,7 +776,6 @@ export default {
     },
     session: {
         offlineMessageRetry: 'Looks like you\'re offline. Please check your connection and try again.',
-        offlineMessage: 'Looks like you\'re offline.',
     },
     workspace: {
         common: {

From 194c7b281e16de8b9dc63ce1579bebbb7532f313 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 21 Sep 2022 18:10:36 +0000
Subject: [PATCH 175/178] Update version to 1.2.3-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 9f59017d2753..90b05049900c 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020300
-        versionName "1.2.3-0"
+        versionCode 1001020301
+        versionName "1.2.3-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 33d546d95a50..2d07404f29d3 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.3.0</string>
+	<string>1.2.3.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ed1115811875..18fcc5740c18 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.2.3.0</string>
+	<string>1.2.3.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 3df791ed8f07..050c0949b312 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.3-0",
+  "version": "1.2.3-1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.3-0",
+      "version": "1.2.3-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 53cb077b80f2..16cf197fdbd2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.3-0",
+  "version": "1.2.3-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 011185157eb8a951c940ba689eb3d484fdfdd71e Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 21 Sep 2022 19:01:04 +0000
Subject: [PATCH 176/178] Update version to 1.2.4-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 90b05049900c..94b2fab83e19 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020301
-        versionName "1.2.3-1"
+        versionCode 1001020400
+        versionName "1.2.4-0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 2d07404f29d3..a2dea3b6f85f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.3.1</string>
+	<string>1.2.4.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 18fcc5740c18..07089a169d45 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.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.3.1</string>
+	<string>1.2.4.0</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 050c0949b312..014c7bfb70c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.3-1",
+  "version": "1.2.4-0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.3-1",
+      "version": "1.2.4-0",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 16cf197fdbd2..247410d2c656 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.3-1",
+  "version": "1.2.4-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 97202a251557b39b8458bc9783e491d0f762fe44 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 21 Sep 2022 13:10:00 -0600
Subject: [PATCH 177/178] fix syntax error

---
 fastlane/Fastfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 1f0f7c68cd27..dcf54d46f828 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -141,7 +141,7 @@ platform :ios do
     end
 
     upload_symbols_to_crashlytics(
-      app_id: "1:921154746561:ios:216bd10ccc947659027c40"
+      app_id: "1:921154746561:ios:216bd10ccc947659027c40",
       dsym_path: lane_context[SharedValues::DSYM_OUTPUT_PATH],
       gsp_path: "./ios/GoogleService-Info.plist",
       binary_path: "./ios/Pods/FirebaseCrashlytics/upload-symbols"

From 8ad32dd091669b9bcce22cce2b1aae6388ad1e12 Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 21 Sep 2022 19:24:51 +0000
Subject: [PATCH 178/178] Update version to 1.2.4-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 94b2fab83e19..4336b0bcce34 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020400
-        versionName "1.2.4-0"
+        versionCode 1001020401
+        versionName "1.2.4-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a2dea3b6f85f..afed4fb26d89 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.4.0</string>
+	<string>1.2.4.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 07089a169d45..559ecc8585fb 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.2.4.0</string>
+	<string>1.2.4.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 014c7bfb70c4..d28de067c372 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.2.4-0",
+  "version": "1.2.4-1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.2.4-0",
+      "version": "1.2.4-1",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 247410d2c656..4448343ab73e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.4-0",
+  "version": "1.2.4-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.",