From 327e058fbd92a44c846b1d53b1b63c50d33e1588 Mon Sep 17 00:00:00 2001
From: Mohammad Aljammal <Mohammad.Al-Jammal@cloudsolutions.com.sa>
Date: Thu, 8 Apr 2021 23:48:59 +0300
Subject: [PATCH] fix design issues and merge conflict

---
 lib/config/config.dart                                    | 4 ++--
 lib/widgets/otp/sms-popup.dart                            | 8 +++++---
 .../patients/profile/soap_update/update_soap_index.dart   | 2 +-
 pubspec.lock                                              | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/config/config.dart b/lib/config/config.dart
index 52fb8c3f..654f704a 100644
--- a/lib/config/config.dart
+++ b/lib/config/config.dart
@@ -4,8 +4,8 @@ const MAX_SMALL_SCREEN = 660;
 const ONLY_NUMBERS = "[0-9]";
 const ONLY_LETTERS = "[a-zA-Z &'\"]";
 const ONLY_DATE = "[0-9/]";
-//const BASE_URL = 'https://hmgwebservices.com/';
-const BASE_URL = 'https://uat.hmgwebservices.com/';
+const BASE_URL = 'https://hmgwebservices.com/';
+// const BASE_URL = 'https://uat.hmgwebservices.com/';
 const PHARMACY_ITEMS_URL = "Services/Lists.svc/REST/GetPharmcyItems_Region_enh";
 const PHARMACY_LIST_URL = "Services/Patients.svc/REST/GetPharmcyList";
 const PATIENT_PROGRESS_NOTE_URL =
diff --git a/lib/widgets/otp/sms-popup.dart b/lib/widgets/otp/sms-popup.dart
index 951e14ed..9cdda71b 100644
--- a/lib/widgets/otp/sms-popup.dart
+++ b/lib/widgets/otp/sms-popup.dart
@@ -236,9 +236,11 @@ class SMSOTP {
                     Padding(
                         padding: EdgeInsets.only(top: 10),
                         child: Row(children: [
-                          AppText(
-                            TranslationBase.of(context).validationMessage + ' ',
-                            fontWeight: FontWeight.w600,
+                          Expanded(
+                            child: AppText(
+                              TranslationBase.of(context).validationMessage + ' ',
+                              fontWeight: FontWeight.w600,
+                            ),
                           ),
                           AppText(
                             displayTime,
diff --git a/lib/widgets/patients/profile/soap_update/update_soap_index.dart b/lib/widgets/patients/profile/soap_update/update_soap_index.dart
index 288171c4..72c8c714 100644
--- a/lib/widgets/patients/profile/soap_update/update_soap_index.dart
+++ b/lib/widgets/patients/profile/soap_update/update_soap_index.dart
@@ -142,6 +142,6 @@ class _UpdateSoapIndexState extends State<UpdateSoapIndex>
           ),
         ),
       ),
-    );
+    ));
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index e15e02c9..46eca7cf 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -608,7 +608,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0-nullsafety.4"
+    version: "1.3.0-nullsafety.3"
   mime:
     dependency: transitive
     description:
@@ -900,7 +900,7 @@ packages:
       name: stack_trace
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.10.0-nullsafety.2"
+    version: "1.10.0-nullsafety.1"
   stream_channel:
     dependency: transitive
     description:
@@ -1084,5 +1084,5 @@ packages:
     source: hosted
     version: "2.2.1"
 sdks:
-  dart: ">=2.10.0 <=2.11.0-213.1.beta"
+  dart: ">=2.10.0 <2.11.0"
   flutter: ">=1.22.0 <2.0.0"