Merge pull request #12734 from Expensify/OSBotify-cherry-pick-staging…

…-12722 🍒 Cherry pick PR #12722 to staging 🍒
Expensify · Nov 15, 2022 · 10ed3fd · 10ed3fd
2 parents 3bf0b72 + 497f3d7
commit 10ed3fd
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 53 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001022703
-        versionName "1.2.27-3"
+        versionCode 1001022704
+        versionName "1.2.27-4"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.27.3</string>
+	<string>1.2.27.4</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git 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.27.3</string>
+	<string>1.2.27.4</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.27-3",
+  "version": "1.2.27-4",
   "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.",

diff --git a/src/ONYXKEYS.js b/src/ONYXKEYS.js
@@ -155,9 +155,6 @@ export default {
     // Is report data loading?
     IS_LOADING_REPORT_DATA: 'isLoadingReportData',
 
-    // Are we loading the initial app data?
-    IS_LOADING_INITIAL_APP_DATA: 'isLoadingInitialAppData',
-
     // Is Keyboard shortcuts modal open?
     IS_SHORTCUTS_MODAL_OPEN: 'isShortcutsModalOpen',
 

diff --git a/src/libs/actions/App.js b/src/libs/actions/App.js
@@ -123,35 +123,20 @@ function openApp() {
                 key: ONYXKEYS.IS_LOADING_REPORT_DATA,
                 value: true,
             },
-            {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
-                key: ONYXKEYS.IS_LOADING_INITIAL_APP_DATA,
-                value: true,
-            },
         ],
         successData: [
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.IS_LOADING_REPORT_DATA,
                 value: false,
             },
-            {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
-                key: ONYXKEYS.IS_LOADING_INITIAL_APP_DATA,
-                value: false,
-            },
         ],
         failureData: [
             {
                 onyxMethod: CONST.ONYX.METHOD.MERGE,
                 key: ONYXKEYS.IS_LOADING_REPORT_DATA,
                 value: false,
             },
-            {
-                onyxMethod: CONST.ONYX.METHOD.MERGE,
-                key: ONYXKEYS.IS_LOADING_INITIAL_APP_DATA,
-                value: false,
-            },
         ],
     });
 }

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
@@ -153,13 +153,9 @@ class ReportScreen extends React.Component {
     isReportReadyForDisplay() {
         const reportIDFromPath = getReportID(this.props.route);
 
-        // We need to wait for the initial app data to load as it tells us which reports are unread. Waiting will allow the new marker to be set
-        // correctly when the report mounts. If we don't do this, the report may initialize in the "read" state and the marker won't be set at all.
-        const isLoadingInitialAppData = this.props.isLoadingInitialAppData;
-
         // This is necessary so that when we are retrieving the next report data from Onyx the ReportActionsView will remount completely
         const isTransitioning = this.props.report && this.props.report.reportID !== reportIDFromPath;
-        return reportIDFromPath && this.props.report.reportID && !isTransitioning && !isLoadingInitialAppData;
+        return reportIDFromPath && this.props.report.reportID && !isTransitioning;
     }
 
     fetchReportIfNeeded() {
@@ -283,15 +279,26 @@ class ReportScreen extends React.Component {
                                 this.setState({skeletonViewContainerHeight});
                             }}
                         >
-                            {this.isReportReadyForDisplay() && (
-                                <ReportActionsView
-                                    reportActions={this.props.reportActions}
-                                    report={this.props.report}
-                                    session={this.props.session}
-                                    isComposerFullSize={this.props.isComposerFullSize}
-                                    isDrawerOpen={this.props.isDrawerOpen}
-                                    parentViewHeight={this.state.skeletonViewContainerHeight}
-                                />
+                            {(this.isReportReadyForDisplay() && !isLoadingInitialReportActions) && (
+                                <>
+                                    <ReportActionsView
+                                        reportActions={this.props.reportActions}
+                                        report={this.props.report}
+                                        session={this.props.session}
+                                        isComposerFullSize={this.props.isComposerFullSize}
+                                        isDrawerOpen={this.props.isDrawerOpen}
+                                        parentViewHeight={this.state.skeletonViewContainerHeight}
+                                    />
+                                    <ReportFooter
+                                        errors={addWorkspaceRoomOrChatErrors}
+                                        pendingAction={addWorkspaceRoomOrChatPendingAction}
+                                        isOffline={this.props.network.isOffline}
+                                        reportActions={this.props.reportActions}
+                                        report={this.props.report}
+                                        isComposerFullSize={this.props.isComposerFullSize}
+                                        onSubmitComment={this.onSubmitComment}
+                                    />
+                                </>
                             )}
 
                             {/* Note: The report should be allowed to mount even if the initial report actions are not loaded. If we prevent rendering the report while they are loading then
@@ -301,17 +308,6 @@ class ReportScreen extends React.Component {
                                     containerHeight={this.state.skeletonViewContainerHeight}
                                 />
                             )}
-                            {this.isReportReadyForDisplay() && !isLoadingInitialReportActions && (
-                                <ReportFooter
-                                    errors={addWorkspaceRoomOrChatErrors}
-                                    pendingAction={addWorkspaceRoomOrChatPendingAction}
-                                    isOffline={this.props.network.isOffline}
-                                    reportActions={this.props.reportActions}
-                                    report={this.props.report}
-                                    isComposerFullSize={this.props.isComposerFullSize}
-                                    onSubmitComment={this.onSubmitComment}
-                                />
-                            )}
                         </View>
                     </FullPageNotFoundView>
                 </ScreenWrapper>
@@ -357,8 +353,5 @@ export default compose(
         personalDetails: {
             key: ONYXKEYS.PERSONAL_DETAILS,
         },
-        isLoadingInitialAppData: {
-            key: ONYXKEYS.IS_LOADING_INITIAL_APP_DATA,
-        },
     }),
 )(ReportScreen);