From da869bfdd34d8c8e522822fd11f200a66c3a41f9 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Mon, 2 Oct 2023 13:45:53 +1100
Subject: [PATCH] refactor: rename hook

useconversationusernameorshorten to usenicknameorprofilenameorshortenedpubkey
---
 ts/components/MemberListItem.tsx           | 4 ++--
 ts/components/conversation/ContactName.tsx | 7 +++++--
 ts/hooks/useParamSelector.ts               | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ts/components/MemberListItem.tsx b/ts/components/MemberListItem.tsx
index cda20a20b..261ffe3a4 100644
--- a/ts/components/MemberListItem.tsx
+++ b/ts/components/MemberListItem.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { Avatar, AvatarSize, CrownIcon } from './avatar/Avatar';
-import { useConversationUsernameOrShorten } from '../hooks/useParamSelector';
+import { useNicknameOrProfileNameOrShortenedPubkey } from '../hooks/useParamSelector';
 import { SessionRadio } from './basic/SessionRadio';
 
 const AvatarContainer = styled.div`
@@ -91,7 +91,7 @@ export const MemberListItem = (props: {
     dataTestId,
   } = props;
 
-  const memberName = useConversationUsernameOrShorten(pubkey);
+  const memberName = useNicknameOrProfileNameOrShortenedPubkey(pubkey);
 
   return (
     <StyledSessionMemberItem
diff --git a/ts/components/conversation/ContactName.tsx b/ts/components/conversation/ContactName.tsx
index ecb53f86b..ed01e7a78 100644
--- a/ts/components/conversation/ContactName.tsx
+++ b/ts/components/conversation/ContactName.tsx
@@ -3,7 +3,10 @@ import classNames from 'classnames';
 import { CSSProperties } from 'styled-components';
 
 import { Emojify } from './Emojify';
-import { useConversationUsernameOrShorten, useIsPrivate } from '../../hooks/useParamSelector';
+import {
+  useNicknameOrProfileNameOrShortenedPubkey,
+  useIsPrivate,
+} from '../../hooks/useParamSelector';
 
 type Props = {
   pubkey: string;
@@ -19,7 +22,7 @@ export const ContactName = (props: Props) => {
   const { pubkey, name, profileName, module, boldProfileName, compact, shouldShowPubkey } = props;
   const prefix = module || 'module-contact-name';
 
-  const convoName = useConversationUsernameOrShorten(pubkey);
+  const convoName = useNicknameOrProfileNameOrShortenedPubkey(pubkey);
   const isPrivate = useIsPrivate(pubkey);
   const shouldShowProfile = Boolean(convoName || profileName || name);
   const styles = (boldProfileName
diff --git a/ts/hooks/useParamSelector.ts b/ts/hooks/useParamSelector.ts
index 9cdb5388a..8a8c8bf53 100644
--- a/ts/hooks/useParamSelector.ts
+++ b/ts/hooks/useParamSelector.ts
@@ -34,11 +34,14 @@ export function useConversationUsername(convoId?: string) {
 /**
  * Returns either the nickname, displayNameInProfile, or the shorten pubkey
  */
-export function useConversationUsernameOrShorten(convoId?: string) {
+export function useNicknameOrProfileNameOrShortenedPubkey(convoId?: string) {
   const convoProps = useConversationPropsById(convoId);
 
   return (
-    convoProps?.nickname || convoProps?.displayNameInProfile || (convoId && PubKey.shorten(convoId))
+    convoProps?.nickname ||
+    convoProps?.displayNameInProfile ||
+    (convoId && PubKey.shorten(convoId)) ||
+    window.i18n('unknown')
   );
 }