From 609d1a87ec93edcce690892ca4b81c11ab09003e Mon Sep 17 00:00:00 2001
From: Dat PHAM HOANG <dphamhoang@linagora.com>
Date: Thu, 10 Nov 2022 16:22:59 +0700
Subject: [PATCH] TF-1146 Remove Create Folder in destination picker

---
 .../presentation/destination_picker_view.dart | 24 +++++++++++++------
 .../top_bar_destination_picker_builder.dart   | 15 +-----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/lib/features/destination_picker/presentation/destination_picker_view.dart b/lib/features/destination_picker/presentation/destination_picker_view.dart
index 7abca86af..c26d02026 100644
--- a/lib/features/destination_picker/presentation/destination_picker_view.dart
+++ b/lib/features/destination_picker/presentation/destination_picker_view.dart
@@ -282,7 +282,7 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
                     mailboxActions: actions,
                     mailboxIdAlreadySelected: mailboxIdSelected,
                     mailboxDisplayed: MailboxDisplayed.destinationPicker)
-                ..addOnOpenMailboxFolderClick(_handleOpenMailboxNodeClick)
+                ..addOnOpenMailboxFolderClick((node) => _pickMailboxNode(context, node))
                 ..addOnExpandFolderActionClick((mailboxNode) => controller.toggleMailboxFolder(mailboxNode))
               ).build(),
             children: _buildListChildTileWidget(
@@ -300,12 +300,17 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
                 mailboxDisplayed: MailboxDisplayed.destinationPicker,
                 mailboxIdAlreadySelected: mailboxIdSelected,
                 mailboxActions: actions)
-            ..addOnOpenMailboxFolderClick(_handleOpenMailboxNodeClick)
+            ..addOnOpenMailboxFolderClick((node) => _pickMailboxNode(context, node))
           ).build();
         }})
       .toList() ?? <Widget>[];
   }
 
+  void _pickMailboxNode(BuildContext context, MailboxNode mailboxNode) {
+    _handleOpenMailboxNodeClick(mailboxNode);
+    controller.dispatchSelectMailboxDestination(context);
+  }
+
   Widget _buildListMailboxSearched(
       BuildContext context,
       MailboxActions? actions,
@@ -336,13 +341,17 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
                         mailboxIdAlreadySelected: mailboxIdSelected,
                         mailboxDisplayed: MailboxDisplayed.destinationPicker,
                         mailboxIdDestination: controller.mailboxDestination.value?.id)
-                    ..addOnOpenMailboxAction((mailbox) =>
-                        _handleOpenPresentationMailboxClick(context, mailbox)))
+                    ..addOnOpenMailboxAction((mailbox) => _pickPresentationMailbox(context, mailbox)))
                   .build())
         )
     ));
   }
 
+  void _pickPresentationMailbox(BuildContext context, PresentationMailbox mailbox) {
+    _handleOpenPresentationMailboxClick(context, mailbox);
+    controller.dispatchSelectMailboxDestination(context);
+  }
+
   Widget _buildAllMailboxes(
       BuildContext context,
       MailboxActions? actions,
@@ -352,9 +361,10 @@ class DestinationPickerView extends GetWidget<DestinationPickerController>
       return Material(
         color: Colors.transparent,
         child: InkWell(
-          onTap: () => _handleOpenPresentationMailboxClick(
-              context,
-              PresentationMailbox.unifiedMailbox),
+          onTap: () {
+            controller.selectMailboxAction(PresentationMailbox.unifiedMailbox);
+            controller.dispatchSelectMailboxDestination(context);
+          },
           child: Container(
             padding: const EdgeInsets.symmetric(horizontal: 24, vertical: 14),
             color: controller.mailboxDestination.value == PresentationMailbox.unifiedMailbox
diff --git a/lib/features/destination_picker/presentation/widgets/top_bar_destination_picker_builder.dart b/lib/features/destination_picker/presentation/widgets/top_bar_destination_picker_builder.dart
index 1562a214f..5bda8da73 100644
--- a/lib/features/destination_picker/presentation/widgets/top_bar_destination_picker_builder.dart
+++ b/lib/features/destination_picker/presentation/widgets/top_bar_destination_picker_builder.dart
@@ -112,20 +112,7 @@ class TopBarDestinationPickerBuilder extends StatelessWidget {
                     ),
                   ),
                 ),
-              ),
-            Align(
-              alignment: Alignment.centerRight,
-              child: Row(mainAxisSize: MainAxisSize.min, children: [
-                if (_destinationScreenType == DestinationScreenType.destinationPicker &&
-                    _mailboxAction != MailboxActions.create)
-                  _buildIconCreateButton(context),
-                if (_destinationScreenType == DestinationScreenType.destinationPicker)
-                  _buildDoneButton(context)
-                else
-                  _buildSaveButton(context),
-                const SizedBox(width: 8)
-              ]),
-            )
+              )
           ]
       ),
     );