diff --git a/src/components/MultipleAvatars.js b/src/components/MultipleAvatars.js index f0dddfafc583..b50fa439a21c 100644 --- a/src/components/MultipleAvatars.js +++ b/src/components/MultipleAvatars.js @@ -112,6 +112,10 @@ function MultipleAvatars(props) { {/* View is necessary for tooltip to show for multiple avatars in LHN */} @@ -244,6 +256,10 @@ function MultipleAvatars(props) { } accountIDs * @param {Object} personalDetails + * @param {Object} defaultValues {login: accountID} In workspace invite page, when new user is added we pass available data to opt in * @returns {Object} */ -function getAvatarsForAccountIDs(accountIDs, personalDetails) { +function getAvatarsForAccountIDs(accountIDs, personalDetails, defaultValues = {}) { + const reversedDefaultValues = {}; + _.map(Object.entries(defaultValues), (item) => { + reversedDefaultValues[item[1]] = item[0]; + }); + return _.map(accountIDs, (accountID) => { - const userPersonalDetail = lodashGet(personalDetails, accountID, {login: '', accountID, avatar: ''}); + const login = lodashGet(reversedDefaultValues, accountID, ''); + const userPersonalDetail = lodashGet(personalDetails, accountID, {login, accountID, avatar: ''}); return { id: accountID, source: UserUtils.getAvatar(userPersonalDetail.avatar, userPersonalDetail.accountID), diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js index 12caf96f283a..60247037bf3a 100644 --- a/src/pages/workspace/WorkspaceInviteMessagePage.js +++ b/src/pages/workspace/WorkspaceInviteMessagePage.js @@ -194,7 +194,11 @@ class WorkspaceInviteMessagePage extends React.Component {