@vgroup/dialbox 0.5.12 → 0.5.14

package/fesm2015/vgroup-dialbox.mjs

@@ -1931,21 +1931,21 @@ class CallProgressComponent {
             }
             else if (!((_j = this.newIncomingCallsList) === null || _j === void 0 ? void 0 : _j.length)) {
                 console.log('test null');
-                if (this.isRinging) {
-                    this.incomeingCallSocketService.pause();
-                }
                 this.isRinging = false;
                 this.isConcurrentIncoming = false;
                 this.incomingCallDiv = false;
                 this.currentCallList = [];
                 this.currentCall = {};
+                this.cdr.detectChanges();
+                if (this.isRinging) {
+                    this.incomeingCallSocketService.pause();
+                }
                 this.isRinging = false;
                 this.isCallInProgress = false;
                 this.isConferenceCallHold = false;
-                this.stopTimer();
                 this.call.disconnect();
+                this.stopTimer();
                 this.cdr.detectChanges();
-                // this.twilioService.device.disconnectAll()
                 this.endCallEvent.emit();
             }
         }
@@ -2844,7 +2844,6 @@ class CallProgressComponent {
     }
     isMergeCallAllowed() {
         let mergeCallList = this.currentCallList.filter((res) => res.conferenceId == this.currentCall.conferenceId);
-        console.log('mergeCallList', mergeCallList);
         return mergeCallList.length <= 1;
     }
     mergeCalls() {
@@ -3792,7 +3791,7 @@ class DialboxComponent {
         this.registerDragElement();
     }
     ngOnChanges(changes) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f;
         if (((_a = changes['incomingCallnotification']) === null || _a === void 0 ? void 0 : _a.currentValue) && this.incomingCallnotification) {
             this.isIncomingCallnotification = true;
             // let payload = {
@@ -3806,15 +3805,18 @@ class DialboxComponent {
             console.log(',,,,,', this.incomingCallnotification);
             if (this.incomingCallnotification.data.content == "IncomingCall") {
                 let callerInfo;
-                if (((_b = this.incomingCallnotification.data.data) === null || _b === void 0 ? void 0 : _b.c2cBusiness) == 'false') {
-                    this.extensionService.getUserInformation((_c = this.incomingCallnotification.data.data) === null || _c === void 0 ? void 0 : _c.participantId).subscribe((resInfo) => {
-                        console.log('uesrInfo', resInfo);
-                        callerInfo = resInfo.c2cInformation;
-                        this.incomingCallNotification(callerInfo);
-                    });
-                }
-                else {
-                    this.incomingCallNotification({});
+                let numberList = this.callerIdList.map((res) => res.number);
+                if (!numberList.includes((_b = this.incomingCallnotification.data.data) === null || _b === void 0 ? void 0 : _b.fromNumber)) {
+                    if (((_c = this.incomingCallnotification.data.data) === null || _c === void 0 ? void 0 : _c.c2cBusiness) == 'false') {
+                        this.extensionService.getUserInformation((_d = this.incomingCallnotification.data.data) === null || _d === void 0 ? void 0 : _d.participantId).subscribe((resInfo) => {
+                            console.log('uesrInfo', resInfo);
+                            callerInfo = resInfo.c2cInformation;
+                            this.incomingCallNotification(callerInfo);
+                        });
+                    }
+                    else {
+                        this.incomingCallNotification({});
+                    }
                 }
             }
             else if (this.incomingCallnotification.data.content == "Missed Call") {
@@ -3841,10 +3843,10 @@ class DialboxComponent {
             this.twilioService.deviceId = changes['deviceId'].currentValue;
             console.log('Set deviceId in localStorage:', changes['deviceId'].currentValue);
         }
-        if (((_d = changes['userId']) === null || _d === void 0 ? void 0 : _d.currentValue) && this.userId) {
+        if (((_e = changes['userId']) === null || _e === void 0 ? void 0 : _e.currentValue) && this.userId) {
             this.extensionService.userId = this.userId;
         }
-        if (((_e = changes['contactInfo']) === null || _e === void 0 ? void 0 : _e.currentValue) && this.contactInfo) {
+        if (((_f = changes['contactInfo']) === null || _f === void 0 ? void 0 : _f.currentValue) && this.contactInfo) {
             let contact = this.contactInfo;
             console.log('contactInfo', contact);
             if (contact.number) {
@@ -4170,6 +4172,7 @@ class DialboxComponent {
             // Reset dialed number
             this.dialedNumber = '';
             this.sanitizedNum = '';
+            this.twilioService.device.disconnectAll();
             // Emit end call event
             this.endCallEvent.emit();
             console.log('Call ended successfully');