Fix bug causing “Jump to discussion” button not to show

2 files changed, 7 insertions, 11 deletions

diff --git a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6 b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
index 64086b5bbde..7bbdcc2d7f5 100644
--- a/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
+++ b/app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
@@ -14,11 +14,7 @@
         return this.discussions[this.discussionId];
       },
       allResolved: function () {
-        if (this.discussion) {
-          return this.unresolvedDiscussionCount === 0;
-        } else {
-          return true;
-        }
+        return this.unresolvedDiscussionCount === 0;
       },
       showButton: function () {
         if (this.discussionId) {
@@ -66,7 +62,7 @@
           discussionIdsInScope = discussionIdsForElements($(discussionsSelector));
 
           let unresolvedDiscussionCount = 0;
-          
+
           for (let i = 0; i < discussionIdsInScope.length; i++) {
             const discussionId = discussionIdsInScope[i];
             if (discussion && !discussion.isResolved()) {
diff --git a/app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6 b/app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6
index 14cb0168c0e..e373b06b1eb 100644
--- a/app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6
+++ b/app/assets/javascripts/diff_notes/components/resolve_discussion_btn.js.es6
@@ -23,18 +23,18 @@
         if (this.discussion) {
           return this.discussion.isResolvable();
         } else {
-          return undefined;
+          return false;
         }
       },
-      allResolved: function () {
+      isDiscussionResolved: function () {
         if (this.discussion) {
           return this.discussion.isResolved();
         } else {
-          return undefined;
+          return false;
         }
       },
       buttonText: function () {
-        if (this.allResolved) {
+        if (this.isDiscussionResolved) {
           return "Unresolve discussion";
         } else {
           return "Resolve discussion";
@@ -44,7 +44,7 @@
         if (this.discussion) {
           return this.discussion.loading;
         } else {
-          return undefined;
+          return false;
         }
       }
     },