diff --git a/lib/core/di/bloc_module.dart b/lib/core/di/bloc_module.dart
index f05f7ab5..081544ea 100644
--- a/lib/core/di/bloc_module.dart
+++ b/lib/core/di/bloc_module.dart
@@ -144,7 +144,14 @@ void _registerBlocsModule() {
     _getIt<ProposalsBloc>(),
     _getIt<FetchProfileUseCase>(),
     _getIt<AggregateDaoProposalCountsUseCase>(),
-    _getIt<GetDaosFromProposalCountsUseCase>(),
     _getIt<ErrorHandlerManager>(),
   ));
-}
\ No newline at end of file
+
+  _registerFactoryWithParams<ProposalsHistoryBloc, DaoData, void>(
+        (dao, _) => ProposalsHistoryBloc(
+      _getIt<GetProposalsUseCase>(),
+      _getIt<ErrorHandlerManager>(),
+            dao
+    ),
+  );
+}
diff --git a/lib/core/di/di_setup.dart b/lib/core/di/di_setup.dart
index f10641d8..aa26e071 100644
--- a/lib/core/di/di_setup.dart
+++ b/lib/core/di/di_setup.dart
@@ -30,6 +30,7 @@ import 'package:hypha_wallet/core/network/api/services/token_service.dart';
 import 'package:hypha_wallet/core/network/api/services/transaction_history_service.dart';
 import 'package:hypha_wallet/core/network/api/services/user_account_service.dart';
 import 'package:hypha_wallet/core/network/ipfs/ipfs_manager.dart';
+import 'package:hypha_wallet/core/network/models/dao_data_model.dart';
 import 'package:hypha_wallet/core/network/models/network.dart';
 import 'package:hypha_wallet/core/network/models/user_profile_data.dart';
 import 'package:hypha_wallet/core/network/networking_manager.dart';
@@ -75,7 +76,7 @@ import 'package:hypha_wallet/ui/profile/usecases/set_name_use_case.dart';
 import 'package:hypha_wallet/ui/proposals/details/usecases/get_proposal_details_use_case.dart';
 import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_proposals_bloc.dart';
 import 'package:hypha_wallet/ui/proposals/filter/usecases/aggregate_dao_proposal_counts_use_case.dart';
-import 'package:hypha_wallet/ui/proposals/filter/usecases/get_daos_from_proposal_counts_use_case.dart';
+import 'package:hypha_wallet/ui/proposals/history/interactor/proposals_history_bloc.dart';
 import 'package:hypha_wallet/ui/proposals/list/interactor/proposals_bloc.dart';
 import 'package:hypha_wallet/ui/proposals/list/usecases/get_proposals_use_case.dart';
 import 'package:hypha_wallet/ui/search_user/interactor/search_user_bloc.dart';
