From 3167d1a8f07f4e05e041c45ed49a8d4485fa9093 Mon Sep 17 00:00:00 2001
From: Ben Vinegar <ben@benv.ca>
Date: Tue, 26 Jan 2016 15:12:38 -0800
Subject: [PATCH] Fix merge success not clearing rows from stream UI

---
 src/sentry/static/sentry/app/stores/groupStore.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/sentry/static/sentry/app/stores/groupStore.jsx b/src/sentry/static/sentry/app/stores/groupStore.jsx
index 6efe5ac2a669d6..3c71a0697ce684 100644
--- a/src/sentry/static/sentry/app/stores/groupStore.jsx
+++ b/src/sentry/static/sentry/app/stores/groupStore.jsx
@@ -258,6 +258,8 @@ const GroupStore = Reflux.createStore({
   },
 
   onMerge(changeId, itemIds) {
+    itemIds = this._itemIdsOrAll(itemIds);
+
     itemIds.forEach(itemId => {
       this.addStatus(itemId, 'merge');
     });
@@ -265,6 +267,8 @@ const GroupStore = Reflux.createStore({
   },
 
   onMergeError(changeId, itemIds, response) {
+    itemIds = this._itemIdsOrAll(itemIds);
+
     itemIds.forEach(itemId => {
       this.clearStatus(itemId, 'merge');
     });
@@ -273,6 +277,8 @@ const GroupStore = Reflux.createStore({
   },
 
   onMergeSuccess(changeId, mergedIds, response) {
+    mergedIds = this._itemIdsOrAll(mergedIds); // everything on page
+
     mergedIds.forEach(itemId => {
       this.clearStatus(itemId, 'merge');
     });