Merge branch 'develop' into aleksandrs/6963_multi_session_logout

This commit is contained in:
Aleksandrs Proskurins
2022-10-25 10:43:34 +03:00
28 changed files with 132 additions and 104 deletions
@@ -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)) },
@@ -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 {