diff --git a/lib/core/di/usecases_module.dart b/lib/core/di/usecases_module.dart
index 585debdd..3f0daa6a 100644
--- a/lib/core/di/usecases_module.dart
+++ b/lib/core/di/usecases_module.dart
@@ -88,6 +88,4 @@ void _registerUseCasesModule() {
   _registerFactory(() => GetProposalDetailsUseCase(_getIt<AuthRepository>(), _getIt<ProposalRepository>()));
 
   _registerFactory(() => AggregateDaoProposalCountsUseCase());
-
-  _registerFactory(() => GetDaosFromProposalCountsUseCase());
-}
\ No newline at end of file
+}
diff --git a/lib/core/extension/base_proposal_model_extension.dart b/lib/core/extension/base_proposal_model_extension.dart
index fe8d5b64..de7248d6 100644
--- a/lib/core/extension/base_proposal_model_extension.dart
+++ b/lib/core/extension/base_proposal_model_extension.dart
@@ -2,6 +2,7 @@ import 'package:hypha_wallet/core/network/models/base_proposal_model.dart';
 
 extension BaseProposalModelExtension on BaseProposalModel {
   String formatExpiration() {
+    // TODO(Zied-Saif): use another word instead of 'Expired'
     if (expiration == null) return 'Expired';
 
     if (isExpired()) {
diff --git a/lib/core/extension/proposals_filter_extension.dart b/lib/core/extension/proposals_filter_extension.dart
new file mode 100644
index 00000000..74b45b2b
--- /dev/null
+++ b/lib/core/extension/proposals_filter_extension.dart
@@ -0,0 +1,7 @@
+import 'package:hypha_wallet/core/network/models/proposal_model.dart';
+
+extension ProposalFilterExtension on List<ProposalModel> {
+  List<ProposalModel> filterByDao(List<int> daoIds) {
+    return where((proposal) => daoIds.contains(proposal.dao?.docId)).toList();
+  }
+}
diff --git a/lib/core/extension/string_extension.dart b/lib/core/extension/string_extension.dart
index 89684fd4..7d6b1ab5 100644
--- a/lib/core/extension/string_extension.dart
+++ b/lib/core/extension/string_extension.dart
@@ -4,6 +4,7 @@ extension NullableStringExtension on String? {
 
 extension StringExtension on String {
   // convert blockchain quantity to double, e.g. "1.0000 SEEDS"
+  // This parses a the value of type "Asset" and returns it as double
   double get quantityAsDouble {
     final List<String> parts = split(' ');
     return double.parse(parts[0]);
diff --git a/lib/core/network/models/proposal_details_model.dart b/lib/core/network/models/proposal_details_model.dart
index e014297c..e06627a4 100644
--- a/lib/core/network/models/proposal_details_model.dart
+++ b/lib/core/network/models/proposal_details_model.dart
@@ -1,3 +1,4 @@
+import 'package:hypha_wallet/core/extension/string_extension.dart'; // Add this import
 import 'package:hypha_wallet/core/network/models/base_proposal_model.dart';
 import 'package:hypha_wallet/core/network/models/dao_data_model.dart';
 import 'package:hypha_wallet/core/network/models/vote_model.dart';
@@ -8,6 +9,13 @@ part 'proposal_details_model.g.dart';
 
 @JsonSerializable()
 class ProposalDetailsModel extends BaseProposalModel {
+  double? get utilityAmountDouble => utilityAmount?.quantityAsDouble;
+  double? get voiceAmountDouble => voiceAmount?.quantityAsDouble;
+  double? get cashAmountDouble => cashAmount?.quantityAsDouble;
+  double? get utilityAmountPerPeriodDouble => utilityAmountPerPeriod?.quantityAsDouble;
+  double? get voiceAmountPerPeriodDouble => voiceAmountPerPeriod?.quantityAsDouble;
+  double? get cashAmountPerPeriodDouble => cashAmountPerPeriod?.quantityAsDouble;
+
   @JsonKey(name: '__typename')
   final String type;
 
@@ -44,37 +52,35 @@ class ProposalDetailsModel extends BaseProposalModel {
   @JsonKey(name: 'details_description_s')
   final String? description;
 
-  ProposalDetailsModel({
-    required super.id,
-    required this.type,
-    required this.creationDate,
-    super.dao,
-    super.commitment,
-    super.title,
-    super.unity,
-    super.quorum,
-    super.expiration,
-    super.creator,
-    super.votes,
-    this.tokenMixPercentage,
-    this.cycleCount,
-    this.cycleStartDate,
-    this.utilityAmount,
-    this.voiceAmount,
-    this.cashAmount,
-    this.utilityAmountPerPeriod,
-    this.voiceAmountPerPeriod,
-    this.cashAmountPerPeriod,
-    this.description
-  });
+  ProposalDetailsModel(
+      {required super.id,
+      required this.type,
+      required this.creationDate,
+      super.dao,
+      super.commitment,
+      super.title,
+      super.unity,
+      super.quorum,
+      super.expiration,
+      super.creator,
+      super.votes,
+      this.tokenMixPercentage,
+      this.cycleCount,
+      this.cycleStartDate,
+      this.utilityAmount,
+      this.voiceAmount,
+      this.cashAmount,
+      this.utilityAmountPerPeriod,
+      this.voiceAmountPerPeriod,
+      this.cashAmountPerPeriod,
+      this.description});
 
   factory ProposalDetailsModel.fromJson(Map<String, dynamic> json) {
-    if(json['start'] is List){
-      if((json['start'] as List).isNotEmpty){
+    if (json['start'] is List) {
+      if ((json['start'] as List).isNotEmpty) {
         json['start'] = json['start'][0]['details_startTime_t'];
-      }
-      else{
-        json['start']=null;
+      } else {
+        json['start'] = null;
       }
     }
     // TODO(Saif): check this
diff --git a/lib/core/network/repository/proposal_repository.dart b/lib/core/network/repository/proposal_repository.dart
index 54aa2801..4cf17612 100644
--- a/lib/core/network/repository/proposal_repository.dart
+++ b/lib/core/network/repository/proposal_repository.dart
@@ -10,6 +10,7 @@ import 'package:hypha_wallet/core/network/repository/profile_repository.dart';
 import 'package:hypha_wallet/ui/architecture/result/result.dart';
 import 'package:hypha_wallet/ui/profile/interactor/profile_data.dart';
 import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_status.dart';
+import 'package:hypha_wallet/ui/proposals/list/interactor/get_proposals_use_case_input.dart';
 
 class ProposalRepository {
   final ProposalService _proposalService;
@@ -17,9 +18,9 @@ class ProposalRepository {
 
   ProposalRepository(this._proposalService, this._profileService);
 
-  Future<Result<List<ProposalModel>, HyphaError>> getProposals(UserProfileData user, List<DaoData> daos, FilterStatus filterStatus) async {
-    final List<Future<Result<Map<String, dynamic>, HyphaError>>> futures = daos.map((DaoData dao) {
-      return filterStatus == FilterStatus.active ? _proposalService.getActiveProposals(user, dao.docId) : _proposalService.getPastProposals(user, dao.docId);
+  Future<Result<List<ProposalModel>, HyphaError>> getProposals(UserProfileData user, GetProposalsUseCaseInput input) async {
+    final List<Future<Result<Map<String, dynamic>, HyphaError>>> futures = input.daos.map((DaoData dao) {
+      return input.filterStatus == FilterStatus.active ? _proposalService.getActiveProposals(user, dao.docId) : _proposalService.getPastProposals(user, dao.docId);
     }).toList();
 
     final List<Result<Map<String, dynamic>, HyphaError>> futureResults = await Future.wait(futures);
@@ -38,7 +39,7 @@ class ProposalRepository {
         }
 
         try {
-          final List<ProposalModel> proposals = await _parseProposalsFromResponse(response, daos[i], filterStatus);
+          final List<ProposalModel> proposals = await _parseProposalsFromResponse(response, input.daos[i], input.filterStatus);
           allProposals.addAll(proposals);
         } catch (e, stackTrace) {
           LogHelper.e('Error parsing data into proposal model', error: e, stacktrace: stackTrace);
diff --git a/lib/ui/proposals/components/proposals_list.dart b/lib/ui/proposals/components/proposals_list.dart
new file mode 100644
index 00000000..d85ed627
--- /dev/null
+++ b/lib/ui/proposals/components/proposals_list.dart
@@ -0,0 +1,20 @@
+import 'package:flutter/material.dart';
+import 'package:hypha_wallet/core/network/models/proposal_model.dart';
+import 'package:hypha_wallet/ui/proposals/list/components/hypha_proposals_action_card.dart';
+
+class ProposalsList extends StatelessWidget {
+  final List<ProposalModel> proposals;
+
+  const ProposalsList(this.proposals, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return ListView.separated(
+        padding: const EdgeInsets.only(bottom: 22),
+        itemBuilder: (BuildContext context, int index) => HyphaProposalsActionCard(proposals[index]),
+        separatorBuilder: (BuildContext context, int index) {
+          return const SizedBox(height: 16);
+        },
+        itemCount: proposals.length);
+  }
+}
diff --git a/lib/ui/proposals/filter/components/filter_proposals_view.dart b/lib/ui/proposals/filter/components/filter_proposals_view.dart
index 0e868344..f9fdf372 100644
--- a/lib/ui/proposals/filter/components/filter_proposals_view.dart
+++ b/lib/ui/proposals/filter/components/filter_proposals_view.dart
@@ -74,7 +74,8 @@ class FilterProposalsView extends StatelessWidget {
                   HyphaAppButton(
                     title: 'SAVE FILTERS',
                     onPressed: () {
-                      filterProposalsBloc.add(FilterProposalsEvent.saveFilters(filterProposalsBloc.selectedDaoIndexNotifier.value == null ? state.daoProposalCounts: [state.daoProposalCounts[filterProposalsBloc.selectedDaoIndexNotifier.value!]], filterProposalsBloc.selectedStatusIndexNotifier.value == 0 ? FilterStatus.active : FilterStatus.past));
+                      final int? index = filterProposalsBloc.selectedDaoIndexNotifier.value;
+                      filterProposalsBloc.add(FilterProposalsEvent.saveFilters(index == null ? state.daoProposalCounts : [state.daoProposalCounts[index]], filterProposalsBloc.selectedStatusIndexNotifier.value == 0 ? FilterStatus.active : FilterStatus.past));
                     },
                   ),
                   const SizedBox(
diff --git a/lib/ui/proposals/filter/components/hypha_filter_card.dart b/lib/ui/proposals/filter/components/hypha_filter_card.dart
index 53d9429d..372373ef 100644
--- a/lib/ui/proposals/filter/components/hypha_filter_card.dart
+++ b/lib/ui/proposals/filter/components/hypha_filter_card.dart
@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:hypha_wallet/core/network/models/dao_data_model.dart';
-import 'package:hypha_wallet/design/avatar_image/hypha_avatar_image.dart';
+import 'package:hypha_wallet/design/dao_image.dart';
 import 'package:hypha_wallet/design/hypha_card.dart';
 import 'package:hypha_wallet/design/hypha_colors.dart';
-import 'package:hypha_wallet/design/ipfs_image.dart';
 import 'package:hypha_wallet/design/themes/extensions/theme_extension_provider.dart';
-import 'package:hypha_wallet/design/dao_image.dart';
 
 class HyphaFilterCard extends StatelessWidget {
   final DaoData? dao;
@@ -21,7 +19,7 @@ class HyphaFilterCard extends StatelessWidget {
     // TODO(Saif): fix the card height (filter by status)
     return GestureDetector(
       onTap: () {
-        valueNotifier.value = index;
+        valueNotifier.value = valueNotifier.value == index ? null : index;
       },
       child: HyphaCard(
           child: Padding(
diff --git a/lib/ui/proposals/filter/interactor/filter_proposals_bloc.dart b/lib/ui/proposals/filter/interactor/filter_proposals_bloc.dart
index c58269d7..6f2324b1 100644
--- a/lib/ui/proposals/filter/interactor/filter_proposals_bloc.dart
+++ b/lib/ui/proposals/filter/interactor/filter_proposals_bloc.dart
@@ -11,7 +11,6 @@ import 'package:hypha_wallet/ui/profile/usecases/fetch_profile_use_case.dart';
 import 'package:hypha_wallet/ui/proposals/filter/interactor/dao_proposal_count_entity.dart';
 import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_status.dart';
 import 'package:hypha_wallet/ui/proposals/filter/usecases/aggregate_dao_proposal_counts_use_case.dart';
-import 'package:hypha_wallet/ui/proposals/filter/usecases/get_daos_from_proposal_counts_use_case.dart';
 import 'package:hypha_wallet/ui/proposals/list/interactor/proposals_bloc.dart';
 
 part 'page_command.dart';
@@ -23,14 +22,12 @@ class FilterProposalsBloc extends Bloc<FilterProposalsEvent, FilterProposalsStat
   final ProposalsBloc _proposalsBloc;
   final FetchProfileUseCase _fetchProfileUseCase;
   final AggregateDaoProposalCountsUseCase _aggregateDaoProposalCountsUseCase;
-  final GetDaosFromProposalCountsUseCase _getDaosFromProposalCountsUseCase;
   final ErrorHandlerManager _errorHandlerManager;
 
   FilterProposalsBloc(
       this._proposalsBloc,
       this._fetchProfileUseCase,
       this._aggregateDaoProposalCountsUseCase,
-      this._getDaosFromProposalCountsUseCase,
       this._errorHandlerManager,
       ) : super(const FilterProposalsState()) {
     on<_Initial>(_initial);
@@ -40,11 +37,13 @@ class FilterProposalsBloc extends Bloc<FilterProposalsEvent, FilterProposalsStat
     add(const FilterProposalsEvent.initial());
   }
 
-  final ValueNotifier<int?> _selectedDaoIndexNotifier = ValueNotifier<int?>(null);
+  final ValueNotifier<int?> _selectedDaoIndexNotifier = ValueNotifier<int?>(0);
   final ValueNotifier<int> _selectedStatusIndexNotifier = ValueNotifier<int>(0);
+  List<int>? _daoIds;
 
   ValueNotifier<int?> get selectedDaoIndexNotifier => _selectedDaoIndexNotifier;
   ValueNotifier<int> get selectedStatusIndexNotifier => _selectedStatusIndexNotifier;
+  List<int>? get daoIds => _daoIds;
 
   Future<void> _initial(_Initial event, Emitter<FilterProposalsState> emit) async {
     emit(state.copyWith(pageState: PageState.loading));
@@ -76,7 +75,8 @@ class FilterProposalsBloc extends Bloc<FilterProposalsEvent, FilterProposalsStat
   }
 
   Future<void> _saveFilters(_SaveFilters event, Emitter<FilterProposalsState> emit) async {
-    _proposalsBloc.add(ProposalsEvent.initial(daos: _getDaosFromProposalCountsUseCase.run(event.daoProposalCounts), filterStatus: event.filterStatus));
+    _daoIds = event.daoProposalCounts.map((DaoProposalCountEntity daoProposalCount) => daoProposalCount.dao.docId).toList();
+    _proposalsBloc.add(ProposalsEvent.initial(filterStatus: event.filterStatus));
     emit(state.copyWith(command: const PageCommand.navigateToProposals()));
   }
 }
diff --git a/lib/ui/proposals/filter/usecases/aggregate_dao_proposal_counts_use_case.dart b/lib/ui/proposals/filter/usecases/aggregate_dao_proposal_counts_use_case.dart
index 61ad439b..7c35c325 100644
--- a/lib/ui/proposals/filter/usecases/aggregate_dao_proposal_counts_use_case.dart
+++ b/lib/ui/proposals/filter/usecases/aggregate_dao_proposal_counts_use_case.dart
@@ -20,8 +20,9 @@ class AggregateDaoProposalCountsUseCase {
       }
     }
 
-    return daoProposalCounts.entries
-        .map((entry) => DaoProposalCountEntity(entry.key, entry.value))
-        .toList();
+    final List<MapEntry<DaoData, int>> sortedEntries = daoProposalCounts.entries.toList()
+      ..sort((a, b) => a.key.settingsDaoTitle.compareTo(b.key.settingsDaoTitle));
+
+    return sortedEntries.map((entry) => DaoProposalCountEntity(entry.key, entry.value)).toList();
   }
 }
diff --git a/lib/ui/proposals/filter/usecases/get_daos_from_proposal_counts_use_case.dart b/lib/ui/proposals/filter/usecases/get_daos_from_proposal_counts_use_case.dart
deleted file mode 100644
index ffd5fa31..00000000
--- a/lib/ui/proposals/filter/usecases/get_daos_from_proposal_counts_use_case.dart
+++ /dev/null
@@ -1,8 +0,0 @@
-import 'package:hypha_wallet/core/network/models/dao_data_model.dart';
-import 'package:hypha_wallet/ui/proposals/filter/interactor/dao_proposal_count_entity.dart';
-
-class GetDaosFromProposalCountsUseCase {
-  List<DaoData> run(List<DaoProposalCountEntity> daoProposalCounts) {
-    return daoProposalCounts.map((entity) => entity.dao).toList();
-  }
-}
diff --git a/lib/ui/proposals/history/components/proposals_history_view.dart b/lib/ui/proposals/history/components/proposals_history_view.dart
new file mode 100644
index 00000000..c58a4038
--- /dev/null
+++ b/lib/ui/proposals/history/components/proposals_history_view.dart
@@ -0,0 +1,35 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:get/get.dart';
+import 'package:hypha_wallet/design/hypha_colors.dart';
+import 'package:hypha_wallet/ui/proposals/components/proposals_list.dart';
+import 'package:hypha_wallet/ui/proposals/history/interactor/proposals_history_bloc.dart';
+import 'package:hypha_wallet/ui/shared/hypha_body_widget.dart';
+
+class ProposalsHistoryView extends StatelessWidget {
+  const ProposalsHistoryView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        backgroundColor: context.isDarkMode ? HyphaColors.darkBlack : HyphaColors.offWhite,
+        appBar: AppBar(
+          title: const Text('Proposals History'),
+        ),
+        body: RefreshIndicator(
+          onRefresh: () async {
+            context.read<ProposalsHistoryBloc>().add(const ProposalsHistoryEvent.initial(refresh: true));
+          },
+          child: BlocBuilder<ProposalsHistoryBloc, ProposalsHistoryState>(
+              builder: (context, state) {
+            return HyphaBodyWidget(pageState: state.pageState, success: (context) {
+              return Container(
+                padding: const EdgeInsets.all(20),
+                child: ProposalsList(state.proposals),
+              );
+            });
+          }),
+        )
+    );
+  }
+}
diff --git a/lib/ui/proposals/history/interactor/proposals_history_bloc.dart b/lib/ui/proposals/history/interactor/proposals_history_bloc.dart
new file mode 100644
index 00000000..9268f0da
--- /dev/null
+++ b/lib/ui/proposals/history/interactor/proposals_history_bloc.dart
@@ -0,0 +1,40 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+import 'package:hypha_wallet/core/error_handler/error_handler_manager.dart';
+import 'package:hypha_wallet/core/error_handler/model/hypha_error.dart';
+import 'package:hypha_wallet/core/network/models/dao_data_model.dart';
+import 'package:hypha_wallet/core/network/models/proposal_model.dart';
+import 'package:hypha_wallet/ui/architecture/interactor/page_states.dart';
+import 'package:hypha_wallet/ui/architecture/result/result.dart';
+import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_status.dart';
+import 'package:hypha_wallet/ui/proposals/list/interactor/get_proposals_use_case_input.dart';
+import 'package:hypha_wallet/ui/proposals/list/usecases/get_proposals_use_case.dart';
+
+part 'proposals_history_bloc.freezed.dart';
+part 'proposals_history_event.dart';
+part 'proposals_history_state.dart';
+
+class ProposalsHistoryBloc extends Bloc<ProposalsHistoryEvent, ProposalsHistoryState> {
+  final GetProposalsUseCase _getProposalsUseCase;
+  final ErrorHandlerManager _errorHandlerManager;
+  final DaoData _dao;
+
+  ProposalsHistoryBloc(this._getProposalsUseCase, this._errorHandlerManager, this._dao) : super(const ProposalsHistoryState()) {
+    on<_Initial>(_initial);
+  }
+
+  Future<void> _initial(_Initial event, Emitter<ProposalsHistoryState> emit) async {
+    if (!event.refresh) {
+      emit(state.copyWith(pageState: PageState.loading));
+    }
+
+    final Result<List<ProposalModel>, HyphaError> proposalsResult = await _getProposalsUseCase.run(GetProposalsUseCaseInput([_dao], FilterStatus.past));
+
+    if (proposalsResult.isValue) {
+      emit(state.copyWith(pageState: PageState.success, proposals: proposalsResult.asValue!.value));
+    } else {
+      await _errorHandlerManager.handlerError(proposalsResult.asError!.error);
+      emit(state.copyWith(pageState: PageState.failure));
+    }
+  }
+}
diff --git a/lib/ui/proposals/history/interactor/proposals_history_bloc.freezed.dart b/lib/ui/proposals/history/interactor/proposals_history_bloc.freezed.dart
new file mode 100644
index 00000000..f7f69edc
--- /dev/null
+++ b/lib/ui/proposals/history/interactor/proposals_history_bloc.freezed.dart
@@ -0,0 +1,396 @@
+// coverage:ignore-file
+// GENERATED CODE - DO NOT MODIFY BY HAND
+// ignore_for_file: type=lint
+// ignore_for_file: unused_element, deprecated_member_use, deprecated_member_use_from_same_package, use_function_type_syntax_for_parameters, unnecessary_const, avoid_init_to_null, invalid_override_different_default_values_named, prefer_expression_function_bodies, annotate_overrides, invalid_annotation_target, unnecessary_question_mark
+
+part of 'proposals_history_bloc.dart';
+
+// **************************************************************************
+// FreezedGenerator
+// **************************************************************************
+
+T _$identity<T>(T value) => value;
+
+final _privateConstructorUsedError = UnsupportedError(
+    'It seems like you constructed your class using `MyClass._()`. This constructor is only meant to be used by freezed and you are not supposed to need it nor use it.\nPlease check the documentation here for more information: https://github.com/rrousselGit/freezed#adding-getters-and-methods-to-our-models');
+
+/// @nodoc
+mixin _$ProposalsHistoryEvent {
+  bool get refresh => throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function(bool refresh) initial,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function(bool refresh)? initial,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function(bool refresh)? initial,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Initial value) initial,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Initial value)? initial,
+  }) =>
+      throw _privateConstructorUsedError;
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Initial value)? initial,
+    required TResult orElse(),
+  }) =>
+      throw _privateConstructorUsedError;
+
+  /// Create a copy of ProposalsHistoryEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $ProposalsHistoryEventCopyWith<ProposalsHistoryEvent> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ProposalsHistoryEventCopyWith<$Res> {
+  factory $ProposalsHistoryEventCopyWith(ProposalsHistoryEvent value,
+          $Res Function(ProposalsHistoryEvent) then) =
+      _$ProposalsHistoryEventCopyWithImpl<$Res, ProposalsHistoryEvent>;
+  @useResult
+  $Res call({bool refresh});
+}
+
+/// @nodoc
+class _$ProposalsHistoryEventCopyWithImpl<$Res,
+        $Val extends ProposalsHistoryEvent>
+    implements $ProposalsHistoryEventCopyWith<$Res> {
+  _$ProposalsHistoryEventCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of ProposalsHistoryEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? refresh = null,
+  }) {
+    return _then(_value.copyWith(
+      refresh: null == refresh
+          ? _value.refresh
+          : refresh // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$InitialImplCopyWith<$Res>
+    implements $ProposalsHistoryEventCopyWith<$Res> {
+  factory _$$InitialImplCopyWith(
+          _$InitialImpl value, $Res Function(_$InitialImpl) then) =
+      __$$InitialImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({bool refresh});
+}
+
+/// @nodoc
+class __$$InitialImplCopyWithImpl<$Res>
+    extends _$ProposalsHistoryEventCopyWithImpl<$Res, _$InitialImpl>
+    implements _$$InitialImplCopyWith<$Res> {
+  __$$InitialImplCopyWithImpl(
+      _$InitialImpl _value, $Res Function(_$InitialImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of ProposalsHistoryEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? refresh = null,
+  }) {
+    return _then(_$InitialImpl(
+      refresh: null == refresh
+          ? _value.refresh
+          : refresh // ignore: cast_nullable_to_non_nullable
+              as bool,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$InitialImpl implements _Initial {
+  const _$InitialImpl({this.refresh = false});
+
+  @override
+  @JsonKey()
+  final bool refresh;
+
+  @override
+  String toString() {
+    return 'ProposalsHistoryEvent.initial(refresh: $refresh)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$InitialImpl &&
+            (identical(other.refresh, refresh) || other.refresh == refresh));
+  }
+
+  @override
+  int get hashCode => Object.hash(runtimeType, refresh);
+
+  /// Create a copy of ProposalsHistoryEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$InitialImplCopyWith<_$InitialImpl> get copyWith =>
+      __$$InitialImplCopyWithImpl<_$InitialImpl>(this, _$identity);
+
+  @override
+  @optionalTypeArgs
+  TResult when<TResult extends Object?>({
+    required TResult Function(bool refresh) initial,
+  }) {
+    return initial(refresh);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? whenOrNull<TResult extends Object?>({
+    TResult? Function(bool refresh)? initial,
+  }) {
+    return initial?.call(refresh);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeWhen<TResult extends Object?>({
+    TResult Function(bool refresh)? initial,
+    required TResult orElse(),
+  }) {
+    if (initial != null) {
+      return initial(refresh);
+    }
+    return orElse();
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult map<TResult extends Object?>({
+    required TResult Function(_Initial value) initial,
+  }) {
+    return initial(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult? mapOrNull<TResult extends Object?>({
+    TResult? Function(_Initial value)? initial,
+  }) {
+    return initial?.call(this);
+  }
+
+  @override
+  @optionalTypeArgs
+  TResult maybeMap<TResult extends Object?>({
+    TResult Function(_Initial value)? initial,
+    required TResult orElse(),
+  }) {
+    if (initial != null) {
+      return initial(this);
+    }
+    return orElse();
+  }
+}
+
+abstract class _Initial implements ProposalsHistoryEvent {
+  const factory _Initial({final bool refresh}) = _$InitialImpl;
+
+  @override
+  bool get refresh;
+
+  /// Create a copy of ProposalsHistoryEvent
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$InitialImplCopyWith<_$InitialImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+mixin _$ProposalsHistoryState {
+  PageState get pageState => throw _privateConstructorUsedError;
+  List<ProposalModel> get proposals => throw _privateConstructorUsedError;
+
+  /// Create a copy of ProposalsHistoryState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  $ProposalsHistoryStateCopyWith<ProposalsHistoryState> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $ProposalsHistoryStateCopyWith<$Res> {
+  factory $ProposalsHistoryStateCopyWith(ProposalsHistoryState value,
+          $Res Function(ProposalsHistoryState) then) =
+      _$ProposalsHistoryStateCopyWithImpl<$Res, ProposalsHistoryState>;
+  @useResult
+  $Res call({PageState pageState, List<ProposalModel> proposals});
+}
+
+/// @nodoc
+class _$ProposalsHistoryStateCopyWithImpl<$Res,
+        $Val extends ProposalsHistoryState>
+    implements $ProposalsHistoryStateCopyWith<$Res> {
+  _$ProposalsHistoryStateCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  /// Create a copy of ProposalsHistoryState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? pageState = null,
+    Object? proposals = null,
+  }) {
+    return _then(_value.copyWith(
+      pageState: null == pageState
+          ? _value.pageState
+          : pageState // ignore: cast_nullable_to_non_nullable
+              as PageState,
+      proposals: null == proposals
+          ? _value.proposals
+          : proposals // ignore: cast_nullable_to_non_nullable
+              as List<ProposalModel>,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$ProposalsHistoryStateImplCopyWith<$Res>
+    implements $ProposalsHistoryStateCopyWith<$Res> {
+  factory _$$ProposalsHistoryStateImplCopyWith(
+          _$ProposalsHistoryStateImpl value,
+          $Res Function(_$ProposalsHistoryStateImpl) then) =
+      __$$ProposalsHistoryStateImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({PageState pageState, List<ProposalModel> proposals});
+}
+
+/// @nodoc
+class __$$ProposalsHistoryStateImplCopyWithImpl<$Res>
+    extends _$ProposalsHistoryStateCopyWithImpl<$Res,
+        _$ProposalsHistoryStateImpl>
+    implements _$$ProposalsHistoryStateImplCopyWith<$Res> {
+  __$$ProposalsHistoryStateImplCopyWithImpl(_$ProposalsHistoryStateImpl _value,
+      $Res Function(_$ProposalsHistoryStateImpl) _then)
+      : super(_value, _then);
+
+  /// Create a copy of ProposalsHistoryState
+  /// with the given fields replaced by the non-null parameter values.
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? pageState = null,
+    Object? proposals = null,
+  }) {
+    return _then(_$ProposalsHistoryStateImpl(
+      pageState: null == pageState
+          ? _value.pageState
+          : pageState // ignore: cast_nullable_to_non_nullable
+              as PageState,
+      proposals: null == proposals
+          ? _value._proposals
+          : proposals // ignore: cast_nullable_to_non_nullable
+              as List<ProposalModel>,
+    ));
+  }
+}
+
+/// @nodoc
+
+class _$ProposalsHistoryStateImpl implements _ProposalsHistoryState {
+  const _$ProposalsHistoryStateImpl(
+      {this.pageState = PageState.initial,
+      final List<ProposalModel> proposals = const []})
+      : _proposals = proposals;
+
+  @override
+  @JsonKey()
+  final PageState pageState;
+  final List<ProposalModel> _proposals;
+  @override
+  @JsonKey()
+  List<ProposalModel> get proposals {
+    if (_proposals is EqualUnmodifiableListView) return _proposals;
+    // ignore: implicit_dynamic_type
+    return EqualUnmodifiableListView(_proposals);
+  }
+
+  @override
+  String toString() {
+    return 'ProposalsHistoryState(pageState: $pageState, proposals: $proposals)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$ProposalsHistoryStateImpl &&
+            (identical(other.pageState, pageState) ||
+                other.pageState == pageState) &&
+            const DeepCollectionEquality()
+                .equals(other._proposals, _proposals));
+  }
+
+  @override
+  int get hashCode => Object.hash(
+      runtimeType, pageState, const DeepCollectionEquality().hash(_proposals));
+
+  /// Create a copy of ProposalsHistoryState
+  /// with the given fields replaced by the non-null parameter values.
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$ProposalsHistoryStateImplCopyWith<_$ProposalsHistoryStateImpl>
+      get copyWith => __$$ProposalsHistoryStateImplCopyWithImpl<
+          _$ProposalsHistoryStateImpl>(this, _$identity);
+}
+
+abstract class _ProposalsHistoryState implements ProposalsHistoryState {
+  const factory _ProposalsHistoryState(
+      {final PageState pageState,
+      final List<ProposalModel> proposals}) = _$ProposalsHistoryStateImpl;
+
+  @override
+  PageState get pageState;
+  @override
+  List<ProposalModel> get proposals;
+
+  /// Create a copy of ProposalsHistoryState
+  /// with the given fields replaced by the non-null parameter values.
+  @override
+  @JsonKey(includeFromJson: false, includeToJson: false)
+  _$$ProposalsHistoryStateImplCopyWith<_$ProposalsHistoryStateImpl>
+      get copyWith => throw _privateConstructorUsedError;
+}
diff --git a/lib/ui/proposals/history/interactor/proposals_history_event.dart b/lib/ui/proposals/history/interactor/proposals_history_event.dart
new file mode 100644
index 00000000..bd9ea4a1
--- /dev/null
+++ b/lib/ui/proposals/history/interactor/proposals_history_event.dart
@@ -0,0 +1,6 @@
+part of 'proposals_history_bloc.dart';
+
+@freezed
+class ProposalsHistoryEvent with _$ProposalsHistoryEvent {
+  const factory ProposalsHistoryEvent.initial({@Default(false) bool refresh}) = _Initial;
+}
diff --git a/lib/ui/proposals/history/interactor/proposals_history_state.dart b/lib/ui/proposals/history/interactor/proposals_history_state.dart
new file mode 100644
index 00000000..71180a10
--- /dev/null
+++ b/lib/ui/proposals/history/interactor/proposals_history_state.dart
@@ -0,0 +1,9 @@
+part of 'proposals_history_bloc.dart';
+
+@freezed
+class ProposalsHistoryState with _$ProposalsHistoryState {
+  const factory ProposalsHistoryState({
+    @Default(PageState.initial) PageState pageState,
+    @Default([]) List<ProposalModel> proposals,
+  }) = _ProposalsHistoryState;
+}
diff --git a/lib/ui/proposals/history/proposals_history_page.dart b/lib/ui/proposals/history/proposals_history_page.dart
new file mode 100644
index 00000000..b0cb4a2f
--- /dev/null
+++ b/lib/ui/proposals/history/proposals_history_page.dart
@@ -0,0 +1,19 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:get_it/get_it.dart';
+import 'package:hypha_wallet/core/network/models/dao_data_model.dart';
+import 'package:hypha_wallet/ui/proposals/history/components/proposals_history_view.dart';
+import 'package:hypha_wallet/ui/proposals/history/interactor/proposals_history_bloc.dart';
+
+class ProposalsHistoryPage extends StatelessWidget {
+  final DaoData _dao;
+  const ProposalsHistoryPage(this._dao, {super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocProvider(
+      create: (context) => GetIt.I.get<ProposalsHistoryBloc>(param1: _dao)..add(const ProposalsHistoryEvent.initial()),
+      child: const ProposalsHistoryView(),
+    );
+  }
+}
diff --git a/lib/ui/proposals/list/components/proposals_view.dart b/lib/ui/proposals/list/components/proposals_view.dart
index 215fbc2b..d911b295 100644
--- a/lib/ui/proposals/list/components/proposals_view.dart
+++ b/lib/ui/proposals/list/components/proposals_view.dart
@@ -1,16 +1,19 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:get/get.dart' as GetX;
+import 'package:get_it/get_it.dart';
+import 'package:hypha_wallet/core/extension/proposals_filter_extension.dart';
+import 'package:hypha_wallet/core/network/models/proposal_model.dart';
 import 'package:hypha_wallet/design/avatar_image/hypha_avatar_image.dart';
 import 'package:hypha_wallet/design/background/hypha_page_background.dart';
 import 'package:hypha_wallet/design/hypha_colors.dart';
 import 'package:hypha_wallet/design/themes/extensions/theme_extension_provider.dart';
 import 'package:hypha_wallet/ui/blocs/authentication/authentication_bloc.dart';
 import 'package:hypha_wallet/ui/profile/profile_page.dart';
+import 'package:hypha_wallet/ui/proposals/components/proposals_list.dart';
 import 'package:hypha_wallet/ui/proposals/filter/filter_proposals_page.dart';
 import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_proposals_bloc.dart';
 import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_status.dart';
-import 'package:hypha_wallet/ui/proposals/list/components/hypha_proposals_action_card.dart';
 import 'package:hypha_wallet/ui/proposals/list/interactor/proposals_bloc.dart';
 import 'package:hypha_wallet/ui/shared/hypha_body_widget.dart';
 
@@ -84,36 +87,30 @@ class ProposalsView extends StatelessWidget {
                   ),
                   child: HyphaBodyWidget(
                     pageState: state.pageState,
-                    success: (context) => Padding(
-                      padding: const EdgeInsets.symmetric(horizontal: 22),
-                      child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.start,
-                        children: [
-                          const SizedBox(
-                            height: 22,
-                          ),
-                          Text(
-                            '${state.proposals.length} ${context.read<ProposalsBloc>().filterStatus.string} Proposal${state.proposals.length == 1 ? '' : 's'}',
-                            style: context.hyphaTextTheme.ralMediumBody
-                                .copyWith(color: HyphaColors.midGrey),
-                          ),
-                          const SizedBox(
-                            height: 20,
-                          ),
-                          Expanded(
-                              child: ListView.separated(
-                                  padding: const EdgeInsets.only(bottom: 22),
-                                  itemBuilder: (BuildContext context,
-                                          int index) =>
-                                      HyphaProposalsActionCard(state.proposals[index]),
-                                  separatorBuilder:
-                                      (BuildContext context, int index) {
-                                    return const SizedBox(height: 16);
-                                  },
-                                  itemCount: state.proposals.length)),
-                        ],
-                      ),
-                    ),
+                    success: (context) {
+                      final List<int>? daoIds = GetIt.I.get<FilterProposalsBloc>().daoIds;
+                      final List<ProposalModel> proposals = daoIds != null ? state.proposals.filterByDao(daoIds) : state.proposals;
+                      return Padding(
+                        padding: const EdgeInsets.symmetric(horizontal: 22),
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            const SizedBox(
+                              height: 22,
+                            ),
+                            Text(
+                              '${proposals.length} ${context.read<ProposalsBloc>().filterStatus.string} Proposal${proposals.length == 1 ? '' : 's'}',
+                              style: context.hyphaTextTheme.ralMediumBody
+                                  .copyWith(color: HyphaColors.midGrey),
+                            ),
+                            const SizedBox(
+                              height: 20,
+                            ),
+                          Expanded(child: ProposalsList(proposals)),
+                          ],
+                        ),
+                      );
+                    },
                   ),
                 )),
             floatingActionButton: IconButton(
diff --git a/lib/ui/proposals/list/interactor/get_proposals_use_case_input.dart b/lib/ui/proposals/list/interactor/get_proposals_use_case_input.dart
new file mode 100644
index 00000000..aa1886f1
--- /dev/null
+++ b/lib/ui/proposals/list/interactor/get_proposals_use_case_input.dart
@@ -0,0 +1,9 @@
+import 'package:hypha_wallet/core/network/models/dao_data_model.dart';
+import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_status.dart';
+
+class GetProposalsUseCaseInput {
+  final List<DaoData> daos;
+  final FilterStatus filterStatus;
+
+  GetProposalsUseCaseInput(this.daos, this.filterStatus);
+}
diff --git a/lib/ui/proposals/list/interactor/proposals_bloc.dart b/lib/ui/proposals/list/interactor/proposals_bloc.dart
index ba9d7d76..0c86697b 100644
--- a/lib/ui/proposals/list/interactor/proposals_bloc.dart
+++ b/lib/ui/proposals/list/interactor/proposals_bloc.dart
@@ -9,6 +9,7 @@ import 'package:hypha_wallet/ui/architecture/result/result.dart';
 import 'package:hypha_wallet/ui/profile/interactor/profile_data.dart';
 import 'package:hypha_wallet/ui/profile/usecases/fetch_profile_use_case.dart';
 import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_status.dart';
+import 'package:hypha_wallet/ui/proposals/list/interactor/get_proposals_use_case_input.dart';
 import 'package:hypha_wallet/ui/proposals/list/usecases/get_proposals_use_case.dart';
 
 part 'proposals_bloc.freezed.dart';
@@ -24,6 +25,7 @@ class ProposalsBloc extends Bloc<ProposalsEvent, ProposalsState> {
     on<_Initial>(_initial);
   }
 
+  List<DaoData>? _daos;
   FilterStatus filterStatus = FilterStatus.active;
 
   Future<void> _initial(_Initial event, Emitter<ProposalsState> emit) async {
@@ -32,24 +34,24 @@ class ProposalsBloc extends Bloc<ProposalsEvent, ProposalsState> {
       filterStatus = event.filterStatus;
     }
 
-    if (event.daos != null) {
-      await _fetchAndEmitProposals(emit, event.daos!, filterStatus);
-      return;
-    }
-
-    final Result<ProfileData, HyphaError> profileResult = await _fetchProfileUseCase.run();
-
-    if (profileResult.isValue && profileResult.asValue!.value.daos.isNotEmpty) {
-      await _fetchAndEmitProposals(emit, profileResult.asValue!.value.daos, filterStatus);
+    if (_daos == null) {
+      final Result<ProfileData, HyphaError> profileResult = await _fetchProfileUseCase.run();
+
+      if (profileResult.isValue && profileResult.asValue!.value.daos.isNotEmpty) {
+        _daos = profileResult.asValue!.value.daos;
+        await _fetchAndEmitProposals(emit, _daos!, filterStatus);
+      } else {
+        final HyphaError error = profileResult.isError ? profileResult.asError!.error : HyphaError.api('Failed to retrieve DAOs');
+        await _errorHandlerManager.handlerError(error);
+        emit(state.copyWith(pageState: PageState.failure));
+      }
     } else {
-      final HyphaError error = profileResult.isError ? profileResult.asError!.error : HyphaError.api('Failed to retrieve DAOs');
-      await _errorHandlerManager.handlerError(error);
-      emit(state.copyWith(pageState: PageState.failure));
+      await _fetchAndEmitProposals(emit, _daos!, filterStatus);
     }
   }
 
   Future<void> _fetchAndEmitProposals(Emitter<ProposalsState> emit, List<DaoData> daos, FilterStatus filterStatus) async {
-    final Result<List<ProposalModel>, HyphaError> proposalsResult = await _getProposalsUseCase.run(daos, filterStatus);
+    final Result<List<ProposalModel>, HyphaError> proposalsResult = await _getProposalsUseCase.run(GetProposalsUseCaseInput(daos, filterStatus));
 
     if (proposalsResult.isValue) {
       emit(state.copyWith(pageState: PageState.success, proposals: proposalsResult.asValue!.value));
diff --git a/lib/ui/proposals/list/interactor/proposals_bloc.freezed.dart b/lib/ui/proposals/list/interactor/proposals_bloc.freezed.dart
index d58bf8b9..79658a00 100644
--- a/lib/ui/proposals/list/interactor/proposals_bloc.freezed.dart
+++ b/lib/ui/proposals/list/interactor/proposals_bloc.freezed.dart
@@ -17,27 +17,20 @@ final _privateConstructorUsedError = UnsupportedError(
 /// @nodoc
 mixin _$ProposalsEvent {
   bool get refresh => throw _privateConstructorUsedError;
-  List<DaoData>? get daos => throw _privateConstructorUsedError;
   FilterStatus get filterStatus => throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(
-            bool refresh, List<DaoData>? daos, FilterStatus filterStatus)
-        initial,
+    required TResult Function(bool refresh, FilterStatus filterStatus) initial,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(
-            bool refresh, List<DaoData>? daos, FilterStatus filterStatus)?
-        initial,
+    TResult? Function(bool refresh, FilterStatus filterStatus)? initial,
   }) =>
       throw _privateConstructorUsedError;
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(
-            bool refresh, List<DaoData>? daos, FilterStatus filterStatus)?
-        initial,
+    TResult Function(bool refresh, FilterStatus filterStatus)? initial,
     required TResult orElse(),
   }) =>
       throw _privateConstructorUsedError;
@@ -71,7 +64,7 @@ abstract class $ProposalsEventCopyWith<$Res> {
           ProposalsEvent value, $Res Function(ProposalsEvent) then) =
       _$ProposalsEventCopyWithImpl<$Res, ProposalsEvent>;
   @useResult
-  $Res call({bool refresh, List<DaoData>? daos, FilterStatus filterStatus});
+  $Res call({bool refresh, FilterStatus filterStatus});
 }
 
 /// @nodoc
@@ -90,7 +83,6 @@ class _$ProposalsEventCopyWithImpl<$Res, $Val extends ProposalsEvent>
   @override
   $Res call({
     Object? refresh = null,
-    Object? daos = freezed,
     Object? filterStatus = null,
   }) {
     return _then(_value.copyWith(
@@ -98,10 +90,6 @@ class _$ProposalsEventCopyWithImpl<$Res, $Val extends ProposalsEvent>
           ? _value.refresh
           : refresh // ignore: cast_nullable_to_non_nullable
               as bool,
-      daos: freezed == daos
-          ? _value.daos
-          : daos // ignore: cast_nullable_to_non_nullable
-              as List<DaoData>?,
       filterStatus: null == filterStatus
           ? _value.filterStatus
           : filterStatus // ignore: cast_nullable_to_non_nullable
@@ -118,7 +106,7 @@ abstract class _$$InitialImplCopyWith<$Res>
       __$$InitialImplCopyWithImpl<$Res>;
   @override
   @useResult
-  $Res call({bool refresh, List<DaoData>? daos, FilterStatus filterStatus});
+  $Res call({bool refresh, FilterStatus filterStatus});
 }
 
 /// @nodoc
@@ -135,7 +123,6 @@ class __$$InitialImplCopyWithImpl<$Res>
   @override
   $Res call({
     Object? refresh = null,
-    Object? daos = freezed,
     Object? filterStatus = null,
   }) {
     return _then(_$InitialImpl(
@@ -143,10 +130,6 @@ class __$$InitialImplCopyWithImpl<$Res>
           ? _value.refresh
           : refresh // ignore: cast_nullable_to_non_nullable
               as bool,
-      daos: freezed == daos
-          ? _value._daos
-          : daos // ignore: cast_nullable_to_non_nullable
-              as List<DaoData>?,
       filterStatus: null == filterStatus
           ? _value.filterStatus
           : filterStatus // ignore: cast_nullable_to_non_nullable
@@ -159,31 +142,18 @@ class __$$InitialImplCopyWithImpl<$Res>
 
 class _$InitialImpl implements _Initial {
   const _$InitialImpl(
-      {this.refresh = false,
-      final List<DaoData>? daos,
-      this.filterStatus = FilterStatus.active})
-      : _daos = daos;
+      {this.refresh = false, this.filterStatus = FilterStatus.active});
 
   @override
   @JsonKey()
   final bool refresh;
-  final List<DaoData>? _daos;
-  @override
-  List<DaoData>? get daos {
-    final value = _daos;
-    if (value == null) return null;
-    if (_daos is EqualUnmodifiableListView) return _daos;
-    // ignore: implicit_dynamic_type
-    return EqualUnmodifiableListView(value);
-  }
-
   @override
   @JsonKey()
   final FilterStatus filterStatus;
 
   @override
   String toString() {
-    return 'ProposalsEvent.initial(refresh: $refresh, daos: $daos, filterStatus: $filterStatus)';
+    return 'ProposalsEvent.initial(refresh: $refresh, filterStatus: $filterStatus)';
   }
 
   @override
@@ -192,14 +162,12 @@ class _$InitialImpl implements _Initial {
         (other.runtimeType == runtimeType &&
             other is _$InitialImpl &&
             (identical(other.refresh, refresh) || other.refresh == refresh) &&
-            const DeepCollectionEquality().equals(other._daos, _daos) &&
             (identical(other.filterStatus, filterStatus) ||
                 other.filterStatus == filterStatus));
   }
 
   @override
-  int get hashCode => Object.hash(runtimeType, refresh,
-      const DeepCollectionEquality().hash(_daos), filterStatus);
+  int get hashCode => Object.hash(runtimeType, refresh, filterStatus);
 
   /// Create a copy of ProposalsEvent
   /// with the given fields replaced by the non-null parameter values.
@@ -212,33 +180,27 @@ class _$InitialImpl implements _Initial {
   @override
   @optionalTypeArgs
   TResult when<TResult extends Object?>({
-    required TResult Function(
-            bool refresh, List<DaoData>? daos, FilterStatus filterStatus)
-        initial,
+    required TResult Function(bool refresh, FilterStatus filterStatus) initial,
   }) {
-    return initial(refresh, daos, filterStatus);
+    return initial(refresh, filterStatus);
   }
 
   @override
   @optionalTypeArgs
   TResult? whenOrNull<TResult extends Object?>({
-    TResult? Function(
-            bool refresh, List<DaoData>? daos, FilterStatus filterStatus)?
-        initial,
+    TResult? Function(bool refresh, FilterStatus filterStatus)? initial,
   }) {
-    return initial?.call(refresh, daos, filterStatus);
+    return initial?.call(refresh, filterStatus);
   }
 
   @override
   @optionalTypeArgs
   TResult maybeWhen<TResult extends Object?>({
-    TResult Function(
-            bool refresh, List<DaoData>? daos, FilterStatus filterStatus)?
-        initial,
+    TResult Function(bool refresh, FilterStatus filterStatus)? initial,
     required TResult orElse(),
   }) {
     if (initial != null) {
-      return initial(refresh, daos, filterStatus);
+      return initial(refresh, filterStatus);
     }
     return orElse();
   }
@@ -274,15 +236,11 @@ class _$InitialImpl implements _Initial {
 
 abstract class _Initial implements ProposalsEvent {
   const factory _Initial(
-      {final bool refresh,
-      final List<DaoData>? daos,
-      final FilterStatus filterStatus}) = _$InitialImpl;
+      {final bool refresh, final FilterStatus filterStatus}) = _$InitialImpl;
 
   @override
   bool get refresh;
   @override
-  List<DaoData>? get daos;
-  @override
   FilterStatus get filterStatus;
 
   /// Create a copy of ProposalsEvent
diff --git a/lib/ui/proposals/list/interactor/proposals_event.dart b/lib/ui/proposals/list/interactor/proposals_event.dart
index fa6ca754..05eb07ce 100644
--- a/lib/ui/proposals/list/interactor/proposals_event.dart
+++ b/lib/ui/proposals/list/interactor/proposals_event.dart
@@ -4,7 +4,6 @@ part of 'proposals_bloc.dart';
 class ProposalsEvent with _$ProposalsEvent {
   const factory ProposalsEvent.initial({
     @Default(false) bool refresh,
-    List<DaoData>? daos,
     @Default(FilterStatus.active) FilterStatus filterStatus,
   }) = _Initial;
 }
diff --git a/lib/ui/proposals/list/usecases/get_proposals_use_case.dart b/lib/ui/proposals/list/usecases/get_proposals_use_case.dart
index 588c6963..67f7e40b 100644
--- a/lib/ui/proposals/list/usecases/get_proposals_use_case.dart
+++ b/lib/ui/proposals/list/usecases/get_proposals_use_case.dart
@@ -1,17 +1,17 @@
 import 'package:hypha_wallet/core/error_handler/model/hypha_error.dart';
-import 'package:hypha_wallet/core/network/models/dao_data_model.dart';
 import 'package:hypha_wallet/core/network/models/proposal_model.dart';
 import 'package:hypha_wallet/core/network/repository/auth_repository.dart';
 import 'package:hypha_wallet/core/network/repository/proposal_repository.dart';
+import 'package:hypha_wallet/ui/architecture/interactor/base_usecase.dart';
 import 'package:hypha_wallet/ui/architecture/result/result.dart';
-import 'package:hypha_wallet/ui/proposals/filter/interactor/filter_status.dart';
+import 'package:hypha_wallet/ui/proposals/list/interactor/get_proposals_use_case_input.dart';
 
-// TODO(Zied): add 'extends' (check)
-class GetProposalsUseCase {
+class GetProposalsUseCase extends InputUseCase<Result<List<ProposalModel>, HyphaError>, GetProposalsUseCaseInput> {
   final AuthRepository _authRepository;
   final ProposalRepository _proposalRepository;
 
   GetProposalsUseCase(this._authRepository, this._proposalRepository);
 
-  Future<Result<List<ProposalModel>, HyphaError>> run(List<DaoData> daos, FilterStatus filterStatus) async => _proposalRepository.getProposals(_authRepository.authDataOrCrash.userProfileData, daos, filterStatus);
+  @override
+  Future<Result<List<ProposalModel>, HyphaError>> run(GetProposalsUseCaseInput input) async => _proposalRepository.getProposals(_authRepository.authDataOrCrash.userProfileData, input);
 }