diff --git a/lib/pages/delivery/model/delivery_model.dart b/lib/pages/delivery/model/delivery_model.dart
index 235f820..d18ec1f 100644
--- a/lib/pages/delivery/model/delivery_model.dart
+++ b/lib/pages/delivery/model/delivery_model.dart
@@ -12,9 +12,9 @@ import 'package:logging/logging.dart';
 class DeliveryModel extends BaseModel {
   final log = Logger('DeliveryModel');
   List<Carton> get cartons =>
-      _selectedIndex == 1 ? _cartons : List<Carton>.from(_delivered.values);
+      _selectedIndex == 1 ? _cartons : List<Carton>.from(_delivered?.values ?? []);
 
-  late Paginator _delivered;
+   Paginator? _delivered;
   int _selectedIndex = 1;
   bool isLoading = false;
   List<Carton> _cartons = [];
@@ -31,9 +31,9 @@ class DeliveryModel extends BaseModel {
     _selectedIndex = 1;
     _loadCartons();
 
-    if (_delivered != null) _delivered.close();
+    if (_delivered != null) _delivered!.close();
     _delivered = _getDelivered();
-    _delivered.load();
+    _delivered!.load();
   }
 
   Future<void> _loadCartons() async {
@@ -82,10 +82,10 @@ class DeliveryModel extends BaseModel {
   }
 
   Future<void> loadMore() async {
-    if (_delivered.ended || _selectedIndex == 1) return;
+    if (_delivered!.ended || _selectedIndex == 1) return;
     isLoading = true;
     notifyListeners();
-    await _delivered.load(onFinished: () {
+    await _delivered!.load(onFinished: () {
       isLoading = false;
       notifyListeners();
     });
@@ -94,7 +94,7 @@ class DeliveryModel extends BaseModel {
   Future<void> refresh() async {
     if (_selectedIndex == 1) return;
 
-    await _delivered.refresh(onFinished: () {
+    await _delivered!.refresh(onFinished: () {
       notifyListeners();
     });
   }
@@ -106,7 +106,7 @@ class DeliveryModel extends BaseModel {
   @override
   logout() async {
     if (listener != null) await listener!.cancel();
-    if (_delivered != null) _delivered.close();
+    if (_delivered != null) _delivered!.close();
     _cartons = [];
   }
 
diff --git a/lib/pages/delivery_address/model/delivery_address_model.dart b/lib/pages/delivery_address/model/delivery_address_model.dart
index 33c4d4d..fa47182 100644
--- a/lib/pages/delivery_address/model/delivery_address_model.dart
+++ b/lib/pages/delivery_address/model/delivery_address_model.dart
@@ -95,7 +95,7 @@ class DeliveryAddressModel extends BaseModel {
         .collection("$path")
         .orderBy("full_name")
         .get();
-    return querySnap.docs
+    return querySnap.docs                              
         .map((e) =>
             DeliveryAddress.fromMap(e.data as Map<String, dynamic>, e.id))
         .toList();
diff --git a/lib/pages/main/util.dart b/lib/pages/main/util.dart
index 277bfe1..5018f59 100644
--- a/lib/pages/main/util.dart
+++ b/lib/pages/main/util.dart
@@ -42,7 +42,7 @@ Future<void> showConfirmDialog(
             child: LocalText(
               context,
               translationKey,
-              translationVariables: translationVariables!,
+              translationVariables: translationVariables,
               color: primaryColor,
             ),
           ),
diff --git a/pubspec.lock b/pubspec.lock
index c317df9..5054151 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: _fe_analyzer_shared
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "22.0.0"
+    version: "25.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.1"
+    version: "2.2.0"
   args:
     dependency: transitive
     description:
@@ -28,7 +28,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.6.1"
+    version: "2.8.1"
   barcode_scan2:
     dependency: "direct main"
     description:
@@ -91,7 +91,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   cli_util:
     dependency: transitive
     description:
@@ -434,6 +434,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "9.1.0"
+  frontend_server_client:
+    dependency: transitive
+    description:
+      name: frontend_server_client
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.2"
   glob:
     dependency: transitive
     description:
@@ -531,7 +538,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   mime:
     dependency: transitive
     description:
@@ -893,21 +900,21 @@ packages:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.16.8"
+    version: "1.17.10"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.0"
+    version: "0.4.2"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.19"
+    version: "0.4.0"
   timeline_list:
     dependency: "direct main"
     description: