Merge pull request #3030 from Bilb/fix-qa-issues-disappear_v2

Fix qa issues disappear v2

ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx

@@ -28,7 +28,7 @@ const ButtonSpacer = styled.div`
 `;
 
 const StyledButtonContainer = styled.div`
-  background: linear-gradient(0deg, black, transparent);
+  background: linear-gradient(0deg, var(--background-primary-color), transparent);
   position: absolute;
   width: 100%;
   bottom: 0px;

ts/models/conversation.ts

@@ -870,7 +870,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
     );
 
     // we don't add an update message when this comes from a config message, as we already have the SyncedMessage itself with the right timestamp to display
-    const shouldAddExpireUpdateMessage = !fromConfigMessage;
 
     if (this.isPublic()) {
       throw new Error("updateExpireTimer() Disappearing messages aren't supported in communities");
@@ -883,6 +882,15 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       expirationMode = 'off';
       expireTimer = 0;
     }
+    const shouldAddExpireUpdateMessage =
+      (this.isPrivate() && !fromConfigMessage) ||
+      (this.isClosedGroup() &&
+        !PubKey.isClosedGroupV3(this.id) &&
+        !fromConfigMessage &&
+        expirationMode !== this.get('expirationMode') &&
+        expireTimer !== this.get('expireTimer') &&
+        expirationMode !== 'off' &&
+        expireTimer !== 0);
 
     // When we add a disappearing messages notification to the conversation, we want it
     // to be above the message that initiated that change, hence the subtraction.