Skip to content
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

Updated code to remove dependency on IS_LOADING_POLICY_DATA for Welcome.js #11627

Merged
merged 7 commits into from
Oct 20, 2022
Merged

Updated code to remove dependency on IS_LOADING_POLICY_DATA for Welcome.js #11627

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc1669c
updated code to include status of loading policy data
techievivek Oct 6, 2022
264f9bc
updated code to remove loading policy data flag for Welecome.js
techievivek Oct 10, 2022
6406b54
Merge branch 'main' into techievivek_workspace_chat_for_first_time_user
techievivek Oct 10, 2022
6b08625
removed getPolicyList and key IS_LOADING_POLICY_DATA
techievivek Oct 12, 2022
9aec997
fixed linter
techievivek Oct 12, 2022
321990e
fixed loading of reports in policy case
techievivek Oct 13, 2022
59f7091
Merge branch 'main' into techievivek_workspace_chat_for_first_time_user
techievivek Oct 19, 2022
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: 6 additions & 3 deletions src/libs/actions/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,17 +121,20 @@ function openApp() {
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.IS_LOADING_REPORT_DATA,
value: true,
}],
},
],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

strange I thought we'd prefer what was there before (}]) did the linter complain about this?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 I think the other way reads better. Same for the others.

successData: [{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.IS_LOADING_REPORT_DATA,
value: false,
}],
},
],
failureData: [{
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.IS_LOADING_REPORT_DATA,
value: false,
}],
},
],
});
}

Expand Down
12 changes: 1 addition & 11 deletions src/libs/actions/Welcome.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ let isReadyPromise = new Promise((resolve) => {

let isFirstTimeNewExpensifyUser;
let isLoadingReportData = true;
let isLoadingPolicyData = true;
let email = '';

/**
Expand All @@ -28,7 +27,7 @@ let email = '';
* - Whether we have loaded all reports the server knows about
*/
function checkOnReady() {
if (!_.isBoolean(isFirstTimeNewExpensifyUser) || isLoadingPolicyData || isLoadingReportData) {
if (!_.isBoolean(isFirstTimeNewExpensifyUser) || isLoadingReportData) {
return;
}

Expand All @@ -53,15 +52,6 @@ Onyx.connect({
},
});

Onyx.connect({
key: ONYXKEYS.IS_LOADING_POLICY_DATA,
initWithStoredValues: false,
callback: (val) => {
isLoadingPolicyData = val;
checkOnReady();
},
});

const allReports = {};
Onyx.connect({
key: ONYXKEYS.COLLECTION.REPORT,
Expand Down