Merge branch 'develop' into alfogrillo/unit_tests_test_plan

element-hq · Mar 29, 2023 · f7ed13e · f7ed13e
2 parents cb2452d + b2f3f28
commit f7ed13e
Showing 1 changed file with 19 additions and 18 deletions.
diff --git a/ElementX/Sources/Screens/RoomMemberDetails/View/RoomMemberDetailsScreen.swift b/ElementX/Sources/Screens/RoomMemberDetails/View/RoomMemberDetailsScreen.swift
@@ -74,29 +74,30 @@ struct RoomMemberDetailsScreen: View {
 
     private var blockUserSection: some View {
         Section {
-            if context.viewState.isIgnored {
-                Button {
-                    context.send(viewAction: .showUnignoreAlert)
-                } label: {
-                    Label(L10n.screenRoomMemberDetailsUnblockUser, systemImage: "slash.circle")
-                }
-                .accessibilityIdentifier(A11yIdentifiers.roomMemberDetailsScreen.unignore)
-                .buttonStyle(FormButtonStyle(accessory: context.viewState.isProcessingIgnoreRequest ? .progressView : nil))
-                .disabled(context.viewState.isProcessingIgnoreRequest)
-            } else {
-                Button(role: .destructive) {
-                    context.send(viewAction: .showIgnoreAlert)
-                } label: {
-                    Label(L10n.screenRoomMemberDetailsBlockUser, systemImage: "slash.circle")
-                }
-                .accessibilityIdentifier(A11yIdentifiers.roomMemberDetailsScreen.ignore)
-                .buttonStyle(FormButtonStyle(accessory: context.viewState.isProcessingIgnoreRequest ? .progressView : nil))
-                .disabled(context.viewState.isProcessingIgnoreRequest)
+            Button {
+                context.send(viewAction: blockUserButtonAction)
+            } label: {
+                Label(blockUserButtonTitle, systemImage: "slash.circle")
             }
+            .accessibilityIdentifier(blockUserButtonAccessibilityIdentifier)
+            .buttonStyle(FormButtonStyle(accessory: context.viewState.isProcessingIgnoreRequest ? .progressView : nil))
+            .disabled(context.viewState.isProcessingIgnoreRequest)
         }
         .formSectionStyle()
     }
 
+    private var blockUserButtonAction: RoomMemberDetailsViewAction {
+        context.viewState.isIgnored ? .showUnignoreAlert : .showIgnoreAlert
+    }
+
+    private var blockUserButtonTitle: String {
+        context.viewState.isIgnored ? L10n.screenRoomMemberDetailsUnblockUser : L10n.screenRoomMemberDetailsBlockUser
+    }
+
+    private var blockUserButtonAccessibilityIdentifier: String {
+        context.viewState.isIgnored ? A11yIdentifiers.roomMemberDetailsScreen.unignore : A11yIdentifiers.roomMemberDetailsScreen.ignore
+    }
+
     @ViewBuilder
     private func blockUserAlertActions(_ item: IgnoreUserAlertItem) -> some View {
         Button(item.cancelTitle, role: .cancel) { }