input-output-hk · damian-molinski · Nov 7, 2025 · Oct 14, 2025 · Oct 14, 2025 · Oct 14, 2025
@@ -47,9 +47,6 @@ class _AppState extends State<App> {
       BlocProvider<SessionCubit>(
         create: (_) => Dependencies.instance.get<SessionCubit>(),
       ),
-      BlocProvider<ProposalsCubit>(
-        create: (_) => Dependencies.instance.get<ProposalsCubit>(),
-      ),
       BlocProvider<VotingCubit>(
         create: (_) => Dependencies.instance.get<VotingCubit>(),
       ),

@@ -113,7 +113,7 @@ final class Dependencies extends DependencyProvider {
           blockchainConfig: get<AppConfig>().blockchain,
         );
       })
-      ..registerLazySingleton<ProposalsCubit>(
+      ..registerFactory<ProposalsCubit>(
         () => ProposalsCubit(
           get<UserService>(),
           get<CampaignService>(),

@@ -2,6 +2,7 @@ import 'dart:async';
 
 import 'package:catalyst_voices/common/error_handler.dart';
 import 'package:catalyst_voices/common/signal_handler.dart';
+import 'package:catalyst_voices/dependency/dependencies.dart';
 import 'package:catalyst_voices/pages/campaign_phase_aware/proposal_submission_phase_aware.dart';
 import 'package:catalyst_voices/pages/proposals/widgets/proposals_content.dart';
 import 'package:catalyst_voices/pages/proposals/widgets/proposals_header.dart';
@@ -17,7 +18,7 @@ import 'package:flutter/material.dart';
 import 'package:rxdart/rxdart.dart';
 
 class ProposalsPage extends StatefulWidget {
-  final SignedDocumentRef? categoryId;
+  final String? categoryId;
   final ProposalsPageTab? tab;
 
   const ProposalsPage({
@@ -35,18 +36,29 @@ class _ProposalsPageState extends State<ProposalsPage>
         TickerProviderStateMixin,
         ErrorHandlerStateMixin<ProposalsCubit, ProposalsPage>,
         SignalHandlerStateMixin<ProposalsCubit, ProposalsSignal, ProposalsPage> {
+  late final _cubit = Dependencies.instance.get<ProposalsCubit>();
+
   late VoicesTabController<ProposalsPageTab> _tabController;
   late final PagingController<ProposalBrief> _pagingController;
   late final StreamSubscription<List<ProposalsPageTab>> _tabsSubscription;
 
+  @override
+  ProposalsCubit get errorEmitter => _cubit;
+
+  @override
+  ProposalsCubit get signalEmitter => _cubit;
+
   @override
   Widget build(BuildContext context) {
-    return ProposalSubmissionPhaseAware(
-      activeChild: HeaderAndContentLayout(
-        header: const ProposalsHeader(),
-        content: ProposalsContent(
-          tabController: _tabController,
-          pagingController: _pagingController,
+    return BlocProvider.value(
+      value: _cubit,
+      child: ProposalSubmissionPhaseAware(
+        activeChild: HeaderAndContentLayout(
+          header: const ProposalsHeader(),
+          content: ProposalsContent(
+            tabController: _tabController,
+            pagingController: _pagingController,
+          ),
         ),
       ),
     );
@@ -59,10 +71,9 @@ class _ProposalsPageState extends State<ProposalsPage>
     final tab = widget.tab ?? ProposalsPageTab.total;
 
     if (widget.categoryId != oldWidget.categoryId || widget.tab != oldWidget.tab) {
-      context.read<ProposalsCubit>().changeFilters(
-        onlyMy: Optional(tab == ProposalsPageTab.my),
+      _cubit.changeFilters(
         category: Optional(widget.categoryId),
-        type: tab.filter,
+        tab: Optional(tab),
       );
 
       _doResetPagination();
@@ -75,6 +86,7 @@ class _ProposalsPageState extends State<ProposalsPage>
 
   @override
   void dispose() {
+    unawaited(_cubit.close());
     _tabController.dispose();
     _pagingController.dispose();
     unawaited(_tabsSubscription.cancel());
@@ -105,9 +117,8 @@ class _ProposalsPageState extends State<ProposalsPage>
   void initState() {
     super.initState();
 
-    final proposalsCubit = context.read<ProposalsCubit>();
     final sessionCubit = context.read<SessionCubit>();
-    final supportedTabs = _determineTabs(sessionCubit.state.isProposerUnlock, proposalsCubit.state);
+    final supportedTabs = _determineTabs(sessionCubit.state.isProposerUnlock, _cubit.state);
     final selectedTab = _determineTab(supportedTabs, widget.tab);
 
     _tabController = VoicesTabController(
@@ -123,15 +134,13 @@ class _ProposalsPageState extends State<ProposalsPage>
 
     _tabsSubscription = Rx.combineLatest2(
       sessionCubit.watchState().map((e) => e.isProposerUnlock),
-      proposalsCubit.watchState(),
+      _cubit.watchState(),
       _determineTabs,
     ).distinct().listen(_updateTabsIfNeeded);
 
-    proposalsCubit.init(
-      onlyMyProposals: selectedTab == ProposalsPageTab.my,
-      category: widget.categoryId,
-      type: selectedTab.filter,
-      order: const Alphabetical(),
+    _cubit.init(
+      categoryId: widget.categoryId,
+      tab: widget.tab ?? ProposalsPageTab.total,
     );
 
     _pagingController
@@ -167,15 +176,15 @@ class _ProposalsPageState extends State<ProposalsPage>
     ProposalBrief? lastProposalId,
   ) async {
     final request = PageRequest(page: pageKey, size: pageSize);
-    await context.read<ProposalsCubit>().getProposals(request);
+    await _cubit.getProposals(request);
   }
 
   void _updateRoute({
     Optional<String>? categoryId,
     ProposalsPageTab? tab,
   }) {
     Router.neglect(context, () {
-      final effectiveCategoryId = categoryId.dataOr(widget.categoryId?.id);
+      final effectiveCategoryId = categoryId.dataOr(widget.categoryId);
       final effectiveTab = tab?.name ?? widget.tab?.name;
 
       ProposalsRoute(

@@ -24,9 +24,11 @@ class ProposalsPaginationTile extends StatelessWidget {
         unawaited(route.push(context));
       },
       onFavoriteChanged: (isFavorite) {
-        context.read<ProposalsCubit>().onChangeFavoriteProposal(
-          proposal.selfRef,
-          isFavorite: isFavorite,
+        unawaited(
+          context.read<ProposalsCubit>().onChangeFavoriteProposal(
+            proposal.selfRef,
+            isFavorite: isFavorite,
+          ),
         );
       },
     );

@@ -3,7 +3,6 @@ import 'package:catalyst_voices/widgets/tabbar/voices_tab_bar.dart';
 import 'package:catalyst_voices/widgets/tabbar/voices_tab_controller.dart';
 import 'package:catalyst_voices_blocs/catalyst_voices_blocs.dart';
 import 'package:catalyst_voices_localization/catalyst_voices_localization.dart';
-import 'package:catalyst_voices_models/catalyst_voices_models.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart';
 import 'package:flutter/material.dart';
 
@@ -17,7 +16,7 @@ class ProposalsTabs extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BlocSelector<ProposalsCubit, ProposalsState, ProposalsCount>(
+    return BlocSelector<ProposalsCubit, ProposalsState, Map<ProposalsPageTab, int>>(
       selector: (state) => state.count,
       builder: (context, state) {
         return _ProposalsTabs(
@@ -30,7 +29,7 @@ class ProposalsTabs extends StatelessWidget {
 }
 
 class _ProposalsTabs extends StatelessWidget {
-  final ProposalsCount data;
+  final Map<ProposalsPageTab, int> data;
   final VoicesTabController<ProposalsPageTab> controller;
 
   const _ProposalsTabs({
@@ -51,7 +50,7 @@ class _ProposalsTabs extends StatelessWidget {
           VoicesTab(
             data: tab,
             key: tab.tabKey(),
-            child: VoicesTabText(tab.noOf(context, count: data.ofType(tab.filter))),
+            child: VoicesTabText(tab.noOf(context, count: data[tab] ?? 0)),
           ),
       ],
     );

@@ -84,13 +84,10 @@ final class ProposalsRoute extends GoRouteData with FadePageTransitionMixin {
 
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    final categoryId = this.categoryId;
-    final categoryRef = categoryId != null ? SignedDocumentRef(id: categoryId) : null;
-
     final tab = ProposalsPageTab.values.asNameMap()[this.tab];
 
     return ProposalsPage(
-      categoryId: categoryRef,
+      categoryId: categoryId,
       tab: tab,
     );
   }

@@ -161,7 +161,7 @@ class DiscoveryCubit extends Cubit<DiscoveryState> with BlocErrorEmitterMixin {
     unawaited(_proposalsV2Sub?.cancel());
 
     _proposalsV2Sub = _proposalService
-        .watchProposalsBriefPage(
+        .watchProposalsBriefPageV2(
           request: const PageRequest(page: 0, size: _maxRecentProposalsCount),
         )
         .map((page) => page.items)