Merge pull request #9 from session-foundation/qa/release/1.15.0

fix: QA issues for group
session-foundation · Dec 8, 2024 · b731ffc · b731ffc
2 parents 9507cde + 3b18d6a
commit b731ffc
Show file tree

Hide file tree

Showing 95 changed files with 964 additions and 609 deletions.
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
@@ -31,6 +31,7 @@ jobs:
   build_linux:
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         # this needs to be a valid target of https://www.electron.build/linux#target
         pkg_to_build: ['deb', 'rpm', 'freebsd', 'AppImage']

diff --git a/package.json b/package.json
@@ -91,7 +91,7 @@
     "fs-extra": "9.0.0",
     "glob": "10.3.10",
     "image-type": "^4.1.0",
-    "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.6/libsession_util_nodejs-v0.4.6.tar.gz",
+    "libsession_util_nodejs": "https://github.com/session-foundation/libsession-util-nodejs/releases/download/v0.4.7/libsession_util_nodejs-v0.4.7.tar.gz",
     "libsodium-wrappers-sumo": "^0.7.9",
     "linkify-it": "^4.0.1",
     "lodash": "^4.17.21",

diff --git a/ts/components/AboutView.tsx b/ts/components/AboutView.tsx
@@ -95,22 +95,26 @@ export const AboutView = () => {
           className="version"
           text={versionInfo}
           buttonType={SessionButtonType.Simple}
+          showToast={false}
         />
         <CopyToClipboardButton
           className="os"
           text={systemInfo}
           buttonType={SessionButtonType.Simple}
+          showToast={false}
         />
         <CopyToClipboardButton
           className="commitHash"
           text={commitInfo}
           buttonType={SessionButtonType.Simple}
+          showToast={false}
         />
         {environmentStates.length ? (
           <CopyToClipboardButton
             className="environment"
             text={environmentStates.join(' - ')}
             buttonType={SessionButtonType.Simple}
+            showToast={false}
           />
         ) : null}
         <a href="https://getsession.org">https://getsession.org</a>

diff --git a/ts/components/NoticeBanner.tsx b/ts/components/NoticeBanner.tsx
@@ -5,7 +5,6 @@ import { SessionIconButton, SessionIconType } from './icon';
 import { StyledRootDialog } from './dialog/StyledRootDialog';
 
 const StyledNoticeBanner = styled(Flex)`
-  position: relative;
   background-color: var(--primary-color);
   color: var(--black-color);
   font-size: var(--font-size-md);
@@ -15,14 +14,13 @@ const StyledNoticeBanner = styled(Flex)`
   cursor: pointer;
 
   .session-icon-button {
-    position: absolute;
     right: var(--margins-sm);
     pointer-events: none;
   }
 `;
 
 const StyledText = styled.span`
-  margin-right: var(--margins-xl);
+  margin-right: var(--margins-sm);
 `;
 
 type NoticeBannerProps = {
@@ -65,7 +63,7 @@ const StyledGroupInviteBanner = styled(Flex)`
   // when part a a dialog, invert it and make it narrower (as the dialog grows to make it fit)
   ${StyledRootDialog} & {
     background-color: unset;
-    color: var(--orange-color);
+    color: var(--text-primary-color);
     max-width: 300px;
   }
 `;

diff --git a/ts/components/basic/SessionToast.tsx b/ts/components/basic/SessionToast.tsx
@@ -18,7 +18,6 @@ export enum SessionToastType {
 
 type Props = {
   description: string;
-
   id?: string;
   type?: SessionToastType;
   icon?: SessionIconType;
@@ -28,7 +27,7 @@ type Props = {
 
 const DescriptionDiv = styled.div`
   font-size: var(--font-size-sm);
-  color: var(--text-secondary-color);
+  color: var(--text-primary-color);
   text-overflow: ellipsis;
   font-family: var(--font-default);
   padding-top: var(--margins-xs);

diff --git a/ts/components/buttons/CopyToClipboardButton.tsx b/ts/components/buttons/CopyToClipboardButton.tsx
@@ -11,12 +11,13 @@ type CopyProps = {
   copyContent?: string;
   onCopyComplete?: (copiedValue: string | undefined) => void;
   hotkey?: boolean;
+  showToast?: boolean;
 };
 
 type CopyToClipboardButtonProps = Omit<SessionButtonProps, 'children' | 'onClick'> & CopyProps;
 
 export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => {
-  const { copyContent, onCopyComplete, hotkey = false, text } = props;
+  const { copyContent, onCopyComplete, hotkey = false, text, showToast = true } = props;
   const [copied, setCopied] = useState(false);
 
   const onClick = () => {
@@ -27,8 +28,9 @@ export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => {
       }
 
       clipboard.writeText(toCopy);
-
-      ToastUtils.pushCopiedToClipBoard();
+      if (showToast) {
+        ToastUtils.pushCopiedToClipBoard();
+      }
       setCopied(true);
       if (onCopyComplete) {
         onCopyComplete(text);
@@ -54,11 +56,13 @@ type CopyToClipboardIconProps = Omit<SessionIconButtonProps, 'children' | 'onCli
   CopyProps;
 
 export const CopyToClipboardIcon = (props: CopyToClipboardIconProps & { copyContent: string }) => {
-  const { copyContent, onCopyComplete, hotkey = false } = props;
+  const { copyContent, onCopyComplete, hotkey = false, showToast = true } = props;
 
   const onClick = () => {
     clipboard.writeText(copyContent);
-    ToastUtils.pushCopiedToClipBoard();
+    if (showToast) {
+      ToastUtils.pushCopiedToClipBoard();
+    }
     if (onCopyComplete) {
       onCopyComplete(copyContent);
     }

diff --git a/ts/components/conversation/AddMentions.tsx b/ts/components/conversation/AddMentions.tsx
@@ -34,7 +34,7 @@ const Mention = (props: MentionProps) => {
 
   return (
     <StyledMentionAnother>
-      @{foundConvo?.getContactProfileNameOrShortenedPubKey() || PubKey.shorten(props.text)}
+      @{foundConvo?.getNicknameOrRealUsernameOrPlaceholder() || PubKey.shorten(props.text)}
     </StyledMentionAnother>
   );
 };

diff --git a/ts/components/conversation/StagedAttachmentList.tsx b/ts/components/conversation/StagedAttachmentList.tsx
@@ -47,7 +47,7 @@ export const StagedAttachmentList = (props: Props) => {
     if (!conversationKey) {
       return;
     }
-    dispatch(removeAllStagedAttachmentsInConversation({ conversationKey }));
+    dispatch(removeAllStagedAttachmentsInConversation({ conversationId: conversationKey }));
   };
 
   const onRemoveByFilename = (filename: string) => {

diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx
@@ -19,9 +19,11 @@ import {
   useSelectedConversationKey,
   useSelectedHasDisabledBlindedMsgRequests,
   useSelectedIsApproved,
+  useSelectedIsGroupOrCommunity,
   useSelectedIsGroupV2,
   useSelectedIsNoteToSelf,
   useSelectedIsPrivate,
+  useSelectedIsPublic,
   useSelectedNicknameOrProfileNameOrShortenedPubkey,
 } from '../../state/selectors/selectedConversation';
 import {
@@ -204,6 +206,7 @@ export const NoMessageInConversation = () => {
   const selectedConversation = useSelectedConversationKey();
   const hasMessages = useSelectedHasMessages();
   const isGroupV2 = useSelectedIsGroupV2();
+  const isGroupOrCommunity = useSelectedIsGroupOrCommunity();
   const isInvitePending = useLibGroupInvitePending(selectedConversation);
 
   const isMe = useSelectedIsNoteToSelf();
@@ -215,27 +218,42 @@ export const NoMessageInConversation = () => {
   const isKickedFromGroup = useLibGroupKicked(selectedConversation);
   const isGroupDestroyed = useLibGroupDestroyed(selectedConversation);
   const name = useSelectedNicknameOrProfileNameOrShortenedPubkey();
+  const isPublic = useSelectedIsPublic();
 
   const getHtmlToRender = () => {
+    // First, handle the "noteToSelf and various "private" cases
     if (isMe) {
       return localize('noteToSelfEmpty').toString();
     }
-
-    if (canWrite) {
-      return localize('groupNoMessages').withArgs({ group_name: name }).toString();
-    }
-
     if (privateBlindedAndBlockingMsgReqs) {
       return localize('messageRequestsTurnedOff').withArgs({ name }).toString();
     }
+    if (isPrivate) {
+      // "You have no messages from X. Send a message to start the conversation!"
+      return localize('groupNoMessages').withArgs({ group_name: name }).toString();
+    }
 
-    if (isGroupV2 && isGroupDestroyed) {
-      return localize('groupDeletedMemberDescription').withArgs({ group_name: name }).toString();
+    if (isPublic) {
+      return localize('conversationsEmpty').withArgs({ conversation_name: name }).toString();
     }
 
-    if (isGroupV2 && isKickedFromGroup) {
-      return localize('groupRemovedYou').withArgs({ group_name: name }).toString();
+    // a "group but not public" is a legacy or a groupv2 (isPublic is handled just above)
+    if (isGroupOrCommunity) {
+      if (isGroupDestroyed) {
+        return localize('groupDeletedMemberDescription').withArgs({ group_name: name }).toString();
+      }
+
+      if (isKickedFromGroup) {
+        return localize('groupRemovedYou').withArgs({ group_name: name }).toString();
+      }
+      if (canWrite) {
+        // "You have no messages from X. Send a message to start the conversation!"
+        return localize('groupNoMessages').withArgs({ group_name: name }).toString();
+      }
+      // if we cannot write for some reason, don't show the "send a message" part
+      return localize('conversationsEmpty').withArgs({ conversation_name: name }).toString();
     }
+
     return localize('conversationsEmpty').withArgs({ conversation_name: name }).toString();
   };
 

diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
@@ -866,7 +866,7 @@ class CompositionBoxInner extends Component<Props, State> {
 
       window.inboxStore?.dispatch(
         removeAllStagedAttachmentsInConversation({
-          conversationKey: this.props.selectedConversationKey,
+          conversationId: this.props.selectedConversationKey,
         })
       );
       // Empty composition box and stagedAttachments

diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
@@ -46,7 +46,7 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
         i18nMessage: {
           token: 'attachmentsAutoDownloadModalDescription',
           args: {
-            conversation_name: convo.getContactProfileNameOrShortenedPubKey(),
+            conversation_name: convo.getNicknameOrRealUsernameOrPlaceholder(),
           },
         },
         closeTheme: SessionButtonColor.Danger,

diff --git a/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx b/ts/components/conversation/message/message-item/ExpirableReadableMessage.tsx
@@ -46,7 +46,7 @@ function useIsExpired(
         dispatch(
           messagesExpired([
             {
-              conversationKey: convoId,
+              conversationId: convoId,
               messageId,
             },
           ])

diff --git a/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx b/ts/components/conversation/right-panel/overlay/OverlayRightPanelSettings.tsx
@@ -1,5 +1,5 @@
 import { compact, flatten, isEqual } from 'lodash';
-import { useEffect, useState } from 'react';
+import { SessionDataTestId, useEffect, useState } from 'react';
 
 import { useDispatch } from 'react-redux';
 import useInterval from 'react-use/lib/useInterval';
@@ -317,7 +317,7 @@ export const OverlayRightPanelSettings = () => {
                     groupInfoActions.triggerFakeAvatarUpdate({ groupPk: selectedConvoKey }) as any
                   );
                 }}
-                dataTestId="edit-group-name"
+                dataTestId={'' as SessionDataTestId}
               />
               <PanelIconButton
                 iconType={'group'}
@@ -333,7 +333,7 @@ export const OverlayRightPanelSettings = () => {
                     }) as any
                   );
                 }}
-                dataTestId="edit-group-name"
+                dataTestId={'' as SessionDataTestId}
               />
               <PanelIconButton
                 iconType={'group'}
@@ -349,7 +349,7 @@ export const OverlayRightPanelSettings = () => {
                     }) as any
                   );
                 }}
-                dataTestId="edit-group-name"
+                dataTestId={'' as SessionDataTestId}
               />
             </>
           ) : null}

diff --git a/ts/components/dialog/InviteContactsDialog.tsx b/ts/components/dialog/InviteContactsDialog.tsx
@@ -127,7 +127,7 @@ const InviteContactsDialogInner = (props: Props) => {
   const isGroupV2 = useSelectedIsGroupV2();
   const [shareHistory, setShareHistory] = useState(false);
 
-  const { uniqueValues: selectedContacts, addTo, removeFrom } = useSet<string>();
+  const { uniqueValues: selectedContacts, addTo, removeFrom, empty } = useSet<string>();
 
   if (isPrivate) {
     throw new Error('InviteContactsDialogInner must be a group');
@@ -144,27 +144,28 @@ const InviteContactsDialogInner = (props: Props) => {
   };
 
   const onClickOK = () => {
-    if (selectedContacts.length > 0) {
-      if (isPublic) {
-        void submitForOpenGroup(conversationId, selectedContacts);
-      } else {
-        if (PubKey.is03Pubkey(conversationId)) {
-          const forcedAsPubkeys = selectedContacts as Array<PubkeyType>;
-          const action = groupInfoActions.currentDeviceGroupMembersChange({
-            addMembersWithoutHistory: shareHistory ? [] : forcedAsPubkeys,
-            addMembersWithHistory: shareHistory ? forcedAsPubkeys : [],
-            removeMembers: [],
-            groupPk: conversationId,
-            alsoRemoveMessages: false,
-          });
-          dispatch(action as any);
-          return;
-        }
-        void submitForClosedGroup(conversationId, selectedContacts);
-      }
+    if (selectedContacts.length <= 0) {
+      closeDialog();
+      return;
     }
-
-    closeDialog();
+    if (isPublic) {
+      void submitForOpenGroup(conversationId, selectedContacts);
+      return;
+    }
+    if (PubKey.is03Pubkey(conversationId)) {
+      const forcedAsPubkeys = selectedContacts as Array<PubkeyType>;
+      const action = groupInfoActions.currentDeviceGroupMembersChange({
+        addMembersWithoutHistory: shareHistory ? [] : forcedAsPubkeys,
+        addMembersWithHistory: shareHistory ? forcedAsPubkeys : [],
+        removeMembers: [],
+        groupPk: conversationId,
+        alsoRemoveMessages: false,
+      });
+      dispatch(action as any);
+      empty();
+      return;
+    }
+    void submitForClosedGroup(conversationId, selectedContacts);
   };
 
   useKey((event: KeyboardEvent) => {
@@ -182,7 +183,7 @@ const InviteContactsDialogInner = (props: Props) => {
   const hasContacts = validContactsForInvite.length > 0;
 
   return (
-    <SessionWrapperModal title={titleText} onClose={closeDialog}>
+    <SessionWrapperModal title={titleText} onClose={closeDialog} showExitIcon={true}>
       {hasContacts && isGroupV2 && <GroupInviteRequiredVersionBanner />}
 
       <SpacerLG />

diff --git a/ts/components/dialog/UpdateGroupNameDialog.tsx b/ts/components/dialog/UpdateGroupNameDialog.tsx
@@ -189,6 +189,12 @@ export function UpdateGroupNameDialog(props: { conversationId: string }) {
           type="text"
           value={newGroupName}
           placeholder={window.i18n('groupNameEnter')}
+          onKeyDown={e => {
+            if (e.key === 'Enter') {
+              onClickOK();
+              e.preventDefault();
+            }
+          }}
           onChange={e => setNewGroupName(e.target.value)}
           tabIndex={0}
           required={true}

diff --git a/ts/components/leftpane/overlay/OverlayClosedGroup.tsx b/ts/components/leftpane/overlay/OverlayClosedGroup.tsx
@@ -134,7 +134,6 @@ export const OverlayClosedGroupV2 = () => {
 
   async function onEnterPressed() {
     setGroupNameError(undefined);
-    setGroupName('');
     if (isCreatingGroup) {
       window?.log?.warn('Closed group creation already in progress');
       return;