@vgroup/dialbox 0.3.21 → 0.3.22

package/fesm2015/vgroup-dialbox.mjs

@@ -2247,8 +2247,10 @@ class CallProgressComponent {
         this.onholdOrUnholdParticipant({
             participantId: c.participantId,
             conferenceId: this.conferenceId,
-            hold: true
+            hold: !c.hold
         });
+        c.hold = !c.hold;
+        this.cdr.detectChanges();
     }
     onEndCall(c, isAllCallEnd) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -2561,7 +2563,7 @@ class CallProgressComponent {
                     // ...this.callData,
                     phone: phoneNumber,
                     displayNum: phoneNumber,
-                    name: contactName || phoneNumber,
+                    name: (contact === null || contact === void 0 ? void 0 : contact.name) || phoneNumber,
                     img: (contact === null || contact === void 0 ? void 0 : contact.img) || 'assets/images/user.jpg',
                     participantId: data === null || data === void 0 ? void 0 : data.participantId,
                     from: (_e = this.selectedCallerId) === null || _e === void 0 ? void 0 : _e.number,
@@ -2715,17 +2717,27 @@ class CallProgressComponent {
         });
     }
     mergeCalls() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             // Merge functionality - unmute both calls for conference
             if (this.heldCall && this.call) {
-                yield this.onholdOrUnholdParticipant({
-                    participantId: (_b = (_a = this.heldCall) === null || _a === void 0 ? void 0 : _a.callInfo) === null || _b === void 0 ? void 0 : _b.participantId,
-                    conferenceId: this.conferenceId,
-                    hold: false
-                });
-                this.heldCall.mute(false);
-                this.call.mute(false);
+                this.currentCallList.forEach((c) => __awaiter(this, void 0, void 0, function* () {
+                    if ((c === null || c === void 0 ? void 0 : c.participantId) && (c === null || c === void 0 ? void 0 : c.isHold)) {
+                        c.isHold = false;
+                        yield this.onholdOrUnholdParticipant({
+                            participantId: c === null || c === void 0 ? void 0 : c.participantId,
+                            conferenceId: this.conferenceId,
+                            hold: false
+                        });
+                    }
+                    c.isConference = true;
+                }));
+                // await this.onholdOrUnholdParticipant({
+                //   participantId: this.heldCall?.callInfo?.participantId,
+                //   conferenceId: this.conferenceId,
+                //   hold: false
+                // });
+                // this.heldCall.mute(false);
+                // this.call.mute(false);
                 this.isCallOnHold = false;
                 this.isConference = true;
                 this.cdr.detectChanges();