Skip to content

Commit

Permalink
Merge pull request #36852 from bernhardoj/fix/36442-infinite-loading-…
Browse files Browse the repository at this point in the history
…when-accessing-workspace-after-login
  • Loading branch information
blimpich authored Feb 20, 2024
2 parents 00c5fd2 + dce04be commit 3601df8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
4 changes: 0 additions & 4 deletions src/libs/Navigation/AppNavigator/ReportScreenIDSetter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import useActiveWorkspace from '@hooks/useActiveWorkspace';
import usePermissions from '@hooks/usePermissions';
import {getPolicyMembersByIdWithoutCurrentUser} from '@libs/PolicyUtils';
import * as ReportUtils from '@libs/ReportUtils';
import * as App from '@userActions/App';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Policy, PolicyMembers, Report, ReportMetadata} from '@src/types/onyx';
import type {ReportScreenWrapperProps} from './ReportScreenWrapper';
Expand Down Expand Up @@ -71,7 +70,6 @@ function ReportScreenIDSetter({route, reports, policies, policyMembers = {}, nav
if (reportActionID && !regexValidReportActionID.test(reportActionID)) {
navigation.setParams({reportActionID: ''});
}
App.confirmReadyToOpenApp();
return;
}

Expand All @@ -93,8 +91,6 @@ function ReportScreenIDSetter({route, reports, policies, policyMembers = {}, nav
// in that case the reportID is undefined
if (reportID) {
navigation.setParams({reportID: String(reportID)});
} else {
App.confirmReadyToOpenApp();
}
}, [route, navigation, reports, canUseDefaultRooms, policies, isFirstTimeNewExpensifyUser, reportMetadata, activeWorkspaceID, policyMembers, accountID]);

Expand Down
5 changes: 1 addition & 4 deletions src/pages/home/sidebar/SidebarLinks.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@ function SidebarLinks({onLinkClick, insets, optionListItems, isLoading, priority
const {isSmallScreenWidth} = useWindowDimensions();

useEffect(() => {
if (!isSmallScreenWidth) {
return;
}
App.confirmReadyToOpenApp();
}, [isSmallScreenWidth]);
}, []);

useEffect(() => {
InteractionManager.runAfterInteractions(() => {
Expand Down

0 comments on commit 3601df8

Please sign in to comment.