Skip to content

Commit

Permalink
Merge pull request #21159 from Expensify/jasper-filterPersonalDetails…
Browse files Browse the repository at this point in the history
…WithoutLogins

Only consider personal details with logins set in `OptionsListUtils.getOptions`

(cherry picked from commit b7069ec)
  • Loading branch information
luacmartins authored and OSBotify committed Jun 21, 2023
1 parent 6971304 commit 1070721
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
6 changes: 6 additions & 0 deletions src/libs/OptionsListUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,12 @@ function getOptions(
};
}

// We're only picking personal details that have logins set
// This is a temporary fix for all the logic that's been breaking because of the new privacy changes
// See https://github.com/Expensify/Expensify/issues/293465 for more context
// eslint-disable-next-line no-param-reassign
personalDetails = _.pick(personalDetails, (detail) => Boolean(detail.login));

let recentReportOptions = [];
let personalDetailsOptions = [];
const reportMapForAccountIDs = {};
Expand Down
4 changes: 3 additions & 1 deletion src/libs/actions/Task.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,9 @@ function editTaskAndNavigate(report, ownerEmail, ownerAccountID, {title, descrip

// Sometimes title or description is undefined, so we need to check for that, and we provide it to multiple functions
const reportName = (title || report.reportName).trim();
const reportDescription = (!_.isUndefined(description) ? description : report.description).trim();

// Description can be unset, so we default to an empty string if so
const reportDescription = (!_.isUndefined(description) ? description : lodashGet(report, 'description', '')).trim();

// If we make a change to the assignee, we want to add a comment to the assignee's chat
let optimisticAssigneeAddComment;
Expand Down

0 comments on commit 1070721

Please sign in to comment.