Merge branch 'develop' into flescio/1040-poll_detail

# Conflicts: # Riot/Generated/Strings.swift # RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift # RiotSwiftUI/Modules/Room/PollHistory/PollHistoryModels.swift # RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
2026-04-21 17:12:45 +02:00 · 2023-01-27 15:22:15 +01:00
parent 5ea70aacd8 0791ad42e9
commit f0f56c0b69
22 changed files with 445 additions and 182 deletions
@@ -44,6 +44,9 @@ struct PollHistory: View {
        .onChange(of: viewModel.mode) { _ in
            viewModel.send(viewAction: .segmentDidChange)
        }
+        .alert(item: $viewModel.alertInfo) {
+            $0.alert
+        }
    }
    
    @ViewBuilder
@@ -76,19 +79,23 @@ struct PollHistory: View {
        }
    }
    
+    @ViewBuilder
    private var loadMoreButton: some View {
-        HStack(spacing: 8) {
-            if viewModel.viewState.isLoading {
-                spinner
+        if viewModel.viewState.canLoadMoreContent {
+            HStack(spacing: 8) {
+                if viewModel.viewState.isLoading {
+                    spinner
+                }
+                
+                Button {
+                    viewModel.send(viewAction: .loadMoreContent)
+                } label: {
+                    Text(VectorL10n.pollHistoryLoadMore)
+                        .font(theme.fonts.body)
+                }
+                .accessibilityIdentifier("PollHistory.loadMore")
+                .disabled(viewModel.viewState.isLoading)
            }
-            
-            Button {
-                #warning("handle action in next ticket")
-            } label: {
-                Text(VectorL10n.pollHistoryLoadMore)
-                    .font(theme.fonts.body)
-            }
-            .disabled(viewModel.viewState.isLoading)
        }
    }