fix(IncomingCallPage, ActiveCallsPage): 🐛 fix a bug that the mergingPair is not removed when the inbound call is answered

packages/ringcentral-integration/modules/CallMonitor/index.js

@@ -585,9 +585,6 @@ export default class CallMonitor extends RcModule {
     return this._selectors.otherDeviceCalls();
   }
 
-  get lastCallInfo() {
-    return this._selectors.lastCallInfo();
-  }
   @getter
   ringoutRingCalls = createSelector(
     () => this.otherDeviceCalls,
@@ -600,7 +597,7 @@ export default class CallMonitor extends RcModule {
     () => this.otherDeviceCalls,
     otherDeviceCalls => otherDeviceCalls.filter(callItem =>
       !isRingingInboundCall(callItem) &&
-          !isRingOutOnHold(callItem)
+      !isRingOutOnHold(callItem)
     )
   );
   @getter

packages/ringcentral-widgets-demo/dev-server/containers/App/index.js

@@ -50,7 +50,7 @@ export default function App({
     brandIcon: icon
   };
   const getAvatarUrl = async (contact) => {
-    const avatarUrl = await phone.contacts.getProfileImage(contact, false);
+    const avatarUrl = await phone.contacts.getProfileImage(contact, true);
     return avatarUrl;
   };
   return (

packages/ringcentral-widgets/containers/ActiveCallsPage/index.js

@@ -1,5 +1,6 @@
 import { connect } from 'react-redux';
 import formatNumber from 'ringcentral-integration/lib/formatNumber';
+import callDirections from 'ringcentral-integration/enums/callDirections';
 import { isRinging, isRingingInboundCall } from 'ringcentral-integration/lib/callLogHelpers';
 import callingModes from 'ringcentral-integration/modules/CallingSettings/callingModes';
 import { withPhone } from '../../lib/phoneContext';
@@ -87,8 +88,21 @@ function mapToFunctions(_, {
         countryCode: regionSettings.countryCode,
       });
     },
-    async webphoneAnswer(...args) {
-      return (webphone && webphone.answer(...args));
+    async webphoneAnswer(sessionId) {
+      if (!webphone) {
+        return;
+      }
+
+      const session = webphone.sessions.find(session => session.id === sessionId);
+      if (
+        conferenceCall &&
+        session &&
+        session.direction === callDirections.inbound
+      ) {
+        conferenceCall.closeMergingPair();
+      }
+
+      webphone.answer(sessionId);
     },
     async webphoneToVoicemail(...args) {
       return (webphone && webphone.toVoiceMail(...args));

packages/ringcentral-widgets/containers/IncomingCallPage/index.js

@@ -239,6 +239,7 @@ function mapToFunctions(_, {
     webphone,
     regionSettings,
     contactSearch,
+    conferenceCall,
   },
   getAvatarUrl = () => null,
 }) {
@@ -248,7 +249,12 @@ function mapToFunctions(_, {
       areaCode: regionSettings.areaCode,
       countryCode: regionSettings.countryCode,
     }),
-    answer: sessionId => webphone.answer(sessionId),
+    answer(sessionId) {
+      if (conferenceCall) {
+        conferenceCall.closeMergingPair();
+      }
+      webphone.answer(sessionId);
+    },
     reject: sessionId => webphone.reject(sessionId),
     toVoiceMail: sessionId => webphone.toVoiceMail(sessionId),
     onForward: (sessionId, forwardNumber) => webphone.forward(sessionId, forwardNumber),