Merge feat/campaign_total_ask into chore/remove_old_daos

Author: damian-molinski

catalyst_voices/apps/voices/lib/pages/category/category_page.dart

@@ -141,9 +141,9 @@ class _CategoryDetailContent extends StatelessWidget {
 }
 
 class _CategoryDetailError extends StatelessWidget {
-  final SignedDocumentRef categoryId;
+  final SignedDocumentRef categoryRef;
 
-  const _CategoryDetailError({required this.categoryId});
+  const _CategoryDetailError({required this.categoryRef});
 
   @override
   Widget build(BuildContext context) {
@@ -167,7 +167,7 @@ class _CategoryDetailError extends StatelessWidget {
                     ? null
                     : () {
                         unawaited(
-                          context.read<CategoryDetailCubit>().getCategoryDetail(categoryId),
+                          context.read<CategoryDetailCubit>().getCategoryDetail(categoryRef),
                         );
                       },
               ),
@@ -189,7 +189,7 @@ class _CategoryPageState extends State<CategoryPage> {
         children: [
           const _CategoryDetailContent(),
           _CategoryDetailError(
-            categoryId: widget.categoryRef,
+            categoryRef: widget.categoryRef,
           ),
         ].constrainedDelegate(),
       ),

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/proposal/proposal_cubit.dart

@@ -49,8 +49,8 @@ final class ProposalCubit extends Cubit<ProposalState>
     _cache = _cache.copyWith(
       activeAccountId: Optional(_userService.user.activeAccount?.catalystId),
     );
-    _activeAccountIdSub = _userService.watchUser
-        .map((event) => event.activeAccount?.catalystId)
+    _activeAccountIdSub = _userService.watchUnlockedActiveAccount
+        .map((activeAccount) => activeAccount?.catalystId)
         .distinct()
         .listen(_handleActiveAccountIdChanged);
   }

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/proposal_builder/proposal_builder_bloc.dart

@@ -82,12 +82,9 @@ final class ProposalBuilderBloc extends Bloc<ProposalBuilderEvent, ProposalBuild
       accountPublicStatus: Optional(activeAccount?.publicStatus),
     );
 
-    _activeAccountSub = _userService.watchUser
-        .map((event) => event.activeAccount)
-        .distinct()
-        .listen(
-          (value) => add(RebuildActiveAccountProposalEvent(account: value)),
-        );
+    _activeAccountSub = _userService.watchUnlockedActiveAccount.listen(
+      (value) => add(RebuildActiveAccountProposalEvent(account: value)),
+    );
 
     _isMaxProposalsLimitReachedSub = _proposalService.watchMaxProposalsLimitReached().listen((
       event,

catalyst_voices/packages/internal/catalyst_voices_blocs/lib/src/session/session_cubit.dart

@@ -7,7 +7,6 @@ import 'package:catalyst_voices_shared/catalyst_voices_shared.dart';
 import 'package:catalyst_voices_view_models/catalyst_voices_view_models.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
-import 'package:rxdart/rxdart.dart';
 
 bool _alwaysAllowRegistration = kDebugMode;
 
@@ -51,11 +50,8 @@ final class SessionCubit extends Cubit<SessionState>
         .distinct()
         .listen(_handleUserSettings);
 
-    _keychainUnlockedSub = _userService.watchUser
-        .map((user) => user.activeAccount)
-        .switchMap((account) {
-          return account?.keychain.watchIsUnlocked ?? Stream.value(false);
-        })
+    _keychainUnlockedSub = _userService.watchUnlockedActiveAccount
+        .map((account) => account != null)
         .distinct()
         .listen(_onActiveKeychainUnlockChanged);
 
@@ -229,8 +225,6 @@ final class SessionCubit extends Cubit<SessionState>
     );
   }
 
