Merge pull request #1355 from wireapp/staging

release 2017-06-07#2
wireapp · Jun 7, 2017 · 1454b1b · 1454b1b
2 parents 6f044ee + dd6ff67
commit 1454b1b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/app/script/client/Client.js b/app/script/client/Client.js
@@ -25,14 +25,17 @@ window.z.client = z.client || {};
 z.client.Client = class Client {
   static get CONFIG() {
     return {
-      DEFAULT_VALUE: '?', 
+      DEFAULT_VALUE: '?',
     };
   }
 
   constructor(payload = {}) {
     this.class = Client.CONFIG.DEFAULT_VALUE;
-    this.label = Client.CONFIG.DEFAULT_VALUE;
-    this.model = Client.CONFIG.DEFAULT_VALUE;
+
+    if (payload.address) {
+      this.label = Client.CONFIG.DEFAULT_VALUE;
+      this.model = Client.CONFIG.DEFAULT_VALUE;
+    }
 
     for (const property in payload) {
       if (payload.hasOwnProperty(property) && payload[property] !== undefined) {

diff --git a/app/script/conversation/ConversationCellState.js b/app/script/conversation/ConversationCellState.js
@@ -230,8 +230,9 @@ z.conversation.ConversationCellState = (() => {
 
   const pending_state = {
     description(conversation_et) {
-      const [participating_user_et] = conversation_et.participating_user_ets();
-      return participating_user_et ? `@${participating_user_et.username()}` : '';
+      const [user_et] = conversation_et.participating_user_ets();
+      const has_username = user_et && user_et.username();
+      return has_username ? `@${user_et.username()}` : '';
     },
     icon() {
       return z.conversation.ConversationStatusIcon.PENDING_CONNECTION;

diff --git a/app/script/view_model/VideoCallingViewModel.js b/app/script/view_model/VideoCallingViewModel.js
@@ -211,7 +211,7 @@ z.ViewModel.VideoCallingViewModel = class VideoCallingViewModel {
         amplify.publish(z.event.WebApp.CALL.MEDIA.TOGGLE, conversation_id, z.media.MediaType.SCREEN);
       } else if (z.util.Environment.electron) {
         amplify.publish(z.event.WebApp.ANALYTICS.EVENT, z.tracking.EventName.CALLING.SHARED_SCREEN, {
-          conversation_type: this.joined_call().is_group() ? z.tracking.attribute.ConversationType.GROUP : z.tracking.attribute.ConversationType.ONE_TO_ONE,
+          conversation_type: this.joined_call().is_group ? z.tracking.attribute.ConversationType.GROUP : z.tracking.attribute.ConversationType.ONE_TO_ONE,
           kind_of_call_when_sharing: this.joined_call().is_remote_video_send() ? 'video' : 'audio',
         });