Merge pull request #1875 from TryQuiet/bug/1842

Bug/1842
TryQuiet · Sep 29, 2023 · 34f0d7b · 34f0d7b
2 parents f3e0655 + e05d20b
commit 34f0d7b
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 * Bump github actions/* to versions using node16
 
+* Placeholder(...) for community name
+
+* No unregistered/duplicated label for system messages
+
 [2.0.0-alpha.11]
 
 * Customize Launch Screen on iOS

diff --git a/...s/desktop/src/renderer/components/CreateJoinCommunity/PerformCommunityActionComponent.tsx b/...s/desktop/src/renderer/components/CreateJoinCommunity/PerformCommunityActionComponent.tsx
@@ -155,7 +155,7 @@ export const PerformCommunityActionComponent: React.FC<PerformCommunityActionPro
 }) => {
   const [formSent, setFormSent] = useState(false)
 
-  const [communityName, setCommunityName] = useState('')
+  const [communityName, setCommunityName] = useState('...')
   const [parsedNameDiffers, setParsedNameDiffers] = useState(false)
 
   const waitingForResponse = formSent && !hasReceivedResponse

diff --git a/packages/desktop/src/renderer/components/Settings/Tabs/LeaveCommunity/LeaveCommunity.tsx b/packages/desktop/src/renderer/components/Settings/Tabs/LeaveCommunity/LeaveCommunity.tsx
@@ -16,7 +16,7 @@ import { capitalizeFirstLetter } from '@quiet/common'
 export const LeaveCommunity: React.FC = () => {
   const community = useSelector(communities.selectors.currentCommunity)
 
-  let communityName = '' // Prevent error on initial app start
+  let communityName = '...' // Prevent error on initial app start
 
   if (community?.name) {
     communityName = capitalizeFirstLetter(community.name)

diff --git a/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.test.tsx b/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.test.tsx
@@ -89,7 +89,9 @@ describe('IdentityPanel', () => {
             >
               <h4
                 class="MuiTypography-root MuiTypography-h4 IdentityPanelnickname css-ajdqea-MuiTypography-root"
-              />
+              >
+                ...
+              </h4>
               <svg
                 aria-hidden="true"
                 class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall css-ptiqhd-MuiSvgIcon-root"
@@ -144,7 +146,9 @@ describe('IdentityPanel', () => {
             >
               <h4
                 class="MuiTypography-root MuiTypography-h4 IdentityPanelnickname css-ajdqea-MuiTypography-root"
-              />
+              >
+                ...
+              </h4>
               <svg
                 aria-hidden="true"
                 class="MuiSvgIcon-root MuiSvgIcon-fontSizeSmall css-ptiqhd-MuiSvgIcon-root"

diff --git a/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.tsx b/packages/desktop/src/renderer/components/Sidebar/IdentityPanel/IdentityPanel.tsx
@@ -46,7 +46,7 @@ export interface IdentityPanelProps {
 }
 
 export const IdentityPanel: React.FC<IdentityPanelProps> = ({ currentCommunity, accountSettingsModal }) => {
-  const communityName = currentCommunity?.name || ''
+  const communityName = currentCommunity?.name || '...'
   return (
     <IdentityPanelButtonStyled>
       <Button

diff --git a/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx b/packages/desktop/src/renderer/components/widgets/channels/BasicMessage.tsx
@@ -218,7 +218,7 @@ export const BasicMessageComponent: React.FC<BasicMessageProps & FileActionsProp
                       {infoMessage ? 'Quiet' : messageDisplayData.nickname}
                     </Typography>
                   </Grid>
-                  {userLabel && (
+                  {userLabel && !infoMessage && (
                     <Grid>
                       <UserLabel
                         username={messageDisplayData.nickname}

diff --git a/packages/mobile/src/components/ChannelList/ChannelList.component.tsx b/packages/mobile/src/components/ChannelList/ChannelList.component.tsx
@@ -8,7 +8,7 @@ import { Spinner } from '../Spinner/Spinner.component'
 import { capitalizeFirstLetter } from '@quiet/common'
 
 export const ChannelList: FC<ChannelListProps> = ({ community, tiles, communityContextMenu }) => {
-  let communityName = ''
+  let communityName = '...'
   if (community?.name) {
     communityName = capitalizeFirstLetter(community.name)
   }

diff --git a/packages/mobile/src/components/ContextMenu/menus/CommunityContextMenu.container.tsx b/packages/mobile/src/components/ContextMenu/menus/CommunityContextMenu.container.tsx
@@ -22,7 +22,7 @@ export const CommunityContextMenu: FC = () => {
 
   const community = useSelector(communities.selectors.currentCommunity)
 
-  let title = ''
+  let title = '...'
   if (community?.name) {
     title = capitalizeFirstLetter(community.name)
   }

diff --git a/packages/mobile/src/components/Message/Message.component.tsx b/packages/mobile/src/components/Message/Message.component.tsx
@@ -146,7 +146,7 @@ export const Message: FC<MessageProps & FileActionsProps> = ({
               </Typography>
             </View>
 
-            {userLabel && (
+            {userLabel && !info && (
               <View>
                 <UserLabel
                   username={representativeMessage.nickname}

diff --git a/packages/mobile/src/screens/LeaveCommunity/LeaveCommunity.screen.tsx b/packages/mobile/src/screens/LeaveCommunity/LeaveCommunity.screen.tsx
@@ -16,7 +16,7 @@ export const LeaveCommunityScreen: FC = () => {
 
   const community = useSelector(communities.selectors.currentCommunity)
 
-  let communityName = ''
+  let communityName = '...'
   if (community?.name) {
     communityName = capitalizeFirstLetter(community.name)
   }