From 7694a821103605d2dcf6eafe85d4f0db2de31875 Mon Sep 17 00:00:00 2001 From: dab246 Date: Thu, 6 Jul 2023 20:07:10 +0700 Subject: [PATCH] TF-1708 Sync mailbox path by display name (cherry picked from commit 6cc0a00821bc71c28750ab3ba8377d6f83881346) --- .../mailbox/presentation/model/mailbox_tree.dart | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/features/mailbox/presentation/model/mailbox_tree.dart b/lib/features/mailbox/presentation/model/mailbox_tree.dart index 0e83f641b..40c22a1dd 100644 --- a/lib/features/mailbox/presentation/model/mailbox_tree.dart +++ b/lib/features/mailbox/presentation/model/mailbox_tree.dart @@ -6,6 +6,8 @@ import 'package:jmap_dart_client/jmap/mail/mailbox/mailbox.dart'; import 'package:model/mailbox/expand_mode.dart'; import 'package:model/mailbox/presentation_mailbox.dart'; import 'package:model/mailbox/select_mode.dart'; +import 'package:tmail_ui_user/features/mailbox/presentation/extensions/presentation_mailbox_extension.dart'; +import 'package:tmail_ui_user/main/routes/route_navigation.dart'; import 'mailbox_node.dart'; @@ -85,7 +87,12 @@ class MailboxTree with EquatableMixin { if (matchedNode == null) { return null; } - String path = '${matchedNode.item.name?.name}'; + String path = ''; + if (currentContext != null) { + path = matchedNode.item.getDisplayName(currentContext!); + } else { + path = '${matchedNode.item.name?.name}'; + } var parentId = matchedNode.item.parentId; @@ -94,7 +101,11 @@ class MailboxTree with EquatableMixin { if (parentNode == null) { break; } - path = '${parentNode.item.name?.name}/$path'; + if (currentContext != null) { + path = '${parentNode.item.getDisplayName(currentContext!)}/$path'; + } else { + path = '${parentNode.item.name?.name}/$path'; + } parentId = parentNode.item.parentId; } return path;