Merge branch 'master' into cwhitten/channels-update

microsoft · May 2, 2019 · 7f20391 · 7f20391
2 parents dc4cdb0 + eee2b26
commit 7f20391
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/app/client/src/data/sagas/chatSagas.ts b/packages/app/client/src/data/sagas/chatSagas.ts
@@ -243,7 +243,7 @@ function getTextFromActivity(activity: Activity): string {
   } else if (activity.valueType === ValueTypes.Activity) {
     return 'text' in activity.value ? activity.value.text : activity.label;
   }
-  return activity.text;
+  return activity.text || activity.label || '';
 }
 
 function buildDiff(prependWith: string, path: (string | number)[], target: any, source: any): void {