bug fixes

lib/screens/patients/profile/referral/my-referral-detail-screen.dart

@@ -17,6 +17,7 @@ import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/borderedButton.dart';
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:hexcolor/hexcolor.dart';
 import 'package:provider/provider.dart';
 

lib/screens/patients/profile/referral/my-referral-patient-screen.dart

@@ -8,6 +8,7 @@ import 'package:doctor_app_flutter/widgets/patients/profile/profile-welcome-widg
 import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart';
 import 'package:doctor_app_flutter/widgets/shared/app_texts_widget.dart';
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 
 import '../../../../routes.dart';
@@ -74,11 +75,8 @@ class MyReferralPatientScreen extends StatelessWidget {
                                   'referral': model.pendingReferral[index]
                                 });
                               },
-                              child: Icon(
-                                Icons.info_outline,
-                                color: Colors.black,
-                                size: 30,
-                              ),
+                              child: Icon(FontAwesomeIcons.arrowRight,
+                                  size: 25, color: Colors.black),
                             ),
                           ),
                         ),

lib/widgets/patients/patient-referral-item-widget.dart

@@ -463,36 +463,41 @@ class PatientReferralItemWidget extends StatelessWidget {
                           width: 30,
                           height: 30,
                           margin: EdgeInsets.only(
-                              left: projectViewModel.isArabic ? 10 : 10 /*10:85*/,
-                              right: projectViewModel.isArabic ? 10 : 10 /*85:10*/,
+                              left:
+                                  projectViewModel.isArabic ? 10 : 10 /*10:85*/,
+                              right:
+                                  projectViewModel.isArabic ? 10 : 10 /*85:10*/,
                               top: 5),
                           decoration: BoxDecoration(
                               shape: BoxShape.rectangle,
                               border: Border(
-                                bottom:
-                                    BorderSide(color: Colors.grey[400], width: 2.5),
-                                left:
-                                    BorderSide(color: Colors.grey[400], width: 2.5),
+                                bottom: BorderSide(
+                                    color: Colors.grey[400], width: 2.5),
+                                left: BorderSide(
+                                    color: Colors.grey[400], width: 2.5),
                               )),
                         ),
                         Expanded(
                           flex: 4,
                           child: Container(
-                            margin: EdgeInsets.only(left: 10, top: 25, right : 10, bottom: 0),
+                            margin: EdgeInsets.only(
+                                left: 10, top: 25, right: 10, bottom: 0),
                             child: Column(
                               children: [
                                 RichText(
                                   text: TextSpan(
                                     style: TextStyle(
-                                        fontSize: 2.0 * SizeConfig.textMultiplier,
+                                        fontSize:
+                                            2.0 * SizeConfig.textMultiplier,
                                         color: Colors.black),
                                     children: <TextSpan>[
                                       TextSpan(
                                           text: TranslationBase.of(context)
-                                              .referralDoctor +
+                                                  .referralDoctor +
                                               " : ",
                                           style: TextStyle(
-                                              fontSize: 14, fontFamily: 'Poppins')),
+                                              fontSize: 14,
+                                              fontFamily: 'Poppins')),
                                       TextSpan(
                                           text: referralDoctorName,
                                           style: TextStyle(
@@ -511,8 +516,7 @@ class PatientReferralItemWidget extends StatelessWidget {
                     Container(
                         width: double.infinity,
                         alignment: Alignment.centerRight,
-                        child: Icon(FontAwesomeIcons.arrowRight,
-                            size: 25, color: Colors.black))
+                        child: infoIcon ?? Container())
                   ],
                 ),
                 // onTap: onTap,

lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart

@@ -116,7 +116,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget
                                       fontFamily: 'Poppins',
                                       fontSize: 12,
                                     ),
-                              arrivalType == '1'
+                              arrivalType == '1'|| patient.arrivedOn == null
                                   ? AppText(
                                       patient.startTime != null
                                           ? patient.startTime

lib/widgets/patients/profile/patient-profile-header-new-design.dart

@@ -116,7 +116,7 @@ class PatientProfileHeaderNewDesign extends StatelessWidget {
                                       fontFamily: 'Poppins',
                                       fontSize: 12,
                                     ),
-                              arrivalType == '1'
+                              arrivalType == '1' || patient.arrivedOn == null
                                   ? AppText(
                                       patient.startTime != null
                                           ? patient.startTime

lib/widgets/patients/profile/patient_profile_header_with_appointment_card.dart

@@ -150,7 +150,7 @@ class PatientProfileHeaderWhitAppointment extends StatelessWidget {
                               'Poppins',
                               fontSize: 12,
                             ),
-                            arrivalType == '1'
+                            arrivalType == '1' || patient.arrivedOn == null
                                 ? AppText(
                               patient.startTime !=
                                   null

lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart

@@ -150,7 +150,7 @@ class PatientProfileHeaderWhitAppointmentAppBar extends StatelessWidget with Pre
                               'Poppins',
                               fontSize: 12,
                             ),
-                            arrivalType == '1'
+                            arrivalType == '1' || patient.arrivedOn == null
                                 ? AppText(
                               patient.startTime !=
                                   null