🍒 Cherry pick PR #20654 to staging 🍒

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001032705
-        versionName "1.3.27-5"
+        versionCode 1001032706
+        versionName "1.3.27-6"
     }
 
     splits {

ios/NewExpensify/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.27.5</string>
+	<string>1.3.27.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.27.5</string>
+	<string>1.3.27.6</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.27-5",
+  "version": "1.3.27-6",
   "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.",

src/libs/Navigation/AppNavigator/AuthScreens.js

@@ -19,6 +19,7 @@ import KeyboardShortcut from '../../KeyboardShortcut';
 import Navigation from '../Navigation';
 import * as User from '../../actions/User';
 import * as Modal from '../../actions/Modal';
+import * as Report from '../../actions/Report';
 import modalCardStyleInterpolator from './modalCardStyleInterpolator';
 import createResponsiveStackNavigator from './createResponsiveStackNavigator';
 import SCREENS from '../../../SCREENS';
@@ -85,13 +86,18 @@ const propTypes = {
     session: PropTypes.shape({
         email: PropTypes.string.isRequired,
     }),
+
+    /** The report ID of the last opened public room as anonymous user */
+    lastOpenedPublicRoomID: PropTypes.string,
+
     ...windowDimensionsPropTypes,
 };
 
 const defaultProps = {
     session: {
         email: null,
     },
+    lastOpenedPublicRoomID: null,
 };
 
 class AuthScreens extends React.Component {
@@ -115,6 +121,11 @@ class AuthScreens extends React.Component {
 
         App.openApp();
         App.setUpPoliciesAndNavigate(this.props.session);
+
+        if (this.props.lastOpenedPublicRoomID) {
+            // Re-open the last opened public room if the user logged in from a public room link
+            Report.openLastOpenedPublicRoom(this.props.lastOpenedPublicRoomID);
+        }
         Download.clearDownloads();
         Timing.end(CONST.TIMING.HOMEPAGE_INITIAL_RENDER);
 
@@ -274,5 +285,8 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        lastOpenedPublicRoomID: {
+            key: ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID,
+        },
     }),
 )(AuthScreens);

src/libs/Navigation/AppNavigator/ReportScreenWrapper.js

@@ -12,8 +12,6 @@ import reportPropTypes from '../../../pages/reportPropTypes';
 import FullScreenLoadingIndicator from '../../../components/FullscreenLoadingIndicator';
 import {withNavigationPropTypes} from '../../../components/withNavigation';
 import * as App from '../../actions/App';
-import * as Report from '../../actions/Report';
-import * as Session from '../../actions/Session';
 
 const propTypes = {
     /** Available reports that would be displayed in this navigator */
@@ -33,9 +31,6 @@ const propTypes = {
         }),
     ),
 
-    /** The report ID of the last opened public room as anonymous user */
-    lastOpenedPublicRoomID: PropTypes.string,
-
     isFirstTimeNewExpensifyUser: PropTypes.bool,
 
     /** Navigation route context info provided by react navigation */
@@ -58,7 +53,6 @@ const defaultProps = {
     betas: [],
     policies: {},
     isFirstTimeNewExpensifyUser: false,
-    lastOpenedPublicRoomID: null,
 };
 
 /**
@@ -102,15 +96,6 @@ class ReportScreenWrapper extends Component {
         }
     }
 
-    componentDidMount() {
-        if (!this.props.lastOpenedPublicRoomID || Session.isAnonymousUser()) {
-            return;
-        }
-        // Re-open the last opened public room if the user logged in
-        Report.setLastOpenedPublicRoom('');
-        Report.openReport(this.props.lastOpenedPublicRoomID);
-    }
-
     shouldComponentUpdate(nextProps) {
         // Don't update if there is a reportID in the params already
         if (lodashGet(this.props.route, 'params.reportID', null)) {
@@ -161,7 +146,4 @@ export default withOnyx({
     isFirstTimeNewExpensifyUser: {
         key: ONYXKEYS.NVP_IS_FIRST_TIME_NEW_EXPENSIFY_USER,
     },
-    lastOpenedPublicRoomID: {
-        key: ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID,
-    },
 })(ReportScreenWrapper);

src/libs/actions/Report.js

@@ -1680,6 +1680,18 @@ function setLastOpenedPublicRoom(reportID) {
     Onyx.set(ONYXKEYS.LAST_OPENED_PUBLIC_ROOM_ID, reportID);
 }
 
+/**
+ * Navigates to the last opened public room
+ *
+ * @param {String} lastOpenedPublicRoomID
+ */
+function openLastOpenedPublicRoom(lastOpenedPublicRoomID) {
+    Navigation.isNavigationReady().then(() => {
+        setLastOpenedPublicRoom('');
+        Navigation.navigate(ROUTES.getReportRoute(lastOpenedPublicRoomID));
+    });
+}
+
 /**
  * Flag a comment as offensive
  *
@@ -1804,4 +1816,5 @@ export {
     leaveRoom,
     setLastOpenedPublicRoom,
     flagComment,
+    openLastOpenedPublicRoom,
 };