Wildan/21518/fix

src/pages/home/ReportScreen.js

@@ -132,6 +132,7 @@ class ReportScreen extends React.Component {
         this.state = {
             skeletonViewContainerHeight: reportActionsListViewHeight,
             isBannerVisible: true,
+            isReportRemoved: false,
         };
         this.firstRenderRef = React.createRef();
         this.firstRenderRef.current = reportActionsListViewHeight === 0;
@@ -160,13 +161,33 @@ class ReportScreen extends React.Component {
         if (ReportUtils.shouldHideComposer(this.props.report, this.props.errors)) {
             EmojiPickerAction.hideEmojiPicker(true);
         }
+        const onyxReportID = this.props.report.reportID;
+        const prevOnyxReportID = prevProps.report.reportID;
+        const routeReportID = getReportID(this.props.route);
+
+        // navigate to concierge when the room removed from another device (e.g. user leaving a room)
+        // the report will not really null when removed, it will have defaultProps properties and values
+        if (
+            prevOnyxReportID &&
+            prevOnyxReportID === routeReportID &&
+            !onyxReportID &&
+            // non-optimistic case
+            (_.isEqual(this.props.report, defaultProps.report) ||
+                // optimistic case
+                (prevProps.report.statusNum === CONST.REPORT.STATUS.OPEN && this.props.report.statusNum === CONST.REPORT.STATUS.CLOSED))
+        ) {
+            Navigation.goBack();
+            Report.navigateToConciergeChat();
+            // isReportRemoved will prevent <FullPageNotFoundView> showing when navigating
+            this.setState({isReportRemoved: true});
+            return;
+        }
+
         // If you already have a report open and are deeplinking to a new report on native,
         // the ReportScreen never actually unmounts and the reportID in the route also doesn't change.
         // Therefore, we need to compare if the existing reportID is the same as the one in the route
         // before deciding that we shouldn't call OpenReport.
-        const onyxReportID = this.props.report.reportID;
-        const routeReportID = getReportID(this.props.route);
-        if (onyxReportID === prevProps.report.reportID && (!onyxReportID || onyxReportID === routeReportID)) {
+        if (onyxReportID === prevOnyxReportID && (!onyxReportID || onyxReportID === routeReportID)) {
             return;
         }
 
@@ -266,7 +287,7 @@ class ReportScreen extends React.Component {
                     shouldEnableKeyboardAvoidingView={this.props.isFocused}
                 >
                     <FullPageNotFoundView
-                        shouldShow={(!this.props.report.reportID && !this.props.report.isLoadingReportActions && !isLoading) || shouldHideReport}
+                        shouldShow={(!this.props.report.reportID && !this.props.report.isLoadingReportActions && !isLoading && !this.state.isReportRemoved) || shouldHideReport}
                         subtitleKey="notFound.noAccess"
                         shouldShowCloseButton={false}
                         shouldShowBackButton={this.props.isSmallScreenWidth}