@snugdesk/whatsapp-widget 0.2.13 → 0.2.16

package/fesm2022/snugdesk-whatsapp-widget.mjs

@@ -3101,8 +3101,7 @@ class WhatsAppMessagesComponent {
                     message.interactionAttendee = interactionAttendee;
                 }
                 if (message.interactionAttendee?.entityId) {
-                    this.isRestrictedToTemplateReplies = false;
-                    this.startCountdownTimer(24 * 60 * 60); // 24 hours in seconds
+                    this.updateTemplateRestrictionFromInbound(message);
                     // Update the selected tenant phone number to the one receiving the new message
                     this.selectedWABAPhoneNumber =
                         this.wabaPhoneNumbers.find((phoneNumber) => this.cleanPhoneNumber(phoneNumber.display_phone_number) ===
@@ -3828,8 +3827,7 @@ class WhatsAppMessagesComponent {
             !this.selectedEntityConversationMessages?.length ||
             !lastInteraction ||
             !!lastInteraction.completedAt ||
-            lastInteraction.status === 'DISCONNECTED' ||
-            this.getCurrentTime() - lastMessage?.createdAt > 24 * 60 * 60);
+            lastInteraction.status === 'DISCONNECTED');
     }
     toggleMessageTemplatePopup() {
         this.showTemplatePopup = !this.showTemplatePopup;
@@ -3858,9 +3856,6 @@ class WhatsAppMessagesComponent {
         textarea.style.height = 'auto';
         textarea.style.height = textarea.scrollHeight + 'px';
     }
-    getCurrentTime() {
-        return moment.utc().unix();
-    }
     startCountdownTimer(remainingTime) {
         if (this.countdownInterval) {
             clearInterval(this.countdownInterval);
@@ -4161,8 +4156,10 @@ class WhatsAppMessagesComponent {
         const res_whatsappMessages = await this.fetchEntityConversationMessages(entityConversation.id);
         this.selectedEntityConversationMessages = res_whatsappMessages || [];
         this.interactionMessageByEntityConversationIdSubscription = this.subscribeToEntityConversationMessages(entityConversation.id);
-        if (!this.selectedEntityConversationMessages?.length)
+        if (!this.selectedEntityConversationMessages?.length) {
+            this.isRestrictedToTemplateReplies = true;
             return;
+        }
         this.updateSelectedPhoneFromLastMessage();
         const latestInteraction = entityConversation?.interactions?.items?.[0];
         if (latestInteraction && !latestInteraction.deletedAt && !latestInteraction.completedAt) {
@@ -4181,18 +4178,29 @@ class WhatsAppMessagesComponent {
         this.selectedWABAPhoneNumber = this.wabaPhoneNumbers.find((phoneNumber) => this.cleanPhoneNumber(phoneNumber.display_phone_number) === this.cleanPhoneNumber(lastConversationMessage.endpoint?.address)) || this.wabaPhoneNumbers?.[0];
     }
     async updateTemplateRestriction(latestInteraction, entityConversation) {
-        const lastEntityMessage = await this.getLastEntityInteractionMessage(latestInteraction.id, entityConversation?.entityId);
-        if (!lastEntityMessage) {
-            this.isRestrictedToTemplateReplies = true;
-            return;
-        }
+        const lastInboundMessageFromList = this.getLastInboundMessageFromMessages();
+        const lastInboundMessage = lastInboundMessageFromList ??
+            (await this.getLastEntityInteractionMessage(latestInteraction.id, entityConversation?.entityId));
+        this.updateTemplateRestrictionFromInbound(lastInboundMessage);
+    }
+    updateTemplateRestrictionFromInbound(lastInboundMessage) {
         const now = moment.utc().unix();
-        const twentyFourHoursInSeconds = 24 * 60 * 60;
-        const messageAgeInSeconds = now - lastEntityMessage.createdAt;
-        this.isRestrictedToTemplateReplies = messageAgeInSeconds > twentyFourHoursInSeconds;
-        if (!this.isRestrictedToTemplateReplies) {
-            this.startCountdownTimer(lastEntityMessage.createdAt + twentyFourHoursInSeconds - now);
+        const replyWindowSeconds = 24 * 60 * 60;
+        const isRestricted = !lastInboundMessage || now - lastInboundMessage.createdAt > replyWindowSeconds;
+        this.isRestrictedToTemplateReplies = isRestricted;
+        if (!isRestricted && lastInboundMessage) {
+            this.startCountdownTimer(lastInboundMessage.createdAt + replyWindowSeconds - now);
+        }
+    }
+    getLastInboundMessageFromMessages() {
+        for (let i = this.selectedEntityConversationMessages.length - 1; i >= 0; i--) {
+            const msg = this.selectedEntityConversationMessages[i];
+            const attendee = msg?.interactionAttendee ?? this.interactionAttendeesMap?.[msg?.interactionAttendeeId];
+            if (attendee?.entityId && !msg?.deletedAt) {
+                return msg;
+            }
         }
+        return undefined;
     }
     isEntityConversationInactive() {
         return !!this.entity?.blockedAt || !!this.entity?.deletedAt || !!this.selectedEntityConversation?.blockedAt || !!this.selectedEntityConversation?.deletedAt;