Merge button status (#2189)

* Addresses #2178
Shows merge status without button when you cannot merge.

* Swift naming

Author: Huddie

Classes/Issues/IssuesViewController.swift

@@ -439,8 +439,7 @@ final class IssuesViewController:
         // side effect so to jump to the last element when auto scrolling
         lastTimelineElement = objects.last
 
-        if viewerIsCollaborator,
-            current.labels.status.status == .open,
+        if current.labels.status.status == .open,
             let merge = current.mergeModel {
             objects.append(merge)
         }
@@ -478,7 +477,12 @@ final class IssuesViewController:
 
         // controls
         case is IssueNeckLoadModel: return IssueNeckLoadSectionController(delegate: self)
-        case is IssueMergeModel: return IssueMergeSectionController(model: model, client: client, resultID: resultID)
+        case is IssueMergeModel: return IssueMergeSectionController(
+            model: model,
+            client: client,
+            mergeCapable: viewerIsCollaborator,
+            resultID: resultID
+        )
 
         // deprecated
         case is IssueDiffHunkModel: return IssueDiffHunkSectionController()

Classes/Issues/Merge/IssueMergeSectionController.swift

@@ -17,11 +17,18 @@ ListBindingSectionControllerSelectionDelegate {
     private let model: IssueDetailsModel
     private let client: GithubClient
     private let resultID: String?
+    private var isMergeCapable = false
     private var loading = false
 
-    init(model: IssueDetailsModel, client: GithubClient, resultID: String?) {
+    init(
+        model: IssueDetailsModel,
+        client: GithubClient,
+        mergeCapable: Bool,
+        resultID: String?
+        ) {
         self.model = model
         self.client = client
+        self.isMergeCapable = mergeCapable
         self.resultID = resultID
         super.init()
         dataSource = self
@@ -122,11 +129,13 @@ ListBindingSectionControllerSelectionDelegate {
             state: state
         ))
 
-        viewModels.append(IssueMergeButtonModel(
-            enabled: buttonEnabled,
-            type: preferredMergeType,
-            loading: loading
-        ))
+        if isMergeCapable {
+            viewModels.append(IssueMergeButtonModel(
+                enabled: buttonEnabled,
+                type: preferredMergeType,
+                loading: loading
+            ))
+        }
 
         return viewModels
     }

Classes/Notifications/NotificationsViewController.swift

@@ -55,11 +55,11 @@ ReviewGitHubAccessDelegate
 
         makeBackBarItemEmpty()
         resetRightBarItem()
-
+        
         switch inboxType {
         case .unread:
             let item = UIBarButtonItem(
-                image: UIImage(named: "bullets-hollow"),
+                image: UIImage(named: "filter"),
                 style: .plain,
                 target: self,
                 action: #selector(NotificationsViewController.onMore(sender:))