Wrap long toast messages instead of truncating

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.gitignore

@@ -52,4 +52,7 @@ app.*.map.json
 # Firebase Configuration (sensitive files - should not be in version control)
 **/android/app/google-services.json
 **/ios/Runner/GoogleService-Info.plist
-**/lib/firebase_options.dart
+**/lib/firebase_options.dart
+
+# IDE
+.cursor

lib/core/routes/app_routes.dart

@@ -200,7 +200,9 @@ class TendersRouteData extends GoRouteData with _$TendersRouteData {
 
   @override
   Widget build(BuildContext context, GoRouterState state) {
-    return tendersProvider(child: const TendersScreen());
+    return tendersProvider(
+      child: TendersScreen(initialTab: state.uri.queryParameters['tab']),
+    );
   }
 }
 

lib/core/utils/app_toast.dart

@@ -7,7 +7,12 @@ class AppToast {
       context: context,
       type: ToastificationType.success,
       style: ToastificationStyle.flatColored,
-      title: Text(message),
+      title: Text(
+        message,
+        maxLines: 5,
+        softWrap: true,
+        overflow: TextOverflow.ellipsis,
+      ),
       autoCloseDuration: const Duration(seconds: 3),
     );
   }
@@ -17,7 +22,12 @@ class AppToast {
       context: context,
       type: ToastificationType.error,
       style: ToastificationStyle.flatColored,
-      title: Text(message),
+      title: Text(
+        message,
+        maxLines: 5,
+        softWrap: true,
+        overflow: TextOverflow.ellipsis,
+      ),
       autoCloseDuration: const Duration(seconds: 3),
     );
   }
@@ -31,8 +41,18 @@ class AppToast {
       context: context,
       type: ToastificationType.info,
       style: ToastificationStyle.flatColored,
-      title: Text(title),
-      description: Text(description),
+      title: Text(
+        title,
+        maxLines: 2,
+        softWrap: true,
+        overflow: TextOverflow.ellipsis,
+      ),
+      description: Text(
+        description,
+        maxLines: 5,
+        softWrap: true,
+        overflow: TextOverflow.ellipsis,
+      ),
       autoCloseDuration: const Duration(seconds: 6),
     );
   }

lib/data/services/model/recommended_tenders_response/recommended_tenders_response.dart

@@ -10,16 +10,13 @@ part 'recommended_tenders_response.g.dart';
 @freezed
 abstract class RecommendedTendersResponse with _$RecommendedTendersResponse {
   @JsonSerializable(explicitToJson: true)
-  const factory 
-RecommendedTendersResponse({
-  required bool? succes,
-  required String? message,
-  required ErrorModel? error,
-  required RecommendedTendersData? data,
-  
+  const factory RecommendedTendersResponse({
+    @JsonKey(name: 'success') required bool? success,
+    required String? message,
+    required ErrorModel? error,
+    required RecommendedTendersData? data,
   }) = _RecommendedTendersResponse;
 
-  factory 
-RecommendedTendersResponse.fromJson(Map<String, dynamic> json) =>
+  factory RecommendedTendersResponse.fromJson(Map<String, dynamic> json) =>
       _$RecommendedTendersResponseFromJson(json);
 }

lib/data/services/model/recommended_tenders_response/recommended_tenders_response.freezed.dart

@@ -15,7 +15,7 @@ T _$identity<T>(T value) => value;
 /// @nodoc
 mixin _$RecommendedTendersResponse {
 
- bool? get succes; String? get message; ErrorModel? get error; RecommendedTendersData? get data;
+ bool? get success; String? get message; ErrorModel? get error; RecommendedTendersData? get data;
 /// Create a copy of RecommendedTendersResponse
 /// with the given fields replaced by the non-null parameter values.
 @JsonKey(includeFromJson: false, includeToJson: false)
@@ -28,16 +28,16 @@ $RecommendedTendersResponseCopyWith<RecommendedTendersResponse> get copyWith =>
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is RecommendedTendersResponse&&(identical(other.succes, succes) || other.succes == succes)&&(identical(other.message, message) || other.message == message)&&(identical(other.error, error) || other.error == error)&&(identical(other.data, data) || other.data == data));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is RecommendedTendersResponse&&(identical(other.success, success) || other.success == success)&&(identical(other.message, message) || other.message == message)&&(identical(other.error, error) || other.error == error)&&(identical(other.data, data) || other.data == data));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,succes,message,error,data);
+int get hashCode => Object.hash(runtimeType,success,message,error,data);
 
 @override
 String toString() {
-  return 'RecommendedTendersResponse(succes: $succes, message: $message, error: $error, data: $data)';
+  return 'RecommendedTendersResponse(success: $success, message: $message, error: $error, data: $data)';
 }
 
 
