From f7a4e7ee81fcaa6dc46614abfdcf4a0ede025ffd Mon Sep 17 00:00:00 2001
From: warrickct <warrickct@gmail.com>
Date: Wed, 2 Mar 2022 13:09:42 +1100
Subject: [PATCH] Move disappearing message indicator to right of conversation
 header.

---
 ts/components/conversation/ConversationHeader.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ts/components/conversation/ConversationHeader.tsx b/ts/components/conversation/ConversationHeader.tsx
index 877a948b3..ac0b61dbf 100644
--- a/ts/components/conversation/ConversationHeader.tsx
+++ b/ts/components/conversation/ConversationHeader.tsx
@@ -363,11 +363,13 @@ export const ConversationHeaderWithDetails = () => {
             <TripleDotsMenu triggerId={triggerId} showBackButton={isMessageDetailOpened} />
             <ConversationHeaderTitle />
           </div>
-          {!isKickedFromGroup && <ExpirationLength expirationSettingName={expirationSettingName} />}
         </div>
 
         {!isSelectionMode && (
-          <ConversationHeaderButtonContainer>
+          <ConversationHeaderRightContainer>
+            {!isKickedFromGroup && (
+              <ExpirationLength expirationSettingName={expirationSettingName} />
+            )}
             <CallButton />
             <AvatarHeader
               onAvatarClick={() => {
@@ -376,7 +378,7 @@ export const ConversationHeaderWithDetails = () => {
               pubkey={selectedConvoKey}
               showBackButton={isMessageDetailOpened}
             />
-          </ConversationHeaderButtonContainer>
+          </ConversationHeaderRightContainer>
         )}
 
         <ConversationHeaderMenu triggerId={triggerId} />
@@ -387,7 +389,7 @@ export const ConversationHeaderWithDetails = () => {
   );
 };
 
-export const ConversationHeaderButtonContainer = styled.div`
+export const ConversationHeaderRightContainer = styled.div`
   display: flex;
   flex-direction: row;
   align-items: center;