Merge pull request #9 from cometchat-pro-samples/hotfix-callscreen

fixing avatar issue for incoming calls
cometchat · Jun 12, 2020 · 15e24dc · 15e24dc
2 parents 4e878fe + df76ead
commit 15e24dc
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/src/lib/CometChat/components/CometChatMessageListScreen/CallScreen/index.js b/src/lib/CometChat/components/CometChatMessageListScreen/CallScreen/index.js
@@ -220,33 +220,19 @@ class CallScreen extends React.PureComponent {
     let callScreen =  null, iframeScreen, incomingCallScreen, outgoingCallScreen;
     if(this.state.showIncomingScreen) {
 
-      if(this.props.type === "user" && !this.state.callIProgress.sender.getAvatar()) {
+      if(!this.state.callIProgress.sender.getAvatar()) {
 
         const uid = this.state.callIProgress.sender.getUid();
         const char = this.state.callIProgress.sender.getName().charAt(0).toUpperCase();
-
         this.state.callIProgress.sender.setAvatar(SvgAvatar.getAvatar(uid, char));
 
-      } else if(this.props.type === "group" && !this.state.callIProgress.sender.getIcon()) {
-
-        const guid = this.state.callIProgress.sender.getGuid();
-        const char = this.state.callIProgress.sender.getName().charAt(0).toUpperCase();
-
-        this.state.callIProgress.sender.setIcon(SvgAvatar.getAvatar(guid, char));
-      }
-
-      let avatar;
-      if(this.props.type === "user") {
-        avatar = (<Avatar image={this.state.callIProgress.sender.avatar} />);
-      } else if(this.props.type === "group") {
-        avatar = (<Avatar image={this.state.callIProgress.sender.icon} />);
       }
 
       incomingCallScreen = (
         <div className="cp-incoming-call-screen">
           <div className="m-a">Calling...</div>
           <div className="m-a cp-call-title">{this.state.callIProgress.sender.name}</div>
-          <div className="m-a">{avatar}</div>
+          <div className="m-a"><Avatar image={this.state.callIProgress.sender.avatar} /></div>
           <div className="m-a" style={{ display: "flex", width: '25%' }}>
             <div className="m-a p-xl cp-accept-button" onClick={this.acceptCall}>ACCEPT</div>
             <div className="m-a p-xl cp-reject-button" onClick={() => this.rejectCall(CometChat.CALL_STATUS.REJECTED)}>REJECT</div>