diff --git a/android/app/build.gradle b/android/app/build.gradle
index 0e9c8c7..a02cc42 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -24,12 +24,16 @@ if (flutterVersionName == null) {
 apply plugin: 'com.android.application'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
     compileSdkVersion 30
 
     defaultConfig {
-        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.mokkon.fcs.fcs"
         minSdkVersion 21
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/dev/AndroidManifest.xml b/android/app/src/dev/AndroidManifest.xml
index d269aae..03ad093 100644
--- a/android/app/src/dev/AndroidManifest.xml
+++ b/android/app/src/dev/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mokkon.fcs_dev.fcs">
+    package="com.mokkon.fcs.fcs">
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
@@ -15,7 +15,6 @@
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
             <!-- This keeps the window background of the activity showing
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 890efd6..d5787e9 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.mokkon.fcs.fcs">
    <application
-        android:label="fcs"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
diff --git a/android/app/src/main/java/com/mokkon/fcs/fcs/Application.java b/android/app/src/main/java/com/mokkon/fcs/fcs/Application.java
new file mode 100644
index 0000000..2d028e9
--- /dev/null
+++ b/android/app/src/main/java/com/mokkon/fcs/fcs/Application.java
@@ -0,0 +1,13 @@
+package com.mokkon.fcs.fcs;
+
+ import io.flutter.app.FlutterApplication;
+import io.flutter.plugin.common.PluginRegistry;
+import io.flutter.plugins.GeneratedPluginRegistrant;
+
+
+public class Application extends FlutterApplication  {
+  @Override
+  public void onCreate() {
+    super.onCreate();
+  }
+}
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4..b1da307 100644
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b7..cdf697f 100644
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d4391..a8316e6 100644
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d..2b85987 100644
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372e..7e0c447 100644
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
new file mode 100644
index 0000000..0a46b50
--- /dev/null
+++ b/android/app/src/main/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">FCS</string>
+</resources>
diff --git a/android/settings_aar.gradle b/android/settings_aar.gradle
new file mode 100644
index 0000000..e7b4def
--- /dev/null
+++ b/android/settings_aar.gradle
@@ -0,0 +1 @@
+include ':app'
diff --git a/lib/data/provider/auth_fb.dart b/lib/data/provider/auth_fb.dart
index 6062f1a..d89e12d 100644
--- a/lib/data/provider/auth_fb.dart
+++ b/lib/data/provider/auth_fb.dart
@@ -32,9 +32,6 @@ class AuthFb {
       try {
         _authResult = await _fb.signInWithCredential(credential);
         print("PhoneVerificationCompleted :$_authResult");
-        if (_authResult == null) {
-          throw SigninException("Sigin error!");
-        }
       } catch (e) {
         print("Exception:$e");
         // throw e;
@@ -61,7 +58,8 @@ class AuthFb {
       _verificationId = verificationId;
       print("codeSent  " + phoneNumber);
       codeSentCompleted = true;
-      completer.complete(fcs.AuthResult(authStatus: AuthStatus.SMS_SENT));
+      if (!completer.isCompleted)
+        completer.complete(fcs.AuthResult(authStatus: AuthStatus.SMS_SENT));
     };
 
     final fb.PhoneCodeAutoRetrievalTimeout codeAutoRetrievalTimeout =
@@ -70,7 +68,8 @@ class AuthFb {
 
       _verificationId = verificationId;
       if (codeSentCompleted) {
-        completer.complete(fcs.AuthResult(authStatus: AuthStatus.SMS_SENT));
+        if (!completer.isCompleted)
+          completer.complete(fcs.AuthResult(authStatus: AuthStatus.SMS_SENT));
       } else {
         completer.completeError(SigninException("SMS code failed"));
       }
@@ -92,11 +91,7 @@ class AuthFb {
       final fb.AuthCredential credential = fb.PhoneAuthProvider.credential(
           verificationId: _verificationId, smsCode: smsCode);
 
-      fb.UserCredential _authResult =
-          await _fb.signInWithCredential(credential);
-      if (_authResult == null) {
-        throw SigninException("Sigin error!");
-      }
+      await _fb.signInWithCredential(credential);
       await _addUserToStream(refreshIdToken: true);
     } on Exception catch (e) {
       return Future.error(SigninException(e.toString()));
@@ -118,7 +113,7 @@ class AuthFb {
     log.info("Claims:$claims");
     if (claims == null) return;
 
-    String cid = claims["cid"];
+    String? cid = claims["cid"];
     User? user;
     if (cid != null && cid != "") {
       user = await _getUserFromFirestore(cid);
@@ -129,7 +124,7 @@ class AuthFb {
     }
 
     // add privileges
-    String privileges = claims["pr"];
+    String? privileges = claims["pr"];
     if (privileges != null && privileges != "") {
       user.privileges = privileges.split(":").toList();
     } else {
@@ -238,7 +233,7 @@ class AuthFb {
         // get privilege from claim
         fb.IdTokenResult idToken = await firebaseUser.getIdTokenResult(true);
 
-        String privileges = idToken.claims?["pr"] ?? '';
+        String? privileges = idToken.claims?["pr"] ?? '';
         if (privileges != null && privileges != "") {
           user.privileges = privileges.split(":").toList();
         }
@@ -274,7 +269,7 @@ class AuthFb {
       }
     }
 
-    controller = StreamController<User>(
+    controller = StreamController<User?>(
         onListen: _start, onPause: _stop, onResume: _start, onCancel: _stop);
 
     return controller.stream;
diff --git a/lib/data/provider/messaging_fcm.dart b/lib/data/provider/messaging_fcm.dart
index c008ecd..4a440b5 100644
--- a/lib/data/provider/messaging_fcm.dart
+++ b/lib/data/provider/messaging_fcm.dart
@@ -45,9 +45,13 @@ class MessagingFCM {
       }
     });
 
-    String? token = await _firebaseMessaging.getToken();
-    if (onSetupComplete != null && token != null) onSetupComplete(token);
-    log.info("Messaging Token:$token");
+    try {
+      String? token = await _firebaseMessaging.getToken();
+      if (onSetupComplete != null && token != null) onSetupComplete(token);
+      log.info("Messaging Token:$token");
+    } on Exception catch (e) {
+      log.shout("Unable to get messing token:$e");
+    }
   }
 
   Future<void> subscribeToTopic(String topic) {
diff --git a/lib/main-dev.dart b/lib/main-dev.dart
index 8964b01..fe11f38 100644
--- a/lib/main-dev.dart
+++ b/lib/main-dev.dart
@@ -1,3 +1,4 @@
+import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:logging/logging.dart';
@@ -6,8 +7,9 @@ import 'app.dart';
 import 'config.dart';
 import 'data/provider/messaging_fcm.dart';
 
-void main() {
+Future<void> main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  await Firebase.initializeApp();
   FirebaseMessaging.onBackgroundMessage(backgroundMessageHandler);
 
   Config(
diff --git a/lib/pages/carton/model/carton_model.dart b/lib/pages/carton/model/carton_model.dart
index da5a7fb..e299754 100644
--- a/lib/pages/carton/model/carton_model.dart
+++ b/lib/pages/carton/model/carton_model.dart
@@ -12,7 +12,7 @@ import 'package:logging/logging.dart';
 
 class CartonModel extends BaseModel {
   List<Carton> _boxes = [];
-  late PaginatorListener<Carton> cartonsByFilter;
+  PaginatorListener<Carton>? cartonsByFilter;
 
   final log = Logger('CartonModel');
   List<Carton> get boxes => _selectedIndex == 1
@@ -165,8 +165,8 @@ class CartonModel extends BaseModel {
           .where("status", isEqualTo: carton_packed_status)
           .orderBy(orderName, descending: true);
 
-      cartonsByFilter.refresh(
-          listeningQuery: listenerQuery, pageQuery: pageQuery);
+      cartonsByFilter!
+          .refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
     } catch (e) {
       log.warning("Error!! $e");
     }
@@ -211,7 +211,7 @@ class CartonModel extends BaseModel {
     if (listener != null) await listener!.cancel();
     if (cartonListener != null) await cartonListener!.cancel();
     if (_delivered != null) _delivered!.close();
-    if (cartonsByFilter != null) cartonsByFilter.close();
+    if (cartonsByFilter != null) cartonsByFilter!.close();
     _boxes = [];
   }
 
diff --git a/lib/pages/carton_search/carton_search.dart b/lib/pages/carton_search/carton_search.dart
index 07c2215..4c441da 100644
--- a/lib/pages/carton_search/carton_search.dart
+++ b/lib/pages/carton_search/carton_search.dart
@@ -146,7 +146,7 @@ class PartSearchDelegate extends SearchDelegate<Carton> {
     return Container(
       padding: EdgeInsets.only(top: 5),
       child: PaginatorListView<Carton>(
-        paginatorListener: cartonModel.cartonsByFilter,
+        paginatorListener: cartonModel.cartonsByFilter!,
         rowBuilder: (c) => CartonListRow(
           key: ValueKey(c.id),
           carton: c,
diff --git a/lib/pages/delivery_address/model/delivery_address_model.dart b/lib/pages/delivery_address/model/delivery_address_model.dart
index 0ccbf33..33c4d4d 100644
--- a/lib/pages/delivery_address/model/delivery_address_model.dart
+++ b/lib/pages/delivery_address/model/delivery_address_model.dart
@@ -13,11 +13,11 @@ class DeliveryAddressModel extends BaseModel {
 
   StreamSubscription<QuerySnapshot>? listener;
 
-  DeliveryAddress get defalutAddress =>
-      deliveryAddresses.firstWhere((e) => e.isDefault, orElse: () => DeliveryAddress());
+  DeliveryAddress get defalutAddress => deliveryAddresses
+      .firstWhere((e) => e.isDefault, orElse: () => DeliveryAddress());
 
-  DeliveryAddress getLocalDeliveryAddress(String id) =>
-      deliveryAddresses.firstWhere((e) => e.id == id, orElse: () => DeliveryAddress());
+  DeliveryAddress getLocalDeliveryAddress(String id) => deliveryAddresses
+      .firstWhere((e) => e.id == id, orElse: () => DeliveryAddress());
 
   @override
   void privilegeChanged() {
@@ -46,7 +46,8 @@ class DeliveryAddressModel extends BaseModel {
         deliveryAddresses.clear();
         deliveryAddresses = snapshot.docs.map((documentSnapshot) {
           var s = DeliveryAddress.fromMap(
-              documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
+              documentSnapshot.data() as Map<String, dynamic>,
+              documentSnapshot.id);
           return s;
         }).toList();
         notifyListeners();
@@ -59,7 +60,7 @@ class DeliveryAddressModel extends BaseModel {
   Future<DeliveryAddress> getDeliveryAddress(String id) async {
     String path = "/$user_collection/${user!.id}/$delivery_address_collection";
     var snap = await FirebaseFirestore.instance.collection(path).doc(id).get();
-    return DeliveryAddress.fromMap(snap.data as Map<String,dynamic>, snap.id);
+    return DeliveryAddress.fromMap(snap.data as Map<String, dynamic>, snap.id);
   }
 
   void initUser(user) {
@@ -95,7 +96,8 @@ class DeliveryAddressModel extends BaseModel {
         .orderBy("full_name")
         .get();
     return querySnap.docs
-        .map((e) => DeliveryAddress.fromMap(e.data as Map<String,dynamic>, e.id))
+        .map((e) =>
+            DeliveryAddress.fromMap(e.data as Map<String, dynamic>, e.id))
         .toList();
   }
 }
diff --git a/lib/pages/discount/model/discount_model.dart b/lib/pages/discount/model/discount_model.dart
index df50e03..415aad1 100644
--- a/lib/pages/discount/model/discount_model.dart
+++ b/lib/pages/discount/model/discount_model.dart
@@ -49,7 +49,8 @@ class DiscountModel extends BaseModel {
           .listen((snaps) {
         _discounts.clear();
         snaps.docs.forEach((d) {
-          _discounts.add(Discount.fromMap(d.data as Map<String,dynamic>, d.id));
+          _discounts
+              .add(Discount.fromMap(d.data() as Map<String, dynamic>, d.id));
         });
         notifyListeners();
       });
@@ -79,9 +80,9 @@ class DiscountModel extends BaseModel {
           .where("customer_id", isEqualTo: userID)
           .where("status", isEqualTo: "available");
       var snaps = await q.get(const GetOptions(source: Source.server));
-    var discounts = snaps.docs.map((snap) {
+      var discounts = snaps.docs.map((snap) {
         if (snap.exists) {
-          var s = Discount.fromMap(snap.data as Map<String,dynamic>, snap.id);
+          var s = Discount.fromMap(snap.data as Map<String, dynamic>, snap.id);
           return s;
         }
       }).toList();
diff --git a/lib/pages/faq/model/faq_model.dart b/lib/pages/faq/model/faq_model.dart
index cc43d41..1ad7eb9 100644
--- a/lib/pages/faq/model/faq_model.dart
+++ b/lib/pages/faq/model/faq_model.dart
@@ -27,7 +27,7 @@ class FAQModel extends BaseModel {
           .listen((snaps) {
         faqs.clear();
         snaps.docs.forEach((d) {
-          faqs.add(FAQ.fromMap(d.data as Map<String,dynamic>, d.id));
+          faqs.add(FAQ.fromMap(d.data(), d.id));
         });
         notifyListeners();
       });
diff --git a/lib/pages/fcs_shipment/model/fcs_shipment_model.dart b/lib/pages/fcs_shipment/model/fcs_shipment_model.dart
index 45d2141..6bb8a16 100644
--- a/lib/pages/fcs_shipment/model/fcs_shipment_model.dart
+++ b/lib/pages/fcs_shipment/model/fcs_shipment_model.dart
@@ -58,7 +58,7 @@ class FcsShipmentModel extends BaseModel {
         _fcsShipments.clear();
         _fcsShipments = snapshot.docs.map((documentSnapshot) {
           var s = FcsShipment.fromMap(
-              documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
+              documentSnapshot.data() as Map<String,dynamic>, documentSnapshot.id);
           return s;
         }).toList();
         notifyListeners();
diff --git a/lib/pages/invoice/model/invoice_model.dart b/lib/pages/invoice/model/invoice_model.dart
index e1d82ab..91d1bc6 100644
--- a/lib/pages/invoice/model/invoice_model.dart
+++ b/lib/pages/invoice/model/invoice_model.dart
@@ -20,9 +20,9 @@ class InvoiceModel extends BaseModel {
   List<Invoice> _invoices = [];
 
   List<Invoice> get invoices =>
-      _selectedIndex == 1 ? _invoices : List<Invoice>.from(_paginator.values);
+      _selectedIndex == 1 ? _invoices : List<Invoice>.from(_paginator!.values);
 
-  late Paginator _paginator;
+  Paginator? _paginator;
 
   bool endOfPaidInvoices = false;
   bool isLoading = false;
@@ -43,9 +43,9 @@ class InvoiceModel extends BaseModel {
   initData(bool forCustomer, bool isCanceled, bool isPaid) {
     _loadInvoices(forCustomer);
 
-    if (_paginator != null) _paginator.close();
+    if (_paginator != null) _paginator!.close();
     _paginator = _getPaginator(forCustomer, isCanceled, isPaid);
-    _paginator.load(onFinished: () {
+    _paginator!.load(onFinished: () {
       notifyListeners();
     });
   }
@@ -70,7 +70,8 @@ class InvoiceModel extends BaseModel {
       listener = q.snapshots().listen((QuerySnapshot snapshot) {
         _invoices.clear();
         _invoices = snapshot.docs.map((documentSnapshot) {
-          var s = Invoice.fromMap(documentSnapshot.data as Map<String, dynamic>,
+          var s = Invoice.fromMap(
+              documentSnapshot.data() as Map<String, dynamic>,
               documentSnapshot.id);
           return s;
         }).toList();
@@ -106,11 +107,11 @@ class InvoiceModel extends BaseModel {
   }
 
   Future<void> loadMore({bool? isCustomer}) async {
-    if (_paginator.ended || _selectedIndex == 1)
+    if (_paginator!.ended || _selectedIndex == 1)
       return; // when paid menu is not selected return
     isLoading = true;
     notifyListeners();
-    await _paginator.load(onFinished: () {
+    await _paginator!.load(onFinished: () {
       isLoading = false;
       notifyListeners();
     });
@@ -118,7 +119,7 @@ class InvoiceModel extends BaseModel {
 
   Future<void> refresh({bool? isCustomer}) async {
     if (_selectedIndex == 1) return; // when paid menu is not selected return
-    await _paginator.refresh(onFinished: () {
+    await _paginator!.refresh(onFinished: () {
       notifyListeners();
     });
   }
@@ -128,7 +129,7 @@ class InvoiceModel extends BaseModel {
   }
 
   logout() async {
-    if (_paginator != null) _paginator.close();
+    if (_paginator != null) _paginator!.close();
     if (listener != null) await listener!.cancel();
     _invoices = [];
   }
diff --git a/lib/pages/market/model/market_model.dart b/lib/pages/market/model/market_model.dart
index 658d2c0..117450c 100644
--- a/lib/pages/market/model/market_model.dart
+++ b/lib/pages/market/model/market_model.dart
@@ -27,7 +27,8 @@ class MarketModel extends BaseModel {
         markets.clear();
         markets = snapshot.docs.map((documentSnapshot) {
           var user = Market.fromMap(
-              documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id);
+              documentSnapshot.data() as Map<String, dynamic>,
+              documentSnapshot.id);
           return user;
         }).toList();
         notifyListeners();
diff --git a/lib/pages/package/model/package_model.dart b/lib/pages/package/model/package_model.dart
index 380f9b7..4878bc6 100644
--- a/lib/pages/package/model/package_model.dart
+++ b/lib/pages/package/model/package_model.dart
@@ -16,9 +16,9 @@ import 'package:path/path.dart' as Path;
 class PackageModel extends BaseModel {
   final log = Logger('PackageModel');
 
-  late PaginatorListener<Package> packages;
-  late PaginatorListener<Package> customerPackages;
-  late PaginatorListener<Package> activePackages;
+  PaginatorListener<Package>? packages;
+  PaginatorListener<Package>? customerPackages;
+  PaginatorListener<Package>? activePackages;
 
   bool isLoading = false;
   int _menuSelectedIndex = 1;
@@ -63,9 +63,9 @@ class PackageModel extends BaseModel {
 
   @override
   logout() async {
-    if (customerPackages != null) customerPackages.close();
-    if (packages != null) packages.close();
-    if (activePackages != null) activePackages.close();
+    if (customerPackages != null) customerPackages!.close();
+    if (packages != null) packages!.close();
+    if (activePackages != null) activePackages!.close();
   }
 
   Future<void> _loadPackages(bool isDelivered) async {
@@ -84,7 +84,7 @@ class PackageModel extends BaseModel {
           .where("is_delivered", isEqualTo: isDelivered);
 
       pageQuery = pageQuery.orderBy("update_time", descending: true);
-      packages.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
+      packages!.refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
     } catch (e) {
       log.warning("Error!! $e");
     }
@@ -105,8 +105,8 @@ class PackageModel extends BaseModel {
           .where("user_id", isEqualTo: user!.id)
           .orderBy("update_time", descending: true);
 
-      customerPackages.refresh(
-          listeningQuery: listenerQuery, pageQuery: pageQuery);
+      customerPackages!
+          .refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
     } catch (e) {
       log.warning("Error!! $e");
     }
@@ -128,8 +128,8 @@ class PackageModel extends BaseModel {
           .where("is_delivered", isEqualTo: false);
 
       pageQuery = pageQuery.orderBy("update_time", descending: true);
-      activePackages.refresh(
-          listeningQuery: listenerQuery, pageQuery: pageQuery);
+      activePackages!
+          .refresh(listeningQuery: listenerQuery, pageQuery: pageQuery);
     } catch (e) {
       log.warning("Error!! $e");
     }
@@ -163,8 +163,7 @@ class PackageModel extends BaseModel {
           .get(const GetOptions(source: Source.server));
       if (snaps.docs.length == 1) {
         var snap = snaps.docs[0];
-        var package =
-            Package.fromMap(snap.data as Map<String, dynamic>, snap.id);
+        var package = Package.fromMap(snap.data(), snap.id);
         return package;
       }
     } catch (e) {
diff --git a/lib/pages/package/package_info.dart b/lib/pages/package/package_info.dart
index cb755e6..519d42b 100644
--- a/lib/pages/package/package_info.dart
+++ b/lib/pages/package/package_info.dart
@@ -38,7 +38,7 @@ class PackageInfo extends StatefulWidget {
 
 class _PackageInfoState extends State<PackageInfo> {
   var dateFormatter = new DateFormat('dd MMM yyyy');
-  Package? _package;
+  Package? _package = Package();
   bool _isLoading = false;
   MultiImgController multiImgController = MultiImgController();
 
@@ -48,13 +48,19 @@ class _PackageInfoState extends State<PackageInfo> {
     initPackage(widget.package!);
   }
 
-  initPackage(Package pkg) async {
+  initPackage(Package? pkg) async {
+    setState(() {
+      _isLoading = true;
+    });
+    if (pkg == null) return;
     PackageModel packageModel =
         Provider.of<PackageModel>(context, listen: false);
-    Package? package = await packageModel.getPackageByTrackingID(pkg.trackingID!);
+    Package? package =
+        await packageModel.getPackageByTrackingID(pkg!.trackingID!);
     setState(() {
       _package = package;
       multiImgController.setImageUrls = package!.photoUrls;
+      _isLoading = false;
     });
   }
 
diff --git a/lib/pages/package/package_list.dart b/lib/pages/package/package_list.dart
index e806ead..66cb1bb 100644
--- a/lib/pages/package/package_list.dart
+++ b/lib/pages/package/package_list.dart
@@ -84,7 +84,7 @@ class _PackageListState extends State<PackageList> {
             ],
           ),
           body: PaginatorListView<Package>(
-            paginatorListener: packages,
+            paginatorListener: packages!,
             rowBuilder: (p) => PackageListRow(
               key: ValueKey(p.id),
               package: p,
diff --git a/lib/pages/payment_methods/model/payment_method_model.dart b/lib/pages/payment_methods/model/payment_method_model.dart
index 229bd9f..acdd43e 100644
--- a/lib/pages/payment_methods/model/payment_method_model.dart
+++ b/lib/pages/payment_methods/model/payment_method_model.dart
@@ -26,8 +26,7 @@ class PaymentMethodModel extends BaseModel {
           .listen((snaps) {
         paymentMethods.clear();
         snaps.docs.forEach((d) {
-          paymentMethods
-              .add(PaymentMethod.fromMap(d.data as Map<String, dynamic>, d.id));
+          paymentMethods.add(PaymentMethod.fromMap(d.data(), d.id));
         });
         notifyListeners();
       });
diff --git a/lib/pages/processing/processing_list.dart b/lib/pages/processing/processing_list.dart
index ec021b0..2fc2691 100644
--- a/lib/pages/processing/processing_list.dart
+++ b/lib/pages/processing/processing_list.dart
@@ -73,7 +73,7 @@ class _ProcessingListState extends State<ProcessingList> {
             backgroundColor: primaryColor,
           ),
           body: PaginatorListView<Package>(
-            paginatorListener: packages,
+            paginatorListener: packages!,
             rowBuilder: (p) => ProcessingListRow(
               key: ValueKey(p.id),
               package: p,
diff --git a/lib/pages/processing_old/processing_list.dart b/lib/pages/processing_old/processing_list.dart
index 38e5c0a..de4aae4 100644
--- a/lib/pages/processing_old/processing_list.dart
+++ b/lib/pages/processing_old/processing_list.dart
@@ -65,7 +65,7 @@ class _ProcessingListState extends State<ProcessingList> {
             ],
           ),
           body: PaginatorListView<Package>(
-            paginatorListener: packages,
+            paginatorListener: packages!,
             rowBuilder: (p) => ProcessingListRow(
               key: ValueKey(p.id),
               package: p,
diff --git a/lib/pages/receiving/receiving_list.dart b/lib/pages/receiving/receiving_list.dart
index 8f23bbb..16a95db 100644
--- a/lib/pages/receiving/receiving_list.dart
+++ b/lib/pages/receiving/receiving_list.dart
@@ -75,7 +75,7 @@ class _ReceivingListState extends State<ReceivingList> {
             backgroundColor: primaryColor,
           ),
           body: PaginatorListView<Package>(
-            paginatorListener: packages,
+            paginatorListener: packages!,
             rowBuilder: (p) => ReceivingListRow(
               key: ValueKey(p.id),
               package: p,
diff --git a/lib/pages/shipment/model/shipment_model.dart b/lib/pages/shipment/model/shipment_model.dart
index 0dd8c56..01d9fd1 100644
--- a/lib/pages/shipment/model/shipment_model.dart
+++ b/lib/pages/shipment/model/shipment_model.dart
@@ -15,11 +15,11 @@ class ShipmentModel extends BaseModel {
 
   List<Shipment> get shipments => _menuSelectedIndex == 1
       ? _shipments
-      : List<Shipment>.from(_delivered.values);
+      : List<Shipment>.from(_delivered!.values);
 
   List<Shipment> _shipments = [];
 
-  late Paginator _delivered;
+  Paginator? _delivered;
   bool isLoading = false;
   int _menuSelectedIndex = 1;
 
@@ -34,7 +34,7 @@ class ShipmentModel extends BaseModel {
     logout();
     _loadShipments(forCustomer, myPickup);
     _delivered = _getDelivered(forCustomer);
-    _delivered.load(onFinished: () {
+    _delivered!.load(onFinished: () {
       isLoading = false;
       notifyListeners();
     });
@@ -42,7 +42,7 @@ class ShipmentModel extends BaseModel {
 
   @override
   logout() async {
-    if (_delivered != null) _delivered.close();
+    if (_delivered != null) _delivered!.close();
     if (listener != null) await listener!.cancel();
     _shipments = [];
   }
@@ -50,10 +50,10 @@ class ShipmentModel extends BaseModel {
   Future<void> loadMore({bool? isCustomer}) async {
     if (menuSelectedIndex == 1)
       return; // when delivered menu is not selected return
-    if (_delivered.ended) return;
+    if (_delivered!.ended) return;
     isLoading = true;
     notifyListeners();
-    await _delivered.load(onFinished: () {
+    await _delivered!.load(onFinished: () {
       isLoading = false;
       notifyListeners();
     });
@@ -62,7 +62,7 @@ class ShipmentModel extends BaseModel {
   Future<void> refresh({bool? isCustomer}) async {
     if (menuSelectedIndex == 1)
       return; // when delivered menu is not selected return
-    await _delivered.refresh(onFinished: () {
+    await _delivered!.refresh(onFinished: () {
       notifyListeners();
     });
   }
diff --git a/lib/pages/staff/model/staff_model.dart b/lib/pages/staff/model/staff_model.dart
index b2c2ebb..152a775 100644
--- a/lib/pages/staff/model/staff_model.dart
+++ b/lib/pages/staff/model/staff_model.dart
@@ -46,8 +46,9 @@ class StaffModel extends BaseModel {
           .listen((QuerySnapshot snapshot) {
         employees.clear();
         employees = snapshot.docs.map((documentSnapshot) {
-          var user =
-              User.fromMap(documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
+          var user = User.fromMap(
+              documentSnapshot.data() as Map<String, dynamic>,
+              documentSnapshot.id);
           return user;
         }).toList();
         notifyListeners();
@@ -66,7 +67,8 @@ class StaffModel extends BaseModel {
         privileges.clear();
         privileges = snapshot.docs.map((documentSnapshot) {
           var privilege = Privilege.fromMap(
-              documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
+              documentSnapshot.data() as Map<String, dynamic>,
+              documentSnapshot.id);
           return privilege;
         }).toList();
         notifyListeners();
@@ -101,8 +103,8 @@ class StaffModel extends BaseModel {
           .where("privileges", arrayContains: privilege)
           .get(const GetOptions(source: Source.server));
       users = snaps.docs.map((documentSnapshot) {
-        var user =
-            User.fromMap(documentSnapshot.data as Map<String,dynamic>, documentSnapshot.id);
+        var user = User.fromMap(
+            documentSnapshot.data as Map<String, dynamic>, documentSnapshot.id);
         return user;
       }).toList();
     } catch (e) {
diff --git a/lib/pages/widgets/local_text.dart b/lib/pages/widgets/local_text.dart
index 92fbff8..9fa0c95 100644
--- a/lib/pages/widgets/local_text.dart
+++ b/lib/pages/widgets/local_text.dart
@@ -7,9 +7,9 @@ import 'package:fcs/helpers/theme.dart';
 class LocalText extends Text {
   final BuildContext context;
   LocalText(this.context, String translationKey,
-      {Color? color,
-      double? fontSize,
-      FontWeight? fontWeight,
+      {Color color = secondaryColor,
+      double fontSize = 13,
+      FontWeight fontWeight = FontWeight.w500,
       List<String>? translationVariables,
       String? text,
       bool underline = false})
@@ -19,14 +19,14 @@ class LocalText extends Text {
                     translationVariables: translationVariables),
             style: Provider.of<LanguageModel>(context, listen: false).isEng
                 ? newLabelStyle(
-                    color: color!,
-                    fontSize: fontSize!,
-                    fontWeight: fontWeight!,
+                    color: color,
+                    fontSize: fontSize,
+                    fontWeight: fontWeight,
                     underline: underline)
                 : newLabelStyleMM(
-                    color: color!,
-                    fontSize: fontSize!,
-                    fontWeight: fontWeight!,
+                    color: color,
+                    fontSize: fontSize,
+                    fontWeight: fontWeight,
                     underline: underline));
 }