diff --git a/src/components/UserDetailsTooltip/index.web.js b/src/components/UserDetailsTooltip/index.web.js index 5dd87d74dd3a..0cca88b9f475 100644 --- a/src/components/UserDetailsTooltip/index.web.js +++ b/src/components/UserDetailsTooltip/index.web.js @@ -36,7 +36,7 @@ function UserDetailsTooltip(props) { let title = String(userDisplayName).trim() ? userDisplayName : ''; const subtitle = (userLogin || '').trim() && !_.isEqual(LocalePhoneNumber.formatPhoneNumber(userLogin || ''), userDisplayName) ? Str.removeSMSDomain(userLogin) : ''; - if (props.icon && props.icon.type === CONST.ICON_TYPE_WORKSPACE) { + if (props.icon && (props.icon.type === CONST.ICON_TYPE_WORKSPACE || !title)) { title = props.icon.name; } const renderTooltipContent = useCallback( diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index a36151fd0808..305ea224e6ab 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -805,7 +805,7 @@ function getOptions( userToInvite.icons = [ { source: UserUtils.getAvatar('', optimisticAccountID), - login: searchValue, + name: searchValue, type: CONST.ICON_TYPE_AVATAR, }, ]; diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 54c69c630714..831806f7fb89 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -804,13 +804,13 @@ function getWorkspaceIcon(report) { * @param {Number} [defaultAccountID] * @returns {Array<*>} */ -function getIcons(report, personalDetails, defaultIcon = null, isPayer = false) { +function getIcons(report, personalDetails, defaultIcon = null, isPayer = false, defaultName = '', defaultAccountID = -1) { if (_.isEmpty(report)) { const fallbackIcon = { source: defaultIcon || Expensicons.FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, - name: '', - id: -1, + name: defaultName, + id: defaultAccountID, }; return [fallbackIcon]; } diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js index bf616870fc48..569e4a7a6e3e 100644 --- a/src/pages/home/HeaderView.js +++ b/src/pages/home/HeaderView.js @@ -194,6 +194,7 @@ function HeaderView(props) { onPress={() => { Navigation.navigate(ROUTES.getReportRoute(props.report.parentReportID)); }} + style={[styles.alignSelfStart, styles.mw100]} accessibilityLabel={parentNavigationSubtitle} accessibilityRole={CONST.ACCESSIBILITY_ROLE.LINK} > diff --git a/src/pages/home/report/ReactionList/BaseReactionList.js b/src/pages/home/report/ReactionList/BaseReactionList.js index 87d68780e836..0b77fca7c645 100755 --- a/src/pages/home/report/ReactionList/BaseReactionList.js +++ b/src/pages/home/report/ReactionList/BaseReactionList.js @@ -87,6 +87,7 @@ function BaseReactionList(props) { participantsList: [item], icons: [ { + id: item.accountID, source: UserUtils.getAvatar(item.avatar, item.accountID), name: item.login, type: CONST.ICON_TYPE_AVATAR, diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index 381ca3e4b889..59fbde29efc0 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -331,6 +331,7 @@ function WorkspaceMembersPage(props) { participantsList: [item], icons: [ { + id: item.accountID, source: UserUtils.getAvatar(item.avatar, item.accountID), name: item.login, type: CONST.ICON_TYPE_AVATAR,