From b98543a9fc2c7b53edb5d4d5201ab32caf16460a Mon Sep 17 00:00:00 2001
From: Maxim Shishmarev <msgmaxim@gmail.com>
Date: Mon, 15 Jun 2020 11:51:44 +1000
Subject: [PATCH] Fix enum in a definition type

---
 js/models/message.d.ts   | 11 ++---------
 ts/receiver/queuedJob.ts |  4 ++--
 ts/receiver/receiver.ts  |  2 +-
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/js/models/message.d.ts b/js/models/message.d.ts
index a800fb701..73a3c88aa 100644
--- a/js/models/message.d.ts
+++ b/js/models/message.d.ts
@@ -1,13 +1,6 @@
-enum MessageModelType {
-  INCOMING = 'incoming',
-  OUTGOING = 'outgoing',
-  FRIEND_REQUEST = 'friend-request',
-}
 
-export enum EndSessionType {
-  DONE = 'done',
-  ONGOING = 'ongoing',
-}
+type MessageModelType = 'incoming' | 'outgoing' | 'friend-request';
+export type EndSessionType = 'done' | 'ongoing';
 
 interface MessageAttributes {
   id: number;
diff --git a/ts/receiver/queuedJob.ts b/ts/receiver/queuedJob.ts
index e74f73ad8..dabd90886 100644
--- a/ts/receiver/queuedJob.ts
+++ b/ts/receiver/queuedJob.ts
@@ -78,8 +78,8 @@ function handleSessionReset(
   message: MessageModel
 ) {
   const endSessionType = conversation.isSessionResetReceived()
-    ? EndSessionType.ONGOING
-    : EndSessionType.DONE;
+    ? 'ongoing'
+    : 'done';
   message.set({ endSessionType });
 }
 
diff --git a/ts/receiver/receiver.ts b/ts/receiver/receiver.ts
index 4e62ed335..e6df8d2bb 100644
--- a/ts/receiver/receiver.ts
+++ b/ts/receiver/receiver.ts
@@ -735,7 +735,7 @@ export async function handleMessageEvent(event: any): Promise<void> {
   // eslint-disable-next-line no-bitwise
   if (message.flags & SESSION_RESTORE) {
     // Show that the session reset is "in progress" even though we had a valid session
-    msg.set({ endSessionType: EndSessionType.ONGOING });
+    msg.set({ endSessionType: 'ongoing' });
   }
 
   const ourNumber = window.textsecure.storage.user.getNumber();