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

Jump to bottom

Fix task owner and assignee custom avatar aren't showing #32113

Merged
merged 5 commits into from
Dec 1, 2023
Merged

Fix task owner and assignee custom avatar aren't showing #32113

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af4fe4d
add missing onyx subscription
bernhardoj Nov 28, 2023
103781a
add owner account id to participant
bernhardoj Nov 28, 2023
f8d2e79
Merge branch 'main' into fix/31372-user-avatar-not-showing
bernhardoj Nov 30, 2023
cd3ae07
always include owner account id
bernhardoj Nov 30, 2023
86b38b6
Merge branch 'main' into fix/31372-user-avatar-not-showing
bernhardoj Dec 1, 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
8 changes: 7 additions & 1 deletion src/components/LHNOptionsList/LHNOptionsList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,13 @@ function LHNOptionsList({
const transactionID = lodashGet(itemParentReportAction, ['originalMessage', 'IOUTransactionID'], '');
const itemTransaction = transactionID ? transactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] : {};
const itemComment = draftComments[`${ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT}${reportID}`] || '';
const participantsPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs(itemFullReport.participantAccountIDs, personalDetails);
const participants = [...(itemFullReport.participantAccountIDs || [])];

if (itemFullReport.ownerAccountID > 0) {
participants.push(itemFullReport.ownerAccountID);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add comment explaining this part of the logic. And I couldn't find where this logic is coming from. Is there any documentation or indication of owner account id being 0 for non-task reports

Copy link
Contributor Author

Choose a reason for hiding this comment

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

From my observation, ownerAccountID of 0 means the report doesn't have an ownerAccountID, for example, DM.

I just checked OptionsListUtils.getPersonalDetailsForAccountIDs and it already ignores falsy account id.

App/src/libs/OptionsListUtils.js

Lines 163 to 167 in f65f38d

_.each(accountIDs, (accountID) => {
const cleanAccountID = Number(accountID);
if (!cleanAccountID) {
return;
}

Should we just include it in the array without checking it? (it would be cleaner)

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, that makes sense

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated


const participantsPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs(participants, personalDetails);

return (
<OptionRowLHNData
Expand Down
13 changes: 12 additions & 1 deletion src/components/ReportActionItem/TaskView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import lodashGet from 'lodash/get';
import PropTypes from 'prop-types';
import React, {useEffect} from 'react';
import {View} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import Checkbox from '@components/Checkbox';
import Hoverable from '@components/Hoverable';
import Icon from '@components/Icon';
Expand All @@ -27,6 +28,7 @@ import useThemeStyles from '@styles/useThemeStyles';
import * as Session from '@userActions/Session';
import * as Task from '@userActions/Task';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';

const propTypes = {
Expand Down Expand Up @@ -185,4 +187,13 @@ function TaskView(props) {
TaskView.propTypes = propTypes;
TaskView.displayName = 'TaskView';

export default compose(withWindowDimensions, withLocalize, withCurrentUserPersonalDetails)(TaskView);
export default compose(
withWindowDimensions,
withLocalize,
withCurrentUserPersonalDetails,
withOnyx({
personalDetails: {
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
},
}),
)(TaskView);
Loading