From 6e19aa59c85027fb86a6dc6e8574347b626ea5ed Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Thu, 7 Oct 2021 15:27:26 -0700
Subject: [PATCH] Fix safety number viewer for contact modal

Co-authored-by: Josh Perez <60019601+josh-signal@users.noreply.github.com>
---
 .../conversation/ContactModal.stories.tsx        |  2 +-
 ts/components/conversation/ContactModal.tsx      |  6 +++---
 ts/state/ducks/conversations.ts                  | 16 ----------------
 ts/views/inbox_view.ts                           |  7 -------
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/ts/components/conversation/ContactModal.stories.tsx b/ts/components/conversation/ContactModal.stories.tsx
index b02a1d746bd..c40755667c9 100644
--- a/ts/components/conversation/ContactModal.stories.tsx
+++ b/ts/components/conversation/ContactModal.stories.tsx
@@ -34,7 +34,7 @@ const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
   isMember: boolean('isMember', overrideProps.isMember || true),
   openConversationInternal: action('openConversationInternal'),
   removeMemberFromGroup: action('removeMemberFromGroup'),
-  showSafetyNumberInConversation: action('showSafetyNumberInConversation'),
+  toggleSafetyNumberModal: action('toggleSafetyNumberModal'),
   toggleAdmin: action('toggleAdmin'),
   updateConversationModelSharedGroups: action(
     'updateConversationModelSharedGroups'
diff --git a/ts/components/conversation/ContactModal.tsx b/ts/components/conversation/ContactModal.tsx
index 58916794e1c..02844effeac 100644
--- a/ts/components/conversation/ContactModal.tsx
+++ b/ts/components/conversation/ContactModal.tsx
@@ -31,8 +31,8 @@ type PropsActionType = {
     }>
   ) => void;
   removeMemberFromGroup: (conversationId: string, contactId: string) => void;
-  showSafetyNumberInConversation: (conversationId: string) => void;
   toggleAdmin: (conversationId: string, contactId: string) => void;
+  toggleSafetyNumberModal: (conversationId: string) => unknown;
   updateConversationModelSharedGroups: (conversationId: string) => void;
 };
 
@@ -48,8 +48,8 @@ export const ContactModal = ({
   isMember,
   openConversationInternal,
   removeMemberFromGroup,
-  showSafetyNumberInConversation,
   toggleAdmin,
+  toggleSafetyNumberModal,
   updateConversationModelSharedGroups,
 }: PropsType): JSX.Element => {
   if (!contact) {
@@ -136,7 +136,7 @@ export const ContactModal = ({
               className="ContactModal__button ContactModal__safety-number"
               onClick={() => {
                 hideContactModal();
-                showSafetyNumberInConversation(contact.id);
+                toggleSafetyNumberModal(contact.id);
               }}
             >
               <div className="ContactModal__bubble-icon">
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 22ff8b0d0a5..d040856fb4f 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -805,7 +805,6 @@ export const actions = {
   showArchivedConversations,
   showChooseGroupMembers,
   showInbox,
-  showSafetyNumberInConversation,
   startComposing,
   startNewConversationFromPhoneNumber,
   startSettingGroupMetadata,
@@ -1777,21 +1776,6 @@ function updateConversationModelSharedGroups(
   };
 }
 
-function showSafetyNumberInConversation(
-  conversationId: string
-): ThunkAction<void, RootStateType, unknown, NoopActionType> {
-  return dispatch => {
-    window.Whisper.events.trigger(
-      'showSafetyNumberInConversation',
-      conversationId
-    );
-    dispatch({
-      type: 'NOOP',
-      payload: null,
-    });
-  };
-}
-
 function showInbox(): ShowInboxActionType {
   return {
     type: 'SHOW_INBOX',
diff --git a/ts/views/inbox_view.ts b/ts/views/inbox_view.ts
index 4eea565510c..37ff2a69479 100644
--- a/ts/views/inbox_view.ts
+++ b/ts/views/inbox_view.ts
@@ -117,13 +117,6 @@ Whisper.InboxView = Whisper.View.extend({
       this.conversation_stack.open(conversation, messageId);
     });
 
-    window.Whisper.events.on('showSafetyNumberInConversation', id => {
-      const conversation = window.ConversationController.get(id);
-      if (conversation) {
-        conversation.trigger('showSafetyNumber');
-      }
-    });
-
     window.Whisper.events.on('loadingProgress', count => {
       const view = this.appLoadingScreen;
       if (view) {