Rename ContactType to EmbeddedContactType

ts/components/conversation/ContactDetail.stories.tsx

@@ -8,7 +8,7 @@ import { boolean } from '@storybook/addon-knobs';
 import { storiesOf } from '@storybook/react';
 
 import { ContactDetail, Props } from './ContactDetail';
-import { AddressType, ContactFormType } from '../../types/Contact';
+import { AddressType, ContactFormType } from '../../types/EmbeddedContact';
 import { setup as setupI18n } from '../../../js/modules/i18n';
 import enMessages from '../../../_locales/en/messages.json';
 import { IMAGE_GIF } from '../../types/MIME';

ts/components/conversation/ContactDetail.tsx

@@ -6,11 +6,11 @@ import React from 'react';
 import {
   AddressType,
   ContactFormType,
-  ContactType,
+  EmbeddedContactType,
   Email,
   Phone,
   PostalAddress,
-} from '../../types/Contact';
+} from '../../types/EmbeddedContact';
 import { missingCaseError } from '../../util/missingCaseError';
 
 import {
@@ -22,7 +22,7 @@ import {
 import { LocalizerType } from '../../types/Util';
 
 export type Props = {
-  contact: ContactType;
+  contact: EmbeddedContactType;
   hasSignalAccount: boolean;
   i18n: LocalizerType;
   onSendMessage: () => void;

ts/components/conversation/EmbeddedContact.stories.tsx

@@ -10,7 +10,7 @@ import { storiesOf } from '@storybook/react';
 import { EmbeddedContact, Props } from './EmbeddedContact';
 import { setup as setupI18n } from '../../../js/modules/i18n';
 import enMessages from '../../../_locales/en/messages.json';
-import { ContactFormType } from '../../types/Contact';
+import { ContactFormType } from '../../types/EmbeddedContact';
 import { IMAGE_GIF } from '../../types/MIME';
 
 const i18n = setupI18n('en', enMessages);

ts/components/conversation/EmbeddedContact.tsx

@@ -4,7 +4,7 @@
 import React from 'react';
 import classNames from 'classnames';
 
-import { ContactType } from '../../types/Contact';
+import { EmbeddedContactType } from '../../types/EmbeddedContact';
 
 import { LocalizerType } from '../../types/Util';
 import {
@@ -14,7 +14,7 @@ import {
 } from './_contactUtil';
 
 export type Props = {
-  contact: ContactType;
+  contact: EmbeddedContactType;
   i18n: LocalizerType;
   isIncoming: boolean;
   withContentAbove: boolean;

ts/components/conversation/Message.tsx

@@ -49,7 +49,7 @@ import {
   isVideo,
   isGIF,
 } from '../../types/Attachment';
-import { ContactType } from '../../types/Contact';
+import { EmbeddedContactType } from '../../types/EmbeddedContact';
 
 import { getIncrement } from '../../util/timer';
 import { isFileDangerous } from '../../util/isFileDangerous';
@@ -129,7 +129,7 @@ export type PropsData = {
   direction: DirectionType;
   timestamp: number;
   status?: MessageStatusType;
-  contact?: ContactType;
+  contact?: EmbeddedContactType;
   author: Pick<
     ConversationType,
     | 'acceptedMessageRequest'
@@ -216,7 +216,7 @@ export type PropsActions = {
 
   openConversation: (conversationId: string, messageId?: string) => void;
   showContactDetail: (options: {
-    contact: ContactType;
+    contact: EmbeddedContactType;
     signalAccount?: string;
   }) => void;
   showContactModal: (contactId: string) => void;

ts/components/conversation/_contactUtil.tsx

@@ -9,7 +9,7 @@ import { Spinner } from '../Spinner';
 
 import { LocalizerType } from '../../types/Util';
 import { AvatarColors } from '../../types/Colors';
-import { ContactType, getName } from '../../types/Contact';
+import { EmbeddedContactType, getName } from '../../types/EmbeddedContact';
 
 // This file starts with _ to keep it from showing up in the StyleGuide.
 
@@ -19,7 +19,7 @@ export function renderAvatar({
   size,
   direction,
 }: {
-  contact: ContactType;
+  contact: EmbeddedContactType;
   i18n: LocalizerType;
   size: 28 | 52 | 80;
   direction?: 'outgoing' | 'incoming';
@@ -65,7 +65,7 @@ export function renderName({
   isIncoming,
   module,
 }: {
-  contact: ContactType;
+  contact: EmbeddedContactType;
   isIncoming: boolean;
   module: string;
 }): JSX.Element {
@@ -86,7 +86,7 @@ export function renderContactShorthand({
   isIncoming,
   module,
 }: {
-  contact: ContactType;
+  contact: EmbeddedContactType;
   isIncoming: boolean;
   module: string;
 }): JSX.Element {