-  // TODO(damian-molinski): Refactor active account stream so it emits null when account
-  // keychain is locked.
   void _emitAccountBasedSignal() {
     final account = _account;
 

catalyst_voices/packages/internal/catalyst_voices_models/lib/src/proposals/proposals_filters_v2.dart

@@ -17,6 +17,11 @@ final class ProposalsCampaignFilters extends Equatable {
     return ProposalsCampaignFilters(categoriesIds: categoriesIds);
   }
 
+  factory ProposalsCampaignFilters.from(Campaign campaign) {
+    final categoriesIds = campaign.categories.map((e) => e.selfRef.id).toSet();
+    return ProposalsCampaignFilters(categoriesIds: categoriesIds);
+  }
+
   @override
   List<Object?> get props => [categoriesIds];
 

catalyst_voices/packages/internal/catalyst_voices_services/lib/src/proposal/proposal_service.dart

@@ -403,16 +403,36 @@ final class ProposalServiceImpl implements ProposalService {
 
   @override
   Stream<bool> watchMaxProposalsLimitReached() {
-    // TODO(damian-molinski): watch active account id + active campaign
-    const filters = ProposalsFiltersV2(
-      status: ProposalStatusFilter.aFinal,
-      author: null,
-      campaign: null,
+    final activeAccountId = _userService.watchUnlockedActiveAccount
+        .map((account) => account?.catalystId)
+        .distinct();
+    final activeCampaign = _activeCampaignObserver.watchCampaign.distinct();
+
+    return Rx.combineLatest2<CatalystId?, Campaign?, ProposalsFiltersV2?>(
+      activeAccountId,
+      activeCampaign,
+      (author, campaign) {
+        if (author == null || campaign == null) {
+          return null;
+        }
+
+        return ProposalsFiltersV2(
+          status: ProposalStatusFilter.aFinal,
+          author: author,
+          campaign: ProposalsCampaignFilters.from(campaign),
+        );
+      },
+    ).distinct().switchMap(
+      (filters) {
+        if (filters == null) {
+          return Stream.value(true);
+        }
+
+        return _proposalRepository
+            .watchProposalsCountV2(filters: filters)
+            .map((event) => event >= ProposalDocument.maxSubmittedProposalsPerUser);
+      },
     );
-
-    return _proposalRepository
-        .watchProposalsCountV2(filters: filters)
-        .map((event) => event >= ProposalDocument.maxSubmittedProposalsPerUser);
   }
 
   @override
@@ -458,10 +478,12 @@ final class ProposalServiceImpl implements ProposalService {
   }
 
   @override
-  Stream<List<DetailProposal>> watchUserProposals() async* {
-    yield* _userService.watchUser.distinct().switchMap((user) {
-      final authorId = user.activeAccount?.catalystId;
-      if (!_isProposer(user) || authorId == null) {
+  Stream<List<DetailProposal>> watchUserProposals() {
+    return _userService.watchUnlockedActiveAccount.distinct().switchMap((account) {
+      if (account == null) return const Stream.empty();
+
+      final authorId = account.catalystId;
+      if (!account.hasRole(AccountRole.proposer)) {
         return const Stream.empty();
       }
 
@@ -589,10 +611,6 @@ final class ProposalServiceImpl implements ProposalService {
     return account.catalystId;
   }
 
-  bool _isProposer(User user) {
-    return user.activeAccount?.roles.contains(AccountRole.proposer) ?? false;
-  }
-
   ProposalBriefData _mapJoinedProposalBriefData(
     JoinedProposalBriefData data,
     List<Vote> draftVotes,

catalyst_voices/packages/internal/catalyst_voices_services/lib/src/user/user_service.dart

@@ -7,6 +7,7 @@ import 'package:catalyst_voices_services/catalyst_voices_services.dart';
 import 'package:catalyst_voices_shared/catalyst_voices_shared.dart';
 import 'package:collection/collection.dart';
 import 'package:flutter/foundation.dart';
+import 'package:rxdart/rxdart.dart';
 
 /// [UserService] allows to manage user accounts.
 /// [watchUser] returns a stream of user changes which allows to react to user changes.
@@ -19,6 +20,9 @@ abstract interface class UserService implements ActiveAware {
 
   User get user;
 
+  /// Returns [Account] when keychain is unlocked, otherwise returns `null`.
+  Stream<Account?> get watchUnlockedActiveAccount;
+
   Stream<User> get watchUser;
 
   Future<void> dispose();
@@ -115,6 +119,15 @@ final class UserServiceImpl implements UserService {
   @override
   User get user => _userObserver.user;
 
+  @override
+  Stream<Account?> get watchUnlockedActiveAccount =>
+      watchUser.map((e) => e.activeAccount).switchMap((account) {
+        if (account == null) return Stream.value(null);
+
+        final isUnlockedStream = account.keychain.watchIsUnlocked;
+        return isUnlockedStream.map((isUnlocked) => isUnlocked ? account : null);
+      }).distinct();
+
   @override
   Stream<User> get watchUser => _userObserver.watchUser;
 

catalyst_voices/packages/internal/catalyst_voices_services/test/src/proposal/proposal_service_test.dart

@@ -60,10 +60,15 @@ void main() {
         keychain: MockKeychain(),
         isActive: true,
       );
-      final user = User.optional(accounts: [account]);
+      final campaign = Campaign.f15();
       const proposalsCount = ProposalDocument.maxSubmittedProposalsPerUser + 1;
 
-      when(() => mockUserService.watchUser).thenAnswer((_) => Stream.value(user));
+      when(
+        () => mockUserService.watchUnlockedActiveAccount,
+      ).thenAnswer((_) => Stream.value(account));
+      when(
+        () => mockActiveCampaignObserver.watchCampaign,
+      ).thenAnswer((_) => Stream.value(campaign));
 
       when(
         () => mockProposalRepository.watchProposalsCountV2(