dismiss comment and message viewcontrollers on successful blocking

kickstarter · Nov 7, 2023 · 1d303f8 · 1d303f8
1 parent 1977b86
commit 1d303f8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/Kickstarter-iOS/Features/Comments/Controllers/CommentRepliesViewController.swift b/Kickstarter-iOS/Features/Comments/Controllers/CommentRepliesViewController.swift
@@ -178,6 +178,7 @@ final class CommentRepliesViewController: UITableViewController, MessageBannerVi
         if success {
           self?.messageBannerViewController?
             .showBanner(with: .success, message: "This user has been successfully blocked")
+          self?.view.isUserInteractionEnabled = false
         } else {
           self?.messageBannerViewController?
             .showBanner(with: .error, message: "Your request did not go through. Try again.")
@@ -260,8 +261,12 @@ extension CommentRepliesViewController: RootCommentCellDelegate {
 // MARK: - MessageBannerViewControllerDelegate
 
 extension CommentRepliesViewController: MessageBannerViewControllerDelegate {
-  func messageBannerViewDidHide(type _: MessageBannerType) {
+  func messageBannerViewDidHide(type: MessageBannerType) {
     self.commentComposer.isHidden = false
+
+    if type == .success {
+      self.dismiss(animated: true)
+    }
   }
 }
 

diff --git a/Kickstarter-iOS/Features/Comments/Controllers/CommentsViewController.swift b/Kickstarter-iOS/Features/Comments/Controllers/CommentsViewController.swift
@@ -196,6 +196,7 @@ internal final class CommentsViewController: UITableViewController, MessageBanne
         if success {
           self?.messageBannerViewController?
             .showBanner(with: .success, message: "This user has been successfully blocked")
+          self?.view.isUserInteractionEnabled = false
         } else {
           self?.messageBannerViewController?
             .showBanner(with: .error, message: "Your request did not go through. Try again.")
@@ -300,8 +301,12 @@ extension CommentsViewController: CommentRemovedCellDelegate {
 // MARK: - MessageBannerViewControllerDelegate
 
 extension CommentsViewController: MessageBannerViewControllerDelegate {
-  func messageBannerViewDidHide(type _: MessageBannerType) {
+  func messageBannerViewDidHide(type: MessageBannerType) {
     self.commentComposer.isHidden = false
+
+    if type == .success {
+      self.dismiss(animated: true)
+    }
   }
 }
 

diff --git a/Kickstarter-iOS/Features/Messages/Controller/MessagesViewController.swift b/Kickstarter-iOS/Features/Messages/Controller/MessagesViewController.swift
@@ -31,6 +31,7 @@ internal final class MessagesViewController: UITableViewController, MessageBanne
     super.viewDidLoad()
 
     self.messageBannerViewController = self.configureMessageBannerViewController(on: self)
+    self.messageBannerViewController?.delegate = self
     self.tableView.rowHeight = UITableView.automaticDimension
     self.tableView.dataSource = self.dataSource
 
@@ -100,9 +101,11 @@ internal final class MessagesViewController: UITableViewController, MessageBanne
     self.viewModel.outputs.userBlocked
       .observeForUI()
       .observeValues { [weak self] success in
+
         if success {
           self?.messageBannerViewController?
             .showBanner(with: .success, message: "This user has been successfully blocked")
+          self?.view.isUserInteractionEnabled = false
         } else {
           self?.messageBannerViewController?
             .showBanner(with: .error, message: "Your request did not go through. Try again.")
@@ -206,3 +209,13 @@ extension MessagesViewController: MessageCellDelegate {
     self.present(actionSheet, animated: true)
   }
 }
+
+// MARK: - MessageBannerViewControllerDelegate
+
+extension MessagesViewController: MessageBannerViewControllerDelegate {
+  func messageBannerViewDidHide(type: MessageBannerType) {
+    if type == .success {
+      self.navigationController?.popViewController(animated: true)
+    }
+  }
+}
diff --git a/Kickstarter-iOS/Features/ProjectPage/Controller/ProjectPageViewController.swift b/Kickstarter-iOS/Features/ProjectPage/Controller/ProjectPageViewController.swift
@@ -543,12 +543,11 @@ public final class ProjectPageViewController: UIViewController, MessageBannerVie
         if success {
           self?.messageBannerViewController?
             .showBanner(with: .success, message: "This user has been successfully blocked")
+          self?.view.isUserInteractionEnabled = false
         } else {
           self?.messageBannerViewController?
             .showBanner(with: .error, message: "Your request did not go through. Try again.")
         }
-
-        self?.view.isUserInteractionEnabled = false
       }
   }