Skip to content

Fix: Loading shows even though not found in ProfilePage #33209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
puneetlath merged 3 commits into from
Dec 20, 2023
+1 −8
Merged

Fix: Loading shows even though not found in ProfilePage #33209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac28609
fix: loading shows even though not found in profile page
tienifr Dec 18, 2023
52183ad
fix lint
tienifr Dec 18, 2023
cf24f63
Merge branch 'main' of https://github.com/tienifr/App into fix/32750
tienifr Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions src/pages/ProfilePage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ const propTypes = {
/** Route params */
route: matchType.isRequired,

/** Indicates whether the app is loading initial data */
isLoadingReportData: PropTypes.bool,

/** Session info for the currently logged in user. */
session: PropTypes.shape({
/** Currently logged in user accountID */
Expand All @@ -72,7 +69,6 @@ const propTypes = {
const defaultProps = {
// When opening someone else's profile (via deep link) before login, this is empty
personalDetails: {},
isLoadingReportData: true,
session: {
accountID: 0,
},
Expand Down Expand Up @@ -125,7 +121,7 @@ function ProfilePage(props) {

const isCurrentUser = props.session.accountID === accountID;
const hasMinimumDetails = !_.isEmpty(details.avatar);
const isLoading = lodashGet(details, 'isLoading', false) || _.isEmpty(details) || props.isLoadingReportData;
const isLoading = lodashGet(details, 'isLoading', false) || _.isEmpty(details);

// If the API returns an error for some reason there won't be any details and isLoading will get set to false, so we want to show a blocking screen
const shouldShowBlockingView = !hasMinimumDetails && !isLoading;
Expand Down Expand Up @@ -288,9 +284,6 @@ export default compose(
personalDetails: {
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
},
isLoadingReportData: {
key: ONYXKEYS.IS_LOADING_REPORT_DATA,
},
session: {
key: ONYXKEYS.SESSION,
},
Expand Down