move NotificationForConvoOption declaration + getConversationNotificationSettingType created as used twice

ts/components/conversation/ConversationHeader.tsx

@@ -16,17 +16,13 @@ import {
 import { contextMenu } from 'react-contexify';
 import { DefaultTheme, withTheme } from 'styled-components';
 import { ConversationNotificationSettingType } from '../../models/conversation';
+import { NotificationForConvoOption } from '../../state/ducks/conversations';
 
 export interface TimerOption {
   name: string;
   value: number;
 }
 
-export interface NotificationForConvoOption {
-  name: string;
-  value: ConversationNotificationSettingType;
-}
-
 interface Props {
   id: string;
   name?: string;

ts/components/session/conversation/SessionConversation.tsx

@@ -352,13 +352,7 @@ export class SessionConversation extends React.Component<Props, State> {
 
     const members = conversation.get('members') || [];
 
-    // exclude mentions_only settings for private chats as this does not make much sense
+    const notificationForConvo = conversation.getConversationNotificationSettingType();
-    const notificationForConvo = ConversationNotificationSetting.filter(n =>
-      conversation.isPrivate() ? n !== 'mentions_only' : true
-    ).map((n: ConversationNotificationSettingType) => {
-      // this link to the notificationForConvo_all, notificationForConvo_mentions_only, ...
-      return { value: n, name: window.i18n(`notificationForConvo_${n}`) };
-    });
 
     const headerProps = {
       id: conversation.id,

ts/components/session/menu/ConversationHeaderMenu.tsx

@@ -13,11 +13,13 @@ import {
   getLeaveGroupMenuItem,
   getMarkAllReadMenuItem,
   getNotificationForConvoMenuItem,
+  getPinConversationMenuItem,
   getRemoveModeratorsMenuItem,
   getUpdateGroupNameMenuItem,
 } from './Menu';
-import { NotificationForConvoOption, TimerOption } from '../../conversation/ConversationHeader';
+import { TimerOption } from '../../conversation/ConversationHeader';
 import { ConversationNotificationSettingType } from '../../../models/conversation';
+import { NotificationForConvoOption } from '../../../state/ducks/conversations';
 
 export type PropsConversationHeaderMenu = {
   conversationId: string;

ts/components/session/menu/ConversationListItemContextMenu.tsx

@@ -4,6 +4,7 @@ import {
   ConversationNotificationSettingType,
   ConversationTypeEnum,
 } from '../../../models/conversation';
+import { NotificationForConvoOption } from '../../../state/ducks/conversations';
 
 import {
   getBlockMenuItem,
@@ -18,7 +19,6 @@ import {
   getNotificationForConvoMenuItem,
   getPinConversationMenuItem,
 } from './Menu';
-import { NotificationForConvoOption } from '../../conversation/ConversationHeader';
 
 export type PropsContextConversationItem = {
   id: string;

ts/components/session/menu/Menu.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 
 import { getNumberOfPinnedConversations } from '../../../state/selectors/conversations';
 import { getFocusedSection } from '../../../state/selectors/section';
-import { NotificationForConvoOption, TimerOption } from '../../conversation/ConversationHeader';
+import { TimerOption } from '../../conversation/ConversationHeader';
 import { Item, Submenu } from 'react-contexify';
 import { ConversationNotificationSettingType } from '../../../models/conversation';
 import { useDispatch, useSelector } from 'react-redux';
@@ -26,6 +26,7 @@ import {
 } from '../../../interactions/conversationInteractions';
 import { SessionButtonColor } from '../SessionButton';
 import { ToastUtils } from '../../../session/utils';
+import { NotificationForConvoOption } from '../../../state/ducks/conversations';
 
 const maxNumberOfPinnedConversations = 5;
 

ts/models/conversation.ts

@@ -25,6 +25,7 @@ import {
   actions as conversationActions,
   ConversationType as ReduxConversationType,
   LastMessageStatusType,
+  NotificationForConvoOption,
 } from '../state/ducks/conversations';
 import { ExpirationTimerUpdateMessage } from '../session/messages/outgoing/controlMessage/ExpirationTimerUpdateMessage';
 import { TypingMessage } from '../session/messages/outgoing/controlMessage/TypingMessage';
@@ -35,7 +36,6 @@ import {
 import { GroupInvitationMessage } from '../session/messages/outgoing/visibleMessage/GroupInvitationMessage';
 import { ReadReceiptMessage } from '../session/messages/outgoing/controlMessage/receipt/ReadReceiptMessage';
 import { OpenGroupUtils } from '../opengroup/utils';
-import { ConversationInteraction } from '../interactions';
 import { OpenGroupVisibleMessage } from '../session/messages/outgoing/visibleMessage/OpenGroupVisibleMessage';
 import { OpenGroupRequestCommonType } from '../opengroup/opengroupV2/ApiUtil';
 import { getOpenGroupV2FromConversationId } from '../opengroup/utils/OpenGroupUtils';
@@ -408,16 +408,21 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       groupAdmins,
       members,
       isPinned: this.isPinned(),
-      notificationForConvo: ConversationNotificationSetting.filter(n =>
+      notificationForConvo: this.getConversationNotificationSettingType(),
-        this.isPrivate() ? n !== 'mentions_only' : true
-      ).map((n: ConversationNotificationSettingType) => {
-        // this link to the notificationForConvo_all, notificationForConvo_mentions_only, ...
-        return { value: n, name: window.i18n(`notificationForConvo_${n}`) };
-      }),
       currentNotificationSetting: this.get('triggerNotificationsFor'),
     };
   }
 
+  public getConversationNotificationSettingType(): Array<NotificationForConvoOption> {
+    // exclude mentions_only settings for private chats as this does not make much sense
+    return ConversationNotificationSetting.filter(n =>
+      this.isPrivate() ? n !== 'mentions_only' : true
+    ).map((n: ConversationNotificationSettingType) => {
+      // this link to the notificationForConvo_all, notificationForConvo_mentions_only, ...
+      return { value: n, name: window.i18n(`notificationForConvo_${n}`) };
+    });
+  }
+
   public async updateGroupAdmins(groupAdmins: Array<string>) {
     const existingAdmins = _.uniq(_.sortBy(this.getGroupAdmins()));
     const newAdmins = _.uniq(_.sortBy(groupAdmins));

ts/state/ducks/conversations.ts

@@ -10,7 +10,6 @@ import {
   ConversationTypeEnum,
 } from '../../models/conversation';
 import { MessageDeliveryStatus } from '../../models/messageType';
-import { NotificationForConvoOption } from '../../components/conversation/ConversationHeader';
 
 // State
 
@@ -91,6 +90,11 @@ export interface ConversationType {
   currentNotificationSetting: ConversationNotificationSettingType;
 }
 
+export interface NotificationForConvoOption {
+  name: string;
+  value: ConversationNotificationSettingType;
+}
+
 export type ConversationLookupType = {
   [key: string]: ConversationType;
 };