refactor: ReportScreen handle initial state

Expensify · Apr 3, 2021 · 4cf35fd · 4cf35fd
1 parent 283e6c0
commit 4cf35fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/components/Loading/LoadingIndicator.js b/src/components/Loading/LoadingIndicator.js
@@ -1,3 +1,4 @@
+/* eslint-disable react/jsx-props-no-spreading */
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import {

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
@@ -13,7 +13,11 @@ import ONYXKEYS from '../../ONYXKEYS';
 
 const propTypes = {
     /* The ID of the report this screen should display */
-    reportID: PropTypes.string.isRequired,
+    reportID: PropTypes.string,
+};
+
+const defaultProps = {
+    reportID: '0',
 };
 
 class ReportScreen extends React.Component {
@@ -26,25 +30,29 @@ class ReportScreen extends React.Component {
         };
     }
 
+    componentDidMount() {
+        this.fetchReport();
+    }
+
     componentDidUpdate(prevProps) {
         // Reports changed, reset and load new data
         if (this.props.reportID !== prevProps.reportID) {
-            if (this.reportID) {
-                this.fetchReport();
-            }
+            this.fetchReport();
         }
     }
 
     // Todo: ask why getters aren't on top?
     get canRenderMainContent() {
-        return !this.state.isLoading && !this.state.error;
+        return this.reportID && !this.state.isLoading && !this.state.error;
     }
 
     get reportID() {
         return parseInt(this.props.reportID, 10);
     }
 
     fetchReport() {
+        if (!this.reportID) { return; }
+
         console.debug('[ReportScreen] Fetch started: ');
         this.setState({
             isLoading: true,
@@ -91,6 +99,8 @@ class ReportScreen extends React.Component {
 
 ReportScreen.displayName = 'ReportScreen';
 ReportScreen.propTypes = propTypes;
+ReportScreen.defaultProps = defaultProps;
+
 export default withOnyx({
     reportID: {
         key: ONYXKEYS.CURRENTLY_VIEWED_REPORTID,