Browse Source

Merge pull request #709 from deltachat/rename-block-chat

there is no blockChat
cyBerta 5 years ago
parent
commit
b5c8c0ff03

+ 2 - 2
deltachat-ios/Controller/ContactDetailViewController.swift

@@ -122,7 +122,7 @@ class ContactDetailViewController: UITableViewController {
             switch viewModel.chatActionFor(row: row) {
             case .archiveChat:
                 return archiveChatCell
-            case .blockChat:
+            case .blockContact:
                 return blockContactCell
             case .deleteChat:
                 return deleteChatCell
@@ -189,7 +189,7 @@ class ContactDetailViewController: UITableViewController {
         switch action {
         case .archiveChat:
             toggleArchiveChat()
-        case .blockChat:
+        case .blockContact:
             toggleBlockContact()
         case .deleteChat:
             showDeleteChatConfirmationAlert()

+ 3 - 3
deltachat-ios/ViewModel/ContactDetailViewModel.swift

@@ -14,7 +14,7 @@ class ContactDetailViewModel {
 
     enum ChatAction {
         case archiveChat
-        case blockChat
+        case blockContact
         case deleteChat
     }
 
@@ -50,9 +50,9 @@ class ContactDetailViewModel {
         sections.append(.chatActions)
 
         if chatId != nil {
-            chatActions = [.archiveChat, .blockChat, .deleteChat]
+            chatActions = [.archiveChat, .blockContact, .deleteChat]
         } else {
-            chatActions = [.blockChat]
+            chatActions = [.blockContact]
         }
     }