From 0b50c7a8dd0ac33a0410535e780c34a5635c0fc1 Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Sun, 19 Jun 2022 18:59:11 +0300
Subject: [PATCH] Microsoft Login

---
 lib/ui/settings/email_settings.dart | 24 +++---------------------
 lib/utils/i18n.dart                 |  2 +-
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/lib/ui/settings/email_settings.dart b/lib/ui/settings/email_settings.dart
index dea3ec03b..3c98ae9d7 100644
--- a/lib/ui/settings/email_settings.dart
+++ b/lib/ui/settings/email_settings.dart
@@ -20,7 +20,6 @@ import 'package:invoiceninja_flutter/ui/app/forms/bool_dropdown_button.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/decorated_form_field.dart';
 import 'package:invoiceninja_flutter/ui/app/forms/dynamic_selector.dart';
 import 'package:invoiceninja_flutter/ui/settings/email_settings_vm.dart';
-import 'package:invoiceninja_flutter/utils/dialogs.dart';
 import 'package:invoiceninja_flutter/utils/localization.dart';
 import 'package:invoiceninja_flutter/utils/platforms.dart';
 
@@ -110,23 +109,6 @@ class _EmailSettingsState extends State<EmailSettings> {
     }
   }
 
-  void _onSavePressed(BuildContext context) {
-    final viewModel = widget.viewModel;
-    final settings = viewModel.settings;
-    final sendingUserId = settings.gmailSendingUserId ?? '';
-    final sendingMethod = settings.emailSendingMethod;
-
-    if (sendingMethod == SettingsEntity.EMAIL_SENDING_METHOD_GMAIL &&
-        sendingUserId.isEmpty) {
-      showErrorDialog(
-          context: context,
-          message: AppLocalization.of(context).selectAGmailUser);
-      return;
-    }
-
-    viewModel.onSavePressed(context);
-  }
-
   @override
   Widget build(BuildContext context) {
     final localization = AppLocalization.of(context);
@@ -138,13 +120,13 @@ class _EmailSettingsState extends State<EmailSettings> {
         memoizedMicrosoftUserList(viewModel.state.userState.map);
 
     final gmailSendingUserId = settings.gmailSendingUserId ?? '';
-    final disableSave = settings.emailSendingMethod ==
-            SettingsEntity.EMAIL_SENDING_METHOD_GMAIL &&
+    final disableSave = settings.emailSendingMethod !=
+            SettingsEntity.EMAIL_SENDING_METHOD_DEFAULT &&
         (gmailSendingUserId.isEmpty || gmailSendingUserId == '0');
 
     return EditScaffold(
       title: localization.emailSettings,
-      onSavePressed: disableSave ? null : _onSavePressed,
+      onSavePressed: disableSave ? null : viewModel.onSavePressed,
       body: AppForm(
         formKey: _formKey,
         focusNode: _focusNode,
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index bc5175490..f4557400c 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -16,7 +16,7 @@ mixin LocalizationsProvider on LocaleCodeAware {
   static final Map<String, Map<String, String>> _localizedValues = {
     'en': {
       // STARTER: lang key - do not remove comment
-      'use_web_app_to_connect_microsoft':
+            'use_web_app_to_connect_microsoft':
           'Please use the web app to connect to Microsoft',
       'email_provider': 'Email Provider',
       'connect_microsoft': 'Connect Microsoft',