From b53a61fbde077bea441d578aa8f20daeba273c36 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Tue, 11 May 2021 13:27:19 -0500
Subject: [PATCH] Fix non-default disappearing message timers on group details
 screen

---
 .../ConversationDetails.tsx                   | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/ts/components/conversation/conversation-details/ConversationDetails.tsx b/ts/components/conversation/conversation-details/ConversationDetails.tsx
index b221625675..fb2c670fdc 100644
--- a/ts/components/conversation/conversation-details/ConversationDetails.tsx
+++ b/ts/components/conversation/conversation-details/ConversationDetails.tsx
@@ -63,6 +63,10 @@ export type StateProps = {
 
 export type Props = StateProps;
 
+const expirationTimerDefaultSet = new Set<number>(
+  expirationTimer.DEFAULT_DURATIONS_IN_SECONDS
+);
+
 export const ConversationDetails: React.ComponentType<Props> = ({
   addMembers,
   canEditGroupInfo,
@@ -196,6 +200,13 @@ export const ConversationDetails: React.ComponentType<Props> = ({
       throw missingCaseError(modalState);
   }
 
+  const expireTimer = conversation.expireTimer || 0;
+
+  let expirationTimerDurations = expirationTimer.DEFAULT_DURATIONS_IN_SECONDS;
+  if (!expirationTimerDefaultSet.has(expireTimer)) {
+    expirationTimerDurations = [...expirationTimerDurations, expireTimer];
+  }
+
   return (
     <div className="conversation-details-panel">
       <ConversationDetailsHeader
@@ -222,24 +233,15 @@ export const ConversationDetails: React.ComponentType<Props> = ({
             label={i18n('ConversationDetails--disappearing-messages-label')}
             right={
               <div className="module-conversation-details-select">
-                <select
-                  onChange={updateExpireTimer}
-                  value={conversation.expireTimer || 0}
-                >
-                  {expirationTimer.DEFAULT_DURATIONS_IN_SECONDS.map(
-                    (seconds: number) => {
-                      const label = expirationTimer.format(i18n, seconds);
-                      return (
-                        <option
-                          value={seconds}
-                          key={seconds}
-                          aria-label={label}
-                        >
-                          {label}
-                        </option>
-                      );
-                    }
-                  )}
+                <select onChange={updateExpireTimer} value={expireTimer}>
+                  {expirationTimerDurations.map((seconds: number) => {
+                    const label = expirationTimer.format(i18n, seconds);
+                    return (
+                      <option value={seconds} key={seconds} aria-label={label}>
+                        {label}
+                      </option>
+                    );
+                  })}
                 </select>
               </div>
             }