Implement tender workflows and dashboard integration

lib/views/home/pages/d_home_page.dart

@@ -127,13 +127,7 @@ class DesktopHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary20,
             iconPath: AssetsManager.arrows,
             title: HomeStrings.tenderSubmitted,
-            amount:
-                (homeViewModel
-                            .tenderApprovalsStateResponse
-                            ?.data
-                            ?.submittedTenders ??
-                        0)
-                    .toString(),
+            amount: homeViewModel.submittedTendersCount.toString(),
 
             textColor: AppColors.mainBlue,
             enableTap: true,
@@ -152,7 +146,7 @@ class DesktopHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary10,
             iconPath: AssetsManager.approve,
             title: HomeStrings.approvedTenders,
-            amount: '0',
+            amount: homeViewModel.approvedTendersCount.toString(),
             textColor: AppColors.jellyBean,
             enableTap: true,
             width: 178,
@@ -165,32 +159,22 @@ class DesktopHomePage extends StatelessWidget {
           ),
         ),
         const SizedBox(width: 10),
-        TenderCard(
-          backgroundColor: AppColors.orange10,
-          iconPath: AssetsManager.shield,
-          title: HomeStrings.tenderValue,
-          amount: '0',
-          textColor: AppColors.orange,
-          enableTap: false,
-          width: 178,
-          height: 148,
-          onTap: () {},
-        ),
-        const SizedBox(width: 10),
-        TenderCard(
-          backgroundColor: AppColors.grey10,
-          iconPath: AssetsManager.thumbLike,
-          title: HomeStrings.likedTenders,
-          amount: homeViewModel.userLikedTendersCount.toString(),
-          textColor: AppColors.grey50,
-          enableTap: true,
-          width: 178,
-          height: 148,
-          onTap: () {
-            const LikedTendersRouteData().push(context).then((value) {
-              homeViewModel.init();
-            });
-          },
+        Expanded(
+          child: TenderCard(
+            backgroundColor: AppColors.grey10,
+            iconPath: AssetsManager.thumbLike,
+            title: HomeStrings.likedTenders,
+            amount: homeViewModel.userLikedTendersCount.toString(),
+            textColor: AppColors.grey50,
+            enableTap: true,
+            width: 178,
+            height: 148,
+            onTap: () {
+              const LikedTendersRouteData().push(context).then((value) {
+                homeViewModel.init();
+              });
+            },
+          ),
         ),
       ],
     );

lib/views/home/pages/m_home_page.dart

@@ -5,7 +5,6 @@ import 'package:tm_app/core/constants/assets.dart';
 import 'package:tm_app/core/routes/app_routes.dart';
 import 'package:tm_app/core/theme/colors.dart';
 import 'package:tm_app/core/utils/size_config.dart';
-import 'package:tm_app/data/services/model/tender_approvals_stats_response/tender_approvals_stats_response.dart';
 import 'package:tm_app/view_models/home_view_model.dart';
 import 'package:tm_app/views/shared/tender_app_bar.dart';
 
