From dbccda891e1ff2cbaccefada99a310aa277e788b Mon Sep 17 00:00:00 2001 From: 0xmiroslav Date: Sat, 8 Jul 2023 22:08:08 +0200 Subject: [PATCH 1/5] add missing style in thread subheader --- src/pages/home/HeaderView.js | 1 + 1 file changed, 1 insertion(+) 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} > From 57b45221c2ca3790747041371642f0d0710fac21 Mon Sep 17 00:00:00 2001 From: 0xmiroslav Date: Mon, 10 Jul 2023 00:08:49 +0200 Subject: [PATCH 2/5] fix tooltip in workspace members --- src/pages/workspace/WorkspaceMembersPage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index bb03051af05c..8729a3fe955e 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, From 738a92678b9d17ffca33897404d0b1b42fc12009 Mon Sep 17 00:00:00 2001 From: 0xmiroslav Date: Mon, 10 Jul 2023 00:35:25 +0200 Subject: [PATCH 3/5] fix tooltip in reactions list --- src/pages/home/report/ReactionList/BaseReactionList.js | 1 + 1 file changed, 1 insertion(+) 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, From d64df72629ef1fe0daa0b4a4761cc691b23bcf86 Mon Sep 17 00:00:00 2001 From: 0xmiroslav Date: Mon, 10 Jul 2023 23:12:42 +0200 Subject: [PATCH 4/5] fix tooltip in invite members --- src/libs/ReportUtils.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 00b8753a405f..21b7f5b6ecae 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]; } From 2764ed3a6c2e5f04ed64d7a9ddcc77a2ec60a90b Mon Sep 17 00:00:00 2001 From: 0xmiroslav Date: Wed, 12 Jul 2023 13:18:39 +0200 Subject: [PATCH 5/5] fix tooltip for new searched user --- src/components/UserDetailsTooltip/index.js | 2 +- src/libs/OptionsListUtils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/UserDetailsTooltip/index.js b/src/components/UserDetailsTooltip/index.js index d171b4f88448..b65c4b2166ae 100644 --- a/src/components/UserDetailsTooltip/index.js +++ b/src/components/UserDetailsTooltip/index.js @@ -35,7 +35,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 f5b1de63182b..bc5c03f2e1af 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -802,7 +802,7 @@ function getOptions( userToInvite.icons = [ { source: UserUtils.getAvatar('', optimisticAccountID), - login: searchValue, + name: searchValue, type: CONST.ICON_TYPE_AVATAR, }, ];