From 25cea0f6016f130bde3be87f14c8aaabce58dcc9 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 27 Jul 2022 16:39:02 +0300
Subject: [PATCH] Phone verify

---
 lib/ui/app/menu_drawer.dart       |  3 +-
 lib/ui/settings/user_details.dart | 67 ++++++++++++++++++++-----------
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index 57e3de03c..aed17d6d0 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -379,8 +379,7 @@ class _MenuDrawerState extends State<MenuDrawer> {
                                   ),
                                 ),
                             if (!state.account.accountSmsVerified &&
-                                state.isHosted &&
-                                state.company.displayName.isNotEmpty)
+                                state.isHosted)
                               if (state.isMenuCollapsed)
                                 Tooltip(
                                   message: localization.verifyPhoneNumberHelp,
diff --git a/lib/ui/settings/user_details.dart b/lib/ui/settings/user_details.dart
index 9c81cdbd0..83cd78e35 100644
--- a/lib/ui/settings/user_details.dart
+++ b/lib/ui/settings/user_details.dart
@@ -161,10 +161,13 @@ class _UserDetailsState extends State<UserDetails>
 
     final googleButton = Expanded(
       child: OutlinedButton(
-        child: Text((state.user.isConnectedToGoogle
-                ? localization.disconnectGoogle
-                : localization.connectGoogle)
-            .toUpperCase()),
+        child: Text(
+          (state.user.isConnectedToGoogle
+                  ? localization.disconnectGoogle
+                  : localization.connectGoogle)
+              .toUpperCase(),
+          textAlign: TextAlign.center,
+        ),
         onPressed: state.user.isConnectedToEmail
             ? null
             : () {
@@ -186,10 +189,13 @@ class _UserDetailsState extends State<UserDetails>
 
     final gmailButton = Expanded(
       child: OutlinedButton(
-        child: Text((user.isConnectedToEmail
-                ? localization.disconnectGmail
-                : localization.connectGmail)
-            .toUpperCase()),
+        child: Text(
+          (user.isConnectedToEmail
+                  ? localization.disconnectGmail
+                  : localization.connectGmail)
+              .toUpperCase(),
+          textAlign: TextAlign.center,
+        ),
         onPressed: !state.user.isConnectedToGoogle
             ? null
             : () async {
@@ -211,10 +217,13 @@ class _UserDetailsState extends State<UserDetails>
 
     final microsoftButton = Expanded(
       child: OutlinedButton(
-        child: Text((state.user.isConnectedToMicrosoft
-                ? localization.disconnectMicrosoft
-                : localization.connectMicrosoft)
-            .toUpperCase()),
+        child: Text(
+          (state.user.isConnectedToMicrosoft
+                  ? localization.disconnectMicrosoft
+                  : localization.connectMicrosoft)
+              .toUpperCase(),
+          textAlign: TextAlign.center,
+        ),
         onPressed: state.user.isConnectedToEmail
             ? null
             : () {
@@ -236,10 +245,13 @@ class _UserDetailsState extends State<UserDetails>
 
     final office365Button = Expanded(
       child: OutlinedButton(
-        child: Text((user.isConnectedToEmail
-                ? localization.disconnectEmail
-                : localization.connectEmail)
-            .toUpperCase()),
+        child: Text(
+          (user.isConnectedToEmail
+                  ? localization.disconnectEmail
+                  : localization.connectEmail)
+              .toUpperCase(),
+          textAlign: TextAlign.center,
+        ),
         onPressed: !state.user.isConnectedToMicrosoft
             ? null
             : () async {
@@ -261,10 +273,13 @@ class _UserDetailsState extends State<UserDetails>
 
     final appleButton = Expanded(
       child: OutlinedButton(
-        child: Text((state.user.isConnectedToApple
-                ? localization.disconnectApple
-                : localization.connectApple)
-            .toUpperCase()),
+        child: Text(
+          (state.user.isConnectedToApple
+                  ? localization.disconnectApple
+                  : localization.connectApple)
+              .toUpperCase(),
+          textAlign: TextAlign.center,
+        ),
         onPressed: () {
           if (state.settingsUIState.isChanged) {
             showMessageDialog(
@@ -389,6 +404,7 @@ class _UserDetailsState extends State<UserDetails>
                         child: OutlinedButton(
                           child: Text(
                             localization.verifyPhoneNumber.toUpperCase(),
+                            textAlign: TextAlign.center,
                           ),
                           onPressed: () {
                             if (state.settingsUIState.isChanged) {
@@ -418,10 +434,13 @@ class _UserDetailsState extends State<UserDetails>
                     ],
                     Expanded(
                       child: OutlinedButton(
-                        child: Text((state.user.isTwoFactorEnabled
-                                ? localization.disableTwoFactor
-                                : localization.enableTwoFactor)
-                            .toUpperCase()),
+                        child: Text(
+                          (state.user.isTwoFactorEnabled
+                                  ? localization.disableTwoFactor
+                                  : localization.enableTwoFactor)
+                              .toUpperCase(),
+                          textAlign: TextAlign.center,
+                        ),
                         onPressed: () {
                           if (state.settingsUIState.isChanged) {
                             showMessageDialog(