remove isClosable for convo as it is unused

js/models/conversations.d.ts

@@ -58,7 +58,6 @@ export interface ConversationModel
   isPublic: () => boolean;
   isClosedGroup: () => boolean;
   isBlocked: () => boolean;
-  isClosable: () => boolean;
   isAdmin: (id: string) => boolean;
   throttledBumpTyping: () => void;
 

js/models/conversations.js

@@ -115,9 +115,7 @@
     isClosedGroup() {
       return this.get('type') === Message.GROUP && !this.isPublic();
     },
-    isClosable() {
+
-      return this.get('closable');
-    },
     isBlocked() {
       if (!this.id || this.isMe()) {
         return false;
@@ -400,7 +398,6 @@
         type: this.isPrivate() ? 'direct' : 'group',
         isMe: this.isMe(),
         isPublic: this.isPublic(),
-        isClosable: this.isClosable(),
         isTyping: typingKeys.length > 0,
         lastUpdated: this.get('timestamp'),
         name: this.getName(),

ts/components/ConversationListItem.tsx

@@ -34,7 +34,6 @@ export type ConversationListItemProps = {
   avatarPath?: string;
   isMe: boolean;
   isPublic?: boolean;
-  isClosable?: boolean;
   primaryDevice?: string;
 
   lastUpdated: number;

ts/components/conversation/ConversationHeader.tsx

@@ -38,7 +38,6 @@ interface Props {
   avatarPath?: string;
 
   isMe: boolean;
-  isClosable?: boolean;
   isGroup: boolean;
   isPrivate: boolean;
   isPublic: boolean;

ts/components/session/conversation/SessionConversation.tsx

@@ -418,7 +418,6 @@ export class SessionConversation extends React.Component<Props, State> {
       profileName: conversation.getProfileName(),
       avatarPath: conversation.getAvatarPath(),
       isMe: conversation.isMe(),
-      isClosable: conversation.isClosable(),
       isBlocked: conversation.isBlocked(),
       isGroup: !conversation.isPrivate(),
       isPrivate: conversation.isPrivate(),

ts/components/session/menu/ConversationHeaderMenu.tsx

@@ -18,7 +18,6 @@ export type PropsConversationHeaderMenu = {
   triggerId: string;
   isMe: boolean;
   isPublic?: boolean;
-  isClosable?: boolean;
   isKickedFromGroup?: boolean;
   left?: boolean;
   isGroup: boolean;
@@ -44,7 +43,6 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
   const {
     triggerId,
     isMe,
-    isClosable,
     isPublic,
     isGroup,
     isKickedFromGroup,
@@ -125,7 +123,6 @@ export const ConversationHeaderMenu = (props: PropsConversationHeaderMenu) => {
       )}
       {getDeleteContactMenuItem(
         isMe,
-        isClosable,
         isGroup,
         isPublic,
         onDeleteContact,

ts/components/session/menu/ConversationListItemContextMenu.tsx

@@ -16,7 +16,6 @@ export type PropsContextConversationItem = {
   type: 'group' | 'direct';
   isMe: boolean;
   isPublic?: boolean;
-  isClosable?: boolean;
   isBlocked?: boolean;
   hasNickname?: boolean;
   isKickedFromGroup?: boolean;
@@ -39,7 +38,6 @@ export const ConversationListItemContextMenu = (
     triggerId,
     isBlocked,
     isMe,
-    isClosable,
     isPublic,
     hasNickname,
     type,
@@ -92,7 +90,6 @@ export const ConversationListItemContextMenu = (
       )}
       {getDeleteContactMenuItem(
         isMe,
-        isClosable,
         type === 'group',
         isPublic,
         onDeleteContact,

ts/components/session/menu/Menu.tsx

@@ -33,16 +33,15 @@ function showDeleteMessages(isPublic: boolean): boolean {
 }
 
 function showCopyId(isPublic: boolean, isGroup: boolean): boolean {
-  return !isGroup;
+  return !isGroup || isPublic;
 }
 
 function showDeleteContact(
   isMe: boolean,
-  isClosable: boolean,
   isGroup: boolean,
   isPublic: boolean
 ): boolean {
-  return !isMe && isClosable && !!(!isGroup || isPublic);
+  return !isMe && Boolean(!isGroup || isPublic);
 }
 
 function showAddModerators(
@@ -96,20 +95,12 @@ export function getInviteContactMenuItem(
 
 export function getDeleteContactMenuItem(
   isMe: boolean | undefined,
-  isClosable: boolean | undefined,
   isGroup: boolean | undefined,
   isPublic: boolean | undefined,
   action: any,
   i18n: LocalizerType
 ): JSX.Element | null {
-  if (
+  if (showDeleteContact(Boolean(isMe), Boolean(isGroup), Boolean(isPublic))) {
-    showDeleteContact(
-      Boolean(isMe),
-      Boolean(isClosable),
-      Boolean(isGroup),
-      Boolean(isPublic)
-    )
-  ) {
     if (isPublic) {
       return <Item onClick={action}>{i18n('leaveGroup')}</Item>;
     }

ts/state/ducks/conversations.ts

@@ -61,7 +61,6 @@ export type ConversationType = {
   type: 'direct' | 'group';
   isMe: boolean;
   isPublic?: boolean;
-  isClosable?: boolean;
   lastUpdated: number;
   unreadCount: number;
   mentionedUs: boolean;
@@ -158,7 +157,15 @@ const fetchMessagesForConversation = createAsyncThunk(
     conversationKey: string;
     count: number;
   }) => {
+    const beforeTimestamp = Date.now();
     const messages = await getMessages(conversationKey, count);
+    const afterTimestamp = Date.now();
+
+    const time = afterTimestamp - beforeTimestamp;
+    window.log.info(
+      `Loading ${messages.length} messages took ${time}ms to load.`
+    );
+
     return {
       conversationKey,
       messages,