From 142529ad692782c41750230983e7d004ae2c1c6e Mon Sep 17 00:00:00 2001 From: Mauro Romito Date: Wed, 26 Aug 2026 13:44:15 +0200 Subject: [PATCH] Revert "allow copying blocked user id" This reverts commit f6f6538bd68389fbfd6c4b0829d74112dcc68ce3. --- .../BlockedUsersScreenModels.swift | 1 - .../BlockedUsersScreenViewModel.swift | 7 ------- .../View/BlockedUsersScreen.swift | 7 ------- .../BlockedUsersScreenViewModelTests.swift | 19 ------------------- 4 files changed, 34 deletions(-) diff --git a/ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenModels.swift b/ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenModels.swift index 0519c857f..2b1412bb7 100644 --- a/ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenModels.swift +++ b/ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenModels.swift @@ -21,7 +21,6 @@ struct BlockedUsersScreenViewStateBindings { enum BlockedUsersScreenViewAction { case unblockUser(UserProfile) - case copyUserID(UserProfile) } enum BlockedUsersScreenViewStateAlertType: Hashable { diff --git a/ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenViewModel.swift b/ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenViewModel.swift index 5ff91d4b8..cdd66f6ea 100644 --- a/ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenViewModel.swift +++ b/ElementX/Sources/Screens/BlockedUsersScreen/BlockedUsersScreenViewModel.swift @@ -51,12 +51,6 @@ class BlockedUsersScreenViewModel: BlockedUsersScreenViewModelType, BlockedUsers self?.unblockUser(user) }, secondaryButton: .init(title: L10n.actionCancel, role: .cancel, action: nil)) - case .copyUserID(let user): - UIPasteboard.general.string = user.id - userIndicatorController.submitIndicator(UserIndicator(id: Self.copiedIndicatorIdentifier, - type: .toast, - title: L10n.commonCopiedToClipboard, - icon: \.check)) } } @@ -114,7 +108,6 @@ class BlockedUsersScreenViewModel: BlockedUsersScreenViewModelType, BlockedUsers // MARK: Loading indicator private static let loadingIndicatorIdentifier = "\(BlockedUsersScreenViewModel.self)-Loading" - private static let copiedIndicatorIdentifier = "\(BlockedUsersScreenViewModel.self)-Copied" private func showLoadingIndicator() { userIndicatorController.submitIndicator(UserIndicator(id: Self.loadingIndicatorIdentifier, diff --git a/ElementX/Sources/Screens/BlockedUsersScreen/View/BlockedUsersScreen.swift b/ElementX/Sources/Screens/BlockedUsersScreen/View/BlockedUsersScreen.swift index 4113c16a0..a22ac0409 100644 --- a/ElementX/Sources/Screens/BlockedUsersScreen/View/BlockedUsersScreen.swift +++ b/ElementX/Sources/Screens/BlockedUsersScreen/View/BlockedUsersScreen.swift @@ -38,13 +38,6 @@ struct BlockedUsersScreen: View { icon: avatar(for: user)), details: .isWaiting(context.viewState.processingUserID == user.id), kind: .button { context.send(viewAction: .unblockUser(user)) }) - .contextMenu { - Button { - context.send(viewAction: .copyUserID(user)) - } label: { - Label(L10n.actionCopy, icon: \.copy) - } - } } } } diff --git a/UnitTests/Sources/BlockedUsersScreenViewModelTests.swift b/UnitTests/Sources/BlockedUsersScreenViewModelTests.swift index c39946336..dbe65cc05 100644 --- a/UnitTests/Sources/BlockedUsersScreenViewModelTests.swift +++ b/UnitTests/Sources/BlockedUsersScreenViewModelTests.swift @@ -10,7 +10,6 @@ import Combine @testable import ElementX import Foundation import Testing -import UIKit @MainActor struct BlockedUsersScreenViewModelTests { @@ -43,22 +42,4 @@ struct BlockedUsersScreenViewModelTests { #expect(!viewModel.context.viewState.blockedUsers.isEmpty) #expect(clientProxy.profileForCalled) } - - @Test - func copyUserID() throws { - let clientProxy = ClientProxyMock(.init(userID: RoomMemberProxyMock.mockMe.userID)) - let userIndicatorController = UserIndicatorControllerMock() - - let viewModel = BlockedUsersScreenViewModel(hideProfiles: true, - userSession: UserSessionMock(.init(clientProxy: clientProxy)), - userIndicatorController: userIndicatorController) - - let user = try #require(viewModel.context.viewState.blockedUsers.first) - UIPasteboard.general.string = "" - - viewModel.context.send(viewAction: .copyUserID(user)) - - #expect(UIPasteboard.general.string == user.id) - #expect(userIndicatorController.submitIndicatorDelayReceivedArguments?.indicator.title == L10n.commonCopiedToClipboard) - } }