From fc0678f2cc4825a7d45d755000979f6f7309d10e Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Tue, 11 Oct 2022 09:19:42 +0700
Subject: [PATCH] TF-968 Slightly re-arrange mailbox menu

---
 lib/features/mailbox/presentation/mailbox_view.dart         | 3 +++
 lib/features/mailbox/presentation/mailbox_view_web.dart     | 3 +++
 .../mailbox/presentation/model/mailbox_categories.dart      | 2 +-
 lib/l10n/intl_messages.arb                                  | 6 +++---
 lib/main/localizations/app_localizations.dart               | 6 +++---
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/features/mailbox/presentation/mailbox_view.dart b/lib/features/mailbox/presentation/mailbox_view.dart
index 3f7647576..f034b4951 100644
--- a/lib/features/mailbox/presentation/mailbox_view.dart
+++ b/lib/features/mailbox/presentation/mailbox_view.dart
@@ -270,6 +270,9 @@ class MailboxView extends GetWidget<MailboxController> {
   }
 
   Widget _buildMailboxCategory(BuildContext context, MailboxCategories categories, MailboxNode mailboxNode) {
+    if (categories == MailboxCategories.exchange) {
+      return _buildBodyMailboxCategory(context, categories, mailboxNode);
+    }
     return Column(children: [
       _buildHeaderMailboxCategory(context, categories),
       AnimatedContainer(
diff --git a/lib/features/mailbox/presentation/mailbox_view_web.dart b/lib/features/mailbox/presentation/mailbox_view_web.dart
index dacbae15f..63a222498 100644
--- a/lib/features/mailbox/presentation/mailbox_view_web.dart
+++ b/lib/features/mailbox/presentation/mailbox_view_web.dart
@@ -254,6 +254,9 @@ class MailboxView extends GetWidget<MailboxController> with AppLoaderMixin, Popu
   }
 
   Widget _buildMailboxCategory(BuildContext context, MailboxCategories categories, MailboxNode mailboxNode) {
+    if (categories == MailboxCategories.exchange) {
+      return _buildBodyMailboxCategory(context, categories, mailboxNode);
+    }
     return Column(children: [
       _buildHeaderMailboxCategory(context, categories),
       AnimatedContainer(
diff --git a/lib/features/mailbox/presentation/model/mailbox_categories.dart b/lib/features/mailbox/presentation/model/mailbox_categories.dart
index a7a81cf69..ba397bfa5 100644
--- a/lib/features/mailbox/presentation/model/mailbox_categories.dart
+++ b/lib/features/mailbox/presentation/model/mailbox_categories.dart
@@ -25,7 +25,7 @@ extension MailboxCategoriessExtension on MailboxCategories {
       case MailboxCategories.exchange:
         return AppLocalizations.of(context).exchange;
       case MailboxCategories.folders:
-        return AppLocalizations.of(context).folders;
+        return AppLocalizations.of(context).myFolders;
     }
   }
 
diff --git a/lib/l10n/intl_messages.arb b/lib/l10n/intl_messages.arb
index 1297f8e48..ff2cbe21d 100644
--- a/lib/l10n/intl_messages.arb
+++ b/lib/l10n/intl_messages.arb
@@ -1,5 +1,5 @@
 {
-  "@@last_modified": "2022-10-10T23:39:00.642884",
+  "@@last_modified": "2022-10-11T09:16:53.834708",
   "initializing_data": "Initializing data...",
   "@initializing_data": {
     "type": "text",
@@ -126,8 +126,8 @@
     "placeholders_order": [],
     "placeholders": {}
   },
-  "my_folders": "MY FOLDERS",
-  "@my_folders": {
+  "myFolders": "My Folders",
+  "@myFolders": {
     "type": "text",
     "placeholders_order": [],
     "placeholders": {}
diff --git a/lib/main/localizations/app_localizations.dart b/lib/main/localizations/app_localizations.dart
index 1c1385b7c..5ae7741e3 100644
--- a/lib/main/localizations/app_localizations.dart
+++ b/lib/main/localizations/app_localizations.dart
@@ -124,10 +124,10 @@ class AppLocalizations {
     );
   }
 
-  String get my_folders {
+  String get myFolders {
     return Intl.message(
-      'MY FOLDERS',
-      name: 'my_folders',
+      'My Folders',
+      name: 'myFolders',
     );
   }