fix: merge now returns good hashes

we calc the latestEnvelopeTimestamp and use for disappearAfterRead

ts/models/conversation.ts

@@ -934,6 +934,7 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> {
       window.log.debug(
         `[updateExpireTimer] We dont send an ExpireTimerUpdate because this was a remote change receivedAt: ${receivedAt} fromSync: ${fromSync} for ${this.id}`
       );
+
       if (!message.getExpirationStartTimestamp()) {
         const canBeDeleteAfterSend = this.isMe() || this.isGroup();
         if (

ts/receiver/configMessage.ts

@@ -117,13 +117,16 @@ async function mergeConfigsWithIncomingUpdates(
         }
       }
 
-      const mergedCount = await GenericWrapperActions.merge(variant, toMerge);
+      const hashesMerged = await GenericWrapperActions.merge(variant, toMerge);
       const needsPush = await GenericWrapperActions.needsPush(variant);
       const needsDump = await GenericWrapperActions.needsDump(variant);
-      const latestEnvelopeTimestamp = Math.max(...sameVariant.map(m => m.envelopeTimestamp));
+      const mergedTimestamps = sameVariant
+        .filter(m => hashesMerged.includes(m.messageHash))
+        .map(m => m.envelopeTimestamp);
+      const latestEnvelopeTimestamp = Math.max(...mergedTimestamps);
 
       window.log.debug(
-        `${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${mergedCount} `
+        `${variant}: "${publicKey}" needsPush:${needsPush} needsDump:${needsDump}; mergedCount:${hashesMerged.length}`
       );
 
       if (window.sessionFeatureFlags.debug.debugLibsessionDumps) {

ts/session/disappearing_messages/index.ts

@@ -157,7 +157,11 @@ function setExpirationStartTimestamp(
   let expirationStartTimestamp: number | undefined = GetNetworkTime.getNowWithNetworkOffset();
 
   if (callLocation) {
-    // window.log.debug(`[setExpirationStartTimestamp] called from: ${callLocation} ${messageId ?  `messageId: ${messageId} ` : ''}`);
+    // window.log.debug(
+    //   `[setExpirationStartTimestamp] called from: ${callLocation} ${
+    //     messageId ? `messageId: ${messageId} ` : ''
+    //   }`
+    // );
   }
 
   // TODO legacy messages support will be removed in a future release