Merge remote-tracking branch 'upstream/master'

lib/model/pickup_model.dart

@@ -48,7 +48,7 @@ class PickUpModel extends BaseModel {
         toTime: '3PM',
         numberOfPackage: 5,
         weight: 25,
-        status: 'Assigned',
+        status: 'Confirmed',
         date: DateTime(2020, 5, 6),
         address: '154-19 64th Ave.\nFlushing, NY 11367',
         handlingFee: 5000,
@@ -180,7 +180,7 @@ class PickUpModel extends BaseModel {
     return pickups
         .where((e) =>
             e.status == "Pending" ||
-            e.status == "Assigned" ||
+            e.status == "Confirmed" ||
             e.status == "Processed" ||
             e.status == "Rescheduled")
         .toList()

lib/model/shipment_model.dart

@@ -86,10 +86,10 @@ class ShipmentModel extends BaseModel {
     ShippingAddress(
         fullName: 'Mg Myo',
         addressLine1: '153-154 5th Thitsar.',
-        addressLine2: 'Flushing',
+        addressLine2: 'South Okkalapa Township',
         city: 'Yangon',
-        state: 'Yangon',
-        phoneNumber: '+09 5724 87508'),
+        state: 'Myanmar',
+        phoneNumber: '+09 95724 8750'),
   ];
 
   void initUser(user) {