mirror of
https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git
synced 2026-04-20 16:42:44 +02:00
Merge branch 'develop' into aleksandrs/6963_multi_session_logout
This commit is contained in:
@@ -24,7 +24,7 @@ struct UserOtherSessions: View {
|
||||
var body: some View {
|
||||
ScrollView {
|
||||
SwiftUI.Section {
|
||||
if viewModel.viewState.items.isEmpty {
|
||||
if viewModel.viewState.sessionItems.isEmpty {
|
||||
noItemsView()
|
||||
} else {
|
||||
itemsView()
|
||||
@@ -81,7 +81,7 @@ struct UserOtherSessions: View {
|
||||
|
||||
private func itemsView() -> some View {
|
||||
LazyVStack(spacing: 0) {
|
||||
ForEach(viewModel.viewState.items) { viewData in
|
||||
ForEach(viewModel.viewState.sessionItems) { viewData in
|
||||
UserSessionListItem(viewData: viewData,
|
||||
isEditModeEnabled: viewModel.isEditModeEnabled,
|
||||
onBackgroundTap: { sessionId in viewModel.send(viewAction: .userOtherSessionSelected(sessionId: sessionId)) },
|
||||
|
||||
+2
-2
@@ -48,7 +48,7 @@ struct UserOtherSessionsToolbar: ToolbarContent {
|
||||
} else {
|
||||
filterMenuButton()
|
||||
.offset(x: 12)
|
||||
kebabMenu()
|
||||
optionsMenu()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -77,7 +77,7 @@ struct UserOtherSessionsToolbar: ToolbarContent {
|
||||
}
|
||||
}
|
||||
|
||||
private func kebabMenu() -> some View {
|
||||
private func optionsMenu() -> some View {
|
||||
Button { } label: {
|
||||
Menu {
|
||||
Button {
|
||||
|
||||
Reference in New Issue
Block a user