Skip to content

Commit 170276c

Browse files
committed
Fix build errors and broken snapshot tests
1 parent 862a1a1 commit 170276c

File tree

4 files changed

+25
-4
lines changed

4 files changed

+25
-4
lines changed

ElementX/Sources/Other/Extensions/String.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,8 @@ extension String {
100100

101101
extension String {
102102
static func makeCanonicalAlias(aliasLocalPart: Self?, serverName: Self?) -> Self? {
103-
guard let aliasLocalPart = aliasLocalPart,
104-
!aliasLocalPart.isEmpty,
105-
let serverName = serverName,
106-
!serverName.isEmpty else {
103+
guard let aliasLocalPart, !aliasLocalPart.isEmpty,
104+
let serverName, !serverName.isEmpty else {
107105
return nil
108106
}
109107
return "#\(aliasLocalPart):\(serverName)"

ElementX/Sources/Screens/CreateRoom/CreateRoomModels.swift

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,3 +72,14 @@ enum CreateRoomAliasErrorState {
7272
case alreadyExists
7373
case invalidSymbols
7474
}
75+
76+
extension Set<CreateRoomAliasErrorState> {
77+
var errorDescription: String? {
78+
if contains(.alreadyExists) {
79+
return L10n.errorRoomAddressAlreadyExists
80+
} else if contains(.invalidSymbols) {
81+
return L10n.errorRoomAddressInvalidSymbols
82+
}
83+
return nil
84+
}
85+
}

ElementX/Sources/Screens/EditRoomAddressScreen/View/EditRoomAddressScreen.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,17 @@ struct EditRoomAddressScreen_Previews: PreviewProvider, TestablePreview {
9191
NavigationStack {
9292
EditRoomAddressScreen(context: invalidSymbolsViewModel.context)
9393
}
94+
.snapshotPreferences(expect: invalidSymbolsViewModel.context.$viewState.map { state in
95+
!state.aliasErrors.isEmpty
96+
})
9497
.previewDisplayName("Invalid symbols")
9598

9699
NavigationStack {
97100
EditRoomAddressScreen(context: alreadyExistingViewModel.context)
98101
}
102+
.snapshotPreferences(expect: alreadyExistingViewModel.context.$viewState.map { state in
103+
!state.aliasErrors.isEmpty
104+
})
99105
.previewDisplayName("Already existing")
100106
}
101107
}

ElementX/Sources/Screens/SecurityAndPrivacyScreen/View/SecurityAndPrivacyScreen.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,9 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
212212
NavigationStack {
213213
SecurityAndPrivacyScreen(context: publicViewModel.context)
214214
}
215+
.snapshotPreferences(expect: publicViewModel.context.$viewState.map { state in
216+
state.currentSettings.isVisibileInRoomDirectory == true
217+
})
215218
.previewDisplayName("Public room")
216219

217220
NavigationStack {
@@ -222,6 +225,9 @@ struct SecurityAndPrivacyScreen_Previews: PreviewProvider, TestablePreview {
222225
NavigationStack {
223226
SecurityAndPrivacyScreen(context: restrictedViewModel.context)
224227
}
228+
.snapshotPreferences(expect: restrictedViewModel.context.$viewState.map { state in
229+
state.currentSettings.isVisibileInRoomDirectory == true
230+
})
225231
.previewDisplayName("Restricted room")
226232
}
227233
}

0 commit comments

Comments
 (0)