3 files changed, 8 insertions, 2 deletions
diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade
index 5be953b6..deb73072 100644
--- a/client/components/activities/activities.jade
+++ b/client/components/activities/activities.jade
@@ -201,6 +201,7 @@ template(name="cardActivities")
           .activity-checklist(href="{{ card.absoluteUrl }}")
             +viewer
               = checklistItem.title
+        
         if(currentData.timeKey)
           | {{{_ activityType }}}
           = ' '
@@ -215,6 +216,10 @@ template(name="cardActivities")
           | {{{_ activityType currentData.timeValue}}}
         
 
+        if($eq activityType 'deleteComment')
+          | {{{_ 'activity-deleteComment' currentData.commentId}}}.
+        if($eq activityType 'editComment')
+          | {{{_ 'activity-editComment' currentData.commentId}}}.
         if($eq activityType 'addComment')
           +inlinedForm(classNames='js-edit-comment')
             +editor(autofocus=true)
diff --git a/client/components/activities/activities.js b/client/components/activities/activities.js
index 05149826..b082273a 100644
--- a/client/components/activities/activities.js
+++ b/client/components/activities/activities.js
@@ -85,7 +85,7 @@ BlazeComponent.extendComponent({
     const lastLabel = Boards.findOne(Session.get('currentBoard')).getLabelById(
       lastLabelId,
     );
-    if (lastLabel.name === undefined || lastLabel.name === '') {
+    if (lastLabel && (lastLabel.name === undefined || lastLabel.name === '')) {
       return lastLabel.color;
     } else {
       return lastLabel.name;
diff --git a/client/components/activities/comments.js b/client/components/activities/comments.js
index 8289b628..95084646 100644
--- a/client/components/activities/comments.js
+++ b/client/components/activities/comments.js
@@ -38,6 +38,7 @@ BlazeComponent.extendComponent({
             resetCommentInput(input);
             Tracker.flush();
             autosize.update(input);
+            input.trigger('submitted');
           }
           evt.preventDefault();
         },
@@ -54,7 +55,7 @@ BlazeComponent.extendComponent({
 
 // XXX This should be a static method of the `commentForm` component
 function resetCommentInput(input) {
-  input.val('').trigger('input'); // without manually trigger, input event won't be fired
+  input.val(''); // without manually trigger, input event won't be fired
   input.blur();
   commentFormIsOpen.set(false);
 }