Merge pull request Expensify#22500 from 0xmiroslav/fix/follow-up-21092

fix missing style in thread subheader, tooltip issues
kowczarz · Jul 12, 2023 · 29ae942 · 29ae942
2 parents 8923cb0 + 13e1e76
commit 29ae942
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,