fix

lib/core/services/sentry_service.dart

@@ -79,7 +79,8 @@ class SentryService {
           ..beforeSend = (event, hint) {
             // Filter out certain errors if needed
             // Return null to drop the event
-            return event;
+            // return event;
+            return null;
           };
       },
       appRunner: appRunner,

lib/core/utils/extensions.dart

@@ -109,6 +109,15 @@ extension StringExtensions on String {
     if (cleaned.length < 10) return this;
     return '${cleaned.substring(0, 4)} ${cleaned.substring(4, 7)} ***';
   }
+
+  /// Remove leading "#" from string (e.g., "#SO-001" -> "SO-001")
+  /// Useful for backend IDs that start with "#"
+  String get withoutHash {
+    if (startsWith('#')) {
+      return substring(1);
+    }
+    return this;
+  }
 }
 
 // ============================================================================

lib/features/cart/presentation/pages/cart_page.dart

@@ -36,6 +36,7 @@ class CartPage extends ConsumerStatefulWidget {
 
 class _CartPageState extends ConsumerState<CartPage> {
   bool _isSyncing = false;
+  bool _hasLoggedViewCart = false;
 
   // Cart is initialized once in home_page.dart at app startup
   // Provider has keepAlive: true, so no need to reload here
@@ -44,29 +45,32 @@ class _CartPageState extends ConsumerState<CartPage> {
   // and in checkout button handler for checkout flow.
   // No dispose() method needed - using ref.read() in dispose() is unsafe.
 
+  void _logViewCartOnce(CartState cartState) {
+    if (_hasLoggedViewCart || cartState.isEmpty) return;
+    _hasLoggedViewCart = true;
+
+    AnalyticsService.logViewCart(
+      cartValue: cartState.selectedTotal,
+      items: cartState.items.map((item) => AnalyticsEventItem(
+        itemId: item.product.productId,
+        itemName: item.product.name,
+        price: item.product.basePrice,
+        quantity: item.quantity.toInt(),
+      )).toList(),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     final cartState = ref.watch(cartProvider);
 
-
+    // Log view cart analytics event only once when page opens
+    _logViewCartOnce(cartState);
 
     final itemCount = cartState.itemCount;
     final hasSelection = cartState.selectedCount > 0;
 
-    // Log view cart analytics event when cart has items
-    if (cartState.isNotEmpty) {
-      AnalyticsService.logViewCart(
-        cartValue: cartState.selectedTotal,
-        items: cartState.items.map((item) => AnalyticsEventItem(
-          itemId: item.product.productId,
-          itemName: item.product.name,
-          price: item.product.basePrice,
-          quantity: item.quantity.toInt(),
-        )).toList(),
-      );
-    }
-
     return PopScope(
       // Intercept back navigation to sync pending updates
       onPopInvokedWithResult: (didPop, result) async {
@@ -346,6 +350,7 @@ class _CartPageState extends ConsumerState<CartPage> {
 
   /// Build error banner (shown at top when there's an error but cart has items)
   Widget _buildErrorBanner(String errorMessage) {
+    print(errorMessage);
     return Container(
       width: double.infinity,
       padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),

lib/features/cart/presentation/widgets/cart_item_widget.dart

@@ -7,7 +7,7 @@ import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:intl/intl.dart';
+import 'package:go_router/go_router.dart';
 import 'package:worker/core/utils/extensions.dart';
 import 'package:worker/core/widgets/loading_indicator.dart';
 import 'package:worker/core/theme/typography.dart';
@@ -113,34 +113,40 @@ class _CartItemWidgetState extends ConsumerState<CartItemWidget> {
 
           const SizedBox(width: 12),
 
-          // Product Image (bigger: 100x100)
+          // Product Image (bigger: 100x100) - tap to navigate to product detail
-          ClipRRect(
+          GestureDetector(
-            borderRadius: BorderRadius.circular(8),
+            onTap: () {
-            child: CachedNetworkImage(
+              // Navigate to product detail with product ID in path
-              imageUrl: widget.item.product.thumbnail.isNotEmpty
+              context.push('/products/${widget.item.product.productId}');
-                  ? widget.item.product.thumbnail
+            },
-                  : (widget.item.product.images.isNotEmpty
+            child: ClipRRect(
-                      ? widget.item.product.images.first
+              borderRadius: BorderRadius.circular(8),
-                      : ''),
+              child: CachedNetworkImage(
-              width: 100,
+                imageUrl: widget.item.product.thumbnail.isNotEmpty
-              height: 100,
+                    ? widget.item.product.thumbnail
-              fit: BoxFit.cover,
+                    : (widget.item.product.images.isNotEmpty
-              placeholder: (context, url) => Container(
+                        ? widget.item.product.images.first
+                        : ''),
                 width: 100,
                 height: 100,
-                color: colorScheme.surfaceContainerHighest,
+                fit: BoxFit.cover,
-                child: Center(
+                placeholder: (context, url) => Container(
-                  child: CustomLoadingIndicator(color: colorScheme.primary, size: 20),
+                  width: 100,
+                  height: 100,
+                  color: colorScheme.surfaceContainerHighest,
+                  child: Center(
+                    child: CustomLoadingIndicator(color: colorScheme.primary, size: 20),
+                  ),
                 ),
-              ),
+                errorWidget: (context, url, error) => Container(
-              errorWidget: (context, url, error) => Container(
+                  width: 100,
-                width: 100,
+                  height: 100,
-                height: 100,
+                  color: colorScheme.surfaceContainerHighest,
-                color: colorScheme.surfaceContainerHighest,
+                  child: FaIcon(
-                child: FaIcon(
+                    FontAwesomeIcons.image,
-                  FontAwesomeIcons.image,
+                    color: colorScheme.onSurfaceVariant,
-                  color: colorScheme.onSurfaceVariant,
+                    size: 32,
-                  size: 32,
+                  ),
                 ),
               ),
             ),
@@ -193,14 +199,15 @@ class _CartItemWidgetState extends ConsumerState<CartItemWidget> {
 
                     const SizedBox(width: 8),
 
-                    // Quantity TextField
+                    // Quantity TextField - uses text keyboard for Done button on iOS/Android
                     SizedBox(
                       width: 50,
                       height: 32,
                       child: TextField(
                         controller: _quantityController,
                         focusNode: _quantityFocusNode,
-                        keyboardType: TextInputType.number,
+                        keyboardType: TextInputType.text,
+                        textInputAction: TextInputAction.done,
                         textAlign: TextAlign.center,
                         style: AppTypography.titleMedium.copyWith(
                           fontWeight: FontWeight.w600,

lib/features/home/presentation/pages/home_page.dart

@@ -198,7 +198,7 @@ class _HomePageState extends ConsumerState<HomePage> {
                     actions: [
                       QuickAction(
                         icon: FontAwesomeIcons.circlePlus,
-                        label: 'Ghi nhận điểm',
+                        label: 'Tham gia sự kiện',
                         onTap: () => context.push(RouteNames.pointsRecords),
                       ),
                       QuickAction(
@@ -216,7 +216,7 @@ class _HomePageState extends ConsumerState<HomePage> {
 
                   // Sample Houses & News Section
                   QuickActionSection(
-                    title: 'Nhà mẫu, dự án & tin tức',
+                    title: 'Nhà mẫu & Dự án',
                     actions: [
                       QuickAction(
                         icon: FontAwesomeIcons.houseCircleCheck,

lib/features/invoices/presentation/pages/invoice_detail_page.dart

@@ -169,7 +169,7 @@ class InvoiceDetailPage extends ConsumerWidget {
 
                   // Invoice Number
                   Text(
-                    '#${invoice.name}',
+                    invoice.name,
                     style: TextStyle(
                       fontSize: 20,
                       fontWeight: FontWeight.w600,
@@ -192,7 +192,7 @@ class InvoiceDetailPage extends ConsumerWidget {
                       _MetaItem(label: 'Ngày xuất:', value: invoice.formattedDate),
                       if (invoice.orderId != null) ...[
                         const SizedBox(width: 32),
-                        _MetaItem(label: 'Đơn hàng:', value: '#${invoice.orderId}'),
+                        _MetaItem(label: 'Đơn hàng:', value: '${invoice.orderId}'),
                       ],
                     ],
                   ),

lib/features/invoices/presentation/pages/invoices_page.dart

@@ -209,7 +209,7 @@ class _InvoiceCard extends StatelessWidget {
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
                         Text(
-                          '#${invoice.name}',
+                          invoice.name,
                           style: TextStyle(
                             fontSize: 16,
                             fontWeight: FontWeight.w700,
@@ -252,7 +252,7 @@ class _InvoiceCard extends StatelessWidget {
                     if (invoice.orderId != null)
                       _DetailRow(
                         label: 'Đơn hàng:',
-                        value: '#${invoice.orderId}',
+                        value: '${invoice.orderId}',
                       ),
                     _DetailRow(
                       label: 'Tổng tiền:',

lib/features/loyalty/presentation/pages/points_history_page.dart

@@ -402,7 +402,7 @@ class PointsHistoryPage extends ConsumerWidget {
                       ),
                       const SizedBox(height: 4),
                       Text(
-                        'Mã tham chiếu: #${entry.entryId}',
+                        'Mã tham chiếu: ${entry.entryId}',
                         style: TextStyle(
                           fontSize: 13,
                           color: colorScheme.onSurfaceVariant,

lib/features/loyalty/presentation/pages/points_records_page.dart

@@ -295,7 +295,7 @@ class PointsRecordsPage extends ConsumerWidget {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   Text(
-                    '#${record.recordId}',
+                    record.recordId,
                     style: TextStyle(
                       fontSize: 16,
                       fontWeight: FontWeight.w700,

lib/features/notifications/presentation/pages/notifications_page.dart

@@ -27,6 +27,8 @@ class NotificationsPage extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
+    final colorScheme = Theme.of(context).colorScheme;
+
     // Use Flutter hooks for local state management
     final selectedCategory = useState<String>('general');
     final notificationsAsync = ref.watch(
@@ -34,59 +36,38 @@ class NotificationsPage extends HookConsumerWidget {
     );
 
     return Scaffold(
-      backgroundColor: const Color(0xFFF4F6F8),
+      backgroundColor: colorScheme.surfaceContainerLowest,
-      body: SafeArea(
+      appBar: AppBar(
-        child: Column(
+        title: Text(
-          children: [
+          'Thông báo',
-            // Header
+          style: TextStyle(color: colorScheme.onSurface),
-            _buildHeader(),
-
-            // Tabs
-            _buildTabs(context, selectedCategory),
-
-            // Notifications List
-            Expanded(
-              child: notificationsAsync.when(
-                data: (notifications) => _buildNotificationsList(
-                  context,
-                  ref,
-                  notifications,
-                  selectedCategory,
-                ),
-                loading: () => const CustomLoadingIndicator(),
-                error: (error, stack) =>
-                    _buildErrorState(ref, selectedCategory),
-              ),
-            ),
-          ],
         ),
+        elevation: AppBarSpecs.elevation,
+        backgroundColor: colorScheme.surface,
+        foregroundColor: colorScheme.onSurface,
+        centerTitle: false,
       ),
-    );
+      body: Column(
-  }
+        children: [
+          // Tabs
+          _buildTabs(context, selectedCategory),
 
-  /// Build header
+          // Notifications List
-  Widget _buildHeader() {
+          Expanded(
-    return Container(
+            child: notificationsAsync.when(
-      width: double.infinity,
+              data: (notifications) => _buildNotificationsList(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 16),
+                context,
-      decoration: BoxDecoration(
+                ref,
-        color: Colors.white,
+                notifications,
-        boxShadow: [
+                selectedCategory,
-          BoxShadow(
+              ),
-            color: Colors.black.withValues(alpha: 0.05),
+              loading: () => const CustomLoadingIndicator(),
-            blurRadius: 8,
+              error: (error, stack) =>
-            offset: const Offset(0, 2),
+                  _buildErrorState(ref, selectedCategory),
+            ),
           ),
         ],
       ),
-      child: const Text(
-        'Thông báo',
-        style: TextStyle(
-          fontSize: 18,
-          fontWeight: FontWeight.bold,
-          color: Color(0xFF212121),
-        ),
-      ),
     );
   }
 

lib/features/orders/presentation/pages/order_detail_page.dart

@@ -205,7 +205,7 @@ class OrderDetailPage extends ConsumerWidget {
           children: [
             // Order Number and Status Badge
             Text(
-              '#${order.name}',
+              order.name,
               style: TextStyle(
                 fontSize: 20,
                 fontWeight: FontWeight.w700,

lib/features/orders/presentation/pages/payment_detail_page.dart

@@ -248,7 +248,7 @@ class PaymentDetailPage extends ConsumerWidget {
             Column(
               children: [
                 Text(
-                  '#$invoiceNumber',
+                  '$invoiceNumber',
                   style: TextStyle(
                     fontSize: 24,
                     fontWeight: FontWeight.w700,

lib/features/orders/presentation/pages/payments_page.dart

@@ -227,7 +227,7 @@ class PaymentsPage extends ConsumerWidget {
                 children: [
                   _DetailRow(
                     label: 'Mã giao dịch:',
-                    value: '#${payment.name}',
+                    value: '${payment.name}',
                   ),
                   _DetailRow(
                     label: 'Loại giao dịch:',
@@ -325,7 +325,7 @@ class _TransactionCard extends StatelessWidget {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   Text(
-                    '#${payment.name}',
+                    payment.name,
                     style: TextStyle(
                       fontSize: 15,
                       fontWeight: FontWeight.w700,

lib/features/orders/presentation/widgets/order_card.dart

@@ -48,7 +48,7 @@ class OrderCard extends StatelessWidget {
                 children: [
                   // Order number
                   Text(
-                    '#${order.name}',
+                    '${order.name}',
                     style: TextStyle(
                       fontSize: 16,
                       fontWeight: FontWeight.w700,

lib/features/products/data/datasources/products_remote_datasource.dart

@@ -138,7 +138,15 @@ class ProductsRemoteDataSource {
         throw Exception('Product not found: $itemCode');
       }
 
-      return ProductModel.fromJson(message as Map<String, dynamic>);
+      // Handle API error response: {success: false, message: "Item not found"}
+      if (message is Map<String, dynamic>) {
+        if (message['success'] == false) {
+          throw Exception(message['message'] ?? 'Product not found: $itemCode');
+        }
+        return ProductModel.fromJson(message);
+      }
+
+      throw Exception('Invalid response format for product: $itemCode');
     } on DioException catch (e) {
       if (e.response?.statusCode == 404) {
         throw Exception('Product not found: $itemCode');

lib/features/quotes/presentation/pages/quotes_page.dart

@@ -222,7 +222,7 @@ class _QuotesPageState extends ConsumerState<QuotesPage> {
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
                   Text(
-                    '#${quote.quoteNumber}',
+                    '${quote.quoteNumber}',
                     style: const TextStyle(
                       fontSize: 16,
                       fontWeight: FontWeight.w700,

lib/features/showrooms/presentation/pages/design_request_detail_page.dart

@@ -230,7 +230,7 @@ class DesignRequestDetailPage extends ConsumerWidget {
                           children: [
                             // Request ID
                             Text(
-                              '#${request.id}',
+                              '${request.id}',
                               style: TextStyle(
                                 fontSize: 24,
                                 fontWeight: FontWeight.w700,

lib/features/showrooms/presentation/pages/model_houses_page.dart

@@ -509,40 +509,35 @@ class _RequestCard extends StatelessWidget {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               // Header: Code and Status
-              Row(
+
-                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              Container(
-                children: [
+                padding: const EdgeInsets.symmetric(
-                  Expanded(
+                  horizontal: 12,
-                    child: Text(
+                  vertical: 6,
-                      'Mã yêu cầu: #${request.id}',
+                ),
-                      style: TextStyle(
+                decoration: BoxDecoration(
-                        fontSize: 16,
+                  color: _getStatusBackgroundColor(),
-                        fontWeight: FontWeight.w700,
+                  borderRadius: BorderRadius.circular(20),
-                        color: colorScheme.onSurface,
+                ),
-                      ),
+                child: Text(
-                      overflow: TextOverflow.ellipsis,
+                  request.statusText.toUpperCase(),
-                    ),
+                  style: TextStyle(
+                    fontSize: 12,
+                    fontWeight: FontWeight.w600,
+                    color: _getStatusColor(),
                   ),
-                  const SizedBox(width: 8),
+                ),
-                  Container(
+              ),
-                    padding: const EdgeInsets.symmetric(
+              const SizedBox(height: 8),
-                      horizontal: 12,
+
-                      vertical: 6,
+              Text(
-                    ),
+                'Mã yêu cầu: #${request.id}',
-                    decoration: BoxDecoration(
+                style: TextStyle(
-                      color: _getStatusBackgroundColor(),
+                  fontSize: 16,
-                      borderRadius: BorderRadius.circular(20),
+                  fontWeight: FontWeight.w700,
-                    ),
+                  color: colorScheme.onSurface,
-                    child: Text(
+                ),
-                      request.statusText.toUpperCase(),
+                overflow: TextOverflow.ellipsis,
-                      style: TextStyle(
-                        fontSize: 12,
-                        fontWeight: FontWeight.w600,
-                        color: _getStatusColor(),
-                      ),
-                    ),
-                  ),
-                ],
               ),
 
               const SizedBox(height: 8),
@@ -566,16 +561,16 @@ class _RequestCard extends StatelessWidget {
                 ),
               ),
 
-              if (request.plainDescription.isNotEmpty) ...[
+              // if (request.plainDescription.isNotEmpty) ...[
-                const SizedBox(height: 4),
+              //   const SizedBox(height: 4),
-                // Description
+              //   // Description
-                Text(
+              //   Text(
-                  request.plainDescription,
+              //     request.plainDescription,
-                  style: TextStyle(fontSize: 14, color: colorScheme.onSurfaceVariant),
+              //     style: TextStyle(fontSize: 14, color: colorScheme.onSurfaceVariant),
-                  maxLines: 2,
+              //     maxLines: 2,
-                  overflow: TextOverflow.ellipsis,
+              //     overflow: TextOverflow.ellipsis,
-                ),
+              //   ),
-              ],
+              // ],
             ],
           ),
         ),