diff --git a/lib/core/viewModel/patient-referral-viewmodel.dart b/lib/core/viewModel/patient-referral-viewmodel.dart
index 861c110b..42888002 100644
--- a/lib/core/viewModel/patient-referral-viewmodel.dart
+++ b/lib/core/viewModel/patient-referral-viewmodel.dart
@@ -230,12 +230,12 @@ class PatientReferralViewModel extends BaseViewModel {
 
   Future makeReferral(PatiantInformtion patient, String isoStringDate,
       int projectID, int clinicID, int doctorID, String remarks) async {
-    setState(ViewState.Busy);
+    setState(ViewState.BusyLocal);
     await _referralPatientService.makeReferral(
         patient, isoStringDate, projectID, clinicID, doctorID, remarks);
     if (_referralPatientService.hasError) {
       error = _referralPatientService.error;
-      setState(ViewState.Error);
+      setState(ViewState.ErrorLocal);
     } else {
       setState(ViewState.Idle);
     }
diff --git a/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart b/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
index dce1d38c..e8d70786 100644
--- a/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
+++ b/lib/screens/doctor/doctor_replay/doctor_reply_widget.dart
@@ -207,10 +207,11 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
                                 label: TranslationBase.of(context).fileNumber,
                                 value: widget.reply.patientID.toString(),
                                 isCopyable: false,
+                                isExpanded: false,
                               ),
                               CustomRow(
-                                label: TranslationBase.of(context).age + " : ",
-                                isCopyable: false,
+                                label: TranslationBase.of(context).age + " : ",                                isCopyable: false,
+                                isExpanded: false,
                                 value:
                                     "${AppDateUtils.getAgeByBirthday(widget.reply.dateofBirth, context)}",
                               ),
diff --git a/lib/screens/patients/profile/referral/refer-patient-screen.dart b/lib/screens/patients/profile/referral/refer-patient-screen.dart
index a973d1c5..b8da5a14 100644
--- a/lib/screens/patients/profile/referral/refer-patient-screen.dart
+++ b/lib/screens/patients/profile/referral/refer-patient-screen.dart
@@ -7,6 +7,7 @@ import 'package:doctor_app_flutter/models/patient/patiant_info_model.dart';
 import 'package:doctor_app_flutter/screens/base/base_view.dart';
 import 'package:doctor_app_flutter/util/date-utils.dart';
 import 'package:doctor_app_flutter/util/dr_app_toast_msg.dart';
+import 'package:doctor_app_flutter/util/helpers.dart';
 import 'package:doctor_app_flutter/util/translations_delegate_base.dart';
 import 'package:doctor_app_flutter/widgets/patients/patient-referral-item-widget.dart';
 import 'package:doctor_app_flutter/widgets/patients/profile/app_bar/patient-profile-app-bar.dart';
@@ -209,19 +210,28 @@ class _PatientMakeReferralScreenState extends State<PatientMakeReferralScreen> {
                             _selectedClinic == null ||
                             _selectedDoctor == null ||
                             _remarksController.text == null) return;
-                        model
+                        GifLoaderDialogUtils.showMyDialog(context);
+                        await model
                             .makeReferral(
                                 patient,
                                 appointmentDate.toIso8601String(),
                                 _selectedBranch['facilityId'],
                                 _selectedClinic['ClinicID'],
                                 _selectedDoctor['DoctorID'],
-                                _remarksController.text)
-                            .then((_) {
+                                _remarksController.text);
+                        if(model.state ==  ViewState.ErrorLocal) {
+                          GifLoaderDialogUtils.hideDialog(context);
+
+                          Helpers.showErrorToast(model.error);
+
+                        } else {
+                          GifLoaderDialogUtils.hideDialog(context);
+
                           DrAppToastMsg.showSuccesToast(
                               TranslationBase.of(context).referralSuccessMsg);
                           Navigator.pop(context);
-                        });
+                        }
+
                       },
                     ),
                   )
diff --git a/lib/widgets/shared/user-guid/CusomRow.dart b/lib/widgets/shared/user-guid/CusomRow.dart
index f7181f14..006e0fa4 100644
--- a/lib/widgets/shared/user-guid/CusomRow.dart
+++ b/lib/widgets/shared/user-guid/CusomRow.dart
@@ -12,6 +12,7 @@ class CustomRow extends StatelessWidget {
     this.valueSize,
     this.width,
     this.isCopyable = true,
+    this.isExpanded = true,
   }) : super(key: key);
 
   final String label;
@@ -20,6 +21,7 @@ class CustomRow extends StatelessWidget {
   final double valueSize;
   final double width;
   final bool isCopyable;
+  final bool isExpanded;
 
   @override
   Widget build(BuildContext context) {
@@ -38,7 +40,7 @@ class CustomRow extends StatelessWidget {
           width: 1,
         ),
         Expanded(
-          flex: 0,
+          flex: isExpanded ? 1 : 0,
           child: AppText(
             value,
             fontSize: