Merge branch 'sultan' into 'diplomatic-quarter-live'

dashboard issue fixed

See merge request Cloud_Solution/diplomatic-quarter!222

lib/pages/login/confirm-login.dart

@@ -581,7 +581,8 @@ class _ConfirmLogin extends State<ConfirmLogin> {
     });
   }
 
-  goToHome() {
+  goToHome() async {
+    await authenticatedUserObject.getUser(getUser: true);
     authenticatedUserObject.isLogin = true;
     appointmentRateViewModel.isLogin = true;
     projectViewModel.isLogin = true;
@@ -661,7 +662,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
                 borderColor: Colors.grey,
                 showBorder: true,
                 child: Padding(
-                  padding: EdgeInsets.fromLTRB(30, 15, 30, 15),
+                  padding: EdgeInsets.fromLTRB(5, 15, 5, 15),
                   child: Column(
                     mainAxisAlignment: MainAxisAlignment.center,
                     children: <Widget>[
@@ -672,14 +673,16 @@ class _ConfirmLogin extends State<ConfirmLogin> {
                       ),
                       projectViewModel.isArabic
                           ? SizedBox(
-                              height: 0,
+                              height: 20,
                             )
                           : SizedBox(
                               height: 20,
                             ),
                       AppText(
                         TranslationBase.of(context).verifySMS,
-                        fontSize: SizeConfig.textMultiplier * 2,
+                        fontSize: projectViewModel.isArabic
+                            ? SizeConfig.textMultiplier * 1.8
+                            : SizeConfig.textMultiplier * 2,
                         textAlign: TextAlign.center,
                       )
                     ],
@@ -760,7 +763,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
                 borderColor: Colors.grey,
                 showBorder: true,
                 child: Padding(
-                  padding: EdgeInsets.fromLTRB(0, 0, 0, 5),
+                  padding: EdgeInsets.fromLTRB(5, 0, 5, 5),
                   child: Column(
                     children: <Widget>[
                       Image.asset(
@@ -773,7 +776,7 @@ class _ConfirmLogin extends State<ConfirmLogin> {
                               height: 15,
                             )
                           : SizedBox(
-                              height: 20,
+                              height: 10,
                             ),
                       AppText(
                         TranslationBase.of(context).moreVerification,