Merge branch 'sultan_new_design' into 'development_new_design_2.0'

Sultan new design

See merge request Cloud_Solution/diplomatic-quarter!418

lib/pages/AlHabibMedicalService/HomeHealthCare/NewHomeHealthCare/new_Home_health_care_step_three_page.dart

@@ -178,7 +178,7 @@ class _NewHomeHealthCareStepThreePageState extends State<NewHomeHealthCareStepTh
                     context,
                     widget.model.orderId.toString(),
                     onClick: () {
-                      Navigator.pop(context);
+                      Navigator.popUntil(context, (route) => Utils.route(route, equalsTo: HomeHealthCarePage));
                       Navigator.push(context, FadePage(page: HomeHealthCarePage()));
                     },
                   );

lib/pages/ErService/rapid-response-team/rrt-place-order.dart

@@ -208,5 +208,6 @@ class RRTPlaceOrderPage extends StatelessWidget {
 
   gotoRRTRoot() {
     Navigator.popUntil(_context, (route) => Utils.route(route, equalsTo: RRTMainScreen));
+    Navigator.push(_context, FadePage(page: RRTMainScreen()));
   }
 }