From ed18c4952c10ea7c8b188bbd78cbb244fa2b9dd7 Mon Sep 17 00:00:00 2001
From: Peter Velkov <kidroca@gmail.com>
Date: Tue, 29 Mar 2022 21:22:24 +0300
Subject: [PATCH 01/36] Add logging to fullscreen loaders to investigate
 infinite loading screens

---
 src/components/FullscreenLoadingIndicator.js | 51 +++++++++++++++-----
 src/components/WalletStatementModal/index.js |  4 +-
 src/pages/NewChatPage.js                     |  2 +-
 src/pages/SearchPage.js                      |  2 +-
 src/pages/home/ReportScreen.js               |  2 +-
 src/pages/iou/IOUModal.js                    |  4 +-
 src/pages/workspace/WorkspaceInvitePage.js   |  2 +-
 7 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/components/FullscreenLoadingIndicator.js b/src/components/FullscreenLoadingIndicator.js
index 41a2ef2f8436..c1e9eeff9cfc 100644
--- a/src/components/FullscreenLoadingIndicator.js
+++ b/src/components/FullscreenLoadingIndicator.js
@@ -5,17 +5,22 @@ import {ActivityIndicator, StyleSheet, View} from 'react-native';
 import styles from '../styles/styles';
 import themeColors from '../styles/themes/default';
 import stylePropTypes from '../styles/stylePropTypes';
+import Log from '../libs/Log';
 
 const propTypes = {
-    /** Controls whether the loader is mounted and displayed */
-    visible: PropTypes.bool,
+    /** Name used in the logs if the loader is displayed for too long time */
+    name: PropTypes.string,
+
+    /** Optional duration (ms) after which a message would be logged if the loader is still covering the screen */
+    timeout: PropTypes.number,
 
     /** Additional style props */
     style: stylePropTypes,
 };
 
 const defaultProps = {
-    visible: true,
+    timeout: 0,
+    name: '',
     style: [],
 };
 
