Removes showForwardMessageModal from conversation_view

ts/components/conversation/Quote.stories.tsx

@@ -138,7 +138,7 @@ const defaultMessageProps: TimelineMessagesProps = {
   showExpiredOutgoingTapToViewToast: action(
     'showExpiredOutgoingTapToViewToast'
   ),
-  showForwardMessageModal: action('default--showForwardMessageModal'),
+  toggleForwardMessageModal: action('default--toggleForwardMessageModal'),
   showMessageDetail: action('default--showMessageDetail'),
   showVisualAttachment: action('default--showVisualAttachment'),
   startConversation: action('default--startConversation'),

ts/components/conversation/Timeline.stories.tsx

@@ -303,7 +303,7 @@ const actions = () => ({
   showExpiredOutgoingTapToViewToast: action(
     'showExpiredOutgoingTapToViewToast'
   ),
-  showForwardMessageModal: action('showForwardMessageModal'),
+  toggleForwardMessageModal: action('toggleForwardMessageModal'),
 
   showIdentity: action('showIdentity'),
 

ts/components/conversation/Timeline.tsx

@@ -242,7 +242,7 @@ const getActions = createSelector(
       'replyToMessage',
       'retryDeleteForEveryone',
       'retrySend',
-      'showForwardMessageModal',
+      'toggleForwardMessageModal',
       'deleteMessage',
       'deleteMessageForEveryone',
       'showMessageDetail',

ts/components/conversation/TimelineItem.stories.tsx

@@ -82,7 +82,7 @@ const getDefaultProps = () => ({
   openGiftBadge: action('openGiftBadge'),
   showContactDetail: action('showContactDetail'),
   showContactModal: action('showContactModal'),
-  showForwardMessageModal: action('showForwardMessageModal'),
+  toggleForwardMessageModal: action('toggleForwardMessageModal'),
   showVisualAttachment: action('showVisualAttachment'),
   downloadAttachment: action('downloadAttachment'),
   displayTapToViewMessage: action('displayTapToViewMessage'),

ts/components/conversation/TimelineMessage.stories.tsx

@@ -316,7 +316,7 @@ const createProps = (overrideProps: Partial<Props> = {}): Props => ({
   showExpiredOutgoingTapToViewToast: action(
     'showExpiredOutgoingTapToViewToast'
   ),
-  showForwardMessageModal: action('showForwardMessageModal'),
+  toggleForwardMessageModal: action('toggleForwardMessageModal'),
   showMessageDetail: action('showMessageDetail'),
   showVisualAttachment: action('showVisualAttachment'),
   startConversation: action('startConversation'),

ts/components/conversation/TimelineMessage.tsx

@@ -42,7 +42,7 @@ export type PropsData = {
 export type PropsActions = {
   deleteMessage: (id: string) => void;
   deleteMessageForEveryone: (id: string) => void;
-  showForwardMessageModal: (id: string) => void;
+  toggleForwardMessageModal: (id: string) => void;
   reactToMessage: (
     id: string,
     { emoji, remove }: { emoji: string; remove: boolean }
@@ -100,7 +100,7 @@ export function TimelineMessage(props: Props): JSX.Element {
     retrySend,
     retryDeleteForEveryone,
     selectedReaction,
-    showForwardMessageModal,
+    toggleForwardMessageModal,
     showMessageDetail,
     text,
     timestamp,
@@ -335,7 +335,7 @@ export function TimelineMessage(props: Props): JSX.Element {
             ? () => retryDeleteForEveryone(id)
             : undefined
         }
-        onForward={canForward ? () => showForwardMessageModal(id) : undefined}
+        onForward={canForward ? () => toggleForwardMessageModal(id) : undefined}
         onDeleteForMe={() => deleteMessage(id)}
         onDeleteForEveryone={
           canDeleteForEveryone ? () => setHasDOEConfirmation(true) : undefined

ts/state/smart/Stories.tsx

@@ -75,9 +75,7 @@ export function SmartStories(): JSX.Element | null {
       i18n={i18n}
       me={me}
       myStories={myStories}
-      onForwardStory={storyId => {
+      onForwardStory={toggleForwardMessageModal}
-        toggleForwardMessageModal(storyId);
-      }}
       onSaveStory={story => {
         if (story.attachment) {
           saveAttachment(story.attachment, story.timestamp);

ts/state/smart/Timeline.tsx

@@ -89,7 +89,6 @@ export type TimelinePropsType = ExternalProps &
     | 'showContactModal'
     | 'showExpiredIncomingTapToViewToast'
     | 'showExpiredOutgoingTapToViewToast'
-    | 'showForwardMessageModal'
     | 'showIdentity'
     | 'showMessageDetail'
     | 'showVisualAttachment'

ts/views/conversation_view.tsx

@@ -128,7 +128,6 @@ type MessageActionsType = {
   showSafetyNumber: (contactId: string) => unknown;
   showExpiredIncomingTapToViewToast: () => unknown;
   showExpiredOutgoingTapToViewToast: () => unknown;
-  showForwardMessageModal: (messageId: string) => unknown;
   showIdentity: (conversationId: string) => unknown;
   showMessageDetail: (messageId: string) => unknown;
   showVisualAttachment: (options: {
@@ -559,8 +558,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
       showToast(ToastTapToViewExpiredOutgoing);
     };
 
-    const showForwardMessageModal = this.showForwardMessageModal.bind(this);
-
     return {
       deleteMessage,
       displayTapToViewMessage,
@@ -580,7 +577,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
       showSafetyNumber,
       showExpiredIncomingTapToViewToast,
       showExpiredOutgoingTapToViewToast,
-      showForwardMessageModal,
       showIdentity,
       showMessageDetail,
       showVisualAttachment,
@@ -748,10 +744,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     this.model.updateVerified();
   }
 
-  async showForwardMessageModal(messageId: string): Promise<void> {
-    window.reduxActions.globalModals.toggleForwardMessageModal(messageId);
-  }
-
   showAllMedia(): void {
     if (document.querySelectorAll('.module-media-gallery').length) {
       return;
@@ -1207,7 +1199,7 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
       getConversation: getConversationSelector(window.reduxStore.getState()),
       media,
       onForward: messageId => {
-        this.showForwardMessageModal(messageId);
+        window.reduxActions.globalModals.toggleForwardMessageModal(messageId);
       },
       onSave,
       selectedIndex: selectedIndex >= 0 ? selectedIndex : 0,