Merge remote-tracking branch 'origin/zaid_development_new' into zaid_development_new

lib/views/pages/user/gas_refill/request_gas_refill.dart

@@ -155,7 +155,7 @@ class _RequestGasRefillState extends State<RequestGasRefill> {
     }
     if (_firstTime) {
       if (widget.gasRefillModel != null) {
-        _formModel.status = const Lookup(value: 0);
+        _formModel.status = widget.gasRefillModel?.status ?? const Lookup(value: 0);
         _gasRefillProvider.expectedDateTime = _formModel.expectedDate;
         _gasRefillProvider.timer = TimerModel(startAt: widget.gasRefillModel?.startDate, endAt: widget.gasRefillModel?.endDate);
       } else {

lib/views/pages/user/requests/request_details.dart

@@ -27,7 +27,7 @@ import '../../../../models/service_request/search_work_order.dart';
 import 'report/future_service_report.dart';
 
 class RequestDetailsPage extends StatelessWidget {
-  static final String id = "/call-details";
+  static const String id = "/call-details";
   final ServiceRequest serviceRequest;
 
   const RequestDetailsPage({Key key, this.serviceRequest}) : super(key: key);