From 135c8327480d6050788c8b4b5a4e54570169f755 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Fri, 9 Dec 2022 00:53:19 -0500
Subject: [PATCH] Removes showIdentity and showSafetyNumber in favor of redux
 action

---
 .../conversation/MessageDetail.stories.tsx    |  2 +-
 ts/components/conversation/MessageDetail.tsx  |  9 ++++---
 .../SafetyNumberNotification.stories.tsx      |  2 +-
 .../conversation/SafetyNumberNotification.tsx |  6 ++---
 .../conversation/Timeline.stories.tsx         |  2 +-
 ts/components/conversation/Timeline.tsx       |  2 +-
 .../conversation/TimelineItem.stories.tsx     |  2 +-
 ts/state/smart/MessageDetail.tsx              |  4 ---
 ts/state/smart/Timeline.tsx                   |  1 -
 ts/views/conversation_view.tsx                | 27 +------------------
 10 files changed, 14 insertions(+), 43 deletions(-)

diff --git a/ts/components/conversation/MessageDetail.stories.tsx b/ts/components/conversation/MessageDetail.stories.tsx
index 1878695039..f700f4309c 100644
--- a/ts/components/conversation/MessageDetail.stories.tsx
+++ b/ts/components/conversation/MessageDetail.stories.tsx
@@ -69,7 +69,7 @@ const createProps = (overrideProps: Partial<Props> = {}): Props => ({
   interactionMode: 'keyboard',
   theme: ThemeType.light,
 
-  showSafetyNumber: action('showSafetyNumber'),
+  toggleSafetyNumberModal: action('toggleSafetyNumberModal'),
 
   checkForAccount: action('checkForAccount'),
   clearSelectedMessage: action('clearSelectedMessage'),
diff --git a/ts/components/conversation/MessageDetail.tsx b/ts/components/conversation/MessageDetail.tsx
index 779986ac62..aa6a3669a7 100644
--- a/ts/components/conversation/MessageDetail.tsx
+++ b/ts/components/conversation/MessageDetail.tsx
@@ -65,7 +65,6 @@ export type PropsData = {
   receivedAt: number;
   sentAt: number;
 
-  showSafetyNumber: (contactId: string) => void;
   i18n: LocalizerType;
   theme: ThemeType;
   getPreferredBadge: PreferredBadgeSelectorType;
@@ -101,7 +100,9 @@ export type PropsReduxActions = Pick<
   | 'doubleCheckMissingQuoteReference'
   | 'checkForAccount'
   | 'viewStory'
->;
+> & {
+  toggleSafetyNumberModal: (contactId: string) => void;
+};
 
 export type ExternalProps = PropsData & PropsBackboneActions;
 export type Props = PropsData & PropsBackboneActions & PropsReduxActions;
@@ -162,7 +163,7 @@ export class MessageDetail extends React.Component<Props> {
   }
 
   public renderContact(contact: Contact): JSX.Element {
-    const { i18n, showSafetyNumber } = this.props;
+    const { i18n, toggleSafetyNumberModal } = this.props;
     const errors = contact.errors || [];
 
     const errorComponent = contact.isOutgoingKeyError ? (
@@ -170,7 +171,7 @@ export class MessageDetail extends React.Component<Props> {
         <button
           type="button"
           className="module-message-detail__contact__show-safety-number"
-          onClick={() => showSafetyNumber(contact.id)}
+          onClick={() => toggleSafetyNumberModal(contact.id)}
         >
           {i18n('showSafetyNumber')}
         </button>
diff --git a/ts/components/conversation/SafetyNumberNotification.stories.tsx b/ts/components/conversation/SafetyNumberNotification.stories.tsx
index efd4d70749..8cc15a15f9 100644
--- a/ts/components/conversation/SafetyNumberNotification.stories.tsx
+++ b/ts/components/conversation/SafetyNumberNotification.stories.tsx
@@ -21,7 +21,7 @@ const createProps = (overrideProps: Partial<Props> = {}): Props => ({
   i18n,
   contact: overrideProps.contact || ({} as ContactType),
   isGroup: boolean('isGroup', overrideProps.isGroup || false),
-  showIdentity: action('showIdentity'),
+  toggleSafetyNumberModal: action('toggleSafetyNumberModal'),
 });
 
 export default {
diff --git a/ts/components/conversation/SafetyNumberNotification.tsx b/ts/components/conversation/SafetyNumberNotification.tsx
index cd6654fcaf..3c2325af29 100644
--- a/ts/components/conversation/SafetyNumberNotification.tsx
+++ b/ts/components/conversation/SafetyNumberNotification.tsx
@@ -24,7 +24,7 @@ type PropsHousekeeping = {
 };
 
 export type PropsActions = {
-  showIdentity: (id: string) => void;
+  toggleSafetyNumberModal: (id: string) => void;
 };
 
 export type Props = PropsData & PropsHousekeeping & PropsActions;
@@ -33,7 +33,7 @@ export function SafetyNumberNotification({
   contact,
   isGroup,
   i18n,
-  showIdentity,
+  toggleSafetyNumberModal,
 }: Props): JSX.Element {
   const changeKey = isGroup
     ? 'safetyNumberChangedGroup'
@@ -62,7 +62,7 @@ export function SafetyNumberNotification({
       button={
         <Button
           onClick={() => {
-            showIdentity(contact.id);
+            toggleSafetyNumberModal(contact.id);
           }}
           size={ButtonSize.Small}
           variant={ButtonVariant.SystemMessage}
diff --git a/ts/components/conversation/Timeline.stories.tsx b/ts/components/conversation/Timeline.stories.tsx
index 3e3a637ee4..d711dfff85 100644
--- a/ts/components/conversation/Timeline.stories.tsx
+++ b/ts/components/conversation/Timeline.stories.tsx
@@ -305,7 +305,7 @@ const actions = () => ({
   ),
   toggleForwardMessageModal: action('toggleForwardMessageModal'),
 
-  showIdentity: action('showIdentity'),
+  toggleSafetyNumberModal: action('toggleSafetyNumberModal'),
 
   downloadNewVersion: action('downloadNewVersion'),
 
diff --git a/ts/components/conversation/Timeline.tsx b/ts/components/conversation/Timeline.tsx
index 90fcb8d9de..a05ef0baef 100644
--- a/ts/components/conversation/Timeline.tsx
+++ b/ts/components/conversation/Timeline.tsx
@@ -262,7 +262,7 @@ const getActions = createSelector(
       'showExpiredOutgoingTapToViewToast',
       'startConversation',
 
-      'showIdentity',
+      'toggleSafetyNumberModal',
 
       'downloadNewVersion',
 
diff --git a/ts/components/conversation/TimelineItem.stories.tsx b/ts/components/conversation/TimelineItem.stories.tsx
index ba8f2656fc..847a5686b7 100644
--- a/ts/components/conversation/TimelineItem.stories.tsx
+++ b/ts/components/conversation/TimelineItem.stories.tsx
@@ -96,7 +96,7 @@ const getDefaultProps = () => ({
   openLink: action('openLink'),
   scrollToQuotedMessage: action('scrollToQuotedMessage'),
   downloadNewVersion: action('downloadNewVersion'),
-  showIdentity: action('showIdentity'),
+  toggleSafetyNumberModal: action('toggleSafetyNumberModal'),
   startCallingLobby: action('startCallingLobby'),
   startConversation: action('startConversation'),
   returnToActiveCall: action('returnToActiveCall'),
diff --git a/ts/state/smart/MessageDetail.tsx b/ts/state/smart/MessageDetail.tsx
index 1f06a1dafc..b65a7dbc29 100644
--- a/ts/state/smart/MessageDetail.tsx
+++ b/ts/state/smart/MessageDetail.tsx
@@ -38,8 +38,6 @@ const mapStateToProps = (
     receivedAt,
     sentAt,
 
-    showSafetyNumber,
-
     displayTapToViewMessage,
     kickOffAttachmentDownload,
     markAttachmentAsCorrupted,
@@ -77,8 +75,6 @@ const mapStateToProps = (
     interactionMode: getInteractionMode(state),
     theme: getTheme(state),
 
-    showSafetyNumber,
-
     displayTapToViewMessage,
     kickOffAttachmentDownload,
     markAttachmentAsCorrupted,
diff --git a/ts/state/smart/Timeline.tsx b/ts/state/smart/Timeline.tsx
index 635a5db822..1cbef583dd 100644
--- a/ts/state/smart/Timeline.tsx
+++ b/ts/state/smart/Timeline.tsx
@@ -89,7 +89,6 @@ export type TimelinePropsType = ExternalProps &
     | 'showContactModal'
     | 'showExpiredIncomingTapToViewToast'
     | 'showExpiredOutgoingTapToViewToast'
-    | 'showIdentity'
     | 'showMessageDetail'
     | 'showVisualAttachment'
     | 'startConversation'
diff --git a/ts/views/conversation_view.tsx b/ts/views/conversation_view.tsx
index 6b43765176..608a63ab17 100644
--- a/ts/views/conversation_view.tsx
+++ b/ts/views/conversation_view.tsx
@@ -21,7 +21,7 @@ import { getContactId } from '../messages/helpers';
 import { strictAssert } from '../util/assert';
 import { enqueueReactionForSend } from '../reactions/enqueueReactionForSend';
 import type { GroupNameCollisionsWithIdsByTitle } from '../util/groupMemberNameCollisions';
-import { isDirectConversation, isGroup } from '../util/whatTypeOfConversation';
+import { isGroup } from '../util/whatTypeOfConversation';
 import { findAndFormatContact } from '../util/findAndFormatContact';
 import { getPreferredBadgeSelector } from '../state/selectors/badges';
 import {
@@ -125,10 +125,8 @@ type MessageActionsType = {
     };
   }) => unknown;
   showContactModal: (contactId: string) => unknown;
-  showSafetyNumber: (contactId: string) => unknown;
   showExpiredIncomingTapToViewToast: () => unknown;
   showExpiredOutgoingTapToViewToast: () => unknown;
-  showIdentity: (conversationId: string) => unknown;
   showMessageDetail: (messageId: string) => unknown;
   showVisualAttachment: (options: {
     attachment: AttachmentType;
@@ -528,9 +526,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     };
     const displayTapToViewMessage = (messageId: string) =>
       this.displayTapToViewMessage(messageId);
-    const showIdentity = (conversationId: string) => {
-      this.showSafetyNumber(conversationId);
-    };
     const openGiftBadge = (messageId: string): void => {
       const message = window.MessageController.getById(messageId);
       if (!message) {
@@ -546,9 +541,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     const downloadNewVersion = () => {
       openLinkInWebBrowser('https://signal.org/download');
     };
-    const showSafetyNumber = (contactId: string) => {
-      this.showSafetyNumber(contactId);
-    };
     const showExpiredIncomingTapToViewToast = () => {
       log.info('Showing expired tap-to-view toast for an incoming message');
       showToast(ToastTapToViewExpiredIncoming);
@@ -574,10 +566,8 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
       retryDeleteForEveryone,
       showContactDetail,
       showContactModal,
-      showSafetyNumber,
       showExpiredIncomingTapToViewToast,
       showExpiredOutgoingTapToViewToast,
-      showIdentity,
       showMessageDetail,
       showVisualAttachment,
       startConversation,
@@ -973,21 +963,6 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
     view.render();
   }
 
-  showSafetyNumber(id?: string): void {
-    let conversation: undefined | ConversationModel;
-
-    if (!id && isDirectConversation(this.model.attributes)) {
-      conversation = this.model;
-    } else {
-      conversation = window.ConversationController.get(id);
-    }
-    if (conversation) {
-      window.reduxActions.globalModals.toggleSafetyNumberModal(
-        conversation.get('id')
-      );
-    }
-  }
-
   downloadAttachmentWrapper(
     messageId: string,
     providedAttachment?: AttachmentType