@@ -44,10 +43,7 @@ class MobileHomePage extends StatelessWidget {
                     SizedBox(height: 32.0.h()),
                     _progressBarsRow(homeViewModel),
                     SizedBox(height: 32.0.h()),
-                    _firstTenderCardsRow(
-                      context,
-                      homeViewModel.tenderApprovalsStateResponse!,
-                    ),
+                    _firstTenderCardsRow(context, homeViewModel),
                     SizedBox(height: 8.0.h()),
                     _secondTenderCardsRow(homeViewModel, context),
                     SizedBox(height: 40.0.h()),
@@ -93,7 +89,7 @@ class MobileHomePage extends StatelessWidget {
 
   Widget _firstTenderCardsRow(
     BuildContext context,
-    TenderApprovalsStatsResponse tenderApprovalsStateResponse,
+    HomeViewModel homeViewModel,
   ) {
     return Padding(
       padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
@@ -104,9 +100,7 @@ class MobileHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary20,
             iconPath: AssetsManager.arrows,
             title: HomeStrings.tenderSubmitted,
-            amount:
-                (tenderApprovalsStateResponse.data?.submittedTenders ?? 0)
-                    .toString(),
+            amount: homeViewModel.submittedTendersCount.toString(),
             textColor: AppColors.mainBlue,
             enableTap: true,
             onTap: () {
@@ -119,7 +113,7 @@ class MobileHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary10,
             iconPath: AssetsManager.approve,
             title: HomeStrings.approvedTenders,
-            amount: '0',
+            amount: homeViewModel.approvedTendersCount.toString(),
 
             textColor: AppColors.jellyBean,
             enableTap: true,
@@ -143,27 +137,21 @@ class MobileHomePage extends StatelessWidget {
       child: Row(
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
-          TenderCard(
-            backgroundColor: AppColors.orange10,
-            iconPath: AssetsManager.shield,
-            title: HomeStrings.tenderValue,
-            amount: '0',
-            textColor: AppColors.orange,
-            enableTap: false,
-            onTap: () {},
-          ),
-          TenderCard(
-            backgroundColor: AppColors.grey10,
-            iconPath: AssetsManager.thumbLike,
-            title: HomeStrings.likedTenders,
-            amount: homeViewModel.userLikedTendersCount.toString(),
-            textColor: AppColors.grey50,
-            enableTap: true,
-            onTap: () {
-              const LikedTendersRouteData().push(context).then((value) {
-                homeViewModel.init();
-              });
-            },
+          Expanded(
+            child: TenderCard(
+              backgroundColor: AppColors.grey10,
+              iconPath: AssetsManager.thumbLike,
+              title: HomeStrings.likedTenders,
+              amount: homeViewModel.userLikedTendersCount.toString(),
+              textColor: AppColors.grey50,
+              enableTap: true,
+              width: double.infinity,
+              onTap: () {
+                const LikedTendersRouteData().push(context).then((value) {
+                  homeViewModel.init();
+                });
+              },
+            ),
           ),
         ],
       ),

lib/views/home/pages/t_home_page.dart

@@ -4,7 +4,6 @@ import 'package:provider/provider.dart';
 import 'package:tm_app/core/routes/app_routes.dart';
 import 'package:tm_app/core/theme/colors.dart';
 import 'package:tm_app/core/utils/size_config.dart';
-import 'package:tm_app/data/services/model/tender_approvals_stats_response/tender_approvals_stats_response.dart';
 import 'package:tm_app/view_models/home_view_model.dart';
 import 'package:tm_app/views/shared/tablet_navigation_widget.dart';
 
@@ -59,10 +58,7 @@ class TabletHomePage extends StatelessWidget {
                       SizedBox(height: 40.0.h()),
                       _progressBarsRow(homeViewModel),
                       SizedBox(height: 32.0.h()),
-                      _firstTenderCardsRow(
-                        context,
-                        homeViewModel.tenderApprovalsStateResponse!,
-                      ),
+                      _firstTenderCardsRow(context, homeViewModel),
                       SizedBox(height: 8.0.h()),
                       _secondTenderCardsRow(homeViewModel, context),
                       SizedBox(height: 32.0.h()),
@@ -113,7 +109,7 @@ class TabletHomePage extends StatelessWidget {
 
   Widget _firstTenderCardsRow(
     BuildContext context,
-    TenderApprovalsStatsResponse tenderApprovalsStateResponse,
+    HomeViewModel homeViewModel,
   ) {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
@@ -123,9 +119,7 @@ class TabletHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary20,
             iconPath: AssetsManager.arrows,
             title: HomeStrings.tenderSubmitted,
-            amount:
-                (tenderApprovalsStateResponse.data?.submittedTenders ?? 0)
-                    .toString(),
+            amount: homeViewModel.submittedTendersCount.toString(),
 
             textColor: AppColors.mainBlue,
             enableTap: true,
@@ -144,7 +138,7 @@ class TabletHomePage extends StatelessWidget {
             backgroundColor: AppColors.primary10,
             iconPath: AssetsManager.approve,
             title: HomeStrings.approvedTenders,
-            amount: '0',
+            amount: homeViewModel.approvedTendersCount.toString(),
             textColor: AppColors.jellyBean,
             enableTap: true,
             width: double.infinity,
@@ -167,20 +161,6 @@ class TabletHomePage extends StatelessWidget {
     return Row(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
-        Expanded(
-          child: TenderCard(
-            backgroundColor: AppColors.orange10,
-            iconPath: AssetsManager.shield,
-            title: HomeStrings.tenderValue,
-            amount: '0',
-            textColor: AppColors.orange,
-            enableTap: false,
-            width: double.infinity,
-            height: 148,
-            onTap: () {},
-          ),
-        ),
-        const SizedBox(width: 16.0),
         Expanded(
           child: TenderCard(
             backgroundColor: AppColors.grey10,

lib/views/home/strings/home_strings.dart

@@ -5,11 +5,11 @@ class HomeStrings {
   static const String partnership = 'Partnership';
   static const String selfApply = 'Self-apply';
   static const String contracting = 'Contracting';
-  static const String tenderSubmitted = 'Tenders submitted';
+  static const String tenderSubmitted = 'Submitted tenders';
   static const String approvedTenders = 'Approved tenders';
   static const String tenderValue = 'Tender Value';
   static const String thunderStatus = 'Thunder status';
-  static const String likedTenders = 'Liked Tenders';
+  static const String likedTenders = 'Liked tenders';
   static const String yourTenders = 'Your tenders';
   static const String recommendation = 'Recommendation';
   static const String welcome = 'Welcome';

lib/views/tenders/widgets/animated_feedback_button.dart

@@ -8,6 +8,7 @@ class AnimatedFeedbackButton extends StatefulWidget {
   final Color activeColor;
   final Color inactiveColor;
   final bool isActive;
+  final bool isLoading;
   final VoidCallback onTap;
   final String tooltip;
 
@@ -18,6 +19,7 @@ class AnimatedFeedbackButton extends StatefulWidget {
     required this.isActive,
     required this.onTap,
     required this.tooltip,
+    this.isLoading = false,
     super.key,
   });
 
@@ -63,6 +65,9 @@ class _AnimatedFeedbackButtonState extends State<AnimatedFeedbackButton>
   }
 
   void _handleTap() {
+    if (widget.isLoading) {
+      return;
+    }
     _clickController.forward().then((_) {
       _clickController.reverse();
     });
@@ -75,7 +80,7 @@ class _AnimatedFeedbackButtonState extends State<AnimatedFeedbackButton>
       message: widget.tooltip,
       child: InkWell(
         splashColor: Colors.transparent,
-        onTap: _handleTap,
+        onTap: widget.isLoading ? null : _handleTap,
         child: AnimatedBuilder(
           animation: _clickController,
           builder: (context, child) {
@@ -94,15 +99,23 @@ class _AnimatedFeedbackButtonState extends State<AnimatedFeedbackButton>
                   duration: const Duration(milliseconds: 100),
                   curve: Curves.easeInOut,
                   builder: (context, color, child) {
-                    return SvgPicture.asset(
+                    return SizedBox(
                       width: 24.0.w(),
                       height: 24.0.w(),
-                      fit: BoxFit.cover,
-                      widget.iconPath,
-                      colorFilter: ColorFilter.mode(
-                        color ?? widget.inactiveColor,
-                        BlendMode.srcATop,
-                      ),
+                      child:
+                          widget.isLoading
+                              ? CircularProgressIndicator(
+                                strokeWidth: 2,
+                                color: color ?? widget.inactiveColor,
+                              )
+                              : SvgPicture.asset(
+                                fit: BoxFit.cover,
+                                widget.iconPath,
+                                colorFilter: ColorFilter.mode(
+                                  color ?? widget.inactiveColor,
+                                  BlendMode.srcATop,
+                                ),
+                              ),
                     );
                   },
                 ),

lib/views/tenders/widgets/main_tenders_slider.dart

@@ -41,6 +41,52 @@ class _MainTendersSliderState extends State<MainTendersSlider> {
     if (widget.isDesktop) {
       _scrollController.addListener(_onScroll);
     }
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (mounted) {
+        _hydrateRenderedFeedback();
+      }
+    });
+  }
+
+  @override
+  void didUpdateWidget(covariant MainTendersSlider oldWidget) {
+    super.didUpdateWidget(oldWidget);
+    final oldIds = oldWidget.tenders.map((tender) => tender.id).toList();
+    final newIds = widget.tenders.map((tender) => tender.id).toList();
+    if (oldIds.length != newIds.length ||
+        !Iterable<int>.generate(
+          newIds.length,
+        ).every((index) => oldIds[index] == newIds[index])) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        if (mounted) {
+          _hydrateRenderedFeedback();
+        }
+      });
+    }
+  }
+
+  void _hydrateRenderedFeedback() {
+    if (widget.tenders.isEmpty) {
+      return;
+    }
+
+    final viewModel = context.read<TendersViewModel>();
+    final tendersToHydrate =
+        widget.isDesktop
+            ? widget.tenders
+            : <TenderData>[
+              widget.tenders[(currentPage - 1).clamp(
+                0,
+                widget.tenders.length - 1,
+              )],
+            ];
+
+    for (final tender in tendersToHydrate) {
+      final id = tender.id;
+      if (id != null && id.isNotEmpty) {
+        viewModel.getTenderFeedback(id);
+      }
+    }
   }
 
   void _onScroll() {

lib/views/tenders/widgets/tender_action_buttons_row.dart

@@ -48,6 +48,7 @@ class TenderActionButtonsRow extends StatelessWidget {
 
     final feedback = viewModel.getFeedbackForTender(tender.id!);
     final isDisliked = feedback?.feedbackType == TenderFeedback.disliked.value;
+    final isLoading = viewModel.isFeedbackLoading(tender.id!);
 
     return Column(
       children: [
@@ -56,9 +57,10 @@ class TenderActionButtonsRow extends StatelessWidget {
           activeColor: AppColors.errorColor,
           inactiveColor: AppColors.grey50,
           isActive: isDisliked,
+          isLoading: isLoading,
           tooltip: TendersStrings.dislike,
           onTap: () {
-            viewModel.toogleFeedback(
+            viewModel.toggleFeedback(
               tenderId: tender.id!,
               feedbackType: TenderFeedback.disliked.value,
             );
@@ -85,6 +87,7 @@ class TenderActionButtonsRow extends StatelessWidget {
 
     final feedback = viewModel.getFeedbackForTender(tender.id!);
     final isLiked = feedback?.feedbackType == TenderFeedback.liked.value;
+    final isLoading = viewModel.isFeedbackLoading(tender.id!);
 
     return Column(
       children: [
@@ -93,9 +96,10 @@ class TenderActionButtonsRow extends StatelessWidget {
           activeColor: AppColors.successColor,
           inactiveColor: AppColors.grey50,
           isActive: isLiked,
+          isLoading: isLoading,
           tooltip: TendersStrings.like,
           onTap: () {
-            viewModel.toogleFeedback(
+            viewModel.toggleFeedback(
               tenderId: tender.id!,
               feedbackType: TenderFeedback.liked.value,
             );

lib/views/your_tenders/pages/your_tenders_desktop_page.dart

@@ -11,6 +11,7 @@ import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
 import 'package:tm_app/views/your_tenders/widgets/filter_button.dart';
 import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.dart';
 import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
+import 'package:tm_app/views/your_tenders/widgets/submission_workflow.dart';
 
 import '../../shared/desktop_navigation_widget.dart';
 import '../../shared/page_selection_dialog.dart';
@@ -79,7 +80,9 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
 
                           Widget content;
 
-                          if (viewModel.selectedStatus ==
+                          if (viewModel.isSubmissionWorkflow) {
+                            content = const SubmissionWorkflow();
+                          } else if (viewModel.selectedStatus ==
                                   TenderFeedback.liked.value &&
                               viewModel.likedTendersData != null) {
                             content = LikedDislikedTendersList(
@@ -114,7 +117,8 @@ class _YourTendersDesktopPageState extends State<YourTendersDesktopPage>
                               Expanded(child: content),
                               SizedBox(height: 10.0.h()),
 
-                              _listPagesControll(context, viewModel),
+                              if (!viewModel.isSubmissionWorkflow)
+                                _listPagesControll(context, viewModel),
 
                               SizedBox(height: 30.0.h()),
                             ],

lib/views/your_tenders/pages/your_tenders_mobile_page.dart

@@ -7,6 +7,7 @@ import 'package:tm_app/views/your_tenders/strings/your_tenders_strings.dart';
 import 'package:tm_app/views/your_tenders/widgets/filter_button.dart';
 import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.dart';
 import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
+import 'package:tm_app/views/your_tenders/widgets/submission_workflow.dart';
 
 import '../../../core/constants/tender_feedback.dart';
 
@@ -60,7 +61,9 @@ class _YourTendersMobilePageState extends State<YourTendersMobilePage> {
 
                   return Column(
                     children: [
-                      if (viewModel.selectedStatus ==
+                      if (viewModel.isSubmissionWorkflow)
+                        const Expanded(child: SubmissionWorkflow())
+                      else if (viewModel.selectedStatus ==
                               TenderFeedback.liked.value &&
                           viewModel.likedTendersData != null)
                         Expanded(

lib/views/your_tenders/pages/your_tenders_tablet_page.dart

@@ -9,6 +9,7 @@ import 'package:tm_app/views/shared/tablet_desktop_appbar.dart';
 import 'package:tm_app/views/your_tenders/widgets/filter_button.dart';
 import 'package:tm_app/views/your_tenders/widgets/liked_disliked_tenders_list.dart';
 import 'package:tm_app/views/your_tenders/widgets/tenders_submitted.dart';
+import 'package:tm_app/views/your_tenders/widgets/submission_workflow.dart';
 
 import '../../../core/constants/tender_feedback.dart';
 import '../../shared/tablet_navigation_widget.dart';
@@ -85,7 +86,9 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
 
                       Widget content;
 
-                      if (viewModel.selectedStatus ==
+                      if (viewModel.isSubmissionWorkflow) {
+                        content = const SubmissionWorkflow();
+                      } else if (viewModel.selectedStatus ==
                               TenderFeedback.liked.value &&
                           viewModel.likedTendersData != null) {
                         content = LikedDislikedTendersList(
@@ -120,7 +123,8 @@ class _YourTendersTabletPageState extends State<YourTendersTabletPage>
                           Expanded(child: content),
                           SizedBox(height: 10.0.h()),
 
-                          _listPagesControll(context, viewModel),
+                          if (!viewModel.isSubmissionWorkflow)
+                            _listPagesControll(context, viewModel),
 
                           const SizedBox(height: 30.0),
                         ],

lib/views/your_tenders/widgets/submission_workflow.dart

@@ -0,0 +1,511 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:tm_app/core/theme/colors.dart';
+import 'package:tm_app/core/utils/date_utils.dart';
+import 'package:tm_app/data/services/model/tender_submission/tender_submission.dart';
+import 'package:tm_app/view_models/your_tenders_view_model.dart';
+
+class SubmissionWorkflow extends StatelessWidget {
+  const SubmissionWorkflow({super.key});
+
+  static const _stageLabels = <String, String>{
+    'opportunity': 'Opportunity',
+    'in_progress': 'In Progress',
+    'submitted': 'Submitted',
+    'not_applied': 'Not Applied',
+  };
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<YourTendersViewModel>(
+      builder: (context, viewModel, _) {
+        final submissions = viewModel.submissionsData?.data ?? const [];
+        return Column(
+          children: [
+            SizedBox(
+              height: 54,
+              child: ListView(
+                scrollDirection: Axis.horizontal,
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 6,
+                ),
+                children:
+                    YourTendersViewModel.submissionStages.map((stage) {
+                      final selected =
+                          viewModel.selectedSubmissionStage == stage;
+                      final count =
+                          viewModel.submissionStats?.byStage[stage] ?? 0;
+                      return Padding(
+                        padding: const EdgeInsets.only(right: 8),
+                        child: ChoiceChip(
+                          selected: selected,
+                          onSelected:
+                              (_) => viewModel.selectSubmissionStage(stage),
+                          label: Text('${_stageLabels[stage]} ($count)'),
+                          selectedColor: AppColors.secondary20,
+                          side: BorderSide(
+                            color:
+                                selected
+                                    ? AppColors.secondary50
+                                    : AppColors.grey30,
+                          ),
+                        ),
+                      );
+                    }).toList(),
+              ),
+            ),
+            if (viewModel.submissionActionError != null)
+              Container(
+                width: double.infinity,
+                margin: const EdgeInsets.fromLTRB(16, 4, 16, 4),
+                padding: const EdgeInsets.fromLTRB(12, 8, 4, 8),
+                decoration: BoxDecoration(
+                  color: AppColors.red0,
+                  border: Border.all(color: AppColors.red10),
+                  borderRadius: BorderRadius.circular(8),
+                ),
+                child: Row(
+                  children: [
+                    Icon(Icons.error_outline, color: AppColors.error, size: 18),
+                    const SizedBox(width: 8),
+                    Expanded(
+                      child: Text(
+                        viewModel.submissionActionError!,
+                        style: TextStyle(color: AppColors.error, fontSize: 12),
+                      ),
+                    ),
+                    IconButton(
+                      visualDensity: VisualDensity.compact,
+                      onPressed: viewModel.dismissSubmissionActionError,
+                      icon: const Icon(Icons.close, size: 18),
+                    ),
+                  ],
+                ),
+              ),
+            if (viewModel.isLoading && submissions.isEmpty)
+              const Expanded(
+                child: Center(
+                  child: CircularProgressIndicator(
+                    color: AppColors.secondary50,
+                  ),
+                ),
+              )
+            else if (submissions.isEmpty)
+              Expanded(
+                child: Center(
+                  child: Text(
+                    'No ${_stageLabels[viewModel.selectedSubmissionStage]?.toLowerCase()} submissions.',
+                    style: TextStyle(color: AppColors.grey60),
+                  ),
+                ),
+              )
+            else
+              Expanded(
+                child: RefreshIndicator(
+                  onRefresh: viewModel.loadSubmissions,
+                  child: ListView.builder(
+                    physics: const AlwaysScrollableScrollPhysics(),
+                    padding: const EdgeInsets.fromLTRB(16, 8, 16, 24),
+                    itemCount: submissions.length,
+                    itemBuilder:
+                        (context, index) =>
+                            _SubmissionCard(submission: submissions[index]),
+                  ),
+                ),
+              ),
+            if ((viewModel.submissionsData?.meta?.pages ?? 1) > 1)
+              Padding(
+                padding: const EdgeInsets.fromLTRB(16, 0, 16, 12),
+                child: Row(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    IconButton(
+                      tooltip: 'Previous page',
+                      onPressed:
+                          viewModel.currentPage > 1 && !viewModel.isLoading
+                              ? () => viewModel.jumpToPage(
+                                viewModel.currentPage - 1,
+                              )
+                              : null,
+                      icon: const Icon(Icons.chevron_left),
+                    ),
+                    Text(
+                      'Page ${viewModel.currentPage} of ${viewModel.totalPages}',
+                      style: TextStyle(color: AppColors.grey60),
+                    ),
+                    IconButton(
+                      tooltip: 'Next page',
+                      onPressed:
+                          viewModel.currentPage < viewModel.totalPages &&
+                                  !viewModel.isLoading
+                              ? () => viewModel.jumpToPage(
+                                viewModel.currentPage + 1,
+                              )
+                              : null,
+                      icon: const Icon(Icons.chevron_right),
+                    ),
+                  ],
+                ),
+              ),
+          ],
+        );
+      },
+    );
+  }
+}
+
+class _SubmissionCard extends StatelessWidget {
+  const _SubmissionCard({required this.submission});
+
+  final TenderSubmission submission;
+
+  static const _statusLabels = <String, String>{
+    'opportunity': 'Opportunity',
+    'validating': 'Validating',
+    'partner_pending': 'Partner Pending',
+    'applying': 'Applying',
+    'sent_waiting': 'Sent / Waiting',
+    'rejected': 'Lost',
+    'contract': 'Contract Awarded',
+    'not_applied': 'Not Applied',
+  };
+
+  @override
+  Widget build(BuildContext context) {
+    final viewModel = context.watch<YourTendersViewModel>();
+    final tender = submission.tender;
+    final busy = viewModel.updatingSubmissionId == submission.id;
+    final deadline = tender?.submissionDeadline ?? tender?.tenderDeadline;
+
+    return Card(
+      color: AppColors.cardBackground,
+      elevation: 0,
+      margin: const EdgeInsets.only(bottom: 12),
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(12),
+        side: BorderSide(color: AppColors.borderColor),
+      ),
+      child: Padding(
+        padding: const EdgeInsets.all(16),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                Expanded(
+                  child: Text(
+                    tender?.title?.trim().isNotEmpty == true
+                        ? tender!.title!
+                        : 'Tender ${submission.tenderId}',
+                    style: TextStyle(
+                      color: AppColors.grey80,
+                      fontSize: 16,
+                      fontWeight: FontWeight.w600,
+                    ),
+                  ),
+                ),
+                const SizedBox(width: 12),
+                _StatusBadge(
+                  label: _statusLabels[submission.status] ?? submission.status,
+                  status: submission.status,
+                ),
+              ],
+            ),
+            if (tender?.description?.trim().isNotEmpty == true) ...[
+              const SizedBox(height: 8),
+              Text(
+                tender!.description!,
+                maxLines: 2,
+                overflow: TextOverflow.ellipsis,
+                style: TextStyle(color: AppColors.grey70, height: 1.4),
+              ),
+            ],
+            const SizedBox(height: 12),
+            Wrap(
+              spacing: 16,
+              runSpacing: 6,
+              children: [
+                if (tender?.countryCode?.isNotEmpty == true)
+                  _Meta(
+                    icon: Icons.location_on_outlined,
+                    text: tender!.countryCode!,
+                  ),
+                if (deadline != null)
+                  _Meta(
+                    icon: Icons.event_outlined,
+                    text: 'Deadline ${timeConvertor(deadline)}',
+                  ),
+                if (tender?.buyerOrganization?.name?.isNotEmpty == true)
+                  _Meta(
+                    icon: Icons.business_outlined,
+                    text: tender!.buyerOrganization!.name!,
+                  ),
+              ],
+            ),
+            if (submission.statusHistory.isNotEmpty) ...[
+              const SizedBox(height: 4),
+              ExpansionTile(
+                tilePadding: EdgeInsets.zero,
+                childrenPadding: EdgeInsets.zero,
+                dense: true,
+                title: Text(
+                  'Activity (${submission.statusHistory.length})',
+                  style: TextStyle(color: AppColors.grey60, fontSize: 13),
+                ),
+                children:
+                    submission.statusHistory.reversed
+                        .map(
+                          (item) => ListTile(
+                            dense: true,
+                            contentPadding: EdgeInsets.zero,
+                            leading: const Icon(Icons.circle, size: 8),
+                            title: Text(
+                              _statusLabels[item.status] ?? item.status,
+                              style: TextStyle(color: AppColors.grey80),
+                            ),
+                            subtitle: Text(
+                              [
+                                timeConvertor(item.changedAt, hasTime: true),
+                                if (item.description?.isNotEmpty == true)
+                                  item.description!,
+                                if (item.reason?.isNotEmpty == true)
+                                  item.reason!,
+                              ].join(' · '),
+                            ),
+                          ),
+                        )
+                        .toList(),
+              ),
+            ],
+            if (!submission.isTerminal) ...[
+              const SizedBox(height: 12),
+              if (busy)
+                const LinearProgressIndicator(color: AppColors.secondary50)
+              else
+                _Actions(submission: submission),
+            ],
+          ],
+        ),
+      ),
+    );
+  }
+}
+
+class _Actions extends StatelessWidget {
+  const _Actions({required this.submission});
+
+  final TenderSubmission submission;
+
+  @override
+  Widget build(BuildContext context) {
+    final primary = <({String label, String status, String description})>[];
+    switch (submission.status) {
+      case 'opportunity':
+        primary.add((
+          label: 'Start validation',
+          status: 'validating',
+          description: 'User accepted tender',
+        ));
+      case 'validating':
+        if (submission.submissionMode == 'partnership') {
+          primary.add((
+            label: 'Wait for partner',
+            status: 'partner_pending',
+            description: 'Validation completed; waiting for partner documents',
+          ));
+        } else if (submission.submissionMode == 'self-apply') {
+          primary.add((
+            label: 'Start applying',
+            status: 'applying',
+            description: 'Validation completed',
+          ));
+        } else {
+          primary.addAll([
+            (
+              label: 'Start applying',
+              status: 'applying',
+              description: 'Validation completed',
+            ),
+            (
+              label: 'Wait for partner',
+              status: 'partner_pending',
+              description:
+                  'Validation completed; waiting for partner documents',
+            ),
+          ]);
+        }
+      case 'partner_pending':
+        primary.add((
+          label: 'Partner docs ready',
+          status: 'applying',
+          description: 'Partner documents received',
+        ));
+      case 'applying':
+        primary.add((
+          label: 'Submitted to buyer',
+          status: 'sent_waiting',
+          description: 'Application filed with procurement authority',
+        ));
+      case 'sent_waiting':
+        primary.addAll([
+          (
+            label: 'Mark won',
+            status: 'contract',
+            description: 'Contract awarded',
+          ),
+          (
+            label: 'Mark lost',
+            status: 'rejected',
+            description: 'Buyer rejected bid',
+          ),
+        ]);
+    }
+
+    return Wrap(
+      spacing: 8,
+      runSpacing: 8,
+      children: [
+        for (final action in primary)
+          FilledButton(
+            onPressed:
+                () => _confirmUpdate(
+                  context,
+                  status: action.status,
+                  label: action.label,
+                  description: action.description,
+                ),
+            style: FilledButton.styleFrom(
+              backgroundColor: AppColors.secondary50,
+            ),
+            child: Text(action.label),
+          ),
+        if (submission.status != 'sent_waiting')
+          OutlinedButton(
+            onPressed: () => _reject(context),
+            style: OutlinedButton.styleFrom(foregroundColor: AppColors.error),
+            child: const Text('Do not apply'),
+          ),
+      ],
+    );
+  }
+
+  Future<void> _confirmUpdate(
+    BuildContext context, {
+    required String status,
+    required String label,
+    required String description,
+  }) async {
+    final confirmed = await showDialog<bool>(
+      context: context,
+      builder:
+          (dialogContext) => AlertDialog(
+            title: Text(label),
+            content: const Text('Update this tender submission?'),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.pop(dialogContext, false),
+                child: const Text('Cancel'),
+              ),
+              FilledButton(
+                onPressed: () => Navigator.pop(dialogContext, true),
+                child: const Text('Confirm'),
+              ),
+            ],
+          ),
+    );
+    if (confirmed == true && context.mounted) {
+      await context.read<YourTendersViewModel>().updateSubmissionStatus(
+        submission: submission,
+        status: status,
+        description: description,
+      );
+    }
+  }
+
+  Future<void> _reject(BuildContext context) async {
+    final controller = TextEditingController();
+    final reason = await showDialog<String>(
+      context: context,
+      builder:
+          (dialogContext) => AlertDialog(
+            title: const Text('Do not apply'),
+            content: TextField(
+              controller: controller,
+              maxLength: 500,
+              maxLines: 3,
+              decoration: const InputDecoration(
+                labelText: 'Reason (optional)',
+                border: OutlineInputBorder(),
+              ),
+            ),
+            actions: [
+              TextButton(
+                onPressed: () => Navigator.pop(dialogContext),
+                child: const Text('Cancel'),
+              ),
+              FilledButton(
+                onPressed: () => Navigator.pop(dialogContext, controller.text),
+                child: const Text('Confirm'),
+              ),
+            ],
+          ),
+    );
+    controller.dispose();
+    if (reason != null && context.mounted) {
+      await context.read<YourTendersViewModel>().updateSubmissionStatus(
+        submission: submission,
+        status: 'not_applied',
+        reason: reason,
+      );
+    }
+  }
+}
+
+class _StatusBadge extends StatelessWidget {
+  const _StatusBadge({required this.label, required this.status});
+  final String label;
+  final String status;
+
+  @override
+  Widget build(BuildContext context) {
+    final terminal = status == 'rejected' || status == 'not_applied';
+    final won = status == 'contract';
+    final color =
+        terminal
+            ? AppColors.error
+            : (won ? AppColors.green30 : AppColors.blue10);
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 5),
+      decoration: BoxDecoration(
+        color: color.withValues(alpha: .12),
+        borderRadius: BorderRadius.circular(20),
+      ),
+      child: Text(
+        label,
+        style: TextStyle(
+          color: color,
+          fontSize: 12,
+          fontWeight: FontWeight.w600,
+        ),
+      ),
+    );
+  }
+}
+
+class _Meta extends StatelessWidget {
+  const _Meta({required this.icon, required this.text});
+  final IconData icon;
+  final String text;
+
+  @override
+  Widget build(BuildContext context) => Row(
+    mainAxisSize: MainAxisSize.min,
+    children: [
+      Icon(icon, size: 16, color: AppColors.grey60),
+      const SizedBox(width: 4),
+      Text(text, style: TextStyle(color: AppColors.grey60, fontSize: 12)),
+    ],
+  );
+}