@@ -48,7 +48,7 @@ abstract mixin class $RecommendedTendersResponseCopyWith<$Res>  {
   factory $RecommendedTendersResponseCopyWith(RecommendedTendersResponse value, $Res Function(RecommendedTendersResponse) _then) = _$RecommendedTendersResponseCopyWithImpl;
 @useResult
 $Res call({
- bool? succes, String? message, ErrorModel? error, RecommendedTendersData? data
+ bool? success, String? message, ErrorModel? error, RecommendedTendersData? data
 });
 
 
@@ -65,9 +65,9 @@ class _$RecommendedTendersResponseCopyWithImpl<$Res>
 
 /// Create a copy of RecommendedTendersResponse
 /// with the given fields replaced by the non-null parameter values.
-@pragma('vm:prefer-inline') @override $Res call({Object? succes = freezed,Object? message = freezed,Object? error = freezed,Object? data = freezed,}) {
+@pragma('vm:prefer-inline') @override $Res call({Object? success = freezed,Object? message = freezed,Object? error = freezed,Object? data = freezed,}) {
   return _then(_self.copyWith(
-succes: freezed == succes ? _self.succes : succes // ignore: cast_nullable_to_non_nullable
+success: freezed == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
 as bool?,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
 as String?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
 as ErrorModel?,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable
@@ -180,10 +180,10 @@ return $default(_that);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool? succes,  String? message,  ErrorModel? error,  RecommendedTendersData? data)?  $default,{required TResult orElse(),}) {final _that = this;
+@optionalTypeArgs TResult maybeWhen<TResult extends Object?>(TResult Function( bool? success,  String? message,  ErrorModel? error,  RecommendedTendersData? data)?  $default,{required TResult orElse(),}) {final _that = this;
 switch (_that) {
 case _RecommendedTendersResponse() when $default != null:
-return $default(_that.succes,_that.message,_that.error,_that.data);case _:
+return $default(_that.success,_that.message,_that.error,_that.data);case _:
   return orElse();
 
 }
@@ -201,10 +201,10 @@ return $default(_that.succes,_that.message,_that.error,_that.data);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool? succes,  String? message,  ErrorModel? error,  RecommendedTendersData? data)  $default,) {final _that = this;
+@optionalTypeArgs TResult when<TResult extends Object?>(TResult Function( bool? success,  String? message,  ErrorModel? error,  RecommendedTendersData? data)  $default,) {final _that = this;
 switch (_that) {
 case _RecommendedTendersResponse():
-return $default(_that.succes,_that.message,_that.error,_that.data);case _:
+return $default(_that.success,_that.message,_that.error,_that.data);case _:
   throw StateError('Unexpected subclass');
 
 }
@@ -221,10 +221,10 @@ return $default(_that.succes,_that.message,_that.error,_that.data);case _:
 /// }
 /// ```
 
-@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool? succes,  String? message,  ErrorModel? error,  RecommendedTendersData? data)?  $default,) {final _that = this;
+@optionalTypeArgs TResult? whenOrNull<TResult extends Object?>(TResult? Function( bool? success,  String? message,  ErrorModel? error,  RecommendedTendersData? data)?  $default,) {final _that = this;
 switch (_that) {
 case _RecommendedTendersResponse() when $default != null:
-return $default(_that.succes,_that.message,_that.error,_that.data);case _:
+return $default(_that.success,_that.message,_that.error,_that.data);case _:
   return null;
 
 }
@@ -236,10 +236,10 @@ return $default(_that.succes,_that.message,_that.error,_that.data);case _:
 
 @JsonSerializable(explicitToJson: true)
 class _RecommendedTendersResponse implements RecommendedTendersResponse {
-  const _RecommendedTendersResponse({required this.succes, required this.message, required this.error, required this.data});
+  const _RecommendedTendersResponse({required this.success, required this.message, required this.error, required this.data});
   factory _RecommendedTendersResponse.fromJson(Map<String, dynamic> json) => _$RecommendedTendersResponseFromJson(json);
 
-@override final  bool? succes;
+@override final  bool? success;
 @override final  String? message;
 @override final  ErrorModel? error;
 @override final  RecommendedTendersData? data;
@@ -257,16 +257,16 @@ Map<String, dynamic> toJson() {
 
 @override
 bool operator ==(Object other) {
-  return identical(this, other) || (other.runtimeType == runtimeType&&other is _RecommendedTendersResponse&&(identical(other.succes, succes) || other.succes == succes)&&(identical(other.message, message) || other.message == message)&&(identical(other.error, error) || other.error == error)&&(identical(other.data, data) || other.data == data));
+  return identical(this, other) || (other.runtimeType == runtimeType&&other is _RecommendedTendersResponse&&(identical(other.success, success) || other.success == success)&&(identical(other.message, message) || other.message == message)&&(identical(other.error, error) || other.error == error)&&(identical(other.data, data) || other.data == data));
 }
 
 @JsonKey(includeFromJson: false, includeToJson: false)
 @override
-int get hashCode => Object.hash(runtimeType,succes,message,error,data);
+int get hashCode => Object.hash(runtimeType,success,message,error,data);
 
 @override
 String toString() {
-  return 'RecommendedTendersResponse(succes: $succes, message: $message, error: $error, data: $data)';
+  return 'RecommendedTendersResponse(success: $success, message: $message, error: $error, data: $data)';
 }
 
 
@@ -277,7 +277,7 @@ abstract mixin class _$RecommendedTendersResponseCopyWith<$Res> implements $Reco
   factory _$RecommendedTendersResponseCopyWith(_RecommendedTendersResponse value, $Res Function(_RecommendedTendersResponse) _then) = __$RecommendedTendersResponseCopyWithImpl;
 @override @useResult
 $Res call({
- bool? succes, String? message, ErrorModel? error, RecommendedTendersData? data
+ bool? success, String? message, ErrorModel? error, RecommendedTendersData? data
 });
 
 
@@ -294,9 +294,9 @@ class __$RecommendedTendersResponseCopyWithImpl<$Res>
 
 /// Create a copy of RecommendedTendersResponse
 /// with the given fields replaced by the non-null parameter values.
-@override @pragma('vm:prefer-inline') $Res call({Object? succes = freezed,Object? message = freezed,Object? error = freezed,Object? data = freezed,}) {
+@override @pragma('vm:prefer-inline') $Res call({Object? success = freezed,Object? message = freezed,Object? error = freezed,Object? data = freezed,}) {
   return _then(_RecommendedTendersResponse(
-succes: freezed == succes ? _self.succes : succes // ignore: cast_nullable_to_non_nullable
+success: freezed == success ? _self.success : success // ignore: cast_nullable_to_non_nullable
 as bool?,message: freezed == message ? _self.message : message // ignore: cast_nullable_to_non_nullable
 as String?,error: freezed == error ? _self.error : error // ignore: cast_nullable_to_non_nullable
 as ErrorModel?,data: freezed == data ? _self.data : data // ignore: cast_nullable_to_non_nullable

lib/data/services/model/recommended_tenders_response/recommended_tenders_response.g.dart

@@ -9,7 +9,7 @@ part of 'recommended_tenders_response.dart';
 _RecommendedTendersResponse _$RecommendedTendersResponseFromJson(
   Map<String, dynamic> json,
 ) => _RecommendedTendersResponse(
-  succes: json['succes'] as bool?,
+  success: json['success'] as bool?,
   message: json['message'] as String?,
   error:
       json['error'] == null
@@ -26,7 +26,7 @@ _RecommendedTendersResponse _$RecommendedTendersResponseFromJson(
 Map<String, dynamic> _$RecommendedTendersResponseToJson(
   _RecommendedTendersResponse instance,
 ) => <String, dynamic>{
-  'succes': instance.succes,
+  'success': instance.success,
   'message': instance.message,
   'error': instance.error?.toJson(),
   'data': instance.data?.toJson(),

lib/view_models/ai_recommendations_view_model.dart

@@ -1,19 +1,15 @@
 import 'package:flutter/foundation.dart';
-import 'package:tm_app/core/network/app_exceptions.dart';
 import 'package:tm_app/core/utils/result.dart';
 import 'package:tm_app/data/repositories/company_ai_repository.dart';
 import 'package:tm_app/data/repositories/home_repository.dart';
-import 'package:tm_app/data/services/model/recommend_response/recommend_response.dart';
-import 'package:tm_app/data/services/model/recommendation_item/recommendation_item.dart';
 import 'package:tm_app/data/services/model/recommended_tenders_response/recommended_tenders_response.dart';
 import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
 
-/// Drives the "Recommended" (AI) tab in the tenders section.
+/// Drives the "Recommended" tab in the tenders section.
 ///
-/// Calls `POST /api/v1/recommend`. When the AI service is unavailable (503) it
-/// falls back to the legacy CPV/keyword list (`GET /api/v1/tenders/recommend`),
-/// and when the AI returns no results shortly after onboarding it surfaces a
-/// "still learning" hint instead of an empty error.
+/// Calls `GET /api/v1/tenders/recommend`. When the result is empty shortly
+/// after onboarding it surfaces a "still learning" hint instead of an empty
+/// error.
 class AiRecommendationsViewModel with ChangeNotifier {
   AiRecommendationsViewModel({
     required CompanyAiRepository companyAiRepository,
@@ -26,21 +22,17 @@ class AiRecommendationsViewModel with ChangeNotifier {
 
   /// How long after onboarding an empty result is treated as "still learning".
   static const Duration _stillLearningWindow = Duration(minutes: 30);
-  static const int _fallbackPageSize = 20;
+  static const int _pageSize = 20;
 
   bool _isLoading = false;
   String? _errorMessage;
-  List<RecommendationItem> _items = const [];
-  List<TenderData> _fallbackTenders = const [];
-  bool _usingFallback = false;
+  List<TenderData> _recommendedTenders = const [];
   bool _stillLearning = false;
   bool _hasLoaded = false;
 
   bool get isLoading => _isLoading;
   String? get errorMessage => _errorMessage;
-  List<RecommendationItem> get items => _items;
-  List<TenderData> get fallbackTenders => _fallbackTenders;
-  bool get usingFallback => _usingFallback;
+  List<TenderData> get recommendedTenders => _recommendedTenders;
   bool get stillLearning => _stillLearning;
 
   /// True once a load has completed (used to distinguish "no results" from
@@ -51,8 +43,7 @@ class AiRecommendationsViewModel with ChangeNotifier {
   bool get isEmpty =>
       !_isLoading &&
       _errorMessage == null &&
-      _items.isEmpty &&
-      _fallbackTenders.isEmpty;
+      _recommendedTenders.isEmpty;
 
   /// Loads recommendations if they haven't been loaded yet this session.
   Future<void> loadIfNeeded() async {
@@ -62,28 +53,32 @@ class AiRecommendationsViewModel with ChangeNotifier {
     await loadRecommendations();
   }
 
-  /// Loads AI recommendations, applying the 503 fallback and empty-state logic.
+  /// Loads recommended tenders for the Recommended tab.
   Future<void> loadRecommendations() async {
     _isLoading = true;
     _errorMessage = null;
-    _usingFallback = false;
     _stillLearning = false;
     notifyListeners();
 
-    final result = await _companyAiRepository.getRecommendations();
+    final result = await _homeRepository.getHomeRecommendedTenders(
+      limit: _pageSize,
+      offset: 0,
+    );
 
     var loadedSuccessfully = false;
 
     switch (result) {
-      case Ok<RecommendResponse>():
-        _items = result.value.data ?? const [];
-        _fallbackTenders = const [];
-        if (_items.isEmpty) {
+      case Ok<RecommendedTendersResponse>():
+        _recommendedTenders =
+            result.value.data?.tenders.whereType<TenderData>().toList() ??
+            const [];
+        if (_recommendedTenders.isEmpty) {
           _stillLearning = _onboardingWasRecent();
         }
         loadedSuccessfully = true;
-      case Error<RecommendResponse>():
-        loadedSuccessfully = await _handleError(result.error);
+      case Error<RecommendedTendersResponse>():
+        _recommendedTenders = const [];
+        _errorMessage = result.error.toString();
     }
 
     _isLoading = false;
@@ -94,39 +89,6 @@ class AiRecommendationsViewModel with ChangeNotifier {
   /// Pull-to-refresh: always re-fetches.
   Future<void> refresh() => loadRecommendations();
 
-  Future<bool> _handleError(Exception error) async {
-    // 503 means the AI service isn't configured/available — fall back to the
-    // legacy recommend list rather than showing an error. NetworkManager only
-    // exposes this status when Dio received an HTTP response; connection and
-    // timeout failures have no reliable status code and should remain retryable.
-    if (error is AppException && error.statusCode == 503) {
-      await _loadFallback();
-      return _errorMessage == null;
-    }
-    _items = const [];
-    _fallbackTenders = const [];
-    _errorMessage = error.toString();
-    return false;
-  }
-
-  Future<void> _loadFallback() async {
-    final result = await _homeRepository.getHomeRecommendedTenders(
-      limit: _fallbackPageSize,
-      offset: 0,
-    );
-
-    switch (result) {
-      case Ok<RecommendedTendersResponse>():
-        _items = const [];
-        _fallbackTenders =
-            result.value.data?.tenders.whereType<TenderData>().toList() ??
-            const [];
-        _usingFallback = true;
-      case Error<RecommendedTendersResponse>():
-        _errorMessage = result.error.toString();
-    }
-  }
-
   bool _onboardingWasRecent() {
     final startedAt = _companyAiRepository.lastOnboardingStartedAt();
     if (startedAt == null) {

lib/view_models/notification_view_model.dart

@@ -87,7 +87,7 @@ class NotificationViewModel with ChangeNotifier {
     }
     notifyListeners();
 
-    final int offset = page * _pageSize;
+    final int offset = (page - 1) * _pageSize;
 
     final result = await _repository.getNotifications(
       limit: _pageSize,
@@ -138,7 +138,7 @@ class NotificationViewModel with ChangeNotifier {
     }
     notifyListeners();
 
-    final int offset = page * _pageSize;
+    final int offset = (page - 1) * _pageSize;
     final result = await _repository.getUnreadNotifications(
       limit: _pageSize,
       offset: offset,
@@ -181,7 +181,7 @@ class NotificationViewModel with ChangeNotifier {
     }
     notifyListeners();
 
-    final int offset = page * _pageSize;
+    final int offset = (page - 1) * _pageSize;
 
     final result = await _repository.getImportantNotifications(
       limit: _pageSize,

lib/views/board/pages/board_screen.dart

@@ -301,7 +301,7 @@ class _TaskCard extends StatelessWidget {
             ),
           ),
         if (due != null) const SizedBox(height: 12),
-        Text(
+        SelectableText(
           card.title ?? '',
           style: TextStyle(
             fontSize: 14,
@@ -309,7 +309,6 @@ class _TaskCard extends StatelessWidget {
             color: AppColors.grey70,
           ),
           maxLines: 3,
-          overflow: TextOverflow.ellipsis,
         ),
         const SizedBox(height: 12),
         if (card.priority != null) _PriorityChip(priority: card.priority!),

lib/views/detail/widgets/tender_detail_header.dart

@@ -141,7 +141,7 @@ class TenderDetailHeader extends StatelessWidget {
     );
   }
 
-  Widget _titleText() => Text(
+  Widget _titleText() => SelectableText(
     detail.title ?? '',
     style: TextStyle(
       color: AppColors.grey80,

lib/views/home/pages/d_home_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:tm_app/core/constants/assets.dart';
 import 'package:tm_app/core/routes/app_routes.dart';
@@ -67,7 +68,7 @@ class DesktopHomePage extends StatelessWidget {
                                 ),
                               ),
                               SizedBox(height: 32.0.h()),
-                              _yourTenderText(homeViewModel),
+                              _yourTenderText(context, homeViewModel),
                               SizedBox(height: 8.0.h()),
                               _bottomListView(homeViewModel),
                             ],
@@ -170,7 +171,7 @@ class DesktopHomePage extends StatelessWidget {
           title: HomeStrings.tenderValue,
           amount: '0',
           textColor: AppColors.orange,
-          enableTap: true,
+          enableTap: false,
           width: 178,
           height: 148,
           onTap: () {},
@@ -195,21 +196,28 @@ class DesktopHomePage extends StatelessWidget {
     );
   }
 
-  Widget _yourTenderText(HomeViewModel homeViewModel) {
+  Widget _yourTenderText(BuildContext context, HomeViewModel homeViewModel) {
     final isYourTenders =
         (homeViewModel.data?.data?.tenders?.isNotEmpty ?? false);
     return ConstrainedBox(
       constraints: const BoxConstraints(maxWidth: 740),
       child: Align(
         alignment: AlignmentDirectional.centerStart,
-        child: Text(
-          isYourTenders
-              ? HomeStrings.yourTenders
-              : HomeStrings.recommendedTenders,
-          style: TextStyle(
-            fontSize: 18.0.sp(),
-            fontWeight: FontWeight.w700,
-            color: AppColors.grey80,
+        child: GestureDetector(
+          behavior: HitTestBehavior.opaque,
+          onTap:
+              isYourTenders
+                  ? null
+                  : () => context.go('/tenders?tab=recommended'),
+          child: Text(
+            isYourTenders
+                ? HomeStrings.yourTenders
+                : HomeStrings.recommendedTenders,
+            style: TextStyle(
+              fontSize: 18.0.sp(),
+              fontWeight: FontWeight.w700,
+              color: AppColors.grey80,
+            ),
           ),
         ),
       ),

lib/views/home/pages/m_home_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:tm_app/core/constants/assets.dart';
 import 'package:tm_app/core/routes/app_routes.dart';
@@ -50,7 +51,7 @@ class MobileHomePage extends StatelessWidget {
                     SizedBox(height: 8.0.h()),
                     _secondTenderCardsRow(homeViewModel, context),
                     SizedBox(height: 40.0.h()),
-                    _yourTenderText(homeViewModel),
+                    _yourTenderText(context, homeViewModel),
                     _bottomListView(homeViewModel),
                   ],
                 ),
@@ -148,7 +149,7 @@ class MobileHomePage extends StatelessWidget {
             title: HomeStrings.tenderValue,
             amount: '0',
             textColor: AppColors.orange,
-            enableTap: true,
+            enableTap: false,
             onTap: () {},
           ),
           TenderCard(
@@ -169,19 +170,24 @@ class MobileHomePage extends StatelessWidget {
     );
   }
 
-  Widget _yourTenderText(HomeViewModel homeViewModel) {
+  Widget _yourTenderText(BuildContext context, HomeViewModel homeViewModel) {
     final isYourTenders =
         (homeViewModel.data?.data?.tenders?.isNotEmpty ?? false);
     return Padding(
       padding: EdgeInsets.symmetric(horizontal: 24.0.w()),
-      child: Text(
-        isYourTenders
-            ? HomeStrings.yourTenders
-            : HomeStrings.recommendedTenders,
-        style: TextStyle(
-          fontSize: 18.0.sp(),
-          fontWeight: FontWeight.w700,
-          color: AppColors.grey80,
+      child: GestureDetector(
+        behavior: HitTestBehavior.opaque,
+        onTap:
+            isYourTenders ? null : () => context.go('/tenders?tab=recommended'),
+        child: Text(
+          isYourTenders
+              ? HomeStrings.yourTenders
+              : HomeStrings.recommendedTenders,
+          style: TextStyle(
+            fontSize: 18.0.sp(),
+            fontWeight: FontWeight.w700,
+            color: AppColors.grey80,
+          ),
         ),
       ),
     );

lib/views/home/pages/t_home_page.dart

@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:provider/provider.dart';
 import 'package:tm_app/core/routes/app_routes.dart';
 import 'package:tm_app/core/theme/colors.dart';
@@ -65,7 +66,7 @@ class TabletHomePage extends StatelessWidget {
                       SizedBox(height: 8.0.h()),
                       _secondTenderCardsRow(homeViewModel, context),
                       SizedBox(height: 32.0.h()),
-                      _yourTenderText(homeViewModel),
+                      _yourTenderText(context, homeViewModel),
                       SizedBox(height: 8.0.h()),
                       _bottomListView(homeViewModel),
                     ],
@@ -173,7 +174,7 @@ class TabletHomePage extends StatelessWidget {
             title: HomeStrings.tenderValue,
             amount: '0',
             textColor: AppColors.orange,
-            enableTap: true,
+            enableTap: false,
             width: double.infinity,
             height: 148,
             onTap: () {},
@@ -201,15 +202,22 @@ class TabletHomePage extends StatelessWidget {
     );
   }
 
-  Widget _yourTenderText(HomeViewModel homeViewModel) {
+  Widget _yourTenderText(BuildContext context, HomeViewModel homeViewModel) {
     final isYourTenders =
         (homeViewModel.data?.data?.tenders?.isNotEmpty ?? false);
-    return Text(
-      isYourTenders ? HomeStrings.yourTenders : HomeStrings.recommendedTenders,
-      style: TextStyle(
-        fontSize: 18.0.sp(),
-        fontWeight: FontWeight.w700,
-        color: AppColors.grey80,
+    return GestureDetector(
+      behavior: HitTestBehavior.opaque,
+      onTap:
+          isYourTenders ? null : () => context.go('/tenders?tab=recommended'),
+      child: Text(
+        isYourTenders
+            ? HomeStrings.yourTenders
+            : HomeStrings.recommendedTenders,
+        style: TextStyle(
+          fontSize: 18.0.sp(),
+          fontWeight: FontWeight.w700,
+          color: AppColors.grey80,
+        ),
       ),
     );
   }

lib/views/home/tenders_list_item.dart

@@ -75,10 +75,10 @@ class TendersListItem extends StatelessWidget {
               ),
             ),
             SizedBox(height: 12.0.h()),
-            Text(
+            SelectableText(
               tender.title ?? '',
+              maxLines: 2,
               style: TextStyle(
-                overflow: TextOverflow.ellipsis,
                 fontSize: 16.0.sp(),
                 fontWeight: FontWeight.w600,
                 color: AppColors.grey80,

lib/views/liked_tenders/widgets/liked_tenders_list_item.dart

@@ -128,10 +128,10 @@ class LikedListItem extends StatelessWidget {
                     ),
                   ),
               SizedBox(height: 12.0.h()),
-              Text(
+              SelectableText(
                 tender.title!,
+                maxLines: 2,
                 style: TextStyle(
-                  overflow: TextOverflow.ellipsis,
                   fontSize: 16.0.sp(),
                   fontWeight: FontWeight.w600,
                   color: AppColors.grey80,

lib/views/notification/widgets/notification_more_dialog.dart

@@ -75,6 +75,35 @@ class NotificationMoreDialog extends StatelessWidget {
                 ),
               ),
             ),
+            Visibility(
+              visible: notification.link != null && notification.link != '',
+              child: Padding(
+                padding: EdgeInsets.only(left: 28.0.w(), top: 8.0.h()),
+                child: Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Icon(
+                      Icons.link,
+                      size: 16.0.sp(),
+                      color: AppColors.mainBlue,
+                    ),
+                    SizedBox(width: 4.0.w()),
+                    Expanded(
+                      child: SelectableText(
+                        notification.link ?? '',
+                        style: TextStyle(
+                          fontSize: 13.0.sp(),
+                          fontWeight: FontWeight.w400,
+                          color: AppColors.mainBlue,
+                          decoration: TextDecoration.underline,
+                          decorationColor: AppColors.mainBlue,
+                        ),
+                      ),
+                    ),
+                  ],
+                ),
+              ),
+            ),
             SizedBox(height: 12.0.h()),
             Padding(
               padding: EdgeInsets.only(left: 28.0.w()),

lib/views/tenders/pages/d_tenders_page.dart

@@ -1,27 +1,17 @@
-import 'dart:async';
-
 import 'package:flutter/material.dart';
-import 'package:flutter_svg/svg.dart';
 import 'package:provider/provider.dart';
-import 'package:tm_app/core/constants/assets.dart';
 import 'package:tm_app/core/theme/colors.dart';
 import 'package:tm_app/core/utils/size_config.dart';
 import 'package:tm_app/view_models/tenders_view_model.dart';
-import 'package:tm_app/views/shared/base_button.dart';
 import 'package:tm_app/views/shared/desktop_navigation_widget.dart';
-import 'package:tm_app/views/tenders/strings/tenders_strings.dart';
-import 'package:tm_app/views/tenders/widgets/main_tenders_slider.dart';
 import 'package:tm_app/views/tenders/widgets/recommended_tenders_view.dart';
-import 'package:tm_app/views/tenders/widgets/tenders_filter_dialog.dart';
-import 'package:tm_app/views/tenders/widgets/tenders_sort_dialog.dart';
-import 'package:tm_app/views/tenders/widgets/tenders_tab_bar.dart';
 
-import '../../../core/constants/common_strings.dart';
 import '../../../core/utils/app_toast.dart';
-import '../../../view_models/auth_view_model.dart';
 
 class DesktopTendersPage extends StatefulWidget {
-  const DesktopTendersPage({super.key});
+  const DesktopTendersPage({required this.initialSelectedTab, super.key});
+
+  final int initialSelectedTab;
 
   @override
   State<DesktopTendersPage> createState() => _DesktopTendersPageState();
@@ -30,9 +20,6 @@ class DesktopTendersPage extends StatefulWidget {
 class _DesktopTendersPageState extends State<DesktopTendersPage> {
   late final TendersViewModel viewModel;
 
-  /// 0 = All, 1 = Recommended.
-  int _selectedTab = 0;
-
   @override
   void initState() {
     super.initState();
@@ -54,8 +41,6 @@ class _DesktopTendersPageState extends State<DesktopTendersPage> {
 
   @override
   Widget build(BuildContext context) {
-    final userRole = context.watch<AuthViewModel>().userRole;
-    final bool isAllTab = _selectedTab == 0;
     return Scaffold(
       backgroundColor: AppColors.backgroundColor,
       body: SafeArea(
@@ -63,217 +48,29 @@ class _DesktopTendersPageState extends State<DesktopTendersPage> {
           children: [
             const DesktopNavigationWidget(currentIndex: 1),
             SizedBox(height: 24.0.h()),
-            SizedBox(
-              width: 740,
-              child: TendersTabBar(
-                selectedIndex: _selectedTab,
-                onChanged: (index) => setState(() => _selectedTab = index),
+            // Tab bar hidden while tenders only shows recommendations.
+            // SizedBox(
+            //   width: 740,
+            //   child: TendersTabBar(
+            //     selectedIndex: 1,
+            //     onChanged: (index) {},
+            //   ),
+            // ),
+            // SizedBox(height: 24.0.h()),
+            // All tenders controls are hidden while the All tab is disabled.
+            // if (userRole == Role.analyst) const _SearchBox(),
+            // if (userRole == Role.analyst) const _ActionButtons(),
+            const Expanded(
+              child: Center(
+                child: SizedBox(
+                  width: 740,
+                  child: RecommendedTendersView(isDesktop: true),
+                ),
               ),
             ),
-            SizedBox(height: 24.0.h()),
-            if (isAllTab && userRole == Role.analyst) const _SearchBox(),
-            if (isAllTab && userRole == Role.analyst) const _ActionButtons(),
-            Expanded(
-              child:
-                  isAllTab
-                      ? const _AllTendersTab()
-                      : const Center(
-                        child: SizedBox(
-                          width: 740,
-                          child: RecommendedTendersView(),
-                        ),
-                      ),
-            ),
           ],
         ),
       ),
     );
   }
 }
-
-class _AllTendersTab extends StatelessWidget {
-  const _AllTendersTab();
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<TendersViewModel>(
-      builder: (context, vm, child) {
-        if (vm.isLoading) {
-          return const Center(
-            child: CircularProgressIndicator(color: AppColors.jellyBean),
-          );
-        }
-        if (vm.errorMessage != null) {
-          return Center(child: Text(vm.errorMessage!));
-        }
-        final tenders = vm.tendersResponse?.data?.tenders ?? [];
-        if (tenders.isEmpty) {
-          return const Center(child: Text(CommonStrings.noData));
-        }
-
-        return Center(
-          child: SizedBox(
-            width: 740,
-            child: Padding(
-              padding: EdgeInsets.symmetric(vertical: 4.0.h()),
-              child: MainTendersSlider(tenders: tenders, isDesktop: true),
-            ),
-          ),
-        );
-      },
-    );
-  }
-}
-
-class _SearchBox extends StatefulWidget {
-  const _SearchBox();
-
-  @override
-  State<_SearchBox> createState() => _SearchBoxState();
-}
-
-class _SearchBoxState extends State<_SearchBox> {
-  final TextEditingController _searchController = TextEditingController();
-  Timer? _debounceTimer;
-
-  @override
-  void dispose() {
-    _searchController.dispose();
-    _debounceTimer?.cancel();
-    super.dispose();
-  }
-
-  void _onSearchChanged(String query) {
-    _debounceTimer?.cancel();
-    _debounceTimer = Timer(const Duration(milliseconds: 500), () {
-      final viewModel = context.read<TendersViewModel>();
-      viewModel.searchTenders(query);
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox(
-      height: 48.0.h(),
-      width: 680,
-      child: TextField(
-        controller: _searchController,
-        onChanged: _onSearchChanged,
-        style: TextStyle(fontSize: 16.0.sp(), color: AppColors.grey60),
-        decoration: InputDecoration(
-          hintText: TendersStrings.search,
-          hintStyle: TextStyle(fontSize: 16.0.sp(), color: AppColors.grey60),
-          prefixIcon: Padding(
-            padding: EdgeInsets.all(12.0.w()),
-            child: SvgPicture.asset(
-              AssetsManager.normalSearch,
-              width: 24.0.w(),
-              height: 24.0.h(),
-            ),
-          ),
-          filled: true,
-          fillColor: AppColors.grey0,
-          contentPadding: EdgeInsets.symmetric(
-            horizontal: 12.0.w(),
-            vertical: 12.0.h(),
-          ),
-          border: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(12.0.w()),
-            borderSide: const BorderSide(color: AppColors.mainBlue, width: 1),
-          ),
-          enabledBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(12.0.w()),
-            borderSide: BorderSide(color: AppColors.grey40, width: 1),
-          ),
-          focusedBorder: OutlineInputBorder(
-            borderRadius: BorderRadius.circular(12.0.w()),
-            borderSide: const BorderSide(color: AppColors.grey, width: 1.5),
-          ),
-        ),
-      ),
-    );
-  }
-}
-
-class _ActionButtons extends StatelessWidget {
-  const _ActionButtons();
-
-  @override
-  Widget build(BuildContext context) {
-    final viewModel = context.read<TendersViewModel>();
-    return Container(
-      margin: EdgeInsets.only(top: 25.0.h()),
-      height: 40.0.h(),
-      width: 680,
-      child: Row(
-        children: [
-          BaseButton(
-            width: 178.0.w(),
-            isEnabled: true,
-            onPressed: () {
-              showDialog(
-                context: context,
-                builder:
-                    (_) => Dialog(
-                      backgroundColor: AppColors.backgroundColor,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(16),
-                      ),
-                      child: SizedBox(
-                        width: 560,
-                        child: TendersFilterDialog(
-                          viewModel: viewModel,
-                          onFilterChanged: (dateRange, status) {
-                            viewModel.setDateRange(dateRange);
-                            viewModel.setStatus(status!);
-                            viewModel.callWithSortAndStatus();
-                          },
-                        ),
-                      ),
-                    ),
-              );
-            },
-            text: TendersStrings.filter,
-            icon: AssetsManager.filter,
-            iconColor: AppColors.textBlue,
-            backgroundColor: AppColors.primary20,
-            textColor: AppColors.textBlue,
-          ),
-          SizedBox(width: 10.0.w()),
-          BaseButton(
-            width: 178.0.w(),
-            isEnabled: true,
-            onPressed: () {
-              showDialog(
-                context: context,
-                builder:
-                    (_) => Dialog(
-                      backgroundColor: AppColors.backgroundColor,
-                      shape: RoundedRectangleBorder(
-                        borderRadius: BorderRadius.circular(16),
-                      ),
-                      child: SizedBox(
-                        width: 560,
-                        child: TendersSortDialog(
-                          viewModel: viewModel,
-                          onConfirm: (sort) {
-                            viewModel.setSort(sort);
-                            viewModel.callWithSortAndStatus();
-                          },
-                        ),
-                      ),
-                    ),
-              );
-            },
-            text: TendersStrings.sort,
-            icon: AssetsManager.sort,
-            iconColor: AppColors.textBlue,
-            backgroundColor: AppColors.primary20,
-            textColor: AppColors.textBlue,
-          ),
-        ],
-      ),
-    );
-  }
-}
-

lib/views/tenders/pages/m_tenders_page.dart

@@ -1,19 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:tm_app/core/utils/size_config.dart';
 import 'package:tm_app/view_models/tenders_view_model.dart';
 
-import '../../../core/constants/common_strings.dart';
 import '../../../core/theme/colors.dart';
 import '../../../core/utils/app_toast.dart';
 import '../../shared/tender_app_bar.dart';
 import '../strings/tenders_strings.dart';
-import '../widgets/main_tenders_slider.dart';
 import '../widgets/recommended_tenders_view.dart';
-import '../widgets/tenders_tab_bar.dart';
 
 class MobileTendersPage extends StatefulWidget {
-  const MobileTendersPage({super.key});
+  const MobileTendersPage({required this.initialSelectedTab, super.key});
+
+  final int initialSelectedTab;
 
   @override
   State<MobileTendersPage> createState() => _MobileTendersPageState();
@@ -22,9 +20,6 @@ class MobileTendersPage extends StatefulWidget {
 class _MobileTendersPageState extends State<MobileTendersPage> {
   late final TendersViewModel viewModel;
 
-  /// 0 = All, 1 = Recommended.
-  int _selectedTab = 0;
-
   @override
   void initState() {
     super.initState();
@@ -49,63 +44,24 @@ class _MobileTendersPageState extends State<MobileTendersPage> {
     return Scaffold(
       backgroundColor: AppColors.backgroundColor,
       appBar: tenderMobileAppBar(title: TendersStrings.tendersTitle),
-      body: SafeArea(
+      body: const SafeArea(
         child: Column(
           children: [
-            Padding(
-              padding: EdgeInsets.symmetric(
-                horizontal: 24.0.w(),
-                vertical: 12.0.h(),
-              ),
-              child: TendersTabBar(
-                selectedIndex: _selectedTab,
-                onChanged: (index) => setState(() => _selectedTab = index),
-              ),
-            ),
-            Expanded(
-              child:
-                  _selectedTab == 0
-                      ? const _AllTendersTab()
-                      : const RecommendedTendersView(),
-            ),
+            // Tab bar hidden while tenders only shows recommendations.
+            // Padding(
+            //   padding: EdgeInsets.symmetric(
+            //     horizontal: 24.0.w(),
+            //     vertical: 12.0.h(),
+            //   ),
+            //   child: TendersTabBar(
+            //     selectedIndex: 1,
+            //     onChanged: (index) {},
+            //   ),
+            // ),
+            Expanded(child: RecommendedTendersView()),
           ],
         ),
       ),
     );
   }
 }
-
-class _AllTendersTab extends StatelessWidget {
-  const _AllTendersTab();
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<TendersViewModel>(
-      builder: (context, viewModel, child) {
-        if (viewModel.isLoading) {
-          return const Center(
-            child: CircularProgressIndicator(color: AppColors.jellyBean),
-          );
-        }
-        if (viewModel.errorMessage != null) {
-          return Center(child: Text(viewModel.errorMessage!));
-        }
-
-        if ((viewModel.tendersResponse?.data?.tenders == null ||
-                viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
-            viewModel.isLoading == false) {
-          return const Center(child: Text(CommonStrings.noData));
-        }
-
-        return SingleChildScrollView(
-          child: Padding(
-            padding: EdgeInsets.symmetric(vertical: 18.0.h()),
-            child: MainTendersSlider(
-              tenders: viewModel.tendersResponse?.data?.tenders ?? [],
-            ),
-          ),
-        );
-      },
-    );
-  }
-}

lib/views/tenders/pages/t_tenders_page.dart

@@ -4,16 +4,15 @@ import 'package:tm_app/core/theme/colors.dart';
 import 'package:tm_app/core/utils/size_config.dart';
 import 'package:tm_app/view_models/tenders_view_model.dart';
 import 'package:tm_app/views/shared/tablet_navigation_widget.dart';
-import 'package:tm_app/views/tenders/widgets/main_tenders_slider.dart';
 
-import '../../../core/constants/common_strings.dart';
 import '../../shared/tender_app_bar.dart';
 import '../strings/tenders_strings.dart';
 import '../widgets/recommended_tenders_view.dart';
-import '../widgets/tenders_tab_bar.dart';
 
 class TabletTendersPage extends StatefulWidget {
-  const TabletTendersPage({super.key});
+  const TabletTendersPage({required this.initialSelectedTab, super.key});
+
+  final int initialSelectedTab;
 
   @override
   State<TabletTendersPage> createState() => _TabletTendersPageState();
@@ -22,9 +21,6 @@ class TabletTendersPage extends StatefulWidget {
 class _TabletTendersPageState extends State<TabletTendersPage> {
   late final TendersViewModel viewModel;
 
-  /// 0 = All, 1 = Recommended.
-  int _selectedTab = 0;
-
   @override
   void initState() {
     super.initState();
@@ -45,52 +41,18 @@ class _TabletTendersPageState extends State<TabletTendersPage> {
       drawer: const TabletNavigationWidget(currentIndex: 1),
       body: Padding(
         padding: EdgeInsetsDirectional.only(end: 24.0.w(), top: 24.0.h()),
-        child: Column(
+        child: const Column(
           children: [
-            TendersTabBar(
-              selectedIndex: _selectedTab,
-              onChanged: (index) => setState(() => _selectedTab = index),
-            ),
-            SizedBox(height: 24.0.h()),
-            Expanded(
-              child:
-                  _selectedTab == 0
-                      ? const _AllTendersTab()
-                      : const RecommendedTendersView(),
-            ),
+            // Tab bar hidden while tenders only shows recommendations.
+            // TendersTabBar(
+            //   selectedIndex: 1,
+            //   onChanged: (index) {},
+            // ),
+            // SizedBox(height: 24.0.h()),
+            Expanded(child: RecommendedTendersView()),
           ],
         ),
       ),
     );
   }
 }
-
-class _AllTendersTab extends StatelessWidget {
-  const _AllTendersTab();
-
-  @override
-  Widget build(BuildContext context) {
-    return Consumer<TendersViewModel>(
-      builder: (context, viewModel, child) {
-        if (viewModel.isLoading) {
-          return const Center(
-            child: CircularProgressIndicator(color: AppColors.jellyBean),
-          );
-        }
-        if (viewModel.errorMessage != null) {
-          return Center(child: Text(viewModel.errorMessage!));
-        }
-        if ((viewModel.tendersResponse?.data?.tenders == null ||
-                viewModel.tendersResponse!.data!.tenders!.isEmpty) &&
-            viewModel.isLoading == false) {
-          return const Center(child: Text(CommonStrings.noData));
-        }
-        return SingleChildScrollView(
-          child: MainTendersSlider(
-            tenders: viewModel.tendersResponse?.data?.tenders ?? [],
-          ),
-        );
-      },
-    );
-  }
-}

lib/views/tenders/pages/tenders_screen.dart

@@ -10,7 +10,9 @@ import 'm_tenders_page.dart';
 import 't_tenders_page.dart';
 
 class TendersScreen extends StatefulWidget {
-  const TendersScreen({super.key});
+  const TendersScreen({this.initialTab, super.key});
+
+  final String? initialTab;
 
   @override
   State<TendersScreen> createState() => _TendersScreenState();
@@ -48,10 +50,11 @@ class _TendersScreenState extends State<TendersScreen> {
   @override
   Widget build(BuildContext context) {
     SizeConfig.init(context);
-    return const ResponsiveBuilder(
-      mobile: MobileTendersPage(),
-      tablet: TabletTendersPage(),
-      desktop: DesktopTendersPage(),
+    final initialSelectedTab = widget.initialTab == 'recommended' ? 1 : 0;
+    return ResponsiveBuilder(
+      mobile: MobileTendersPage(initialSelectedTab: initialSelectedTab),
+      tablet: TabletTendersPage(initialSelectedTab: initialSelectedTab),
+      desktop: DesktopTendersPage(initialSelectedTab: initialSelectedTab),
     );
   }
 }

lib/views/tenders/widgets/recommended_tenders_view.dart

@@ -1,18 +1,19 @@
 import 'package:flutter/material.dart';
 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_data/tender_data.dart';
 import 'package:tm_app/view_models/ai_recommendations_view_model.dart';
 
 import '../strings/tenders_strings.dart';
-import 'recommendation_card.dart';
+import 'main_tenders_slider.dart';
+import 'tender_card_shimmer.dart';
 
-/// The "Recommended" (AI) tab body. Handles loading, empty/"still learning",
-/// error+retry and the 503 fallback states for [AiRecommendationsViewModel].
+/// The "Recommended" tab body. Handles loading, empty/"still learning",
+/// error+retry and the recommended tender list for [AiRecommendationsViewModel].
 class RecommendedTendersView extends StatefulWidget {
-  const RecommendedTendersView({super.key});
+  const RecommendedTendersView({super.key, this.isDesktop = false});
+
+  final bool isDesktop;
 
   @override
   State<RecommendedTendersView> createState() => _RecommendedTendersViewState();
@@ -34,7 +35,7 @@ class _RecommendedTendersViewState extends State<RecommendedTendersView> {
     return Consumer<AiRecommendationsViewModel>(
       builder: (context, vm, child) {
         if (vm.isLoading) {
-          return const _LoadingSkeleton();
+          return _LoadingSkeleton(isDesktop: widget.isDesktop);
         }
         if (vm.errorMessage != null) {
           return _MessageState(
@@ -49,20 +50,21 @@ class _RecommendedTendersViewState extends State<RecommendedTendersView> {
             onRetry: vm.refresh,
           );
         }
-        if (vm.usingFallback && vm.fallbackTenders.isNotEmpty) {
-          return _FallbackList(tenders: vm.fallbackTenders, onRefresh: vm.refresh);
-        }
-        if (vm.items.isNotEmpty) {
-          return RefreshIndicator(
-            color: AppColors.jellyBean,
-            onRefresh: vm.refresh,
-            child: ListView.separated(
-              padding: EdgeInsets.all(16.0.h()),
-              itemCount: vm.items.length,
-              separatorBuilder: (_, __) => SizedBox(height: 12.0.h()),
-              itemBuilder:
-                  (context, index) =>
-                      RecommendationCard(item: vm.items[index]),
+        if (vm.recommendedTenders.isNotEmpty) {
+          if (widget.isDesktop) {
+            return Padding(
+              padding: EdgeInsets.symmetric(vertical: 4.0.h()),
+              child: MainTendersSlider(
+                tenders: vm.recommendedTenders,
+                isDesktop: true,
+              ),
+            );
+          }
+
+          return SingleChildScrollView(
+            child: Padding(
+              padding: EdgeInsets.symmetric(vertical: 18.0.h()),
+              child: MainTendersSlider(tenders: vm.recommendedTenders),
             ),
           );
         }
@@ -76,116 +78,6 @@ class _RecommendedTendersViewState extends State<RecommendedTendersView> {
   }
 }
 
-/// Renders the legacy keyword-based fallback list with a notice banner.
-class _FallbackList extends StatelessWidget {
-  const _FallbackList({required this.tenders, required this.onRefresh});
-
-  final List<TenderData> tenders;
-  final Future<void> Function() onRefresh;
-
-  @override
-  Widget build(BuildContext context) {
-    return RefreshIndicator(
-      color: AppColors.jellyBean,
-      onRefresh: onRefresh,
-      child: ListView.separated(
-        padding: EdgeInsets.all(16.0.h()),
-        itemCount: tenders.length + 1,
-        separatorBuilder: (_, __) => SizedBox(height: 12.0.h()),
-        itemBuilder: (context, index) {
-          if (index == 0) {
-            return _fallbackNotice();
-          }
-          return _FallbackTenderCard(tender: tenders[index - 1]);
-        },
-      ),
-    );
-  }
-
-  Widget _fallbackNotice() {
-    return Container(
-      width: double.infinity,
-      padding: EdgeInsets.all(12.0.h()),
-      decoration: BoxDecoration(
-        color: AppColors.orange10,
-        borderRadius: BorderRadius.circular(8.0.w()),
-      ),
-      child: Text(
-        TendersStrings.recommendedFallbackNotice,
-        style: TextStyle(
-          fontSize: 13.0.sp(),
-          fontWeight: FontWeight.w500,
-          color: AppColors.yellow4,
-        ),
-      ),
-    );
-  }
-}
-
-/// Lightweight card for a fallback tender. Decoupled from [TendersViewModel]
-/// (no feedback/pagination) so it can render outside the All-tab flow.
-class _FallbackTenderCard extends StatelessWidget {
-  const _FallbackTenderCard({required this.tender});
-
-  final TenderData tender;
-
-  void _openDetail(BuildContext context) {
-    final id = tender.id;
-    if (id == null || id.isEmpty) {
-      return;
-    }
-    TenderDetailRouteData(tenderId: id).push(context);
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final title = tender.title?.trim() ?? '';
-    final buyer = tender.buyerOrganization?.name?.trim() ?? '';
-    return InkWell(
-      borderRadius: BorderRadius.circular(12.0.w()),
-      onTap: () => _openDetail(context),
-      child: Container(
-        width: double.infinity,
-        padding: EdgeInsets.all(16.0.h()),
-        decoration: BoxDecoration(
-          color: AppColors.grey0,
-          borderRadius: BorderRadius.circular(12.0.w()),
-          border: Border.all(color: AppColors.grey30),
-        ),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            if (title.isNotEmpty)
-              Text(
-                title,
-                maxLines: 2,
-                overflow: TextOverflow.ellipsis,
-                style: TextStyle(
-                  fontSize: 15.0.sp(),
-                  fontWeight: FontWeight.w600,
-                  color: AppColors.grey80,
-                ),
-              ),
-            if (buyer.isNotEmpty) ...[
-              SizedBox(height: 8.0.h()),
-              Text(
-                buyer,
-                maxLines: 1,
-                overflow: TextOverflow.ellipsis,
-                style: TextStyle(
-                  fontSize: 13.0.sp(),
-                  fontWeight: FontWeight.w400,
-                  color: AppColors.grey60,
-                ),
-              ),
-            ],
-          ],
-        ),
-      ),
-    );
-  }
-}
-
 /// Centered title/body message with an optional retry button. Wrapped in a
 /// scroll view so pull-to-refresh works even when empty.
 class _MessageState extends StatelessWidget {
@@ -261,23 +153,18 @@ class _MessageState extends StatelessWidget {
 
 /// Simple placeholder list shown while recommendations load.
 class _LoadingSkeleton extends StatelessWidget {
-  const _LoadingSkeleton();
+  const _LoadingSkeleton({required this.isDesktop});
+
+  final bool isDesktop;
 
   @override
   Widget build(BuildContext context) {
     return ListView.separated(
       padding: EdgeInsets.all(16.0.h()),
-      itemCount: 4,
-      separatorBuilder: (_, __) => SizedBox(height: 12.0.h()),
-      itemBuilder:
-          (context, index) => Container(
-            height: 120.0.h(),
-            decoration: BoxDecoration(
-              color: AppColors.grey0,
-              borderRadius: BorderRadius.circular(12.0.w()),
-              border: Border.all(color: AppColors.grey30),
-            ),
-          ),
+      itemCount: isDesktop ? 3 : 2,
+      separatorBuilder:
+          (_, __) => SizedBox(height: isDesktop ? 20.0.h() : 52.0.h()),
+      itemBuilder: (context, index) => TenderCardShimmer(isDesktop: isDesktop),
     );
   }
 }

lib/views/tenders/widgets/tender_card.dart

@@ -198,7 +198,7 @@ class TenderCard extends StatelessWidget {
   }
 
   Widget _tenderTitle() {
-    return Text(
+    return SelectableText(
       tender.title ?? '',
       maxLines: isDesktop ? 2 : 4,
       style: TextStyle(

lib/views/tenders/widgets/tender_card_shimmer.dart

@@ -0,0 +1,173 @@
+import 'package:flutter/material.dart';
+import 'package:tm_app/core/theme/colors.dart';
+import 'package:tm_app/core/utils/size_config.dart';
+
+class TenderCardShimmer extends StatelessWidget {
+  const TenderCardShimmer({super.key, this.isDesktop = false});
+
+  final bool isDesktop;
+
+  @override
+  Widget build(BuildContext context) {
+    return _Shimmer(
+      child: Container(
+        width: double.infinity,
+        margin: EdgeInsets.symmetric(horizontal: 16.0.w()),
+        height: isDesktop ? 350.0.h() : 587.0.h(),
+        padding: EdgeInsets.all(16.0.w()),
+        decoration: BoxDecoration(
+          color: AppColors.grey0,
+          borderRadius: BorderRadius.circular(12),
+          border: Border.all(color: AppColors.grey30),
+        ),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            _bar(width: isDesktop ? 120.0.w() : 140.0.w(), height: 14.0.h()),
+            SizedBox(height: 16.0.h()),
+            _block(height: isDesktop ? 58.0.h() : 70.0.h()),
+            SizedBox(height: isDesktop ? 12.0.h() : 20.0.h()),
+            _bar(width: double.infinity, height: 18.0.h()),
+            SizedBox(height: 8.0.h()),
+            _fractionBar(widthFactor: 0.72, height: 18.0.h()),
+            SizedBox(height: 16.0.h()),
+            _bar(width: double.infinity, height: 14.0.h()),
+            SizedBox(height: 8.0.h()),
+            _bar(width: double.infinity, height: 14.0.h()),
+            SizedBox(height: 8.0.h()),
+            _fractionBar(widthFactor: 0.55, height: 14.0.h()),
+            const Spacer(),
+            Row(
+              children: [
+                _circle(size: 24.0.h()),
+                SizedBox(width: 8.0.w()),
+                _bar(width: 60.0.w(), height: 14.0.h()),
+                const Spacer(),
+                _pill(width: 108.0.w(), height: 40.0.h()),
+              ],
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _bar({required double width, required double height}) {
+    return Container(
+      width: width,
+      height: height,
+      decoration: BoxDecoration(
+        color: AppColors.grey20,
+        borderRadius: BorderRadius.circular(6),
+      ),
+    );
+  }
+
+  Widget _fractionBar({required double widthFactor, required double height}) {
+    return FractionallySizedBox(
+      widthFactor: widthFactor,
+      alignment: AlignmentDirectional.centerStart,
+      child: _bar(width: double.infinity, height: height),
+    );
+  }
+
+  Widget _block({required double height}) {
+    return Container(
+      width: double.infinity,
+      height: height,
+      decoration: BoxDecoration(
+        color: AppColors.grey20,
+        borderRadius: BorderRadius.circular(4),
+      ),
+    );
+  }
+
+  Widget _pill({required double width, required double height}) {
+    return Container(
+      width: width,
+      height: height,
+      decoration: BoxDecoration(
+        color: AppColors.grey20,
+        borderRadius: BorderRadius.circular(100),
+      ),
+    );
+  }
+
+  Widget _circle({required double size}) {
+    return Container(
+      width: size,
+      height: size,
+      decoration: BoxDecoration(
+        color: AppColors.grey20,
+        shape: BoxShape.circle,
+      ),
+    );
+  }
+}
+
+class _Shimmer extends StatefulWidget {
+  const _Shimmer({required this.child});
+
+  final Widget child;
+
+  @override
+  State<_Shimmer> createState() => _ShimmerState();
+}
+
+class _ShimmerState extends State<_Shimmer>
+    with SingleTickerProviderStateMixin {
+  late final AnimationController _controller;
+
+  @override
+  void initState() {
+    super.initState();
+    _controller = AnimationController(
+      vsync: this,
+      duration: const Duration(milliseconds: 1400),
+    )..repeat();
+  }
+
+  @override
+  void dispose() {
+    _controller.dispose();
+    super.dispose();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return AnimatedBuilder(
+      animation: _controller,
+      child: widget.child,
+      builder: (context, child) {
+        return ShaderMask(
+          blendMode: BlendMode.srcATop,
+          shaderCallback: (bounds) {
+            final shimmerWidth = bounds.width * 0.8;
+            final offset = (bounds.width + shimmerWidth) * _controller.value;
+            return LinearGradient(
+              begin: Alignment.centerLeft,
+              end: Alignment.centerRight,
+              colors: [AppColors.grey20, AppColors.grey10, AppColors.grey20],
+              stops: const [0.25, 0.5, 0.75],
+              transform: _SlidingGradientTransform(
+                slidePercent: (offset - shimmerWidth) / bounds.width,
+              ),
+            ).createShader(bounds);
+          },
+          child: child,
+        );
+      },
+    );
+  }
+}
+
+class _SlidingGradientTransform extends GradientTransform {
+  const _SlidingGradientTransform({required this.slidePercent});
+
+  final double slidePercent;
+
+  @override
+  Matrix4 transform(Rect bounds, {TextDirection? textDirection}) {
+    return Matrix4.translationValues(bounds.width * slidePercent, 0, 0);
+  }
+}

lib/views/tenders/widgets/tenders_tab_bar.dart

@@ -4,8 +4,7 @@ import 'package:tm_app/core/utils/size_config.dart';
 
 import '../strings/tenders_strings.dart';
 
-/// Segmented control switching between the "All" tenders list and the
-/// "Recommended" AI tab.
+/// Segmented control for the tenders list.
 class TendersTabBar extends StatelessWidget {
   const TendersTabBar({
     required this.selectedIndex,
@@ -13,7 +12,7 @@ class TendersTabBar extends StatelessWidget {
     super.key,
   });
 
-  /// 0 = All, 1 = Recommended.
+  /// 1 = Recommended. The former All tab is intentionally hidden.
   final int selectedIndex;
   final ValueChanged<int> onChanged;
 
@@ -29,7 +28,8 @@ class TendersTabBar extends StatelessWidget {
       ),
       child: Row(
         children: [
-          _segment(TendersStrings.allTab, 0),
+          // All tenders is hidden for now.
+          // _segment(TendersStrings.allTab, 0),
           _segment(TendersStrings.recommendedTab, 1),
         ],
       ),

lib/views/your_tenders/widgets/tender_card.dart

@@ -99,10 +99,9 @@ class TenderCard extends StatelessWidget {
             SizedBox(height: 12.0.h()),
 
             // Title
-            Text(
+            SelectableText(
               tender.title!,
               maxLines: 1,
-              overflow: TextOverflow.ellipsis,
               style: TextStyle(
                 color: AppColors.grey80,
                 fontSize: 16.0.sp(),

test/view_models/ai_recommendations_view_model_test.dart

@@ -1,6 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:shared_preferences/shared_preferences.dart';
-import 'package:tm_app/core/network/app_exceptions.dart';
 import 'package:tm_app/core/network/network_manager.dart';
 import 'package:tm_app/core/utils/result.dart';
 import 'package:tm_app/data/repositories/company_ai_repository.dart';
@@ -8,79 +7,81 @@ import 'package:tm_app/data/repositories/home_repository.dart';
 import 'package:tm_app/data/services/company_ai_service.dart';
 import 'package:tm_app/data/services/home_service.dart';
 import 'package:tm_app/data/services/liked_tenders_service.dart';
-import 'package:tm_app/data/services/model/recommend_response/recommend_response.dart';
-import 'package:tm_app/data/services/model/recommendation_item/recommendation_item.dart';
 import 'package:tm_app/data/services/model/recommended_tenders_data/recommended_tenders_data.dart';
 import 'package:tm_app/data/services/model/recommended_tenders_response/recommended_tenders_response.dart';
+import 'package:tm_app/data/services/model/tender_data/tender_data.dart';
 import 'package:tm_app/data/services/your_tenders_service.dart';
 import 'package:tm_app/view_models/ai_recommendations_view_model.dart';
 
 void main() {
   group('AiRecommendationsViewModel', () {
-    test('falls back to legacy recommendations on HTTP 503', () async {
-      final prefs = await _prefs();
-      final companyRepository = _FakeCompanyAiRepository(
-        prefs,
-        results: [Result.error(ServerException('unavailable', 503))],
-      );
-      final homeRepository = _FakeHomeRepository(
-        prefs,
-        result: const Result.ok(
-          RecommendedTendersResponse(
-            succes: true,
-            message: 'ok',
-            error: null,
-            data: RecommendedTendersData(tenders: [], metadata: null),
+    test(
+      'loads recommended tenders from GET /api/v1/tenders/recommend',
+      () async {
+        final prefs = await _prefs();
+        final homeRepository = _FakeHomeRepository(
+          prefs,
+          result: Result.ok(
+            RecommendedTendersResponse(
+              success: true,
+              message: 'ok',
+              error: null,
+              data: RecommendedTendersData(
+                tenders: [
+                  _sampleTender(id: 'tender-1', title: 'Bridge repair'),
+                ],
+                metadata: null,
+              ),
+            ),
           ),
-        ),
-      );
-      final viewModel = AiRecommendationsViewModel(
-        companyAiRepository: companyRepository,
-        homeRepository: homeRepository,
-      );
+        );
+        final viewModel = AiRecommendationsViewModel(
+          companyAiRepository: _FakeCompanyAiRepository(prefs),
+          homeRepository: homeRepository,
+        );
 
-      await viewModel.loadRecommendations();
+        await viewModel.loadRecommendations();
 
-      expect(viewModel.hasLoaded, isTrue);
-      expect(viewModel.usingFallback, isTrue);
-      expect(viewModel.errorMessage, isNull);
-      expect(homeRepository.recommendedTendersCalls, 1);
-    });
+        expect(viewModel.hasLoaded, isTrue);
+        expect(viewModel.errorMessage, isNull);
+        expect(homeRepository.recommendedTendersCalls, 1);
+        expect(viewModel.recommendedTenders.single.id, 'tender-1');
+      },
+    );
 
     test('keeps failed transient loads retryable for loadIfNeeded', () async {
       final prefs = await _prefs();
-      final companyRepository = _FakeCompanyAiRepository(
+      final homeRepository = _FakeHomeRepository(
         prefs,
         results: [
-          Result.error(FetchDataException('network failed')),
-          const Result.ok(
-            RecommendResponse(
-              data: [
-                RecommendationItem(
-                  rank: '1',
-                  tenderId: 'tender-1',
-                  analysis: 'Strong match',
-                ),
-              ],
-              error: null,
-              message: 'ok',
+          Result.error(Exception('network failed')),
+          Result.ok(
+            RecommendedTendersResponse(
               success: true,
+              message: 'ok',
+              error: null,
+              data: RecommendedTendersData(
+                tenders: [
+                  _sampleTender(id: 'tender-1', title: 'Bridge repair'),
+                ],
+                metadata: null,
+              ),
             ),
           ),
         ],
       );
       final viewModel = AiRecommendationsViewModel(
-        companyAiRepository: companyRepository,
-        homeRepository: _FakeHomeRepository(prefs),
+        companyAiRepository: _FakeCompanyAiRepository(prefs),
+        homeRepository: homeRepository,
       );
 
       await viewModel.loadRecommendations();
       await viewModel.loadIfNeeded();
 
-      expect(companyRepository.recommendationCalls, 2);
+      expect(homeRepository.recommendedTendersCalls, 2);
       expect(viewModel.hasLoaded, isTrue);
       expect(viewModel.errorMessage, isNull);
-      expect(viewModel.items.single.tenderId, 'tender-1');
+      expect(viewModel.recommendedTenders.single.id, 'tender-1');
     });
 
     test(
@@ -91,16 +92,6 @@ void main() {
           companyAiRepository: _FakeCompanyAiRepository(
             prefs,
             lastOnboardingStartedAt: DateTime.now().millisecondsSinceEpoch,
-            results: [
-              const Result.ok(
-                RecommendResponse(
-                  data: [],
-                  error: null,
-                  message: 'ok',
-                  success: true,
-                ),
-              ),
-            ],
           ),
           homeRepository: _FakeHomeRepository(prefs),
         );
@@ -123,22 +114,11 @@ Future<SharedPreferences> _prefs() async {
 class _FakeCompanyAiRepository extends CompanyAiRepository {
   _FakeCompanyAiRepository(
     SharedPreferences prefs, {
-    required List<Result<RecommendResponse>> results,
     int? lastOnboardingStartedAt,
-  }) : _results = results,
-       _lastOnboardingStartedAt = lastOnboardingStartedAt,
+  }) : _lastOnboardingStartedAt = lastOnboardingStartedAt,
        super(companyAiService: _UnusedCompanyAiService(prefs), prefs: prefs);
 
-  final List<Result<RecommendResponse>> _results;
   final int? _lastOnboardingStartedAt;
-  int recommendationCalls = 0;
-
-  @override
-  Future<Result<RecommendResponse>> getRecommendations() async {
-    final index = recommendationCalls;
-    recommendationCalls += 1;
-    return _results[index];
-  }
 
   @override
   int? lastOnboardingStartedAt() => _lastOnboardingStartedAt;
@@ -147,15 +127,22 @@ class _FakeCompanyAiRepository extends CompanyAiRepository {
 class _FakeHomeRepository extends HomeRepository {
   _FakeHomeRepository(
     SharedPreferences prefs, {
-    this.result = const Result.ok(
-      RecommendedTendersResponse(
-        succes: true,
-        message: 'ok',
-        error: null,
-        data: RecommendedTendersData(tenders: [], metadata: null),
-      ),
-    ),
-  }) : super(
+    List<Result<RecommendedTendersResponse>>? results,
+    Result<RecommendedTendersResponse>? result,
+  }) : _results =
+           results ??
+           [
+             result ??
+                 const Result.ok(
+                   RecommendedTendersResponse(
+                     success: true,
+                     message: 'ok',
+                     error: null,
+                     data: RecommendedTendersData(tenders: [], metadata: null),
+                   ),
+                 ),
+           ],
+       super(
          homeService: HomeService(networkManager: NetworkManager(prefs)),
          yourTendersService: YourTendersService(
            networkManager: NetworkManager(prefs),
@@ -165,7 +152,7 @@ class _FakeHomeRepository extends HomeRepository {
          ),
        );
 
-  final Result<RecommendedTendersResponse> result;
+  final List<Result<RecommendedTendersResponse>> _results;
   int recommendedTendersCalls = 0;
 
   @override
@@ -173,8 +160,9 @@ class _FakeHomeRepository extends HomeRepository {
     required int limit,
     required int offset,
   }) async {
+    final index = recommendedTendersCalls;
     recommendedTendersCalls += 1;
-    return result;
+    return _results[index];
   }
 }
 
@@ -182,3 +170,36 @@ class _UnusedCompanyAiService extends CompanyAiService {
   _UnusedCompanyAiService(SharedPreferences prefs)
     : super(networkManager: NetworkManager(prefs));
 }
+
+TenderData _sampleTender({required String id, required String title}) {
+  return TenderData(
+    success: null,
+    message: null,
+    id: id,
+    tenderId: id,
+    noticePublicationId: null,
+    noticeTypeCode: null,
+    formType: null,
+    noticeLanguageCode: null,
+    issueDate: null,
+    issueTime: null,
+    publicationDate: null,
+    title: title,
+    description: null,
+    procurementTypeCode: null,
+    procedureCode: null,
+    estimatedValue: null,
+    currency: null,
+    duration: null,
+    tenderDeadline: null,
+    submissionDeadline: null,
+    applicationDeadline: null,
+    submissionUrl: null,
+    countryCode: null,
+    durationUnit: null,
+    buyerOrganization: null,
+    lots: null,
+    officialLanguages: null,
+    status: null,
+  );
+}