pr suggestions and updated tests

element-hq · Feb 5, 2025 · 662eeab · 662eeab
1 parent 70920f9
commit 662eeab
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 16 deletions.
diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift
@@ -73,7 +73,7 @@ struct RoomMemberDetailsScreenViewStateBindings {
 
     var ignoreUserAlert: IgnoreUserAlertItem?
     var alertInfo: AlertInfo<RoomMemberDetailsScreenAlertType>?
-    var sheetItem: UserProfileProxy?
+    var inviteConfirmationUser: UserProfileProxy?
 
     /// A media item that will be previewed with QuickLook.
     var mediaPreviewItem: MediaPreviewItem?

diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift
@@ -189,7 +189,7 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
             if let roomID {
                 actionsSubject.send(.openDirectChat(roomID: roomID))
             } else {
-                state.bindings.sheetItem = .init(userID: roomMemberProxy.userID, displayName: roomMemberProxy.displayName, avatarURL: roomMemberProxy.avatarURL)
+                state.bindings.inviteConfirmationUser = .init(userID: roomMemberProxy.userID, displayName: roomMemberProxy.displayName, avatarURL: roomMemberProxy.avatarURL)
             }
         case .failure:
             state.bindings.alertInfo = .init(id: .failedOpeningDirectChat)

diff --git a/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift b/ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift
@@ -25,7 +25,7 @@ struct RoomMemberDetailsScreen: View {
         .navigationTitle(L10n.screenRoomMemberDetailsTitle)
         .alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
         .alert(item: $context.alertInfo)
-        .sheet(item: $context.sheetItem) { user in
+        .sheet(item: $context.inviteConfirmationUser) { user in
             SendInviteConfirmationView(userToInvite: user,
                                        mediaProvider: context.mediaProvider) {
                 context.send(viewAction: .createDirectChat)

diff --git a/ElementX/Sources/Screens/StartChatScreen/View/SendInviteConfirmationView.swift b/ElementX/Sources/Screens/StartChatScreen/View/SendInviteConfirmationView.swift
@@ -18,7 +18,7 @@ struct SendInviteConfirmationView: View {
     @State private var sheetHeight: CGFloat = .zero
     private let topPadding: CGFloat = 24
 
-    var subtitle: String {
+    private var subtitle: String {
         if let displayName = userToInvite.displayName {
             L10n.screenBottomSheetCreateDmMessage(displayName, userToInvite.userID)
         } else {
@@ -89,7 +89,7 @@ struct SendInviteConfirmationView: View {
 
 struct SendInviteConfirmationView_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        SendInviteConfirmationView(userToInvite: .mockAlice,
+        SendInviteConfirmationView(userToInvite: .mockBob,
                                    mediaProvider: nil) { }
     }
 }
diff --git a/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift b/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenModels.swift
@@ -36,7 +36,7 @@ struct UserProfileScreenViewState: BindableState {
 
 struct UserProfileScreenViewStateBindings {
     var alertInfo: AlertInfo<UserProfileScreenAlertType>?
-    var sheetItem: UserProfileProxy?
+    var inviteConfirmationUser: UserProfileProxy?
 
     /// A media item that will be previewed with QuickLook.
     var mediaPreviewItem: MediaPreviewItem?

diff --git a/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenViewModel.swift b/ElementX/Sources/Screens/UserProfileScreen/UserProfileScreenViewModel.swift
@@ -123,7 +123,7 @@ class UserProfileScreenViewModel: UserProfileScreenViewModelType, UserProfileScr
             if let roomID {
                 actionsSubject.send(.openDirectChat(roomID: roomID))
             } else {
-                state.bindings.sheetItem = userProfile
+                state.bindings.inviteConfirmationUser = userProfile
             }
         case .failure:
             state.bindings.alertInfo = .init(id: .failedOpeningDirectChat)

diff --git a/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift b/ElementX/Sources/Screens/UserProfileScreen/View/UserProfileScreen.swift
@@ -22,7 +22,7 @@ struct UserProfileScreen: View {
         .navigationBarTitleDisplayMode(.inline)
         .toolbar { toolbar }
         .alert(item: $context.alertInfo)
-        .sheet(item: $context.sheetItem) { user in
+        .sheet(item: $context.inviteConfirmationUser) { user in
             SendInviteConfirmationView(userToInvite: user,
                                        mediaProvider: context.mediaProvider) {
                 context.send(viewAction: .createDirectChat)

diff --git a/...ces/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-en-GB.1.png b/...ces/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-en-GB.1.png
diff --git a/...es/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-pseudo.1.png b/...es/__Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPad-pseudo.1.png
diff --git a/..._Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-en-GB.1.png b/..._Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-en-GB.1.png
diff --git a/...Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-pseudo.1.png b/...Snapshots__/PreviewTests/test_sendInviteConfirmationView-iPhone-16-pseudo.1.png