@@ -25,18 +30,38 @@ const defaultProps = {
  * @param {Object} props
  * @returns {JSX.Element}
  */
-const FullScreenLoadingIndicator = (props) => {
-    if (!props.visible) {
-        return null;
+class FullScreenLoadingIndicator extends React.Component {
+    componentDidMount() {
+        if (!this.props.name || !this.props.timeout) {
+            return;
+        }
+
+        Log.info(`[LoadingIndicator] "${this.props.name}" became visible`);
+
+        this.timeoutId = setTimeout(
+            () => Log.alert(`[LoadingIndicator] "${this.props.name}" is still visible after ${this.props.timeout} ms`),
+            this.props.timeout,
+        );
     }
 
-    const additionalStyles = _.isArray(props.style) ? props.style : [props.style];
-    return (
-        <View style={[StyleSheet.absoluteFillObject, styles.fullScreenLoading, ...additionalStyles]}>
-            <ActivityIndicator color={themeColors.spinner} size="large" />
-        </View>
-    );
-};
+    componentWillUnmount() {
+        if (!this.timeoutId) {
+            return;
+        }
+
+        clearTimeout(this.timeoutId);
+        Log.info(`[LoadingIndicator] "${this.props.name}" disappeared`);
+    }
+
+    render() {
+        const additionalStyles = _.isArray(this.props.style) ? this.props.style : [this.props.style];
+        return (
+            <View style={[StyleSheet.absoluteFillObject, styles.fullScreenLoading, ...additionalStyles]}>
+                <ActivityIndicator color={themeColors.spinner} size="large" />
+            </View>
+        );
+    }
+}
 
 FullScreenLoadingIndicator.propTypes = propTypes;
 FullScreenLoadingIndicator.defaultProps = defaultProps;
diff --git a/src/components/WalletStatementModal/index.js b/src/components/WalletStatementModal/index.js
index 655ef2421e29..60d57fc5c14b 100644
--- a/src/components/WalletStatementModal/index.js
+++ b/src/components/WalletStatementModal/index.js
@@ -41,9 +41,7 @@ class WalletStatementModal extends React.Component {
         const authToken = lodashGet(this.props, 'session.authToken', null);
         return (
             <>
-                <FullScreenLoadingIndicator
-                    visible={this.state.isLoading}
-                />
+                {this.state.isLoading && <FullScreenLoadingIndicator />}
                 <View style={[styles.flex1]}>
                     <iframe
                         src={`${this.props.statementPageURL}&authToken=${authToken}`}
diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
index 00f2209d3d3e..6e8a5c2d0a44 100755
--- a/src/pages/NewChatPage.js
+++ b/src/pages/NewChatPage.js
@@ -235,7 +235,7 @@ class NewChatPage extends Component {
                             onCloseButtonPress={() => Navigation.dismissModal(true)}
                         />
                         <View style={[styles.flex1, styles.w100, styles.pRelative]}>
-                            <FullScreenLoadingIndicator visible={!didScreenTransitionEnd} />
+                            {!didScreenTransitionEnd && <FullScreenLoadingIndicator />}
                             {didScreenTransitionEnd && (
                                 <>
                                     <OptionsSelector
diff --git a/src/pages/SearchPage.js b/src/pages/SearchPage.js
index 1fc76da9c3be..30c3b7b3aafd 100755
--- a/src/pages/SearchPage.js
+++ b/src/pages/SearchPage.js
@@ -173,7 +173,7 @@ class SearchPage extends Component {
                             onCloseButtonPress={() => Navigation.dismissModal(true)}
                         />
                         <View style={[styles.flex1, styles.w100, styles.pRelative]}>
-                            <FullScreenLoadingIndicator visible={!didScreenTransitionEnd} />
+                            {!didScreenTransitionEnd && <FullScreenLoadingIndicator />}
                             {didScreenTransitionEnd && (
                                 <OptionsSelector
                                     sections={sections}
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index ae4acbdd4820..a90ad90a9570 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -183,7 +183,7 @@ class ReportScreen extends React.Component {
                     nativeID={CONST.REPORT.DROP_NATIVE_ID}
                     style={[styles.flex1, styles.justifyContentEnd, styles.overflowHidden]}
                 >
-                    <FullScreenLoadingIndicator visible={this.shouldShowLoader()} />
+                    {this.shouldShowLoader() && <FullScreenLoadingIndicator />}
                     {!this.shouldShowLoader() && (
                         <ReportActionsView
                             reportID={reportID}
diff --git a/src/pages/iou/IOUModal.js b/src/pages/iou/IOUModal.js
index 8e1d973df99d..a75b7f990cfe 100755
--- a/src/pages/iou/IOUModal.js
+++ b/src/pages/iou/IOUModal.js
@@ -387,9 +387,7 @@ class IOUModal extends Component {
                             </View>
                         </View>
                         <View style={[styles.pRelative, styles.flex1]}>
-                            <FullScreenLoadingIndicator
-                                visible={!didScreenTransitionEnd}
-                            />
+                            {!didScreenTransitionEnd && <FullScreenLoadingIndicator />}
                             {didScreenTransitionEnd && (
                                 <>
                                     {currentStep === Steps.IOUAmount && (
diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js
index 16777e17fd16..0aa6dbcd079c 100644
--- a/src/pages/workspace/WorkspaceInvitePage.js
+++ b/src/pages/workspace/WorkspaceInvitePage.js
@@ -262,7 +262,7 @@ class WorkspaceInvitePage extends React.Component {
                             onBackButtonPress={() => Navigation.goBack()}
                         />
                         <View style={[styles.flex1]}>
-                            <FullScreenLoadingIndicator visible={!didScreenTransitionEnd} />
+                            {!didScreenTransitionEnd && <FullScreenLoadingIndicator />}
                             {didScreenTransitionEnd && (
                                 <OptionsSelector
                                     autoFocus={false}

From 5590d1028ba37529dcf37b7d7f40f35165cd8bc6 Mon Sep 17 00:00:00 2001
From: Peter Velkov <kidroca@gmail.com>
Date: Tue, 29 Mar 2022 21:43:49 +0300
Subject: [PATCH 02/36] FullscreenLoadingIndicator - don't print additional
 noise from stacktrace

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

diff --git a/src/components/FullscreenLoadingIndicator.js b/src/components/FullscreenLoadingIndicator.js
index c1e9eeff9cfc..faad8d37ae1e 100644
--- a/src/components/FullscreenLoadingIndicator.js
+++ b/src/components/FullscreenLoadingIndicator.js
@@ -39,7 +39,11 @@ class FullScreenLoadingIndicator extends React.Component {
         Log.info(`[LoadingIndicator] "${this.props.name}" became visible`);
 
         this.timeoutId = setTimeout(
-            () => Log.alert(`[LoadingIndicator] "${this.props.name}" is still visible after ${this.props.timeout} ms`),
+            () => Log.alert(
+                `[LoadingIndicator] "${this.props.name}" is still visible after ${this.props.timeout} ms`,
+                '',
+                false,
+            ),
             this.props.timeout,
         );
     }

From 48ebd2a84b150b78b34cde828b3f9a32e6131e75 Mon Sep 17 00:00:00 2001
From: Peter Velkov <kidroca@gmail.com>
Date: Tue, 29 Mar 2022 21:44:45 +0300
Subject: [PATCH 03/36] Add loader timeout logs for MainDrawerNavigator and
 NavigationRoot

---
 src/libs/Navigation/AppNavigator/MainDrawerNavigator.js | 2 +-
 src/libs/Navigation/NavigationRoot.js                   | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
index c326ece31769..9cdddface5e8 100644
--- a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
+++ b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
@@ -49,7 +49,7 @@ const MainDrawerNavigator = (props) => {
 
     // Wait until reports are fetched and there is a reportID in initialParams
     if (!initialParams.reportID) {
-        return <FullScreenLoadingIndicator />;
+        return <FullScreenLoadingIndicator name="Main Drawer Loader" timeout={15 * 1000} />;
     }
 
     // After the app initializes and reports are available the home navigation is mounted
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
index 8fe3f02b9f66..403c87855203 100644
--- a/src/libs/Navigation/NavigationRoot.js
+++ b/src/libs/Navigation/NavigationRoot.js
@@ -57,7 +57,13 @@ class NavigationRoot extends Component {
     render() {
         return (
             <NavigationContainer
-                fallback={<FullScreenLoadingIndicator style={styles.navigatorFullScreenLoading} />}
+                fallback={(
+                    <FullScreenLoadingIndicator
+                        name="Navigation Fallback Loader"
+                        timeout={15 * 1000}
+                        style={styles.navigatorFullScreenLoading}
+                    />
+                )}
                 onStateChange={this.parseAndStoreRoute}
                 onReady={this.props.onReady}
                 theme={navigationTheme}

From 904e3eea460444ff883d0091a78a543f2598aadb Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 29 Mar 2022 19:47:59 -0600
Subject: [PATCH 04/36] Navigate to correct report on push notification tap

---
 src/libs/Navigation/Navigation.js | 21 +++++++++++++++++++++
 src/libs/actions/Report.js        | 13 +++++++++++--
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index 9e0312aef2f1..db23c2603e2e 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -35,6 +35,14 @@ function setDidTapNotification() {
     didTapNotificationBeforeReady = true;
 }
 
+/**
+ * Returns true if the Navigation is ready to navigate
+ * @returns {boolean}
+ */
+function isReady() {
+    return navigationRef.isReady();
+}
+
 /**
  * @param {String} methodName
  * @param {Object} params
@@ -185,6 +193,17 @@ function isActiveRoute(routePath) {
     return path === routePath;
 }
 
+/**
+ * Returns whether we have a chat visible or not
+ * @returns {boolean}
+ */
+function isChatVisible() {
+    const path = navigationRef.current && navigationRef.current.getCurrentRoute().name
+        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config).slice(0, 3)
+        : '';
+    return path === '/r/';
+}
+
 /**
  * Alternative to the `Navigation.dismissModal()` function that we can use inside
  * the render function of other components to avoid breaking React rules about side-effects.
@@ -217,6 +236,8 @@ export default {
     navigate,
     dismissModal,
     isActiveRoute,
+    isChatVisible,
+    isReady,
     goBack,
     DismissModal,
     closeDrawer,
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 3aaf22887757..da6154138d61 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -797,8 +797,17 @@ function subscribeToReportCommentPushNotifications() {
 
     // Open correct report when push notification is clicked
     PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, ({reportID}) => {
-        Navigation.setDidTapNotification();
-        Linking.openURL(`${CONST.DEEPLINK_BASE_URL}${ROUTES.getReportRoute(reportID)}`);
+        if (Navigation.isReady()) {
+            // If a chat is visible other than the one we are trying to navigate to, then we need to navigate back
+            if (Navigation.isChatVisible() && Navigation.isActiveRoute(`r/${reportID}`)) {
+                Navigation.goBack();
+            }
+            Navigation.navigate(ROUTES.getReportRoute(reportID));
+        } else {
+            // Navigation container is not yet ready, use deeplinking to open to correct report instead
+            Navigation.setDidTapNotification();
+            Linking.openURL(`${CONST.DEEPLINK_BASE_URL}${ROUTES.getReportRoute(reportID)}`);
+        }
     });
 }
 

From cd397ae9aa6f7f2e2cb1910da3f1b28ce2147882 Mon Sep 17 00:00:00 2001
From: Peter Velkov <kidroca@gmail.com>
Date: Wed, 30 Mar 2022 15:04:46 +0300
Subject: [PATCH 05/36] Update FullScreenLoadingIndicator with PR suggestions

- remove `name` and `timeout` props. Use fixed timeout and a `logDetail` prop
- use fixed strings in log messages and pass details as additional data
- extract timeout duration to CONST
- throw if logging is not configured correctly
- trigger a special CONST.ERROR.ENSURE_BUGBOT alert
---
 src/CONST.js                                  |  1 +
 src/components/FullscreenLoadingIndicator.js  | 39 +++++++++++--------
 .../AppNavigator/MainDrawerNavigator.js       |  2 +-
 src/libs/Navigation/NavigationRoot.js         |  3 +-
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/CONST.js b/src/CONST.js
index 0ecb1aedf48a..4ffeaba8f616 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -305,6 +305,7 @@ const CONST = {
         COLD: 'cold',
         REPORT_ACTION_ITEM_LAYOUT_DEBOUNCE_TIME: 1500,
         TOOLTIP_SENSE: 1000,
+        SPINNER_TIMEOUT: 15 * 1000,
     },
     PRIORITY_MODE: {
         GSD: 'gsd',
diff --git a/src/components/FullscreenLoadingIndicator.js b/src/components/FullscreenLoadingIndicator.js
index faad8d37ae1e..b5356a4ac123 100644
--- a/src/components/FullscreenLoadingIndicator.js
+++ b/src/components/FullscreenLoadingIndicator.js
@@ -6,22 +6,25 @@ import styles from '../styles/styles';
 import themeColors from '../styles/themes/default';
 import stylePropTypes from '../styles/stylePropTypes';
 import Log from '../libs/Log';
+import CONST from '../CONST';
 
 const propTypes = {
-    /** Name used in the logs if the loader is displayed for too long time */
-    name: PropTypes.string,
-
-    /** Optional duration (ms) after which a message would be logged if the loader is still covering the screen */
-    timeout: PropTypes.number,
+    /**
+     * Context info printed in timing log.
+     * Providing this prop would capture logs for mounting/unmounting and staying visible for too long
+     */
+    logDetail: PropTypes.shape({
+        /** Name is used to distinct the loader in captured logs. */
+        name: PropTypes.string.isRequired,
+    }),
 
     /** Additional style props */
     style: stylePropTypes,
 };
 
 const defaultProps = {
-    timeout: 0,
-    name: '',
     style: [],
+    logDetail: null,
 };
 
 /**
@@ -32,29 +35,33 @@ const defaultProps = {
  */
 class FullScreenLoadingIndicator extends React.Component {
     componentDidMount() {
-        if (!this.props.name || !this.props.timeout) {
+        if (!this.props.logDetail) {
             return;
         }
 
-        Log.info(`[LoadingIndicator] "${this.props.name}" became visible`);
+        if (!this.props.logDetail.name) {
+            throw new Error('A name should be set to distinct logged messages. Please check the `logDetails` prop');
+        }
+
+        Log.info('[LoadingIndicator] Became visible', false, this.props.logDetail);
 
-        this.timeoutId = setTimeout(
+        this.timeoutID = setTimeout(
             () => Log.alert(
-                `[LoadingIndicator] "${this.props.name}" is still visible after ${this.props.timeout} ms`,
-                '',
+                `${CONST.ERROR.ENSURE_BUGBOT} [LoadingIndicator] Visible after timeout`,
+                {timeout: CONST.TIMING.SPINNER_TIMEOUT, ...this.props.logDetail},
                 false,
             ),
-            this.props.timeout,
+            CONST.TIMING.SPINNER_TIMEOUT,
         );
     }
 
     componentWillUnmount() {
-        if (!this.timeoutId) {
+        if (!this.timeoutID) {
             return;
         }
 
-        clearTimeout(this.timeoutId);
-        Log.info(`[LoadingIndicator] "${this.props.name}" disappeared`);
+        clearTimeout(this.timeoutID);
+        Log.info('[LoadingIndicator] Disappeared', false, this.props.logDetail);
     }
 
     render() {
diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
index 9cdddface5e8..fbcf4e167b69 100644
--- a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
+++ b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
@@ -49,7 +49,7 @@ const MainDrawerNavigator = (props) => {
 
     // Wait until reports are fetched and there is a reportID in initialParams
     if (!initialParams.reportID) {
-        return <FullScreenLoadingIndicator name="Main Drawer Loader" timeout={15 * 1000} />;
+        return <FullScreenLoadingIndicator logDetail={{name: 'Main Drawer Loader', initialParams}} />;
     }
 
     // After the app initializes and reports are available the home navigation is mounted
diff --git a/src/libs/Navigation/NavigationRoot.js b/src/libs/Navigation/NavigationRoot.js
index 403c87855203..80c7dedec073 100644
--- a/src/libs/Navigation/NavigationRoot.js
+++ b/src/libs/Navigation/NavigationRoot.js
@@ -59,8 +59,7 @@ class NavigationRoot extends Component {
             <NavigationContainer
                 fallback={(
                     <FullScreenLoadingIndicator
-                        name="Navigation Fallback Loader"
-                        timeout={15 * 1000}
+                        logDetail={{name: 'Navigation Fallback Loader', authenticated: this.props.authenticated}}
                         style={styles.navigatorFullScreenLoading}
                     />
                 )}

From 6f27b7ab290218128b4084a33e1f8d5addb8c878 Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Wed, 30 Mar 2022 14:51:12 -0400
Subject: [PATCH 06/36] Make case for archived rooms

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

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 3aaf22887757..d9461c513ff0 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -155,11 +155,20 @@ function getChatReportName(fullReport, chatType) {
             : '')}`;
     }
 
-    // For a basic policy room or a Policy Expense chat, return its original name
-    if (ReportUtils.isUserCreatedPolicyRoom({chatType}) || ReportUtils.isPolicyExpenseChat({chatType})) {
+    // For a basic policy room, return its original name
+    if (ReportUtils.isUserCreatedPolicyRoom({chatType})) {
         return LoginUtils.getEmailWithoutMergedAccountPrefix(fullReport.reportName);
     }
 
+    // For a Policy Expense Chat, return its original name and append (archived)' if it is archived
+    if (ReportUtils.isPolicyExpenseChat({chatType})) {
+        let name = LoginUtils.getEmailWithoutMergedAccountPrefix(fullReport.reportName);
+        if (ReportUtils.isArchivedRoom({stateNum: fullReport.state, statusNum: fullReport.status})) {
+            name += " (archived)";
+        }
+        return name;
+    }
+
     const {sharedReportList} = fullReport;
     return _.chain(sharedReportList)
         .map(participant => participant.email)

From d0c78b407fd8f5edfb7825bb657066818f4f7770 Mon Sep 17 00:00:00 2001
From: phivh <phivhdev@gmail.com>
Date: Fri, 1 Apr 2022 01:08:02 +0700
Subject: [PATCH 07/36] Fix make default payment

---
 src/pages/settings/Payments/PaymentMethodList.js           | 2 +-
 .../settings/Payments/PaymentsPage/BasePaymentsPage.js     | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentMethodList.js b/src/pages/settings/Payments/PaymentMethodList.js
index 9d01deefe9a6..f37ee134390c 100644
--- a/src/pages/settings/Payments/PaymentMethodList.js
+++ b/src/pages/settings/Payments/PaymentMethodList.js
@@ -130,7 +130,7 @@ class PaymentMethodList extends Component {
         combinedPaymentMethods = _.map(combinedPaymentMethods, paymentMethod => ({
             ...paymentMethod,
             type: MENU_ITEM,
-            onPress: e => this.props.onPress(e, paymentMethod.accountType, paymentMethod.accountData),
+            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,
         }));
diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index 3afb26623110..c4028ded0917 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -40,6 +40,7 @@ class BasePaymentsPage extends React.Component {
             shouldShowDefaultDeleteMenu: false,
             shouldShowPasswordPrompt: false,
             shouldShowConfirmPopover: false,
+            isSelectedPaymentMethodDefault: true,
             selectedPaymentMethod: {},
             formattedSelectedPaymentMethod: {},
             anchorPositionTop: 0,
@@ -112,8 +113,9 @@ class BasePaymentsPage extends React.Component {
      * @param {Object} nativeEvent
      * @param {String} accountType
      * @param {String} account
+     * @param {Boolean} accountDefault
      */
-    paymentMethodPressed(nativeEvent, accountType, account) {
+    paymentMethodPressed(nativeEvent, accountType, account, accountDefault) {
         const position = getClickedElementLocation(nativeEvent);
         this.setState({
             addPaymentMethodButton: nativeEvent,
@@ -143,6 +145,7 @@ class BasePaymentsPage extends React.Component {
                 };
             }
             this.setState({
+                isSelectedPaymentMethodDefault: !accountDefault,
                 shouldShowDefaultDeleteMenu: true,
                 selectedPaymentMethod: account,
                 selectedPaymentMethodType: accountType,
@@ -318,7 +321,7 @@ class BasePaymentsPage extends React.Component {
                                     interactive={false}
                                 />
                             )}
-                            {Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected && (
+                            {this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected && (
                                 <TouchableOpacity
                                     onPress={() => {
                                         this.setState({

From 7b3c15854a66a8d06391ab9e19ac1155d4766ad6 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Thu, 31 Mar 2022 12:49:42 -0600
Subject: [PATCH 08/36] Tweak checking for report

---
 src/libs/Navigation/Navigation.js | 19 +++++++------------
 src/libs/actions/Report.js        |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index db23c2603e2e..c0d6edf78706 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -1,11 +1,7 @@
 import _ from 'underscore';
 import React from 'react';
 import {Keyboard} from 'react-native';
-import {
-    StackActions,
-    DrawerActions,
-    getPathFromState,
-} from '@react-navigation/native';
+import {DrawerActions, getPathFromState, StackActions} from '@react-navigation/native';
 import PropTypes from 'prop-types';
 import Onyx from 'react-native-onyx';
 import Log from '../Log';
@@ -194,14 +190,13 @@ function isActiveRoute(routePath) {
 }
 
 /**
- * Returns whether we have a chat visible or not
- * @returns {boolean}
+ * Returns the current active path
+ * @returns {String}
  */
-function isChatVisible() {
-    const path = navigationRef.current && navigationRef.current.getCurrentRoute().name
-        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config).slice(0, 3)
+function getActiveRoute() {
+    return navigationRef.current && navigationRef.current.getCurrentRoute().name
+        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config)
         : '';
-    return path === '/r/';
 }
 
 /**
@@ -236,7 +231,7 @@ export default {
     navigate,
     dismissModal,
     isActiveRoute,
-    isChatVisible,
+    getActiveRoute,
     isReady,
     goBack,
     DismissModal,
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index da6154138d61..371150f6e522 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -799,7 +799,7 @@ function subscribeToReportCommentPushNotifications() {
     PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, ({reportID}) => {
         if (Navigation.isReady()) {
             // If a chat is visible other than the one we are trying to navigate to, then we need to navigate back
-            if (Navigation.isChatVisible() && Navigation.isActiveRoute(`r/${reportID}`)) {
+            if (Navigation.getActiveRoute().slice(1, 2) === ROUTES.REPORT && !Navigation.isActiveRoute(`r/${reportID}`)) {
                 Navigation.goBack();
             }
             Navigation.navigate(ROUTES.getReportRoute(reportID));

From 0763eabeddf53aad7d474010b098d4304ca7e480 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Thu, 31 Mar 2022 12:56:59 -0600
Subject: [PATCH 09/36] Update comment

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

diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index c0d6edf78706..00724a465d52 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -190,7 +190,7 @@ function isActiveRoute(routePath) {
 }
 
 /**
- * Returns the current active path
+ * Returns the current active route
  * @returns {String}
  */
 function getActiveRoute() {

From 354bf1b054a9a22c2eb4ac7ed6fa2895ed430741 Mon Sep 17 00:00:00 2001
From: phivh <phivhdev@gmail.com>
Date: Sun, 3 Apr 2022 20:44:12 +0700
Subject: [PATCH 10/36] Cleanup

---
 .../settings/Payments/PaymentsPage/BasePaymentsPage.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index c4028ded0917..b5693165361f 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -40,7 +40,7 @@ class BasePaymentsPage extends React.Component {
             shouldShowDefaultDeleteMenu: false,
             shouldShowPasswordPrompt: false,
             shouldShowConfirmPopover: false,
-            isSelectedPaymentMethodDefault: true,
+            isSelectedPaymentMethodDefault: false,
             selectedPaymentMethod: {},
             formattedSelectedPaymentMethod: {},
             anchorPositionTop: 0,
@@ -113,9 +113,9 @@ class BasePaymentsPage extends React.Component {
      * @param {Object} nativeEvent
      * @param {String} accountType
      * @param {String} account
-     * @param {Boolean} accountDefault
+     * @param {Boolean} isDefault
      */
-    paymentMethodPressed(nativeEvent, accountType, account, accountDefault) {
+    paymentMethodPressed(nativeEvent, accountType, account, isDefault) {
         const position = getClickedElementLocation(nativeEvent);
         this.setState({
             addPaymentMethodButton: nativeEvent,
@@ -145,7 +145,7 @@ class BasePaymentsPage extends React.Component {
                 };
             }
             this.setState({
-                isSelectedPaymentMethodDefault: !accountDefault,
+                isSelectedPaymentMethodDefault: isDefault,
                 shouldShowDefaultDeleteMenu: true,
                 selectedPaymentMethod: account,
                 selectedPaymentMethodType: accountType,
@@ -321,7 +321,7 @@ class BasePaymentsPage extends React.Component {
                                     interactive={false}
                                 />
                             )}
-                            {this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected && (
+                            {!this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected && (
                                 <TouchableOpacity
                                     onPress={() => {
                                         this.setState({

From 2e507133b1162766e8cbab17e4e3b424520a7696 Mon Sep 17 00:00:00 2001
From: Peter Velkov <kidroca@gmail.com>
Date: Mon, 4 Apr 2022 21:29:29 +0300
Subject: [PATCH 11/36] Remove FullscreenLoadingIndicator class description

Other components do not use class description
Removed to be uniform with the rest of our components
---
 src/components/FullscreenLoadingIndicator.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/components/FullscreenLoadingIndicator.js b/src/components/FullscreenLoadingIndicator.js
index b5356a4ac123..4bf55d7a3921 100644
--- a/src/components/FullscreenLoadingIndicator.js
+++ b/src/components/FullscreenLoadingIndicator.js
@@ -27,12 +27,6 @@ const defaultProps = {
     logDetail: null,
 };
 
-/**
- * Loading indication component intended to cover the whole page, while the page prepares for initial render
- *
- * @param {Object} props
- * @returns {JSX.Element}
- */
 class FullScreenLoadingIndicator extends React.Component {
     componentDidMount() {
         if (!this.props.logDetail) {
@@ -40,7 +34,7 @@ class FullScreenLoadingIndicator extends React.Component {
         }
 
         if (!this.props.logDetail.name) {
-            throw new Error('A name should be set to distinct logged messages. Please check the `logDetails` prop');
+            throw new Error('A name should be set to distinct logged messages. Please check the `logDetails` prop.');
         }
 
         Log.info('[LoadingIndicator] Became visible', false, this.props.logDetail);

From 3da7ab1a38111220f4fd7561c41b45a6af0795cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 13:46:06 -0500
Subject: [PATCH 12/36] don't append lastActorDetails.displayName if chat is
 archived

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

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index 8c600a2cb4eb..8cfad9e5b586 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -250,6 +250,7 @@ function createOption(personalDetailList, report, {
 }) {
     const isChatRoom = ReportUtils.isChatRoom(report);
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
+    const isArchivedRoom = ReportUtils.isArchivedRoom(report);
     const hasMultipleParticipants = personalDetailList.length > 1 || isChatRoom || isPolicyExpenseChat;
     const personalDetail = personalDetailList[0];
     const hasDraftComment = hasReportDraftComment(report);
@@ -262,7 +263,7 @@ function createOption(personalDetailList, report, {
     const lastMessageTextFromReport = ReportUtils.isReportMessageAttachment(lodashGet(report, 'lastMessageText', ''))
         ? `[${Localize.translateLocal('common.attachment')}]`
         : Str.htmlDecode(lodashGet(report, 'lastMessageText', ''));
-    let lastMessageText = report && hasMultipleParticipants && lastActorDetails
+    let lastMessageText = report && !isArchivedRoom && hasMultipleParticipants && lastActorDetails
         ? `${lastActorDetails.displayName}: `
         : '';
     lastMessageText += report ? lastMessageTextFromReport : '';

From c2f1b87a52326225419437edbd2e880a03d66c6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 13:46:55 -0500
Subject: [PATCH 13/36] re-use isArchivedRoom const

---
 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 8cfad9e5b586..f156bae5ddf4 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -316,7 +316,7 @@ function createOption(personalDetailList, report, {
         isIOUReportOwner: lodashGet(iouReport, 'ownerEmail', '') === currentUserLogin,
         iouReportAmount: lodashGet(iouReport, 'total', 0),
         isChatRoom,
-        isArchivedRoom: ReportUtils.isArchivedRoom(report),
+        isArchivedRoom,
         shouldShowSubscript: isPolicyExpenseChat && !report.isOwnPolicyExpenseChat,
         isPolicyExpenseChat,
     };

From d8896333d26e98da828d92f163c0dd13997608eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 13:59:31 -0500
Subject: [PATCH 14/36] use the default subtitle for archived workspaces

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

diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js
index 5d2cebfde73b..b5c92099091f 100644
--- a/src/libs/reportUtils.js
+++ b/src/libs/reportUtils.js
@@ -189,12 +189,12 @@ function getChatRoomSubtitle(report, policiesMap) {
         // The domainAll rooms are just #domainName, so we ignore the prefix '#' to get the domainName
         return report.reportName.substring(1);
     }
-    if (isArchivedRoom(report)) {
-        return report.oldPolicyName;
-    }
     if (isPolicyExpenseChat(report) && report.isOwnPolicyExpenseChat) {
         return Localize.translateLocal('workspace.common.workspace');
     }
+    if (isArchivedRoom(report)) {
+        return report.oldPolicyName;
+    }
     return lodashGet(
         policiesMap,
         [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'name'],

From 2f726f8777c8479c1a99480020f37b4b7da713f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 14:00:36 -0500
Subject: [PATCH 15/36] display oldPolicyName if workspace is archived

---
 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 f156bae5ddf4..6cc430116a46 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -274,7 +274,7 @@ function createOption(personalDetailList, report, {
     let text;
     let alternateText;
     if (isChatRoom || isPolicyExpenseChat) {
-        text = lodashGet(report, ['reportName'], '');
+        text = isArchivedRoom ? report.oldPolicyName : lodashGet(report, ['reportName'], '');
         alternateText = (showChatPreviewLine && !forcePolicyNamePreview && lastMessageText)
             ? lastMessageText
             : subtitle;

From e260888e2b2742f2877171d136002afb9fced46a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 14:07:53 -0500
Subject: [PATCH 16/36] display oldPolicyName if policy name is no longer
 available

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

diff --git a/src/components/ArchivedReportFooter.js b/src/components/ArchivedReportFooter.js
index d423fa0d4e22..d9da0ac82f2c 100644
--- a/src/components/ArchivedReportFooter.js
+++ b/src/components/ArchivedReportFooter.js
@@ -53,7 +53,7 @@ const defaultProps = {
 
 const ArchivedReportFooter = (props) => {
     const archiveReason = lodashGet(props.reportClosedAction, 'originalMessage.reason', CONST.REPORT.ARCHIVE_REASON.DEFAULT);
-    const policyName = lodashGet(props.policies, `${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}.name`);
+    const policyName = lodashGet(props.policies, `${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}.name`, props.report.oldPolicyName);
     let displayName = lodashGet(props.personalDetails, `${props.report.ownerEmail}.displayName`, props.report.ownerEmail);
 
     let oldDisplayName;

From 040baa3b854841257a81a62aedd98b91d259e4b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 14:13:42 -0500
Subject: [PATCH 17/36] use unavailable workspace message in archived report
 footer

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

diff --git a/src/components/ArchivedReportFooter.js b/src/components/ArchivedReportFooter.js
index d9da0ac82f2c..4ee835c17e04 100644
--- a/src/components/ArchivedReportFooter.js
+++ b/src/components/ArchivedReportFooter.js
@@ -8,6 +8,7 @@ import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import compose from '../libs/compose';
 import personalDetailsPropType from '../pages/personalDetailsPropType';
 import ONYXKEYS from '../ONYXKEYS';
+import * as Localize from '../libs/Localize';
 
 const propTypes = {
     /** The reason this report was archived */
@@ -53,7 +54,7 @@ const defaultProps = {
 
 const ArchivedReportFooter = (props) => {
     const archiveReason = lodashGet(props.reportClosedAction, 'originalMessage.reason', CONST.REPORT.ARCHIVE_REASON.DEFAULT);
-    const policyName = lodashGet(props.policies, `${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}.name`, props.report.oldPolicyName);
+    const policyName = archiveReason === CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY ? props.report.oldPolicyName : lodashGet(props.policies, `${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}.name`, Localize.translateLocal('workspace.common.unavailable'));
     let displayName = lodashGet(props.personalDetails, `${props.report.ownerEmail}.displayName`, props.report.ownerEmail);
 
     let oldDisplayName;

From 9491255817ccc994d4ef31a88178f8c2a7f5cf5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 14:17:18 -0500
Subject: [PATCH 18/36] use props.translate and give proper js formatting

---
 src/components/ArchivedReportFooter.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/ArchivedReportFooter.js b/src/components/ArchivedReportFooter.js
index 4ee835c17e04..070971d58406 100644
--- a/src/components/ArchivedReportFooter.js
+++ b/src/components/ArchivedReportFooter.js
@@ -8,7 +8,6 @@ import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import compose from '../libs/compose';
 import personalDetailsPropType from '../pages/personalDetailsPropType';
 import ONYXKEYS from '../ONYXKEYS';
-import * as Localize from '../libs/Localize';
 
 const propTypes = {
     /** The reason this report was archived */
@@ -54,7 +53,7 @@ const defaultProps = {
 
 const ArchivedReportFooter = (props) => {
     const archiveReason = lodashGet(props.reportClosedAction, 'originalMessage.reason', CONST.REPORT.ARCHIVE_REASON.DEFAULT);
-    const policyName = archiveReason === CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY ? props.report.oldPolicyName : lodashGet(props.policies, `${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}.name`, Localize.translateLocal('workspace.common.unavailable'));
+    let policyName = lodashGet(props.policies, `${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}.name`, props.translate('workspace.common.unavailable'));
     let displayName = lodashGet(props.personalDetails, `${props.report.ownerEmail}.displayName`, props.report.ownerEmail);
 
     let oldDisplayName;
@@ -65,6 +64,10 @@ const ArchivedReportFooter = (props) => {
         oldDisplayName = lodashGet(props.personalDetails, `${oldLogin}.displayName`, oldLogin);
     }
 
+    if (archiveReason === CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY) {
+        policyName = props.report.oldPolicyName;
+    }
+
     return (
         <Banner
             text={props.translate(`reportArchiveReasons.${archiveReason}`, {

From 850210ac33856041c987b748ea4a2ae9c5a60a1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 14:31:30 -0500
Subject: [PATCH 19/36] create the function getPolicyName in reportUtils

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

diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js
index b5c92099091f..b70f61dda340 100644
--- a/src/libs/reportUtils.js
+++ b/src/libs/reportUtils.js
@@ -175,6 +175,19 @@ function isArchivedRoom(report) {
     return report.statusNum === CONST.REPORT.STATUS.CLOSED && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED;
 }
 
+/**
+ * Get the policy name from a given report
+ * @param {Object} report
+ * @param {String} report.policyID
+ * @param {String} report.oldPolicyName
+ * @param {Object} policies must have Onyxkey prefix (i.e 'policy_') for keys
+ * @returns {String}
+ */
+function getPolicyName(report, policies) {
+    const defaultValue = report.oldPolicyName || Localize.translateLocal('workspace.common.unavailable');
+    return lodashGet(policies, [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'name'], defaultValue);
+}
+
 /**
  * Get either the policyName or domainName the chat is tied to
  * @param {Object} report
@@ -314,6 +327,7 @@ export {
     isUserCreatedPolicyRoom,
     isChatRoom,
     getChatRoomSubtitle,
+    getPolicyName,
     isArchivedRoom,
     isConciergeChatReport,
     hasExpensifyEmails,

From c41366e9eb940994afd658802d611e61656098e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 14:40:53 -0500
Subject: [PATCH 20/36] replace repeated logic with ReportUtils.getPolicyName

---
 src/components/ArchivedReportFooter.js |  8 ++------
 src/components/ReportWelcomeText.js    |  3 +--
 src/libs/reportUtils.js                | 13 ++-----------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/src/components/ArchivedReportFooter.js b/src/components/ArchivedReportFooter.js
index 070971d58406..cafc106ce2a4 100644
--- a/src/components/ArchivedReportFooter.js
+++ b/src/components/ArchivedReportFooter.js
@@ -8,6 +8,7 @@ import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import compose from '../libs/compose';
 import personalDetailsPropType from '../pages/personalDetailsPropType';
 import ONYXKEYS from '../ONYXKEYS';
+import * as ReportUtils from '../libs/reportUtils';
 
 const propTypes = {
     /** The reason this report was archived */
@@ -53,7 +54,6 @@ const defaultProps = {
 
 const ArchivedReportFooter = (props) => {
     const archiveReason = lodashGet(props.reportClosedAction, 'originalMessage.reason', CONST.REPORT.ARCHIVE_REASON.DEFAULT);
-    let policyName = lodashGet(props.policies, `${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}.name`, props.translate('workspace.common.unavailable'));
     let displayName = lodashGet(props.personalDetails, `${props.report.ownerEmail}.displayName`, props.report.ownerEmail);
 
     let oldDisplayName;
@@ -64,16 +64,12 @@ const ArchivedReportFooter = (props) => {
         oldDisplayName = lodashGet(props.personalDetails, `${oldLogin}.displayName`, oldLogin);
     }
 
-    if (archiveReason === CONST.REPORT.ARCHIVE_REASON.REMOVED_FROM_POLICY) {
-        policyName = props.report.oldPolicyName;
-    }
-
     return (
         <Banner
             text={props.translate(`reportArchiveReasons.${archiveReason}`, {
                 displayName: `<strong>${displayName}</strong>`,
                 oldDisplayName: `<strong>${oldDisplayName}</strong>`,
-                policyName: `<strong>${policyName}</strong>`,
+                policyName: `<strong>${ReportUtils.getPolicyName(props.report, props.policies)}</strong>`,
             })}
             shouldRenderHTML={archiveReason !== CONST.REPORT.ARCHIVE_REASON.DEFAULT}
         />
diff --git a/src/components/ReportWelcomeText.js b/src/components/ReportWelcomeText.js
index d60c8bd6c745..0d86d1071018 100644
--- a/src/components/ReportWelcomeText.js
+++ b/src/components/ReportWelcomeText.js
@@ -10,7 +10,6 @@ import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import compose from '../libs/compose';
 import * as ReportUtils from '../libs/reportUtils';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
-import * as Localize from '../libs/Localize';
 import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
 
@@ -91,7 +90,7 @@ const ReportWelcomeText = (props) => {
                         {props.translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartTwo')}
                     </Text>
                     <Text style={[styles.textStrong]}>
-                        {lodashGet(props.policies, [`${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}`, 'name'], Localize.translateLocal('workspace.common.unavailable'))}
+                        {ReportUtils.getPolicyName(props.report, props.policies)}
                     </Text>
                     <Text>
                         {props.translate('reportActionsView.beginningOfChatHistoryPolicyExpenseChatPartThree')}
diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js
index b70f61dda340..9ff3145921c6 100644
--- a/src/libs/reportUtils.js
+++ b/src/libs/reportUtils.js
@@ -208,11 +208,7 @@ function getChatRoomSubtitle(report, policiesMap) {
     if (isArchivedRoom(report)) {
         return report.oldPolicyName;
     }
-    return lodashGet(
-        policiesMap,
-        [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'name'],
-        Localize.translateLocal('workspace.common.unavailable'),
-    );
+    return getPolicyName(report, policiesMap);
 }
 
 /**
@@ -224,12 +220,7 @@ function getChatRoomSubtitle(report, policiesMap) {
 
 function getRoomWelcomeMessage(report, policiesMap) {
     const welcomeMessage = {};
-
-    const workspaceName = lodashGet(
-        policiesMap,
-        [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'name'],
-        Localize.translateLocal('workspace.common.unavailable'),
-    );
+    const workspaceName = getPolicyName(report, policiesMap);
 
     if (isAdminRoom(report)) {
         welcomeMessage.phrase1 = Localize.translateLocal('reportActionsView.beginningOfChatHistoryAdminRoomPartOne', {workspaceName});

From 3467f88020b074c6ad0cfcfc0ff7c1b1200d7dde Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 4 Apr 2022 13:47:49 -0600
Subject: [PATCH 21/36] Update src/libs/Navigation/Navigation.js

Co-authored-by: Marc Glasser <marc.aaron.glasser@gmail.com>
---
 src/libs/Navigation/Navigation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index 00724a465d52..d3ddd944d989 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -33,7 +33,7 @@ function setDidTapNotification() {
 
 /**
  * Returns true if the Navigation is ready to navigate
- * @returns {boolean}
+ * @returns {Boolean}
  */
 function isReady() {
     return navigationRef.isReady();

From 412c265f7cac83a5b2cc4f070848fc279cd77880 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?= <marco@expensify.com>
Date: Mon, 4 Apr 2022 14:52:25 -0500
Subject: [PATCH 22/36] use default report name if archived workspace for
 admins

---
 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 6cc430116a46..d5161e684341 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -274,7 +274,7 @@ function createOption(personalDetailList, report, {
     let text;
     let alternateText;
     if (isChatRoom || isPolicyExpenseChat) {
-        text = isArchivedRoom ? report.oldPolicyName : lodashGet(report, ['reportName'], '');
+        text = (isArchivedRoom && report.isOwnPolicyExpenseChat) ? report.oldPolicyName : lodashGet(report, ['reportName'], '');
         alternateText = (showChatPreviewLine && !forcePolicyNamePreview && lastMessageText)
             ? lastMessageText
             : subtitle;

From 5feab2bbac5fd8c6aff3701726130e1b9d1dee53 Mon Sep 17 00:00:00 2001
From: Brandon Stites <bstites+1@expensify.com>
Date: Mon, 4 Apr 2022 13:52:53 -0600
Subject: [PATCH 23/36] Attach appversion to all requests

---
 src/libs/Network/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/Network/index.js b/src/libs/Network/index.js
index c6fe983b3bb7..7352bfb0fd75 100644
--- a/src/libs/Network/index.js
+++ b/src/libs/Network/index.js
@@ -9,6 +9,7 @@ import * as NetworkStore from './NetworkStore';
 import * as NetworkEvents from './NetworkEvents';
 import * as PersistedRequestsQueue from './PersistedRequestsQueue';
 import processRequest from './processRequest';
+import {version} from '../../package.json';
 
 // Queue for network requests so we don't lose actions done by the user while offline
 let networkRequestQueue = [];
@@ -181,6 +182,7 @@ function post(command, data = {}, type = CONST.NETWORK.METHOD.POST, shouldUseSec
             ...data,
             shouldRetry: lodashGet(data, 'shouldRetry', true),
             canCancel: lodashGet(data, 'canCancel', true),
+            appversion: version,
         };
 
         // Add the request to a queue of actions to perform

From 86050cc2a9b5dbe43e70c34e9727276404d9d4c6 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 4 Apr 2022 14:08:49 -0600
Subject: [PATCH 24/36] Use `getActiveRoute` in `isActiveRoute`

---
 src/libs/Navigation/Navigation.js | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index d3ddd944d989..96323fca0cef 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -172,6 +172,16 @@ function dismissModal(shouldOpenDrawer = false) {
     }
 }
 
+/**
+ * Returns the current active route
+ * @returns {String}
+ */
+function getActiveRoute() {
+    return navigationRef.current && navigationRef.current.getCurrentRoute().name
+        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config)
+        : '';
+}
+
 /**
  * Check whether the passed route is currently Active or not.
  *
@@ -183,20 +193,7 @@ function dismissModal(shouldOpenDrawer = false) {
  */
 function isActiveRoute(routePath) {
     // We remove First forward slash from the URL before matching
-    const path = navigationRef.current && navigationRef.current.getCurrentRoute().name
-        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config).substring(1)
-        : '';
-    return path === routePath;
-}
-
-/**
- * Returns the current active route
- * @returns {String}
- */
-function getActiveRoute() {
-    return navigationRef.current && navigationRef.current.getCurrentRoute().name
-        ? getPathFromState(navigationRef.current.getState(), linkingConfig.config)
-        : '';
+    return getActiveRoute().substring(1) === routePath;
 }
 
 /**

From 2ef127776e5612016f3772b945fefa61e1bc6d04 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Mon, 4 Apr 2022 14:13:27 -0600
Subject: [PATCH 25/36] Use `canNavigate` instead of `isReady`

---
 src/libs/Navigation/Navigation.js | 10 +---------
 src/libs/actions/Report.js        |  2 +-
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
index 96323fca0cef..360afa67afc9 100644
--- a/src/libs/Navigation/Navigation.js
+++ b/src/libs/Navigation/Navigation.js
@@ -31,14 +31,6 @@ function setDidTapNotification() {
     didTapNotificationBeforeReady = true;
 }
 
-/**
- * Returns true if the Navigation is ready to navigate
- * @returns {Boolean}
- */
-function isReady() {
-    return navigationRef.isReady();
-}
-
 /**
  * @param {String} methodName
  * @param {Object} params
@@ -225,11 +217,11 @@ DismissModal.defaultProps = {
 };
 
 export default {
+    canNavigate,
     navigate,
     dismissModal,
     isActiveRoute,
     getActiveRoute,
-    isReady,
     goBack,
     DismissModal,
     closeDrawer,
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 371150f6e522..c7ccb84500b3 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -797,7 +797,7 @@ function subscribeToReportCommentPushNotifications() {
 
     // Open correct report when push notification is clicked
     PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, ({reportID}) => {
-        if (Navigation.isReady()) {
+        if (Navigation.canNavigate('navigate')) {
             // If a chat is visible other than the one we are trying to navigate to, then we need to navigate back
             if (Navigation.getActiveRoute().slice(1, 2) === ROUTES.REPORT && !Navigation.isActiveRoute(`r/${reportID}`)) {
                 Navigation.goBack();

From 93d6d18c00c264285f83b83fe8ce7abb9cea840d Mon Sep 17 00:00:00 2001
From: Brandon Stites <bstites+1@expensify.com>
Date: Mon, 4 Apr 2022 14:52:34 -0600
Subject: [PATCH 26/36] Fix import

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

diff --git a/src/libs/Network/index.js b/src/libs/Network/index.js
index 7352bfb0fd75..d65ec7380cba 100644
--- a/src/libs/Network/index.js
+++ b/src/libs/Network/index.js
@@ -9,7 +9,7 @@ import * as NetworkStore from './NetworkStore';
 import * as NetworkEvents from './NetworkEvents';
 import * as PersistedRequestsQueue from './PersistedRequestsQueue';
 import processRequest from './processRequest';
-import {version} from '../../package.json';
+import {version} from '../../../package.json';
 
 // Queue for network requests so we don't lose actions done by the user while offline
 let networkRequestQueue = [];

From 9d7feec184ce48a1fe07b51e211f1e8717dc1a22 Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Mon, 4 Apr 2022 18:02:28 -0400
Subject: [PATCH 27/36] Fix comment

---
 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 225b0e2def70..a67c2160eefb 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -160,7 +160,6 @@ function getChatReportName(fullReport, chatType) {
         return LoginUtils.getEmailWithoutMergedAccountPrefix(fullReport.reportName);
     }
 
-    // For a Policy Expense Chat, return its original name and append (archived)' if it is archived
     if (ReportUtils.isPolicyExpenseChat({chatType})) {
         let name = LoginUtils.getEmailWithoutMergedAccountPrefix(fullReport.reportName);
         if (ReportUtils.isArchivedRoom({stateNum: fullReport.state, statusNum: fullReport.status})) {

From 137a0d0f6516b21d97f5beb60a1b44a9aaee2325 Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Mon, 4 Apr 2022 18:11:48 -0400
Subject: [PATCH 28/36] Fix string style

---
 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 a67c2160eefb..42b114dcf960 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -163,7 +163,7 @@ function getChatReportName(fullReport, chatType) {
     if (ReportUtils.isPolicyExpenseChat({chatType})) {
         let name = LoginUtils.getEmailWithoutMergedAccountPrefix(fullReport.reportName);
         if (ReportUtils.isArchivedRoom({stateNum: fullReport.state, statusNum: fullReport.status})) {
-            name += " (archived)";
+            name += ' (archived)';
         }
         return name;
     }

From ae38cc9acf18d54919e698992ccbed937527f88d Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Mon, 4 Apr 2022 22:47:10 -0400
Subject: [PATCH 29/36] Add archived in workspace chat name

---
 src/languages/en.js        |  1 +
 src/languages/es.js        |  1 +
 src/libs/actions/Report.js | 12 +++++++-----
 src/libs/reportUtils.js    |  1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/languages/en.js b/src/languages/en.js
index 23559fc072c4..b4a507d6d9ea 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -37,6 +37,7 @@ export default {
         privacyPolicy: 'Privacy policy',
         delete: 'Delete',
         deleted: 'deleted',
+        archived: 'archived',
         contacts: 'Contacts',
         recents: 'Recents',
         close: 'Close',
diff --git a/src/languages/es.js b/src/languages/es.js
index 62e1f9e0a36c..35ebadde375f 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -37,6 +37,7 @@ export default {
         privacyPolicy: 'Política de privacidad',
         delete: 'Eliminar',
         deleted: 'eliminado',
+        archived: 'archivado',
         contacts: 'Contactos',
         recents: 'Recientes',
         close: 'Cerrar',
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 1d297e416a1b..0335fe87f035 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -161,11 +161,13 @@ function getChatReportName(fullReport, chatType) {
     }
 
     if (ReportUtils.isPolicyExpenseChat({chatType})) {
-        let name = LoginUtils.getEmailWithoutMergedAccountPrefix(fullReport.reportName);
-        if (ReportUtils.isArchivedRoom({stateNum: fullReport.state, statusNum: fullReport.status})) {
-            name += ' (archived)';
-        }
-        return name;
+        return `${LoginUtils.getEmailWithoutMergedAccountPrefix(fullReport.reportName)}${(ReportUtils.isArchivedRoom({
+            chatType,
+            stateNum: fullReport.state,
+            statusNum: fullReport.status,
+        })
+            ? ` (archived)`
+            : '')}`;
     }
 
     const {sharedReportList} = fullReport;
diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js
index 1eee89cb317c..1b722a71d425 100644
--- a/src/libs/reportUtils.js
+++ b/src/libs/reportUtils.js
@@ -172,6 +172,7 @@ function isArchivedRoom(report) {
     if (!isChatRoom(report) && !isPolicyExpenseChat(report)) {
         return false;
     }
+    console.log(report);
 
     return report.statusNum === CONST.REPORT.STATUS.CLOSED && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED;
 }

From b4c4f6539b8502e7f68ed323517d63c894c652fb Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Mon, 4 Apr 2022 22:55:34 -0400
Subject: [PATCH 30/36] correctly use translateLocal

---
 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 0335fe87f035..f9fae2da19af 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -166,7 +166,7 @@ function getChatReportName(fullReport, chatType) {
             stateNum: fullReport.state,
             statusNum: fullReport.status,
         })
-            ? ` (archived)`
+            ? ` (${Localize.translateLocal('common.archived')})`
             : '')}`;
     }
 

From 4d50d12f8d57d0b5c107d4003a7ae3f989cc525d Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Tue, 5 Apr 2022 10:34:11 -0400
Subject: [PATCH 31/36] remove console statement

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

diff --git a/src/libs/reportUtils.js b/src/libs/reportUtils.js
index 1b722a71d425..1eee89cb317c 100644
--- a/src/libs/reportUtils.js
+++ b/src/libs/reportUtils.js
@@ -172,7 +172,6 @@ function isArchivedRoom(report) {
     if (!isChatRoom(report) && !isPolicyExpenseChat(report)) {
         return false;
     }
-    console.log(report);
 
     return report.statusNum === CONST.REPORT.STATUS.CLOSED && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED;
 }

From 18469e8ed58b5797c315672ef6b47a6cb2bdf0e3 Mon Sep 17 00:00:00 2001
From: Tyler Karaszewski <tyler@expensify.com>
Date: Tue, 5 Apr 2022 09:30:03 -0600
Subject: [PATCH 32/36] Fix typo

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

diff --git a/src/languages/es.js b/src/languages/es.js
index 62e1f9e0a36c..73cb88dfc72c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -854,7 +854,7 @@ export default {
             nameInputHelpText: 'Este es el nombre que verás en tu espacio de trabajo.',
             nameIsRequiredError: 'Debes definir un nombre para tu espacio de trabajo.',
             currencyInputLabel: 'Moneda por defecto',
-            currencyInputHelpText: 'Todas los gastos en este epecio de trabajo serán convertidos a esta moneda.',
+            currencyInputHelpText: 'Todas los gastos en este espacio de trabajo serán convertidos a esta moneda.',
             save: 'Guardar',
             genericFailureMessage: 'Se produjo un error al guardar el espacio de trabajo. Por favor, inténtalo de nuevo.',
             avatarUploadFailureMessage: 'No se pudo subir el avatar. Por favor, inténtalo de nuevo.',

From c88e95c34086e096ba56d89be0b2d34ca5f59762 Mon Sep 17 00:00:00 2001
From: phivh <phivhdev@gmail.com>
Date: Tue, 5 Apr 2022 23:52:39 +0700
Subject: [PATCH 33/36] Fix spacing

---
 src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index b5693165361f..3f28b1092647 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -232,6 +232,7 @@ class BasePaymentsPage extends React.Component {
 
     render() {
         const isPayPalMeSelected = this.state.formattedSelectedPaymentMethod.type === CONST.PAYMENT_METHODS.PAYPAL;
+        const isShowButtonMakeDefaultPayment = !this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected;
 
         // Determines whether or not the modal popup is mounted from the bottom of the screen instead of the side mount on Web or Desktop screens
         const isPopoverBottomMount = this.state.anchorPositionTop === 0 || this.props.isSmallScreenWidth;
@@ -321,7 +322,7 @@ class BasePaymentsPage extends React.Component {
                                     interactive={false}
                                 />
                             )}
-                            {!this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected && (
+                            {isShowButtonMakeDefaultPayment && (
                                 <TouchableOpacity
                                     onPress={() => {
                                         this.setState({
@@ -359,7 +360,7 @@ class BasePaymentsPage extends React.Component {
                                 style={[
                                     styles.button,
                                     styles.buttonDanger,
-                                    Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected && styles.mt4,
+                                    isShowButtonMakeDefaultPayment && styles.mt4,
                                     styles.alignSelfCenter,
                                     styles.w100,
                                 ]}

From 4e46f273befac3bf2752cf4d1b8fb3f8023468c5 Mon Sep 17 00:00:00 2001
From: phivh <phivhdev@gmail.com>
Date: Wed, 6 Apr 2022 01:06:15 +0700
Subject: [PATCH 34/36] Cleanup

---
 .../settings/Payments/PaymentsPage/BasePaymentsPage.js      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index 3f28b1092647..c2eabd786c63 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -232,7 +232,7 @@ class BasePaymentsPage extends React.Component {
 
     render() {
         const isPayPalMeSelected = this.state.formattedSelectedPaymentMethod.type === CONST.PAYMENT_METHODS.PAYPAL;
-        const isShowButtonMakeDefaultPayment = !this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected;
+        const shouldShowButtonMakeDefaultPayment = !this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected;
 
         // Determines whether or not the modal popup is mounted from the bottom of the screen instead of the side mount on Web or Desktop screens
         const isPopoverBottomMount = this.state.anchorPositionTop === 0 || this.props.isSmallScreenWidth;
@@ -322,7 +322,7 @@ class BasePaymentsPage extends React.Component {
                                     interactive={false}
                                 />
                             )}
-                            {isShowButtonMakeDefaultPayment && (
+                            {shouldShowButtonMakeDefaultPayment && (
                                 <TouchableOpacity
                                     onPress={() => {
                                         this.setState({
@@ -360,7 +360,7 @@ class BasePaymentsPage extends React.Component {
                                 style={[
                                     styles.button,
                                     styles.buttonDanger,
-                                    isShowButtonMakeDefaultPayment && styles.mt4,
+                                    shouldShowButtonMakeDefaultPayment && styles.mt4,
                                     styles.alignSelfCenter,
                                     styles.w100,
                                 ]}

From e97b620ed4814d26ab2b9f1f3e64b34c7275ab6e Mon Sep 17 00:00:00 2001
From: phivh <phivhdev@gmail.com>
Date: Wed, 6 Apr 2022 10:02:14 +0700
Subject: [PATCH 35/36] Change naming

---
 .../settings/Payments/PaymentsPage/BasePaymentsPage.js      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
index c2eabd786c63..3417b989392b 100644
--- a/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
+++ b/src/pages/settings/Payments/PaymentsPage/BasePaymentsPage.js
@@ -232,7 +232,7 @@ class BasePaymentsPage extends React.Component {
 
     render() {
         const isPayPalMeSelected = this.state.formattedSelectedPaymentMethod.type === CONST.PAYMENT_METHODS.PAYPAL;
-        const shouldShowButtonMakeDefaultPayment = !this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected;
+        const shouldShowMakeDefaultButton = !this.state.isSelectedPaymentMethodDefault && Permissions.canUseWallet(this.props.betas) && !isPayPalMeSelected;
 
         // Determines whether or not the modal popup is mounted from the bottom of the screen instead of the side mount on Web or Desktop screens
         const isPopoverBottomMount = this.state.anchorPositionTop === 0 || this.props.isSmallScreenWidth;
@@ -322,7 +322,7 @@ class BasePaymentsPage extends React.Component {
                                     interactive={false}
                                 />
                             )}
-                            {shouldShowButtonMakeDefaultPayment && (
+                            {shouldShowMakeDefaultButton && (
                                 <TouchableOpacity
                                     onPress={() => {
                                         this.setState({
@@ -360,7 +360,7 @@ class BasePaymentsPage extends React.Component {
                                 style={[
                                     styles.button,
                                     styles.buttonDanger,
-                                    shouldShowButtonMakeDefaultPayment && styles.mt4,
+                                    shouldShowMakeDefaultButton && styles.mt4,
                                     styles.alignSelfCenter,
                                     styles.w100,
                                 ]}

From 3209de07ba2270fd896c6367dc4e97685d0dbe8a Mon Sep 17 00:00:00 2001
From: OSBotify <infra+osbotify@expensify.com>
Date: Wed, 6 Apr 2022 17:53:57 +0000
Subject: [PATCH 36/36] Update version to 1.1.52-0

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

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 861ac8f13109..b3bb898ee2e3 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015100
-        versionName "1.1.51-0"
+        versionCode 1001015200
+        versionName "1.1.52-0"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index ff0410761d3b..92b1d3b79059 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.1.51</string>
+	<string>1.1.52</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.51.0</string>
+	<string>1.1.52.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index a72b11e867a2..3fd8e939d051 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.1.51</string>
+	<string>1.1.52</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.51.0</string>
+	<string>1.1.52.0</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index b23d1d77e615..ca2dc8c48c5d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.51-0",
+  "version": "1.1.52-0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b6cfb77c7ee5..b6ed2db2746d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.51-0",
+  "version": "1.1.52-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.",