From 8335aaba07150482226f2e97398854279c20c706 Mon Sep 17 00:00:00 2001
From: dab246 <tdvu@linagora.com>
Date: Mon, 18 Aug 2025 14:00:58 +0700
Subject: [PATCH] TF-3950 Keep the `hide` and `show` button in the same column
 in web

Signed-off-by: dab246 <tdvu@linagora.com>
---
 .../mailbox_visibility_view.dart                | 15 ++++++++++++++-
 .../mailbox_visibility_folder_tile_builder.dart | 17 +----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart
index ff589ef02..b0f8b60eb 100644
--- a/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart
+++ b/lib/features/manage_account/presentation/mailbox_visibility/mailbox_visibility_view.dart
@@ -133,13 +133,26 @@ class MailboxVisibilityView extends GetWidget<MailboxVisibilityController>
         padding: const EdgeInsets.symmetric(horizontal: 12),
         child: bodyListMailbox,
       );
+    } else {
+      bodyListMailbox = Container(
+        margin: const EdgeInsets.symmetric(horizontal: 12),
+        width: 315,
+        child: bodyListMailbox,
+      );
     }
 
     return SingleChildScrollView(
       controller: controller.mailboxListScrollController,
       key: const PageStorageKey('mailbox_list'),
       physics: const ClampingScrollPhysics(),
-      child: bodyListMailbox,
+      child: controller.responsiveUtils.isScreenWithShortestSide(context)
+        ? bodyListMailbox
+        : Row(
+          children: [
+            Flexible(child: bodyListMailbox),
+            const Spacer(),
+          ],
+        ),
     );
   }
 
diff --git a/lib/features/manage_account/presentation/mailbox_visibility/widgets/mailbox_visibility_folder_tile_builder.dart b/lib/features/manage_account/presentation/mailbox_visibility/widgets/mailbox_visibility_folder_tile_builder.dart
index 01e28aeda..5a2e67352 100644
--- a/lib/features/manage_account/presentation/mailbox_visibility/widgets/mailbox_visibility_folder_tile_builder.dart
+++ b/lib/features/manage_account/presentation/mailbox_visibility/widgets/mailbox_visibility_folder_tile_builder.dart
@@ -1,6 +1,5 @@
 import 'package:core/presentation/extensions/color_extension.dart';
 import 'package:core/presentation/resources/image_paths.dart';
-import 'package:core/presentation/utils/responsive_utils.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:model/extensions/presentation_mailbox_extension.dart';
@@ -33,14 +32,12 @@ class MailBoxVisibilityFolderTileBuilder extends StatefulWidget {
 class _MailBoxVisibilityFolderTileBuilderState
     extends State<MailBoxVisibilityFolderTileBuilder> {
   final _imagePaths = Get.find<ImagePaths>();
-  final _responsiveUtils = Get.find<ResponsiveUtils>();
 
   final GlobalKey _key = GlobalKey();
 
   @override
   Widget build(BuildContext context) {
-    final isScreenWithShortestSide = _responsiveUtils.isScreenWithShortestSide(context);
-    final bodyWidget = Material(
+    return Material(
       key: _key,
       type: MaterialType.transparency,
       child: InkWell(
@@ -50,7 +47,6 @@ class _MailBoxVisibilityFolderTileBuilderState
         ),
         child: Container(
           padding: const EdgeInsets.symmetric(horizontal: 12),
-          width: isScreenWithShortestSide ? double.infinity : 315,
           height: widget.mailboxNode.item.isTeamMailboxes
               ? MailboxItemWidgetStyles.teamMailboxHeight
               : 40,
@@ -81,17 +77,6 @@ class _MailBoxVisibilityFolderTileBuilderState
         ),
       ),
     );
-
-    if (isScreenWithShortestSide) {
-      return bodyWidget;
-    } else {
-      return Row(
-        children: [
-          Flexible(child: bodyWidget),
-          const Spacer(),
-        ],
-      );
-    }
   }
 
   PresentationMailbox get _mailbox => widget.mailboxNode.item;